caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: fix lint warning

Browse source
This commit is contained in:
Andries Smit 2022-05-20 21:42:48 +02:00
parent 36a4ca33ee
commit fc937d897d
15 changed files with 880 additions and 798 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
diaconn/src/main/AndroidManifest.xml
View file

@ -7,7 +7,8 @@
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" /> <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<application> <application
android:supportsRtl="true">
<activity <activity
android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity" android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />

220
diaconn/src/main/res/layout/diaconn_g8_fragment.xml
View file

@ -21,8 +21,8 @@
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:paddingBottom="5dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="5dp"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
@ -35,21 +35,23 @@
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:text="@string/initializing" android:text="@string/initializing"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/serialnumber" android:text="@string/serialnumber"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -57,8 +59,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -68,8 +70,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -77,25 +80,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/diaconn_g8_bluetooth_status" android:text="@string/diaconn_g8_bluetooth_status"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -103,8 +107,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -114,10 +118,11 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:text="{fa-bluetooth-b}" android:text="{fa-bluetooth-b}"
android:textSize="20dp" android:textAlignment="viewStart"
android:textSize="20sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -133,25 +138,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/battery_label" android:text="@string/battery_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -159,8 +165,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -170,8 +176,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="20sp" /> android:textSize="20sp" />
</LinearLayout> </LinearLayout>
@ -179,25 +186,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/lastconnection_label" android:text="@string/lastconnection_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -205,8 +213,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -216,8 +224,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -225,25 +234,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/lastbolus_label" android:text="@string/lastbolus_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -251,8 +261,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -262,8 +272,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -271,25 +282,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/dailyunits" android:text="@string/dailyunits"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -297,8 +309,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -308,8 +320,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -317,25 +330,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/basebasalrate_label" android:text="@string/basebasalrate_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -343,8 +357,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -354,8 +368,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -363,25 +378,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/tempbasal_label" android:text="@string/tempbasal_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -389,8 +405,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -400,8 +416,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -409,25 +426,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/virtualpump_extendedbolus_label" android:text="@string/virtualpump_extendedbolus_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -435,8 +453,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -446,8 +464,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -455,25 +474,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/reservoir_label" android:text="@string/reservoir_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -481,8 +501,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -492,8 +512,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -501,25 +522,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/basal_step" android:text="@string/basal_step"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -527,8 +549,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -538,8 +560,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -547,25 +570,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/bolus_step" android:text="@string/bolus_step"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -573,8 +597,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -584,8 +608,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -593,25 +618,26 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:focusable="true"
android:focusable="true"> android:orientation="horizontal">
<TextView <TextView
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:gravity="end" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/pump_firmware_label" android:text="@string/pump_firmware_label"
android:textAlignment="viewEnd"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
@ -619,8 +645,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text=":" android:text=":"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -630,8 +656,9 @@
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:gravity="start"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp"
android:textAlignment="viewStart"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
@ -639,10 +666,10 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
<TextView <TextView
@ -661,11 +688,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -703,6 +725,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

16
insight/src/main/res/layout/activity_insight_alert.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
@ -15,19 +16,23 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
app:tint="#FFFFFF" /> android:src="@drawable/ic_error"
android:importantForAccessibility="no"
app:tint="?attr/colorControlNormal" />
<TextView <TextView
android:id="@+id/error_code" android:id="@+id/error_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" /> android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="code"/>
<TextView <TextView
android:id="@+id/error_title" android:id="@+id/error_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" /> android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="title"/>
<TextView <TextView
android:id="@+id/error_description" android:id="@+id/error_description"
@ -35,7 +40,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="description"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -64,5 +70,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="confirmClicked" android:onClick="confirmClicked"
android:text="@string/confirm" /> android:text="@string/confirm" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

3
medtronic/src/main/AndroidManifest.xml
View file

@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="info.nightscout.androidaps.plugins.pump.medtronic"> package="info.nightscout.androidaps.plugins.pump.medtronic">
<application> <application
android:supportsRtl="true">
<service <service
android:name=".service.RileyLinkMedtronicService" android:name=".service.RileyLinkMedtronicService"
android:enabled="true" android:enabled="true"

