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 index f1848aa61..4cfd02a4e 100644 --- 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 index 1f777c60f..c9188051d 100644 --- 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 index 6c4fe3248..96da86b81 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -248,8 +248,10 @@ Streckt die Textzeilen, so dass jede Zeile die gleiche Breite hat (wie in Zeitungen) Umgang mit langen Textzeilen Standardoption im Umgang mit vorformatiertem Text, welcher nicht vollständig auf das Display passt. - Scroll innerhalb des Fensters (overflow) - Breche Zeilen um (pre-wrap) + + Scroll innerhalb des Fensters (overflow) + Breche Zeilen um (pre-wrap) + Lesegeschwindigkeit Deine Lesegeschwindigkeit (gemessen in Wörtern pro Minute). Zum Berechnen der geschätzten Lesezeit genutzt. Bildschirm während Lesens anlassen diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index fe4a27d82..7eb65fad1 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,8 +1,8 @@ - - @string/pref_desc_ui_article_handlePreformattedText_overflow - @string/pref_desc_ui_article_handlePreformattedText_prewrap + + pre-overflow + pre-prewrap 100 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d36ed7f64..cc2fef441 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -206,9 +206,10 @@ Stretches lines to equal width (like in newspapers) Handling Long Preformatted Text How To handle preformatted text that is too long to show completely. - Scroll inside window (overflow) - Break lines (pre-wrap) - + + Scroll inside window (overflow) + Break lines (pre-wrap) + Fullscreen Article View Hides system and app bars when reading articles Reading speed @@ -314,6 +315,4 @@ Back Save settings Remove tag - - diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 714278058..5174baac3 100644 --- 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"/>