From 32f3aee6ef0b59024e01d9c057615221c5446aad Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 31 Oct 2022 21:54:53 +0100
Subject: [PATCH] move strings

---
 .../info/nightscout/androidaps/dialogs/CareDialog.kt     | 2 +-
 app/src/main/res/layout/autotune_fragment.xml            | 2 +-
 app/src/main/res/layout/dialog_care.xml                  | 4 ++--
 app/src/main/res/layout/dialog_extendedbolus.xml         | 4 ++--
 app/src/main/res/layout/dialog_profileswitch.xml         | 4 ++--
 app/src/main/res/layout/dialog_tempbasal.xml             | 4 ++--
 app/src/main/res/layout/dialog_temptarget.xml            | 4 ++--
 app/src/main/res/values/strings.xml                      | 9 ---------
 core/src/main/res/values/strings.xml                     | 2 ++
 ui/src/main/res/layout/dialog_carbs.xml                  | 4 ++--
 ui/src/main/res/values/strings.xml                       | 8 ++++++++
 11 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 6e80ae72b5..41eef58548 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -210,7 +210,7 @@ class CareDialog : DialogFragmentWithDate() {
             valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType))
         }
         if (options == EventType.NOTE || options == EventType.EXERCISE) {
-            actions.add(rh.gs(R.string.careportal_newnstreatment_duration_label) + ": " + rh.gs(R.string.format_mins, binding.duration.value.toInt()))
+            actions.add(rh.gs(R.string.duration_label) + ": " + rh.gs(R.string.format_mins, binding.duration.value.toInt()))
             therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs()
             valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) } )
         }
diff --git a/app/src/main/res/layout/autotune_fragment.xml b/app/src/main/res/layout/autotune_fragment.xml
index 744b9a260e..f72b666298 100644
--- a/app/src/main/res/layout/autotune_fragment.xml
+++ b/app/src/main/res/layout/autotune_fragment.xml
@@ -90,7 +90,7 @@
                         android:layout_weight="1"
                         android:paddingStart="5dp"
                         android:paddingEnd="5dp"
-                        app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                        app:customContentDescription="@string/duration_label" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index b0cb311f67..6f2c623fab 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -128,7 +128,7 @@
                 android:layout_gravity="center_horizontal"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/careportal_newnstreatment_duration_label"
+                android:text="@string/duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
@@ -136,7 +136,7 @@
                 android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                app:customContentDescription="@string/duration_label" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index fdea04ea7a..19ec26126c 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -92,7 +92,7 @@
                 android:layout_gravity="center_horizontal"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/careportal_newnstreatment_duration_label"
+                android:text="@string/duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
@@ -100,7 +100,7 @@
                 android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label"  />
+                app:customContentDescription="@string/duration_label"  />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 8531857cbb..1ada284ae4 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -93,7 +93,7 @@
                 android:width="120dp"
                 android:paddingStart="10dp"
                 android:paddingEnd="10dp"
-                android:text="@string/careportal_newnstreatment_duration_label"
+                android:text="@string/duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
@@ -102,7 +102,7 @@
                 android:layout_width="130dp"
                 android:layout_height="40dp"
                 android:layout_marginBottom="2dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                app:customContentDescription="@string/duration_label" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 94a4d347d4..e13e937c17 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -131,7 +131,7 @@
                 android:layout_gravity="center_horizontal"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/careportal_newnstreatment_duration_label"
+                android:text="@string/duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
@@ -139,7 +139,7 @@
                 android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                app:customContentDescription="@string/duration_label" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index dcfae7cff1..4368906cf9 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -94,7 +94,7 @@
                 android:layout_gravity="center_horizontal"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/careportal_newnstreatment_duration_label"
+                android:text="@string/duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
 
@@ -102,7 +102,7 @@
                 android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
-                app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                app:customContentDescription="@string/duration_label" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5db896d96..a4bc2cc03f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,7 +171,6 @@
     <string name="careportal_newnstreatment_meter">Meter</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
     <string name="carb_time_label">Carb time</string>
-    <string name="careportal_newnstreatment_duration_label">Duration</string>
     <string name="profile_label">Profile</string>
     <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
     <string name="overview_tempbasal_button">TempBasal</string>
@@ -547,7 +546,6 @@
     <string name="wearcontrol_title">Controls from Watch</string>
     <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
     <string name="food">Food</string>
