From 7a32d6ad858e4a375eb4add476b21c21a01f7ce5 Mon Sep 17 00:00:00 2001
From: dgis <regis.cosnier@gmail.com>
Date: Sun, 16 Feb 2020 23:55:09 +0100
Subject: [PATCH] Put all the string in the file strings.xml.

---
 app/src/main/res/values/arrays.xml  | 46 ++++++++++++++---------------
 app/src/main/res/values/strings.xml | 29 ++++++++++++++++--
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 7ed5f23..9b6d371 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2,9 +2,9 @@
 <resources>
 
     <string-array name="settings_background_fallback_color_item">
-        <item>Black (default)</item>
-        <item>Status bar color</item>
-        <!--<item>Custom color</item>-->
+        <item>@string/settings_background_fallback_color_item_0</item>
+        <item>@string/settings_background_fallback_color_item_1</item>
+        <!--<item>@string/settings_background_fallback_color_item_2</item>-->
     </string-array>
     <string-array name="settings_background_fallback_color_value">
         <item>0</item>
@@ -13,10 +13,10 @@
     </string-array>
 
     <string-array name="settings_auto_layout_item">
-        <item>None</item>
-        <item>Auto Rotation (default)</item>
-        <item>Auto Zoom</item>
-        <item>Fill Screen</item>
+        <item>@string/settings_auto_layout_item_0</item>
+        <item>@string/settings_auto_layout_item_1</item>
+        <item>@string/settings_auto_layout_item_2</item>
+        <item>@string/settings_auto_layout_item_3</item>
     </string-array>
     <string-array name="settings_auto_layout_value">
         <item>0</item>
@@ -26,9 +26,9 @@
     </string-array>
 
     <string-array name="settings_rotation_item">
-        <item>Allow rotation</item>
-        <item>Portrait</item>
-        <item>Landscape (left or right following the sensor)</item>
+        <item>@string/settings_rotation_item_0</item>
+        <item>@string/settings_rotation_item_1</item>
+        <item>@string/settings_rotation_item_2</item>
     </string-array>
     <string-array name="settings_rotation_value">
         <item>0</item>
@@ -37,9 +37,9 @@
     </string-array>
 
     <string-array name="settings_lcd_overlapping_mode_item">
-        <item>No Overlapping LCD</item>
-        <item>Auto (Double touch)</item>
-        <item>Manual (Zoom or pan)</item>
+        <item>@string/settings_lcd_overlapping_mode_item_0</item>
+        <item>@string/settings_lcd_overlapping_mode_item_1</item>
+        <item>@string/settings_lcd_overlapping_mode_item_2</item>
     </string-array>
     <string-array name="settings_lcd_overlapping_mode_value">
         <item>0</item>
@@ -48,19 +48,19 @@
     </string-array>
 
     <string-array name="ram_cards">
-        <item>32kb (1 port: 2)</item>
-        <item>128kb (1 port: 2)</item>
-        <item>256kb (2 ports: 2,3)</item>
-        <item>512kb (4 ports: 2 through 5)</item>
-        <item>1mb (8 ports: 2 through 9)</item>
-        <item>2mb (16 ports: 2 through 17)</item>
-        <item>4mb (32 ports: 2 through 33)</item>
+        <item>@string/ram_cards_item_0</item>
+        <item>@string/ram_cards_item_1</item>
+        <item>@string/ram_cards_item_2</item>
+        <item>@string/ram_cards_item_3</item>
+        <item>@string/ram_cards_item_4</item>
+        <item>@string/ram_cards_item_5</item>
+        <item>@string/ram_cards_item_6</item>
     </string-array>
 
     <string-array name="settings_printer_model_item">
-        <item>HP82240A</item>
-        <item>HP82240B (default)</item>
-        <!--<item>Generic Serial</item>-->
+        <item>@string/settings_printer_model_item_0</item>
+        <item>@string/settings_printer_model_item_1</item>
+        <!--<item>@string/settings_printer_model_item_2</item>-->
     </string-array>
     <string-array name="settings_printer_model_value">
         <item>0</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17944e8..68f64a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,14 @@
     <string name="menu_printer_simulator_share_graphic">Share Graphic</string>
     <string name="menu_printer_simulator_change_paper">Change Paper (Erase)</string>
 
