Compare commits
2 Commits
develop
...
6cba0674cf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6cba0674cf | ||
|
|
b87d911cea |
@@ -108,15 +108,15 @@ fun PresetIconButton(
|
|||||||
Image(
|
Image(
|
||||||
painter = painterResource(id =
|
painter = painterResource(id =
|
||||||
if (type == PresetButtonType.SAVE) {
|
if (type == PresetButtonType.SAVE) {
|
||||||
R.drawable.ic_preset_save
|
R.drawable.ic_preset_save2
|
||||||
} else {
|
} else {
|
||||||
R.drawable.ic_preset_load
|
R.drawable.ic_preset_load
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
contentDescription = "",
|
contentDescription = "",
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(20.px.dp),
|
.size(30.px.dp),
|
||||||
contentScale = ContentScale.Crop
|
contentScale = ContentScale.Fit
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -552,12 +552,12 @@ fun PresetLoadPopup(
|
|||||||
horizontalArrangement = Arrangement.Center,
|
horizontalArrangement = Arrangement.Center,
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
Spacer(Modifier.weight(1f))
|
|
||||||
|
|
||||||
if (isEditMode) {
|
if (isEditMode) {
|
||||||
////////////////////////////////////////////////////
|
////////////////////////////////////////////////////
|
||||||
// Edit Mode
|
// Edit Mode
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.width(10.px.dp))
|
||||||
|
|
||||||
// Preset Delete (Delete confirm popup)
|
// Preset Delete (Delete confirm popup)
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
@@ -578,7 +578,7 @@ fun PresetLoadPopup(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(Modifier.width(10.px.dp))
|
Spacer(Modifier.weight(1f))
|
||||||
|
|
||||||
// Preset Cancel (Reload selected item from mainViewModel)
|
// Preset Cancel (Reload selected item from mainViewModel)
|
||||||
Box(
|
Box(
|
||||||
@@ -729,7 +729,11 @@ fun PresetLoadPopup(
|
|||||||
contentScale = ContentScale.Crop
|
contentScale = ContentScale.Crop
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.width(10.px.dp))
|
||||||
} else {
|
} else {
|
||||||
|
Spacer(Modifier.weight(1f))
|
||||||
|
|
||||||
////////////////////////////////////////////////////
|
////////////////////////////////////////////////////
|
||||||
// Select Mode - hide Keyboard
|
// Select Mode - hide Keyboard
|
||||||
focusManager.clearFocus(force = true) // Hide the keyboard
|
focusManager.clearFocus(force = true) // Hide the keyboard
|
||||||
@@ -790,6 +794,8 @@ fun PresetLoadPopup(
|
|||||||
contentScale = ContentScale.Crop
|
contentScale = ContentScale.Crop
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.width(10.px.dp))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user