From bdeab0cc73d013d5f81b8c4c8cf8813b5ca5156f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 22 Jun 2023 22:40:55 +0100
Subject: [PATCH] Extract some hardcoded strings to resources

---
 app/src/main/res/layout/activity_alarm_details.xml        | 4 ++--
 app/src/main/res/layout/activity_appinstaller.xml         | 4 ++--
 app/src/main/res/layout/activity_binary_sensor_data.xml   | 4 ++--
 .../res/menu/activity_controlcenterv2_main_drawer.xml     | 2 +-
 app/src/main/res/values/strings.xml                       | 8 ++++++++
 app/src/main/res/xml/devicesettings_banglejs.xml          | 6 +++---
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_alarm_details.xml b/app/src/main/res/layout/activity_alarm_details.xml
index a82069e06..5cdd2dfc9 100644
--- a/app/src/main/res/layout/activity_alarm_details.xml
+++ b/app/src/main/res/layout/activity_alarm_details.xml
@@ -48,7 +48,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:hint="Title"
+                android:hint="@string/title"
                 android:inputType="text"
                 android:maxLength="32" />
 
@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:gravity="start|top"
-                android:hint="Description"
+                android:hint="@string/description"
                 android:inputType="textMultiLine"
                 android:maxLength="256"
                 android:singleLine="false" />
diff --git a/app/src/main/res/layout/activity_appinstaller.xml b/app/src/main/res/layout/activity_appinstaller.xml
index a23b73869..c115c4477 100644
--- a/app/src/main/res/layout/activity_appinstaller.xml
+++ b/app/src/main/res/layout/activity_appinstaller.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:contentDescription="preview image"
+            android:contentDescription="@string/preview_image"
             android:visibility="gone" />
 
         <ListView
@@ -48,7 +48,7 @@
             android:layout_alignParentTop="false"
             android:layout_below="@+id/infoTextView"
             android:layout_centerHorizontal="true"
-            android:contentDescription="Status icon" />
+            android:contentDescription="@string/status_icon" />
 
         <ProgressBar
             style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
diff --git a/app/src/main/res/layout/activity_binary_sensor_data.xml b/app/src/main/res/layout/activity_binary_sensor_data.xml
index 5c690b85e..1545d8cac 100644
--- a/app/src/main/res/layout/activity_binary_sensor_data.xml
+++ b/app/src/main/res/layout/activity_binary_sensor_data.xml
@@ -19,14 +19,14 @@
                 android:layout_width="250dp"
                 android:layout_height="250dp"
                 android:background="@android:color/holo_red_light"
-                android:text="unknown"
+                android:text="@string/unknown"
                 android:textSize="50dp"
                 android:gravity="center"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="unknown"
+                android:text="@string/unknown"
                 android:textSize="50dp"
                 android:id="@+id/text_sensor_count"/>
 
diff --git a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
index 46b28dbf4..f723eb899 100644
--- a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
+++ b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
@@ -35,7 +35,7 @@
             android:icon="@drawable/ic_donate" />
         <item
             android:id="@+id/external_changelog"
-            android:title="@string/changelog_full_title"
+            android:title="@string/action_changelog"
             android:icon="@drawable/ic_history" />
         <item
             android:id="@+id/about"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed7355251..1fcf7e24d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="action_debug">Debug</string>
     <string name="action_quit">Quit</string>
     <string name="action_donate">Donate</string>
+    <string name="action_changelog">Changelog</string>
     <string name="controlcenter_fetch_activity_data">Synchronize</string>
     <string name="controlcenter_find_device">Find lost device</string>
     <string name="find_lost_device_message">Search for %1$s?</string>
@@ -264,8 +265,11 @@
     <string name="pref_summary_banglejs_text_bitmap">If a word cannot be rendered with the watch\'s font, render it to a bitmap in Gadgetbridge and display the bitmap on the watch</string>
     <string name="pref_title_banglejs_txt_bitmap_size">Text Bitmaps Size</string>
     <string name="pref_summary_banglejs_txt_bitmap_size">If \'Text as Bitmaps\' enabled, what size should text be rendered?</string>
+    <string name="pref_title_banglejs_phone_gps_enbale">Use phone gps data</string>
     <string name="pref_summary_banglejs_phone_gps_enbale">Use the gps data of the phone to overwrite the gps data of the bangle device</string>
+    <string name="pref_title_banglejs_phone_gps_network_only">Only use network to determine location</string>
     <string name="pref_summary_banglejs_phone_gps_network_only">This option is only active, if the gps data of the phone is being used. This option can be used to use only the network provider to determine the location. This reduces the power consumption for the cost of accuracy. A reconnection of the device is needed.</string>
+    <string name="pref_title_banglejs_phone_gps_update_interval">GPS data update interval in ms</string>
     <string name="pref_summary_banglejs_phone_gps_update_interval">This option is only active, if the gps data of the phone is being used. This option sets the interval in ms how often the gps position is being updated</string>
     <string name="pref_title_banglejs_webview_url">App loader URL</string>
     <string name="pref_summary_banglejs_webview_url">If you want a custom app loader put your https://…/android.html URL here. Otherwise leave blank for https://banglejs.com/apps</string>
@@ -2137,4 +2141,8 @@
     <string name="pref_app_logs_summary">Enable logs from watch apps</string>
     <string name="pref_app_logs_start_summary">Start logging from watch apps</string>
     <string name="pref_app_logs_stop_summary">Stop logging from watch apps</string>
+    <string name="title">Title</string>
+    <string name="description">Description</string>
+    <string name="preview_image">Preview image</string>
+    <string name="status_icon">Status icon</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_banglejs.xml b/app/src/main/res/xml/devicesettings_banglejs.xml
index 90a7bdd1e..e4fac2ab2 100644
--- a/app/src/main/res/xml/devicesettings_banglejs.xml
+++ b/app/src/main/res/xml/devicesettings_banglejs.xml
@@ -5,20 +5,20 @@
         android:icon="@drawable/ic_gps_location"
         android:key="banglejs_gps_update"
         android:summary="@string/pref_summary_banglejs_phone_gps_enbale"
-        android:title="Use phone gps data" />
+        android:title="@string/pref_title_banglejs_phone_gps_enbale" />
     <EditTextPreference
         android:defaultValue="1000"
         android:inputType="number"
         android:icon="@drawable/ic_access_time"
         android:key="banglejs_gps_update_interval"
         android:summary="@string/pref_summary_banglejs_phone_gps_update_interval"
-        android:title="GPS data update interval in ms" />
+        android:title="@string/pref_title_banglejs_phone_gps_update_interval" />
     <SwitchPreference
         android:defaultValue="false"
         android:icon="@drawable/ic_gps_location"
         android:key="banglejs_gps_use_network_only"
         android:summary="@string/pref_summary_banglejs_phone_gps_network_only"
-        android:title="Only use network to determine location" />
+        android:title="@string/pref_title_banglejs_phone_gps_network_only" />
 
     <SwitchPreference
         android:defaultValue="false"