caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

files renamed and added icon

Browse source
This commit is contained in:
Roumen Georgiev 2018-06-05 12:19:47 +03:00
parent 37e6e0268c
commit c1b69404d0
8 changed files with 7 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
View file

@ -116,7 +116,7 @@ public class DanaRUserOptionsActivity extends Activity {
screenTimeout.setStep(5d); screenTimeout.setStep(5d);
screenTimeout.setParams(5d,5d,240d,5d,new DecimalFormat("1"), false); screenTimeout.setParams(5d,5d,240d,5d,new DecimalFormat("1"), false);
backlightTimeout.setValue((double) pump.backlightOnTimeSec); backlightTimeout.setValue((double) pump.backlightOnTimeSec);
backlightTimeout.setParams(0d,0d,60d,1d,new DecimalFormat("1"), false); backlightTimeout.setParams(1d,1d,60d,1d,new DecimalFormat("1"), false);
if(pump.lastSettingsRead == 0) if(pump.lastSettingsRead == 0)
log.debug("No settings loaded from pump!"); log.debug("No settings loaded from pump!");
if (pump.getUnits() != null) { if (pump.getUnits() != null) {

BIN
app/src/main/res/drawable-hdpi/icon_danar-useropthdpi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-mdpi/icon_danar-useroptmdpi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 974 B

BIN
app/src/main/res/drawable-xhdpi/icon_danar-useroptxhdpi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_danar-useroptxxhdpi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xxxhdpi/icon_danar-useroptxxxhdpi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.7 KiB

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

@ -736,7 +736,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/icon_danar_useropt"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/danar_useroptions" /> android:text="@string/danar_useroptions" />

44
app/src/main/res/layout/danar_user_options.xml
View file

@ -218,6 +218,7 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -229,16 +230,6 @@
android:text="@string/danar_screentimeout" android:text="@string/danar_screentimeout"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<info.nightscout.utils.NumberPicker <info.nightscout.utils.NumberPicker
android:id="@+id/danar_screentimeout" android:id="@+id/danar_screentimeout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -267,6 +258,7 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -278,16 +270,6 @@
android:text="@string/danar_backlight" android:text="@string/danar_backlight"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<info.nightscout.utils.NumberPicker <info.nightscout.utils.NumberPicker
android:id="@+id/danar_backlight" android:id="@+id/danar_backlight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -349,6 +331,7 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -360,15 +343,7 @@
android:text="@string/danar_shutdown" android:text="@string/danar_shutdown"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<info.nightscout.utils.NumberPicker <info.nightscout.utils.NumberPicker
android:id="@+id/danar_shutdown" android:id="@+id/danar_shutdown"
@ -398,6 +373,7 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -409,16 +385,6 @@
android:text="@string/danar_lowreservoir" android:text="@string/danar_lowreservoir"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<info.nightscout.utils.NumberPicker <info.nightscout.utils.NumberPicker
android:id="@+id/danar_lowreservoir" android:id="@+id/danar_lowreservoir"
android:layout_width="wrap_content" android:layout_width="wrap_content"