40
medtronic/src/main/res/layout/medtronic_fragment.xml
View file

@ -55,7 +55,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/rileylink_status" android:text="@string/rileylink_status"
android:textSize="14sp" android:textSize="14sp"
@ -77,7 +77,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:text="{fa-bluetooth-b}" android:text="{fa-bluetooth-b}"
android:textSize="14sp" android:textSize="14sp"
@ -107,7 +107,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/rl_battery_label" android:text="@string/rl_battery_label"
android:textSize="14sp" android:textSize="14sp"
@ -130,7 +130,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:text="" android:text=""
android:textSize="14sp" android:textSize="14sp"
@ -157,7 +157,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/medtronic_pump_status" android:text="@string/medtronic_pump_status"
android:textSize="14sp" android:textSize="14sp"
@ -179,7 +179,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:text="{fa-bluetooth-b}" android:text="{fa-bluetooth-b}"
android:textSize="14sp" android:textSize="14sp"
@ -213,7 +213,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/battery_label" android:text="@string/battery_label"
android:textSize="14sp" android:textSize="14sp"
@ -235,7 +235,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:text="" android:text=""
android:textSize="14sp" android:textSize="14sp"
@ -262,7 +262,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/lastconnection_label" android:text="@string/lastconnection_label"
android:textSize="14sp" android:textSize="14sp"
@ -284,7 +284,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />
@ -310,7 +310,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/lastbolus_label" android:text="@string/lastbolus_label"
android:textSize="14sp" android:textSize="14sp"
@ -332,7 +332,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />
@ -358,7 +358,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/basebasalrate_label" android:text="@string/basebasalrate_label"
android:textSize="14sp" android:textSize="14sp"
@ -380,7 +380,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />
@ -406,7 +406,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/tempbasal_label" android:text="@string/tempbasal_label"
android:textSize="14sp" android:textSize="14sp"
@ -428,7 +428,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />
@ -454,7 +454,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/reservoir_label" android:text="@string/reservoir_label"
android:textSize="14sp" android:textSize="14sp"
@ -476,7 +476,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />
@ -502,7 +502,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/medtronic_errors" android:text="@string/medtronic_errors"
android:textSize="14sp" android:textSize="14sp"
@ -524,7 +524,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:textSize="14sp" android:textSize="14sp"
tools:ignore="RtlSymmetry" /> tools:ignore="RtlSymmetry" />

1
medtronic/src/main/res/layout/medtronic_history_item.xml
View file

@ -4,6 +4,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:paddingEnd="0dp"
android:paddingStart="20dp"> android:paddingStart="20dp">
<TextView <TextView

8
omnipod-common/src/main/AndroidManifest.xml
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common"> <manifest package="info.nightscout.androidaps.plugins.pump.omnipod.common"
xmlns:android="http://schemas.android.com/apk/res/android">
<application></application> <application
android:supportsRtl="true">
</application>
</manifest> </manifest>

60
omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
View file

@ -16,7 +16,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_unique_id" android:text="@string/omnipod_common_overview_pod_unique_id"
@ -38,7 +38,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -56,7 +56,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_lot_number" android:text="@string/omnipod_common_overview_lot_number"
@ -78,7 +78,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -95,7 +95,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_sequence_number" android:text="@string/omnipod_common_overview_pod_sequence_number"
@ -117,7 +117,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -134,7 +134,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_firmware_version" android:text="@string/omnipod_common_overview_firmware_version"
@ -156,7 +156,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -173,7 +173,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_time_on_pod" android:text="@string/omnipod_common_overview_time_on_pod"
@ -195,7 +195,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -213,7 +213,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_expiry_date" android:text="@string/omnipod_common_overview_pod_expiry_date"
@ -235,7 +235,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -253,7 +253,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_status" android:text="@string/omnipod_common_overview_pod_status"
@ -275,7 +275,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="" android:text=""
@ -309,7 +309,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_last_connection" android:text="@string/omnipod_common_overview_last_connection"
@ -331,7 +331,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -357,7 +357,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_last_bolus" android:text="@string/omnipod_common_overview_last_bolus"
@ -379,7 +379,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -405,7 +405,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_base_basal_rate" android:text="@string/omnipod_common_overview_base_basal_rate"
@ -427,7 +427,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -453,7 +453,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_temp_basal_rate" android:text="@string/omnipod_common_overview_temp_basal_rate"
@ -475,7 +475,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -501,7 +501,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_reservoir" android:text="@string/omnipod_common_overview_reservoir"
@ -523,7 +523,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -549,7 +549,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_total_delivered" android:text="@string/omnipod_common_overview_total_delivered"
@ -571,7 +571,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -597,7 +597,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_errors" android:text="@string/omnipod_common_overview_errors"
@ -619,7 +619,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -645,7 +645,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_common_overview_pod_active_alerts" android:text="@string/omnipod_common_overview_pod_active_alerts"
@ -667,7 +667,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />

