Merge pull request #812 from NWuensche/handleLongLines

Pre-wrap Lines by default, setting to change to overflow
wallabag · Aug 26, 2019 · 72c47ed · 72c47ed
2 parents 27d64ce + 56c95e9
commit 72c47ed
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 0 deletions.
diff --git a/app/src/main/assets/dark.css b/app/src/main/assets/dark.css
@@ -237,6 +237,14 @@ header.mbm {
   text-justify: none;
 }
 
+.pre-overflow #article pre {
+  overflow: auto;
+}
+
+.pre-prewrap #article pre {
+  white-space: pre-wrap;
+}
+
 #article blockquote *, #article pre * {
   background: inherit;
 }

diff --git a/app/src/main/assets/main.css b/app/src/main/assets/main.css
@@ -226,6 +226,14 @@ header.mbm {
   text-justify: none;
 }
 
+.pre-overflow #article pre {
+  overflow: auto;
+}
+
+.pre-prewrap #article pre {
+  white-space: pre-wrap;
+}
+
 #article blockquote *, #article pre * {
   background: inherit;
 }

diff --git a/app/src/main/assets/solarized.css b/app/src/main/assets/solarized.css
@@ -241,6 +241,14 @@ header.mbm {
   text-justify: none;
 }
 
+.pre-overflow #article pre {
+  overflow: auto;
+}
+
+.pre-prewrap #article pre {
+  white-space: pre-wrap;
+}
+
 #article blockquote *, #article pre * {
   background: inherit;
 }

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
@@ -364,6 +364,14 @@ public void setArticleTextAlignmentJustify(boolean value) {
         setBoolean(R.string.pref_key_ui_article_textAlignment_justify, value);
     }
 
+    public String getHandlePreformattedTextOption() {
+        return getString(R.string.pref_key_ui_article_handlePreformattedText, "pre-overflow");
+    }
+
+    public void setHandlePreformattedTextOption(String value) {
+        setString(R.string.pref_key_ui_article_handlePreformattedText, value);
+    }
+
     public boolean isFullscreenArticleView() {
         return getBoolean(R.string.pref_key_ui_article_fullscreen, false);
     }

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
@@ -689,6 +689,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");
+        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
@@ -246,6 +246,12 @@
 
     <string name="pref_name_ui_article_textAlignment_justify">Textausrichtung: Blocksatz</string>
     <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-array name="pref_option_handlePreformattedText">
+        <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,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <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>
         <item>150</item>

diff --git a/app/src/main/res/values/strings-preference-keys.xml b/app/src/main/res/values/strings-preference-keys.xml
@@ -23,6 +23,7 @@
     <string name="pref_key_ui_article_fontSize" translatable="false">ui.article.fontSize</string>
     <string name="pref_key_ui_article_fontSerif" translatable="false">ui.article.fontSerif</string>
     <string name="pref_key_ui_article_textAlignment_justify" translatable="false">ui.article.textAlignment.justify</string>
+    <string name="pref_key_ui_article_handlePreformattedText" translatable="false">ui.article.handlePreformattedText</string>
     <string name="pref_key_ui_readingSpeed" translatable="false">ui.readingSpeed</string>
     <string name="pref_key_ui_keepScreenOn" translatable="false">ui.keepScreenOn</string>
     <string name="pref_key_ui_lists_sortOrder" translatable="false">ui.lists.sortOrder</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -204,6 +204,12 @@
     <string name="pref_desc_ui_article_fontSerif">Serif font for articles</string>
     <string name="pref_name_ui_article_textAlignment_justify">Text alignment: Justify</string>
     <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-array name="pref_option_handlePreformattedText">
+        <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>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -104,6 +104,14 @@
                 android:title="@string/pref_name_ui_article_textAlignment_justify"
                 android:summary="@string/pref_desc_ui_article_textAlignment_justify"
                 android:defaultValue="true"/>
+            <ListPreference
+                android:key="@string/pref_key_ui_article_handlePreformattedText"
+                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"
+                android:entryValues="@array/pref_option_handlePreformattedText_values"
+                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"