diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index b9e2aaf3b5..5895f77094 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -27,7 +27,7 @@
android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
- android:text="Profile 1" />
+ android:text="@string/profile1" />
+ android:text="@string/profile2" />
diff --git a/app/src/main/res/layout/activity_smscommunicator_otp.xml b/app/src/main/res/layout/activity_smscommunicator_otp.xml
index dc6e69e303..d62fa269b1 100644
--- a/app/src/main/res/layout/activity_smscommunicator_otp.xml
+++ b/app/src/main/res/layout/activity_smscommunicator_otp.xml
@@ -1,115 +1,111 @@
-
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+
+
+ android:layout_marginTop="5sp"
+ android:layout_marginBottom="5sp"
+ android:paddingStart="15sp"
+ android:paddingEnd="15sp"
+ android:text="@string/smscommunicator_otp_install_info" />
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:paddingStart="15dp"
+ android:paddingEnd="5dp"
+ android:text="@string/smscommunicator_code_verify_label" />
-
-
-
+ android:hint="@string/smscommunicator_code_verify_hint"
+ android:importantForAutofill="no"
+ android:inputType="number"
+ android:maxLength="12"
+ android:textAlignment="center"
+ android:textSize="19sp"
+ tools:ignore="HardcodedText" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingStart="15dp"
+ android:paddingEnd="5dp" />
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/autotune_fragment.xml b/app/src/main/res/layout/autotune_fragment.xml
index 8d366acb97..003699e6ba 100644
--- a/app/src/main/res/layout/autotune_fragment.xml
+++ b/app/src/main/res/layout/autotune_fragment.xml
@@ -1,5 +1,4 @@
-
+ app:contentPadding="2dp">
+
+
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
-
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal|center_vertical"
+ android:layout_weight="2"
+ android:gravity="end"
+ android:paddingStart="5dp"
+ android:paddingEnd="5dp"
+ android:text="@string/autotune_profile"
+ android:textSize="14sp" />
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:hint="@string/autotune_select_profile"
+ android:paddingStart="5dp"
+ android:paddingEnd="5dp">
-
+ android:inputType="none" />
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ app:contentPadding="2dp">
- >
+
+ app:contentPadding="2dp">
-
+ app:contentPadding="2dp">
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ tools:text="1.1.2000" />
+ android:textStyle="bold"
+ tools:text="16:55" />
+ android:textStyle="bold"
+ tools:text="Name" />
+ app:srcCompat="@drawable/ic_flat" />
+ android:textColor="?attr/setTempButton"
+ tools:text="NS" />
+ android:textColor="?attr/alarmColor"
+ tools:text="@string/invalid" />
+ android:visibility="gone" />
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 01bd3dd1c2..0bfd8f9749 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -108,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="0.3U" />
+ tools:text="0.3U" />
+ tools:text="0.7U" />
+ tools:text="1.2U" />
diff --git a/app/src/main/res/layout/import_summary_item.xml b/app/src/main/res/layout/import_summary_item.xml
index 4c90d7c08b..096c4dd351 100644
--- a/app/src/main/res/layout/import_summary_item.xml
+++ b/app/src/main/res/layout/import_summary_item.xml
@@ -21,7 +21,7 @@
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
app:srcCompat="@drawable/ic_meta_format"
- android:tint="#ffffff" />
+ app:tint="?attr/colorControlNormal" />
-
-
+ tools:context=".plugins.aps.loop.LoopFragment">
-
+ android:layout_height="match_parent"
+ android:paddingTop="2dp">
+ android:orientation="vertical">
-
+ android:focusable="true"
+ android:orientation="horizontal">
-
+
-
+
+
+
+
+
+
+
+
+ android:focusable="true"
+ android:orientation="horizontal"
+ android:screenReaderFocusable="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/objectives_fragment.xml b/app/src/main/res/layout/objectives_fragment.xml
index 37363a8491..a24c3742ac 100644
--- a/app/src/main/res/layout/objectives_fragment.xml
+++ b/app/src/main/res/layout/objectives_fragment.xml
@@ -11,8 +11,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
- android:paddingEnd="16dp"
android:paddingTop="16dp"
+ android:paddingEnd="16dp"
android:visibility="gone">
+ android:text="Enable fake time and progress"
+ tools:ignore="HardcodedText" />
+ android:text="Reset"
+ tools:ignore="HardcodedText" />
+
+
diff --git a/app/src/main/res/layout/openapsama_fragment.xml b/app/src/main/res/layout/openapsama_fragment.xml
index 41cb359aa4..e1c625b532 100644
--- a/app/src/main/res/layout/openapsama_fragment.xml
+++ b/app/src/main/res/layout/openapsama_fragment.xml
@@ -1,576 +1,614 @@
-
-
-
+ tools:context=".plugins.aps.openAPSAMA.OpenAPSAMAFragment">
-
+ android:layout_height="match_parent"
+ android:paddingTop="2dp">
+ android:orientation="vertical">
-
+ android:focusable="true"
+ android:orientation="horizontal">
-
+
-
+
+
+
+
+
+
+
+
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 363ecb5074..36752317f8 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -1,6 +1,5 @@
+ android:paddingEnd="5dp">
@@ -34,7 +33,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="0dp"
- android:paddingEnd="5dp" >
+ android:paddingEnd="5dp">
+ android:visibility="gone"
+ app:iconPadding="-4dp" />
+ android:singleLine="true"
+ android:text="@string/overview_insulin_label"
+ android:textColor="?attr/icBolusColor"
+ app:iconPadding="-4dp" />
+ android:singleLine="true"
+ android:text="@string/treatments_wizard_carbs_label"
+ android:textColor="?attr/icBolusCarbsColor"
+ app:iconPadding="-4dp" />
+ android:singleLine="true"
+ android:text="@string/overview_calculator_label"
+ android:textColor="?attr/icCalculatorColor"
+ app:iconPadding="-4dp" />
+ android:visibility="gone"
+ app:iconPadding="-4dp" />
+ android:visibility="gone"
+ app:iconPadding="-4dp" />
+ android:text="@string/quickwizard"
+ android:textColor="?attr/icQuickWizardColor"
+ app:iconPadding="-4dp" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 445f3a3fd9..3c4c4f70ec 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -1,151 +1,143 @@
-
+ app:contentPadding="2dp">
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:orientation="horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_gravity="top"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:text="@string/overview_editquickwizard_valid"
+ android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
+
-
+
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/tidepool_fragment.xml b/app/src/main/res/layout/tidepool_fragment.xml
index 5a1401a549..51d3d90f92 100644
--- a/app/src/main/res/layout/tidepool_fragment.xml
+++ b/app/src/main/res/layout/tidepool_fragment.xml
@@ -1,6 +1,7 @@
@@ -12,47 +13,48 @@
android:layout_marginTop="32dp"
android:text="-"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="HardcodedText" />
@@ -72,7 +74,9 @@
android:id="@+id/log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="-- logs --" />
+ android:text="-- logs --"
+ tools:ignore="HardcodedText" />
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/virtualpump_fragment.xml b/app/src/main/res/layout/virtualpump_fragment.xml
index ab29406d59..156330c5c2 100644
--- a/app/src/main/res/layout/virtualpump_fragment.xml
+++ b/app/src/main/res/layout/virtualpump_fragment.xml
@@ -1,383 +1,404 @@
-
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:focusable="true"
+ android:orientation="horizontal">
-
-
+ android:layout_weight="1"
+ android:paddingStart="0dp"
+ android:paddingEnd="5dp"
+ android:text="@string/basebasalrate_label"
+ android:textAlignment="viewEnd"
+ android:textSize="14sp" />
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_weight="1"
+ android:paddingStart="5dp"
+ android:paddingEnd="0dp"
+ android:textAlignment="viewStart"
+ android:textSize="14sp"
+ tools:text="0.38 U/h" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 716eb554d2..deb18a35b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1212,7 +1212,11 @@
Configure opacity
Loop status
Graph scale
-
+ Profile 1
+ Profile 2
+ Login
+ Remove all
+ Reset start
QR Code for setup one time password
open settings
set carb timer alarm
@@ -1228,4 +1232,5 @@
Aidex
Receive BG values from GlucoRx Aidex CGMS.
+
diff --git a/combo/src/main/AndroidManifest.xml b/combo/src/main/AndroidManifest.xml
index 559e7533ca..a5aa9f0e8e 100644
--- a/combo/src/main/AndroidManifest.xml
+++ b/combo/src/main/AndroidManifest.xml
@@ -2,4 +2,8 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml
index 3225c78e76..c8a812f256 100644
--- a/combo/src/main/res/layout/combopump_fragment.xml
+++ b/combo/src/main/res/layout/combopump_fragment.xml
@@ -1,14 +1,10 @@
-
-
-
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -58,25 +57,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -103,25 +105,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
+ android:textAlignment="viewStart"
+ android:textSize="14sp"
+ tools:text="30%" />
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -194,25 +203,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -239,25 +251,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -284,25 +299,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -329,25 +347,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -374,25 +395,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -419,25 +443,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -465,10 +492,10 @@
android:id="@+id/combo_connection_error_delimiter"
android:layout_width="fill_parent"
android:layout_height="2dip"
- android:layout_marginBottom="5dp"
android:layout_marginStart="20dp"
- android:layout_marginEnd="20dp"
android:layout_marginTop="5dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginBottom="5dp"
android:background="?android:attr/dividerHorizontal" />
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -510,25 +540,26 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText"
+ tools:text="123123" />
@@ -555,10 +589,10 @@
+ android:orientation="horizontal"
+ android:paddingEnd="4dp">
-
-
-
-
+ android:layout_marginEnd="-4dp"
+ android:layout_weight="0.5"
+ android:drawableTop="@drawable/ic_actions_refill"
+ android:paddingStart="0dp"
+ android:paddingEnd="0dp"
+ android:text="@string/refresh" />
-
-
-
+
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index b300340a86..9f170d4340 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
-
+
+
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 791a5cdee3..9443131400 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -82,8 +82,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_weight="2"
- android:gravity="end"
android:text="@string/date"
+ android:textAlignment="viewEnd"
android:textSize="14sp" />
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -119,16 +120,16 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
+ android:textAlignment="viewStart"
+ android:textSize="14sp"
+ tools:text="mmol" />
@@ -164,16 +167,16 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
+ android:textAlignment="viewStart"
+ android:textSize="14sp"
+ tools:text="6.50 h" />
@@ -209,16 +214,16 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
+ android:textAlignment="viewStart"
+ android:textSize="14sp"
+ tools:text="00:00 13.8 g/U" />
@@ -263,13 +270,13 @@
android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -311,16 +319,16 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
@@ -354,8 +363,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_weight="2"
- android:gravity="end"
android:text=""
+ android:textAlignment="viewEnd"
android:textSize="14sp" />
@@ -397,16 +406,16 @@
+ android:focusable="true"
+ android:orientation="horizontal">
+ android:textSize="14sp"
+ tools:ignore="HardcodedText" />
diff --git a/core/src/main/res/layout/maintenance_import_list_activity.xml b/core/src/main/res/layout/maintenance_import_list_activity.xml
index 896a3888f2..07ba5cb7fb 100644
--- a/core/src/main/res/layout/maintenance_import_list_activity.xml
+++ b/core/src/main/res/layout/maintenance_import_list_activity.xml
@@ -2,23 +2,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="4dp"
+ android:orientation="vertical"
tools:context="info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImportListActivity">
-
+ android:fadeScrollbars="true"
+ android:scrollbarStyle="outsideOverlay"
+ android:scrollbars="vertical">
-
-
-
-
+
diff --git a/dana/src/main/AndroidManifest.xml b/dana/src/main/AndroidManifest.xml
index 635ebc7b59..dda39a96f5 100644
--- a/dana/src/main/AndroidManifest.xml
+++ b/dana/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index 8cc0d95305..af8086bb8d 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -1,17 +1,17 @@
+ android:orientation="vertical"
+ tools:context="info.nightscout.androidaps.dana.DanaFragment">
+ android:layout_weight="1"
+ android:paddingTop="5dp">
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -39,8 +39,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -50,36 +50,37 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
- tools:ignore="RtlSymmetry" />
+ tools:ignore="RtlSymmetry"
+ tools:text="123123" />
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -88,8 +89,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -99,9 +100,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
android:text="{fa-bluetooth-b}"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="HardcodedText,RtlSymmetry" />
@@ -110,25 +111,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -137,8 +138,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -148,8 +149,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -158,25 +159,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -185,8 +186,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -196,8 +197,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -206,25 +207,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -233,8 +234,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -244,8 +245,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -254,25 +255,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -281,8 +282,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -292,8 +293,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -302,25 +303,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -329,8 +330,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -340,8 +341,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -350,25 +351,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -377,8 +378,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -388,8 +389,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -398,25 +399,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -425,8 +426,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -436,8 +437,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -446,25 +447,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -473,8 +474,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -484,8 +485,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -494,25 +495,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -521,8 +522,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -532,8 +533,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -542,25 +543,25 @@
+ android:focusable="true"
+ android:orientation="horizontal">
@@ -569,8 +570,8 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
- android:paddingEnd="2dp"
android:paddingStart="2dp"
+ android:paddingEnd="2dp"
android:text=":"
android:textSize="14sp"
tools:ignore="HardcodedText" />
@@ -580,8 +581,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="start"
android:paddingStart="5dp"
+ android:textAlignment="viewStart"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />
@@ -590,10 +591,10 @@
+ android:paddingTop="10dp" />
@@ -622,12 +623,12 @@
android:id="@+id/pump_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="6dp"
- android:paddingBottom="6dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:background="?attr/pumpStatusBackground"
android:gravity="center_vertical|center_horizontal"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -644,12 +645,12 @@
android:id="@+id/queue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="6dp"
- android:paddingBottom="6dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:background="?attr/pumpStatusBackground"
android:gravity="center_vertical|center_horizontal"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -664,25 +665,25 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
android:layout_marginEnd="-2dp"
+ android:layout_weight="1"
android:drawableTop="@drawable/ic_danarprofile"
- android:text="@string/viewprofile"
- android:maxLines="2"
android:ellipsize="end"
- app:iconPadding="-4dp"/>
+ android:maxLines="2"
+ android:text="@string/viewprofile"
+ app:iconPadding="-4dp" />
@@ -691,26 +692,26 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
android:layout_marginEnd="-2dp"
+ android:layout_weight="1"
android:drawableTop="@drawable/ic_danarstats"
- android:text="@string/stats"
- android:maxLines="2"
android:ellipsize="end"
- app:iconPadding="-4dp"/>
+ android:maxLines="2"
+ android:text="@string/stats"
+ app:iconPadding="-4dp" />
+ android:maxLines="2"
+ android:text="@string/danar_useroptions"
+ app:iconPadding="-4dp" />
diff --git a/danar/src/main/AndroidManifest.xml b/danar/src/main/AndroidManifest.xml
index 26ce981370..afa0e2ef98 100644
--- a/danar/src/main/AndroidManifest.xml
+++ b/danar/src/main/AndroidManifest.xml
@@ -5,7 +5,8 @@
-
+