10
omnipod-common/src/main/res/layout/omnipod_common_wizard_action_page_fragment.xml
View file

@ -29,8 +29,9 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing" android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing" android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
app:srcCompat="@drawable/ic_omnipod_wizard_success" android:contentDescription="@string/success"
android:visibility="gone" /> android:visibility="gone"
app:srcCompat="@drawable/ic_omnipod_wizard_success" />
<TextView <TextView
android:id="@+id/omnipod_wizard_action_error" android:id="@+id/omnipod_wizard_action_error"
@ -49,7 +50,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="50dp"> android:paddingEnd="50dp"
android:paddingStart="0dp">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton" style="@style/GrayButton"
@ -77,5 +79,7 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:text="@string/omnipod_common_wizard_button_retry" android:text="@string/omnipod_common_wizard_button_retry"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

3
omnipod-dash/src/main/AndroidManifest.xml
View file

@ -8,7 +8,8 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application> <application
android:supportsRtl="true">
<activity android:name=".ui.wizard.activation.DashPodActivationWizardActivity" /> <activity android:name=".ui.wizard.activation.DashPodActivationWizardActivity" />
<activity android:name=".ui.wizard.deactivation.DashPodDeactivationWizardActivity" /> <activity android:name=".ui.wizard.deactivation.DashPodDeactivationWizardActivity" />
<activity android:name=".ui.DashPodManagementActivity" /> <activity android:name=".ui.DashPodManagementActivity" />

16
omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
View file

@ -11,7 +11,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_address" android:text="@string/omnipod_dash_overview_bluetooth_address"
@ -33,7 +33,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" /> android:textSize="14sp" />
@ -49,7 +49,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_status" android:text="@string/omnipod_dash_overview_bluetooth_status"
@ -71,7 +71,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" android:textSize="14sp"
@ -90,7 +90,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_bluetooth_connection_quality" android:text="@string/omnipod_dash_overview_bluetooth_connection_quality"
@ -112,7 +112,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" android:textSize="14sp"
@ -131,7 +131,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/omnipod_dash_overview_delivery_status" android:text="@string/omnipod_dash_overview_delivery_status"
@ -153,7 +153,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:textSize="14sp" android:textSize="14sp"

3
omnipod-eros/src/main/AndroidManifest.xml
View file

@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="info.nightscout.androidaps.plugins.pump.omnipod.eros"> package="info.nightscout.androidaps.plugins.pump.omnipod.eros">
<application> <application
android:supportsRtl="true">
<service <service
android:name=".rileylink.service.RileyLinkOmnipodService" android:name=".rileylink.service.RileyLinkOmnipodService"
android:enabled="true" android:enabled="true"

5
omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
View file

@ -11,7 +11,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.5" android:layout_weight="1.5"
android:gravity="end" android:textAlignment="viewEnd"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/rileylink_status" android:text="@string/rileylink_status"
@ -33,7 +33,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:gravity="start" android:textAlignment="viewStart"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="{fa-bluetooth-b}" android:text="{fa-bluetooth-b}"
@ -50,4 +50,5 @@
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" /> android:background="?android:attr/dividerHorizontal" />
</merge> </merge>

