Distinguish between types and values

wallabag · Aug 26, 2019 · 4daa817 · 4daa817
1 parent 8c7f955
commit 4daa817
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java b/app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java
@@ -365,7 +365,7 @@ public void setArticleTextAlignmentJustify(boolean value) {
     }
 
     public String getHandlePreformattedTextOption() {
-        return getString(R.string.pref_key_ui_article_handlePreformattedText, getString(R.string.pref_desc_ui_article_handlePreformattedText_overflow));
+        return getString(R.string.pref_key_ui_article_handlePreformattedText, "pre-overflow");
     }
 
     public void setHandlePreformattedTextOption(String value) {

diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java
@@ -683,11 +683,7 @@ private String getHtmlPage() {
         if(weightedFont) additionalClasses.add("weighted-font");
         if(settings.isArticleFontSerif()) additionalClasses.add("serif-font");
         if(settings.isArticleTextAlignmentJustify()) additionalClasses.add("text-align-justify");
-        if(settings.getHandlePreformattedTextOption().equals(getString(R.string.pref_desc_ui_article_handlePreformattedText_overflow))) {
-            additionalClasses.add("pre-overflow");
-        } else {
-            additionalClasses.add("pre-prewrap");
-        }
+        additionalClasses.add(settings.getHandlePreformattedTextOption());
 
         String classAttr;
         if(!additionalClasses.isEmpty()) {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -248,8 +248,10 @@
     <string name="pref_desc_ui_article_textAlignment_justify">Streckt die Textzeilen, so dass jede Zeile die gleiche Breite hat (wie in Zeitungen)</string>
     <string name="pref_name_ui_article_handlePreformattedText">Umgang mit langen Textzeilen</string>
     <string name="pref_desc_ui_article_handlePreformattedText">Standardoption im Umgang mit vorformatiertem Text, welcher nicht vollständig auf das Display passt.</string>
-    <string name="pref_desc_ui_article_handlePreformattedText_overflow">Scroll innerhalb des Fensters (overflow)</string>
-    <string name="pref_desc_ui_article_handlePreformattedText_prewrap">Breche Zeilen um (pre-wrap)</string>
+    <string-array name="pref_option_handlePreformattedText" translatable="true">
+        <item>Scroll innerhalb des Fensters (overflow)</item>
+        <item>Breche Zeilen um (pre-wrap)</item>
+    </string-array>
     <string name="pref_name_ui_readingSpeed">Lesegeschwindigkeit</string>
     <string name="pref_desc_ui_readingSpeed">Deine Lesegeschwindigkeit (gemessen in Wörtern pro Minute). Zum Berechnen der geschätzten Lesezeit genutzt.</string>
     <string name="pref_name_ui_keepScreenOn">Bildschirm während Lesens anlassen</string>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_option_handlePreformattedText_values" translatable="true">
-        <item>@string/pref_desc_ui_article_handlePreformattedText_overflow</item>
-        <item>@string/pref_desc_ui_article_handlePreformattedText_prewrap</item>
+    <string-array name="pref_option_handlePreformattedText_values" translatable="false">
+        <item>pre-overflow</item>
+        <item>pre-prewrap</item>
     </string-array>
     <string-array name="pref_option_readingSpeed_values" translatable="false">
         <item>100</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -206,9 +206,10 @@
     <string name="pref_desc_ui_article_textAlignment_justify">Stretches lines to equal width (like in newspapers)</string>
     <string name="pref_name_ui_article_handlePreformattedText">Handling Long Preformatted Text</string>
     <string name="pref_desc_ui_article_handlePreformattedText">How To handle preformatted text that is too long to show completely.</string>
-    <string name="pref_desc_ui_article_handlePreformattedText_overflow">Scroll inside window (overflow)</string>
-    <string name="pref_desc_ui_article_handlePreformattedText_prewrap">Break lines (pre-wrap)</string>
-
+    <string-array name="pref_option_handlePreformattedText" translatable="true">
+        <item>Scroll inside window (overflow)</item>
+        <item>Break lines (pre-wrap)</item>
+    </string-array>
     <string name="pref_name_ui_article_fullscreen">Fullscreen Article View</string>
     <string name="pref_desc_ui_article_fullscreen">Hides system and app bars when reading articles</string>
     <string name="pref_name_ui_readingSpeed">Reading speed</string>
@@ -314,6 +315,4 @@
     <string name="connectionWizard_summary_prev">Back</string>
     <string name="connectionWizard_summary_next">Save settings</string>
     <string name="remove_tag">Remove tag</string>
-
-
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -109,9 +109,9 @@
                 android:title="@string/pref_name_ui_article_handlePreformattedText"
                 android:summary="@string/pref_desc_ui_article_handlePreformattedText"
                 android:dialogTitle="@string/pref_name_ui_article_handlePreformattedText"
-                android:entries="@array/pref_option_handlePreformattedText_values"
+                android:entries="@array/pref_option_handlePreformattedText"
                 android:entryValues="@array/pref_option_handlePreformattedText_values"
-                android:defaultValue="@string/pref_desc_ui_article_handlePreformattedText_overflow"/>
+                android:defaultValue="pre-overflow"/>
             <fr.gaulupeau.apps.Poche.ui.preferences.IntListPreference
                 android:key="@string/pref_key_ui_readingSpeed"
                 android:title="@string/pref_name_ui_readingSpeed"