From 1147c28f0482f2f1bdf3cb4eb09822e0ed94d3a6 Mon Sep 17 00:00:00 2001 From: Roumen Georgiev Date: Mon, 4 Jun 2018 10:23:01 +0300 Subject: [PATCH] use numberPicker instead of editText --- .../activities/DanaRUserOptionsActivity.java | 38 ++++++++------- .../main/res/layout/danar_user_options.xml | 48 +++++++++---------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java index 902f603826..0c82995c83 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java @@ -17,6 +17,8 @@ import android.widget.TextView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.DecimalFormat; + import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; @@ -24,9 +26,7 @@ import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin; -import info.nightscout.androidaps.plugins.PumpDanaRS.services.DanaRSService; -import info.nightscout.utils.SP; - +import info.nightscout.utils.NumberPicker; /** * Created by Rumen Georgiev on 5/31/2018. */ @@ -42,10 +42,10 @@ public class DanaRUserOptionsActivity extends Activity { RadioButton pumpAlarmVibrate; RadioButton pumpAlarmBoth; Switch pumpUnits; - EditText screenTimeout; - EditText backlightTimeout; - EditText shutdown; - EditText lowReservoir; + NumberPicker screenTimeout; + NumberPicker backlightTimeout; + NumberPicker shutdown; + NumberPicker lowReservoir; Button saveToPumpButton; @Override @@ -72,11 +72,11 @@ public class DanaRUserOptionsActivity extends Activity { pumpAlarmSound = (RadioButton) findViewById(R.id.danar_pumpalarm_sound); pumpAlarmVibrate = (RadioButton) findViewById(R.id.danar_pumpalarm_vibrate); pumpAlarmBoth = (RadioButton) findViewById(R.id.danar_pumpalarm_both); - screenTimeout = (EditText) findViewById(R.id.danar_screentimeout); - backlightTimeout = (EditText) findViewById(R.id.danar_backlight); + screenTimeout = (NumberPicker) findViewById(R.id.danar_screentimeout); + backlightTimeout = (NumberPicker) findViewById(R.id.danar_backlight); pumpUnits = (Switch) findViewById(R.id.danar_units); - shutdown = (EditText) findViewById(R.id.danar_shutdown); - lowReservoir = (EditText) findViewById(R.id.danar_lowreservoir); + shutdown = (NumberPicker) findViewById(R.id.danar_shutdown); + lowReservoir = (NumberPicker) findViewById(R.id.danar_lowreservoir); saveToPumpButton = (Button) findViewById(R.id.save_user_options); saveToPumpButton.setOnClickListener(new View.OnClickListener() { @@ -118,17 +118,23 @@ public class DanaRUserOptionsActivity extends Activity { beep.setChecked(true); } - screenTimeout.setText(String.valueOf(pump.lcdOnTimeSec)); - backlightTimeout.setText(String.valueOf(pump.backlightOnTimeSec)); + screenTimeout.setValue((double) pump.lcdOnTimeSec); + screenTimeout.setStep(5d); + screenTimeout.setParams(5d,5d,240d,5d,new DecimalFormat("1"), false); + backlightTimeout.setValue((double) pump.backlightOnTimeSec); + backlightTimeout.setParams(0d,0d,60d,1d,new DecimalFormat("1"), false); if(pump.lastSettingsRead == 0) - backlightTimeout.setText(String.valueOf(666)); + log.debug("No settings loaded from pump!"); if (pump.getUnits() != null) { if(pump.getUnits().equals(Constants.MMOL)) { pumpUnits.setChecked(true); } } - shutdown.setText(String.valueOf(pump.shutdownHour)); - lowReservoir.setText(String.valueOf(pump.lowReservoirRate)); + shutdown.setValue((double) pump.shutdownHour); + shutdown.setParams(0d,0d,24d,1d,new DecimalFormat("1"), false); + lowReservoir.setValue((double) pump.lowReservoirRate); + lowReservoir.setStep(10D); + lowReservoir.setParams(10d,10d,60d,10d,new DecimalFormat("10"), false); } }); } diff --git a/app/src/main/res/layout/danar_user_options.xml b/app/src/main/res/layout/danar_user_options.xml index b0affb9082..6cc9ae609c 100644 --- a/app/src/main/res/layout/danar_user_options.xml +++ b/app/src/main/res/layout/danar_user_options.xml @@ -239,13 +239,13 @@ android:text=":" android:textSize="14sp" /> - + android:layout_width="wrap_content" + android:layout_height="40dp" + android:layout_gravity="end" + android:paddingLeft="5dp" + android:paddingRight="5dp" /> @@ -288,13 +288,13 @@ android:text=":" android:textSize="14sp" /> - + android:layout_width="wrap_content" + android:layout_height="40dp" + android:layout_gravity="end" + android:paddingLeft="5dp" + android:paddingRight="5dp" /> @@ -370,13 +370,13 @@ android:text=":" android:textSize="14sp" /> - + android:layout_width="wrap_content" + android:layout_height="40dp" + android:layout_gravity="end" + android:paddingLeft="5dp" + android:paddingRight="5dp" /> @@ -419,13 +419,13 @@ android:text=":" android:textSize="14sp" /> - + android:layout_width="wrap_content" + android:layout_height="40dp" + android:layout_gravity="end" + android:paddingLeft="5dp" + android:paddingRight="5dp" />