78
openhumans/src/main/res/layout/activity_open_humans_login_new.xml
View file

@ -32,6 +32,7 @@
<ImageView <ImageView
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="160dp" android:layout_height="160dp"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/open_humans" /> app:srcCompat="@drawable/open_humans" />
@ -41,7 +42,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="center"
android:text="Welcome to Open Humans" android:text="@string/welcome_to_open_humans"
android:textAppearance="?textAppearanceHeadline5" android:textAppearance="?textAppearanceHeadline5"
android:textColor="?colorPrimary" android:textColor="?colorPrimary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -61,7 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="center"
android:text="To setup data upload, click 'Next'." android:text="@string/setup_data_upload"
android:textAppearance="?textAppearanceSubtitle1" android:textAppearance="?textAppearanceSubtitle1"
android:textColor="?colorSecondary" /> android:textColor="?colorSecondary" />
@ -70,7 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="Next" /> android:text="@string/next" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
@ -92,7 +93,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Consent" android:text="@string/consent"
android:textAppearance="?textAppearanceHeadline5" android:textAppearance="?textAppearanceHeadline5"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -100,7 +101,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="Please carefully read the following information and accept the terms of use to proceed." android:text="@string/please_read__information"
android:textAppearance="?textAppearanceSubtitle1" android:textAppearance="?textAppearanceSubtitle1"
android:textColor="?colorSecondary" /> android:textColor="?colorSecondary" />
@ -109,14 +110,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="Terms of Use" android:text="@string/terms_of_use"
android:textAppearance="?textAppearanceHeadline6" android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org." android:text="@string/info_openhumans"
android:textAppearance="?textAppearanceBody2" android:textAppearance="?textAppearanceBody2"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
@ -125,7 +126,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="Data Uploaded" android:text="@string/data_uploaded"
android:textAppearance="?textAppearanceHeadline6" android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -147,7 +148,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Glucose values" android:text="@string/glucose_values"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -170,7 +171,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Boluses" android:text="@string/boluses"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -193,7 +194,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Extended boluses" android:text="@string/extended_boluses"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -216,7 +217,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Carbohydrates" android:text="@string/carbohydrates"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -239,7 +240,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Careportal Events (except notes)" android:text="@string/careportal_events"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -262,7 +263,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Profile Switches" android:text="@string/profile_switches"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -285,7 +286,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Total Daily Doses" android:text="@string/total_daily_doses"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -308,7 +309,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Temporary Basal Rates" android:text="@string/temporary_basal_rates"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -331,7 +332,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Temporary Targets" android:text="@string/temporary_targets"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -354,7 +355,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Settings" android:text="@string/settings"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -377,7 +378,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Application Version" android:text="@string/application_version"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -400,7 +401,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Device Model" android:text="@string/device_model"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -423,7 +424,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Screen Dimensions" android:text="@string/screen_dimensions"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -446,7 +447,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Algorithm Debug Data" android:text="@string/algorithm_debug_data"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -456,7 +457,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="Data NOT Uploaded" android:text="@string/data_not_uploaded"
android:textAppearance="?textAppearanceHeadline6" android:textAppearance="?textAppearanceHeadline6"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -478,7 +479,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Passwords" android:text="@string/passwords"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -501,7 +502,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Nightscout URL" android:text="@string/nightscout_url"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -524,7 +525,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Nightscout API Secret" android:text="@string/nightscout_api_secret"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -547,7 +548,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Free Text Fields" android:text="@string/free_text_fields"
android:textAppearance="?textAppearanceBody1" android:textAppearance="?textAppearanceBody1"
android:textColor="?colorOnBackground" /> android:textColor="?colorOnBackground" />
</LinearLayout> </LinearLayout>
@ -557,7 +558,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="I understand and agree." /> android:text="@string/agree" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/login" android:id="@+id/login"
@ -567,7 +568,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:enabled="false" android:enabled="false"
android:text="Login to Open Humans" /> android:text="@string/login_open_humans" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
@ -590,7 +591,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="Final touches" android:text="@string/final_touches"
android:textAppearance="?textAppearanceHeadline4" android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -599,7 +600,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:text="You are just one step away from uploading your data to Open Humans. Do you want to proceed?" android:text="@string/uploading_proceed"
android:textAppearance="?textAppearanceBody1" /> android:textAppearance="?textAppearanceBody1" />
<LinearLayout <LinearLayout
@ -614,14 +615,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="Cancel" /> android:text="@string/cancel" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/proceed" android:id="@+id/proceed"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="Proceed" /> android:text="@string/proceed" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
@ -645,7 +646,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="Finishing..." android:text="@string/finishing"
android:textAppearance="?textAppearanceHeadline4" android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -654,7 +655,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:text="This may take a few seconds." android:text="@string/this_may_take_a_few_seconds"
android:textAppearance="?textAppearanceBody1" /> android:textAppearance="?textAppearanceBody1" />
<com.google.android.material.progressindicator.LinearProgressIndicator <com.google.android.material.progressindicator.LinearProgressIndicator
@ -683,6 +684,7 @@
<ImageView <ImageView
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:srcCompat="@drawable/tick_mark" /> app:srcCompat="@drawable/tick_mark" />
<TextView <TextView
@ -690,7 +692,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="center"
android:text="We're done!" android:text="@string/we_re_done"
android:textAppearance="?textAppearanceHeadline4" android:textAppearance="?textAppearanceHeadline4"
android:textColor="?colorPrimary" /> android:textColor="?colorPrimary" />
@ -699,7 +701,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:text="From now on, your phone will silently upload data in the background from time to time." android:text="@string/silently_upload_date_note"
android:textAppearance="?textAppearanceBody1" /> android:textAppearance="?textAppearanceBody1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -707,7 +709,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="Close" /> android:text="@string/close" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</FrameLayout> </FrameLayout>