-    <string name="create_ram_card_title">Create RAM Card</string>
+	<string name="create_ram_card_title">Create RAM Card</string>
+	<string name="ram_cards_item_0">32kb (1 port: 2)</string>
+	<string name="ram_cards_item_1">128kb (1 port: 2)</string>
+	<string name="ram_cards_item_2">256kb (2 ports: 2,3)</string>
+	<string name="ram_cards_item_3">512kb (4 ports: 2 through 5)</string>
+	<string name="ram_cards_item_4">1mb (8 ports: 2 through 9)</string>
+	<string name="ram_cards_item_5">2mb (16 ports: 2 through 17)</string>
+	<string name="ram_cards_item_6">4mb (32 ports: 2 through 33)</string>
     <string name="message_open_security">Permission Denied</string>
     <string name="message_open_security_description">For security reason, you must select the folder where are the KML and ROM files and then, reopen this file!</string>
     <string name="message_open_security_retry">Please, open again</string>
@@ -103,13 +110,23 @@
     <string name="settings_category_ui_title">UI</string>
     <string name="settings_auto_layout_title">Layout</string>
     <string name="settings_auto_layout_summary">Following the calculator screen ratio and the current device orientation, find the best layout compromise</string>
+	<string name="settings_auto_layout_item_0">None</string>
+	<string name="settings_auto_layout_item_1">Auto Rotation (default)</string>
+	<string name="settings_auto_layout_item_2">Auto Zoom</string>
+	<string name="settings_auto_layout_item_3">Fill Screen</string>
 
     <string name="settings_rotation_title">Rotation</string>
     <string name="settings_rotation_summary">Allow to rotate, or force Portrait or Landscape orientation</string>
+	<string name="settings_rotation_item_0">Allow rotation</string>
+	<string name="settings_rotation_item_1">Portrait</string>
+	<string name="settings_rotation_item_2">Landscape (left or right following the sensor)</string>
 
     <string name="settings_allow_pinch_zoom_title">Allow to pinch to zoom</string>
     <string name="settings_lcd_overlapping_mode_title">Overlapping LCD mode</string>
     <string name="settings_lcd_overlapping_mode_summary">Select the overlapping LCD mode. A pan or pinch gesture will change the mode to manual.</string>
+	<string name="settings_lcd_overlapping_mode_item_0">No Overlapping LCD</string>
+	<string name="settings_lcd_overlapping_mode_item_1">Auto (Double touch)</string>
+	<string name="settings_lcd_overlapping_mode_item_2">Manual (Zoom or pan)</string>
 
     <string name="settings_hide_bar_status">Hide the status bar</string>
     <string name="settings_hide_bar_nav">Hide the navigation bar</string>
@@ -122,7 +139,10 @@
     <string name="settings_background_kml_color_title">Use KML color</string>
     <string name="settings_background_kml_color_summary">Use default KML transparency color of the background bitmap (if exist)</string>
     <string name="settings_background_fallback_color_title">Other possible colors</string>
-    <string name="settings_background_fallback_color_summary">Else if the KML color is not used</string>
+	<string name="settings_background_fallback_color_summary">Else if the KML color is not used</string>
+	<string name="settings_background_fallback_color_item_0">Black (default)</string>
+	<string name="settings_background_fallback_color_item_1">Status bar color</string>
+	<string name="settings_background_fallback_color_item_2">Custom color</string>
     <string name="settings_background_custom_color_title">Custom color</string>
     <string name="settings_background_custom_color_summary">Used when selecting the \'Custom color\' in the \'Other possible colors\'</string>
 
@@ -135,7 +155,10 @@
 
     <string name="settings_category_printer_title">Printer Simulator</string>
     <string name="settings_printer_model_title">Printer Model</string>
-    <string name="settings_printer_model_summary">You can choose the printer model</string>
+	<string name="settings_printer_model_summary">You can choose the printer model</string>
+	<string name="settings_printer_model_item_0">HP82240A</string>
+	<string name="settings_printer_model_item_1">HP82240B (default)</string>
+	<string name="settings_printer_model_item_2">Generic Serial</string>
     <string name="settings_printer_prevent_line_wrap">Prevent Line Wrapping</string>
     <string name="settings_printer_prevent_line_wrap_summary">Prevent the calc to wrap the line in the textual printer simulator</string>