Skip to content
This repository was archived by the owner on Apr 9, 2021. It is now read-only.

Commit 4bb6556

Browse files
Improve prefs UI
1 parent 73b4305 commit 4bb6556

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

app/src/main/java/org/indilib/i4j/iparcos/PrefsFragment.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
5757
prefScreen.addPreference(prefGroup);
5858
for (INDIProperty<?> prop : props) {
5959
PropPref<?> pref = PropPref.create(context, prop);
60-
if (pref != null) pref.setIconSpaceReserved(false);
61-
map.put(prop, pref);
62-
prefGroup.addPreference(pref);
60+
if (pref != null) {
61+
pref.setIconSpaceReserved(false);
62+
map.put(prop, pref);
63+
prefGroup.addPreference(pref);
64+
}
6365
}
6466
}
6567
}
@@ -91,13 +93,17 @@ public void newProperty(INDIDevice device, final INDIProperty<?> property) {
9193
PreferenceCategory prefGroup = groups.get(group);
9294
if (prefGroup == null) {
9395
prefGroup = new PreferenceCategory(context);
96+
prefGroup.setIconSpaceReserved(false);
9497
groups.put(group, prefGroup);
9598
prefGroup.setTitle(group);
9699
prefScreen.addPreference(prefGroup);
97100
}
98101
PropPref<?> pref = PropPref.create(context, property);
99-
map.put(property, pref);
100-
prefGroup.addPreference(pref);
102+
if (pref != null) {
103+
pref.setIconSpaceReserved(false);
104+
map.put(property, pref);
105+
prefGroup.addPreference(pref);
106+
}
101107
});
102108
}
103109

app/src/main/java/org/indilib/i4j/iparcos/prop/NumberPropPref.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ protected Spannable createSummary() {
5858
}
5959
stringBuilder.append(elements.get(i).getValueAsString());
6060
return new SpannableString(stringBuilder.toString());
61-
6261
} else {
6362
return new SpannableString(getContext().getString(R.string.no_indi_elements));
6463
}

app/src/main/java/org/indilib/i4j/iparcos/prop/PropPref.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ public abstract class PropPref<Element extends INDIElement> extends Preference i
3131
protected PropPref(Context context, INDIProperty<Element> prop) {
3232
super(context);
3333
this.prop = prop;
34-
3534
prop.addINDIPropertyListener(this);
36-
3735
setTitle(createTitle());
3836
setSummary(createSummary());
3937
}
@@ -73,17 +71,14 @@ protected Spannable createTitle() {
7371
color = IPARCOSApp.getContext().getResources().getColor(R.color.light_red);
7472
break;
7573
}
76-
7774
case BUSY: {
7875
color = IPARCOSApp.getContext().getResources().getColor(R.color.light_yellow);
7976
break;
8077
}
81-
8278
case OK: {
8379
color = IPARCOSApp.getContext().getResources().getColor(R.color.light_green);
8480
break;
8581
}
86-
8782
default: {
8883
color = Color.WHITE;
8984
break;

0 commit comments

Comments
 (0)