38
openhumans/src/main/res/values/strings.xml
View file

@ -17,4 +17,42 @@
<string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string> <string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string>
<string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string> <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string>
<string name="upload_now">Upload now</string> <string name="upload_now">Upload now</string>
<string name="next">Next</string>
<string name="welcome_to_open_humans">Welcome to Open Humans</string>
<string name="setup_data_upload">To setup data upload, click \'Next\'.</string>
<string name="consent">Consent</string>
<string name="terms_of_use">Terms of Use</string>
<string name="please_read__information">Please carefully read the following information and accept the terms of use to proceed.</string>
<string name="info_openhumans">This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org.</string>
<string name="data_uploaded">Data Uploaded</string>
<string name="glucose_values">Glucose values</string>
<string name="boluses">Boluses</string>
<string name="extended_boluses">Extended boluses</string>
<string name="carbohydrates">Carbohydrates</string>
<string name="careportal_events">Careportal Events (except notes)</string>
<string name="profile_switches">Profile Switches</string>
<string name="total_daily_doses">Total Daily Doses</string>
<string name="temporary_basal_rates">Temporary Basal Rates</string>
<string name="temporary_targets">Temporary Targets</string>
<string name="settings">Settings</string>
<string name="application_version">Application Version</string>
<string name="device_model">Device Model</string>
<string name="screen_dimensions">Screen Dimensions</string>
<string name="algorithm_debug_data">Algorithm Debug Data</string>
<string name="data_not_uploaded">Data NOT Uploaded</string>
<string name="passwords">Passwords</string>
<string name="nightscout_url">Nightscout URL</string>
<string name="nightscout_api_secret">Nightscout API Secret</string>
<string name="free_text_fields">Free Text Fields</string>
<string name="agree">I understand and agree.</string>
<string name="login_open_humans">Login to Open Humans</string>
<string name="final_touches">Final touches</string>
<string name="uploading_proceed">You are just one step away from uploading your data to Open Humans. Do you want to proceed?</string>
<string name="cancel">Cancel</string>
<string name="proceed">Proceed</string>
<string name="finishing">Finishing...</string>
<string name="this_may_take_a_few_seconds">This may take a few seconds.</string>
<string name="we_re_done">We\'re done!</string>
<string name="silently_upload_date_note">From now on, your phone will silently upload data in the background from time to time.</string>
<string name="close">Close</string>
</resources> </resources>