caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Diaconn: resource cleanup

Browse source
This commit is contained in:
Milos Kozak 2022-02-23 23:59:03 +01:00
parent 547c6056f4
commit 389740ccc3
4 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,6 @@
<string name="end_user_license_agreement">End User License Agreement</string> <string name="end_user_license_agreement">End User License Agreement</string>
<string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string> <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
<string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string> <string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string>
<string name="save">Save</string>
<string name="reloadprofile">Reload profile</string> <string name="reloadprofile">Reload profile</string>
<string name="smscommunicator">SMS Communicator</string> <string name="smscommunicator">SMS Communicator</string>
<string name="smscommunicator_allowednumbers">Allowed phone numbers</string> <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>

1
core/src/main/res/values/strings.xml
View file

@ -68,6 +68,7 @@
<!-- General--> <!-- General-->
<string name="refresh">Refresh</string> <string name="refresh">Refresh</string>
<string name="error">Error</string> <string name="error">Error</string>
<string name="save">Save</string>
<string name="not_set_short">Not set</string> <string name="not_set_short">Not set</string>
<string name="failedupdatebasalprofile">Failed to update basal profile</string> <string name="failedupdatebasalprofile">Failed to update basal profile</string>
<string name="profile_set_ok">Basal profile in pump updated</string> <string name="profile_set_ok">Basal profile in pump updated</string>

35
diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
View file

@ -47,7 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"></LinearLayout> android:padding="5dp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -86,14 +86,14 @@
android:id="@+id/beep_and_alarm" android:id="@+id/beep_and_alarm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="end"
android:minWidth="120dp" /> android:minWidth="120dp" />
<Spinner <Spinner
android:id="@+id/alarm_intesity" android:id="@+id/alarm_intesity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="end"
android:minWidth="120dp" /> android:minWidth="120dp" />
<View <View
@ -102,11 +102,11 @@
android:layout_weight="1" /> android:layout_weight="1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton" style="@style/OkCancelButton.Text"
android:id="@+id/save_alarm" android:id="@+id/save_alarm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Save" /> android:text="@string/save" />
</LinearLayout> </LinearLayout>
@ -114,7 +114,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"></LinearLayout> android:padding="5dp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -155,7 +155,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checkedButton="@+id/pumpalarm_sound" android:checkedButton="@+id/pumpalarm_sound"
android:orientation="horizontal"> android:orientation="vertical">
<RadioButton <RadioButton
android:id="@+id/pumpscreentimeout_10" android:id="@+id/pumpscreentimeout_10"
@ -183,11 +183,11 @@
android:layout_weight="1" /> android:layout_weight="1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton" style="@style/OkCancelButton.Text"
android:id="@+id/save_lcd_on_time" android:id="@+id/save_lcd_on_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Save" /> android:text="@string/save" />
</LinearLayout> </LinearLayout>
@ -195,7 +195,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"></LinearLayout> android:padding="5dp" />
<LinearLayout <LinearLayout
@ -237,7 +237,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checkedButton="@+id/pumpalarm_sound" android:checkedButton="@+id/pumpalarm_sound"
android:orientation="horizontal"> android:orientation="vertical">
<RadioButton <RadioButton
android:id="@+id/pumplang_english" android:id="@+id/pumplang_english"
@ -265,11 +265,11 @@
android:layout_weight="1" /> android:layout_weight="1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton" style="@style/OkCancelButton.Text"
android:id="@+id/save_lang" android:id="@+id/save_lang"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Save" /> android:text="@string/save" />
</LinearLayout> </LinearLayout>
@ -277,7 +277,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"></LinearLayout> android:padding="5dp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -319,7 +319,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:paddingRight="5dp" /> android:paddingEnd="5dp"
tools:ignore="RtlSymmetry" />
<View <View
android:layout_width="0dp" android:layout_width="0dp"
@ -327,11 +328,11 @@
android:layout_weight="1" /> android:layout_weight="1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton" style="@style/OkCancelButton.Text"
android:id="@+id/save_bolus_speed" android:id="@+id/save_bolus_speed"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Save" /> android:text="@string/save" />
</LinearLayout> </LinearLayout>

16
diaconn/src/main/res/values/themes.xml
View file

@ -1,16 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.AndroidAPS" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
</style>
</resources>