caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

units selection in setup wizard

Browse source
This commit is contained in:
Milos Kozak 2019-11-12 15:19:18 +01:00
parent 02891a14fc
commit 128e8a024d
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
View file

@ -108,6 +108,14 @@ public class SWDefinition {
.visibility(() -> !SP.getBoolean(R.string.key_i_understand, false))
.validator(() -> SP.getBoolean(R.string.key_i_understand, false));
private SWScreen screenUnits = new SWScreen(R.string.units)
.skippable(false)
.add(new SWRadioButton()
.option(R.array.unitsArray, R.array.unitsValues)
.preferenceId(R.string.key_units).label(R.string.units)
.comment(R.string.setupwizard_units_prompt))
.validator(() -> SP.contains(R.string.key_units));
private SWScreen screenPermissionBattery = new SWScreen(R.string.permission)
.skippable(false)
.add(new SWInfotext()
@ -412,6 +420,7 @@ public class SWDefinition {
.add(screenPermissionBt)
.add(screenPermissionStore)
.add(screenImport)
.add(screenUnits)
.add(screenNsClient)
.add(screenAge)
.add(screenInsulin)
@ -438,6 +447,7 @@ public class SWDefinition {
.add(screenPermissionBt)
.add(screenPermissionStore)
.add(screenImport)
.add(screenUnits)
.add(screenNsClient)
.add(screenAge)
.add(screenInsulin)
@ -459,6 +469,7 @@ public class SWDefinition {
.add(screenPermissionBattery)
.add(screenPermissionStore)
.add(screenImport)
.add(screenUnits)
.add(screenNsClient)
.add(screenBgSource)
.add(screenAge)

2
app/src/main/res/layout/localprofile_fragment.xml
View file

@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="@string/units"
android:text="@string/units_colon"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView

4
app/src/main/res/values/strings.xml
View file

@ -394,7 +394,8 @@
<string name="button1">Button 1</string>
<string name="button2">Button 2</string>
<string name="button3">Button 3</string>
<string name="units">Units:</string>
<string name="units_colon">Units:</string>
<string name="units">Units</string>
<string name="mgdl">mg/dl</string>
<string name="mmol">mmol/l</string>
<string name="dia">DIA:</string>
@ -1620,5 +1621,6 @@
<string name="common_on">On</string>
<string name="common_off">Off</string>
<string name="nopumpselected">No pump selected</string>
<string name="setupwizard_units_prompt">Select units you want to display values in</string>
</resources>