-    <string name="shortgramm">g</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -655,8 +653,6 @@
     <string name="allow_automated_crash_reporting">Allow automated crash reporting and feature usage data to be sent to the developers via the fabric.io service.</string>
     <string name="g5appnotdetected">Please update your Dexcom app to supported version</string>
     <string name="dexcom_app_not_installed">Dexcom app is not installed.</string>
-    <string name="start_activity_tt">Start Activity TT</string>
-    <string name="start_eating_soon_tt">Start Eating soon TT</string>
     <string name="do_not_bolus_record_only">Do not bolus, record only</string>
     <string name="category">Category</string>
     <string name="subcategory">Subcategory</string>
@@ -669,7 +665,6 @@
     <string name="overview_show_cob">Carbs On Board</string>
     <string name="overview_show_iob">Insulin On Board</string>
     <string name="overview_show_basals">Basals</string>
-    <string name="start_hypo_tt">Start Hypo TT</string>
     <string name="closed_loop_disabled_on_dev_branch">Running dev version. Closed loop is disabled.</string>
     <string name="engineering_mode_enabled">Engineering mode enabled</string>
     <string name="profileswitch_ismissing">ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile.</string>
@@ -829,8 +824,6 @@
     <string name="nav_logsettings">Log settings</string>
     <string name="resettodefaults">Reset to defaults</string>
     <string name="nsmalfunction">NSClient malfunction. Consider NS and NSClient restart.</string>
-    <string name="time_offset">Time offset</string>
-    <string name="remind_to_bolus_later">Remind to bolus later</string>
     <string name="key_aps_mode" translatable="false">aps_mode</string>
     <string name="setupwizard_preferred_aps_mode">Preferred APS mode</string>
     <string name="treatments_wizard_total_label">Total</string>
@@ -906,7 +899,6 @@
     <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
     <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
     <string name="format_percent">%1$d%%</string>
-    <string name="unit_minute_short">min</string>
     <string name="profile_name">Profile name:</string>
     <string name="selected_profile">Selected:</string>
     <string name="unitsnosemicolon">Units</string>
@@ -1131,7 +1123,6 @@
     <string name="a11y_insulin_label">insulin</string>
     <string name="a11y_blood_glucose">blood glucose</string>
     <string name="a11y_bg_outdated">outdated</string>
-    <string name="a11y_carb_reminder">set reminder</string>
     <string name="a11y_add_new_profile">add new profile</string>
     <string name="a11y_clone_profile">clone current profile</string>
     <string name="a11y_delete_current_profile">delete current profile</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 10d9f2b8b6..c53f59bf2d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -199,6 +199,8 @@
     <string name="alarminxmin">Run alarm in %1$d min</string>
     <string name="treatmentdeliveryerror">Bolus reported an error. Manually check real delivered amount</string>
     <string name="bolus_reminder">Bolus reminder</string>
+    <string name="duration_label">Duration</string>
+    <string name="shortgramm">g</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
diff --git a/ui/src/main/res/layout/dialog_carbs.xml b/ui/src/main/res/layout/dialog_carbs.xml
index 479f03323e..f364866639 100644
--- a/ui/src/main/res/layout/dialog_carbs.xml
+++ b/ui/src/main/res/layout/dialog_carbs.xml
@@ -148,7 +148,7 @@
                     android:layout_weight="1"
                     android:padding="10dp"
                     android:width="120dp"
-                    android:text="@string/careportal_newnstreatment_duration_label"
+                    android:text="@string/duration_label"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="bold" />
 
@@ -158,7 +158,7 @@
                     android:layout_height="40dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="2dp"
-                    app:customContentDescription="@string/careportal_newnstreatment_duration_label" />
+                    app:customContentDescription="@string/duration_label" />
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index d43cb2176d..24db1dbc2a 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -6,5 +6,13 @@
     <string name="carbs_constraint_applied">Carbs constraint applied</string>
     <string name="temp_target_short">TT</string>
     <string name="dialog_canceled">Dialog canceled</string>
+    <string name="start_activity_tt">Start Activity TT</string>
+    <string name="start_eating_soon_tt">Start Eating soon TT</string>
+    <string name="start_hypo_tt">Start Hypo TT</string>
+    <string name="time_offset">Time offset</string>
+    <string name="unit_minute_short">min</string>
+    <string name="remind_to_bolus_later">Remind to bolus later</string>
+
+    <string name="a11y_carb_reminder">set reminder</string>
 
 </resources>