Dark98/SliceBeam
1
0
Fork 0
mirror of https://github.com/Dark98/SliceBeam.git synced 2026-07-07 08:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix legacy enums support

Browse Source
This commit is contained in:
YTKAB0BP
2024-11-22 20:29:19 +03:00
parent 4a6a290f6d
commit 368a5cca00
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/ytkab0bp/slicebeam/fragment/ProfileListFragment.java
+21 -2
View File
@@ -580,7 +580,12 @@ public abstract class ProfileListFragment extends Fragment {
labels[i] = Slic3rLocalization.getString(def.enumLabels[i]); labels[i] = Slic3rLocalization.getString(def.enumLabels[i]);
} }
} }
builder.setSingleChoiceItems(labels, Arrays.asList(values).indexOf(opt(def, eIndex)), (dialog, which) -> { String val = opt(def, eIndex);
int i = Arrays.asList(values).indexOf(val);
if (i == -1 && val.matches("^\\d+$")) {
i = Integer.parseInt(val);
}
builder.setSingleChoiceItems(labels, i, (dialog, which) -> {
updateConfigField(def, eIndex, values[which]); updateConfigField(def, eIndex, values[which]);
// TODO: Update only value // TODO: Update only value
recyclerView.getAdapter().notifyItemChanged(boundIndex); recyclerView.getAdapter().notifyItemChanged(boundIndex);
@@ -700,7 +705,21 @@ public abstract class ProfileListFragment extends Fragment {
((PreferenceItem) simpleItem).setTitle(null); ((PreferenceItem) simpleItem).setTitle(null);
} }
} else { } else {
((PreferenceItem) simpleItem).setValueProvider(() -> def.type == ConfigOptionDef.ConfigOptionType.ENUM ? Slic3rLocalization.getString(def.enumLabels[Arrays.asList(def.enumValues).indexOf(opt(def, eIndex))]) : opt(def, eIndex)); ((PreferenceItem) simpleItem).setValueProvider(() -> {
if (def.type == ConfigOptionDef.ConfigOptionType.ENUM) {
String v = opt(def, eIndex);
int i = Arrays.asList(def.enumValues).indexOf(v);
if (i != -1) {
return Slic3rLocalization.getString(def.enumLabels[i]);
} else if (v.matches("^\\d+$")) {
return Slic3rLocalization.getString(def.enumLabels[Integer.parseInt(v)]);
} else {
return v;
}
} else {
return opt(def, eIndex);
}
});
} }
} }
switch (def.type) { switch (def.type) {