fix cs design issues / fix rtl layout

2 files changed, 29 insertions, 31 deletions

diff --git a/News-Android-App/src/main/assets/web.css b/News-Android-App/src/main/assets/web.css
index 8ac0366c..aa338254 100644
--- a/News-Android-App/src/main/assets/web.css
+++ b/News-Android-App/src/main/assets/web.css
@@ -176,27 +176,27 @@ ul li:before {
     */
 }
 
-#subscription, #datetime {
-    margin-bottom:3px;
-    font-size: var(--fontsize-subscript);
-}
-
 #subscription {
-    float:left;
-}
-.rtl #subscription {
-    float: right;
+    display: flex;
 }
 
-#datetime {
-    float:right;
+#subscription span {
+    line-height: 16px;
+    display: inline-flex;
+    align-items: center;
 }
-.rtl #datetime {
-    float: left;
+
+#subscription, #datetime {
+    margin-bottom:3px;
+    font-size: var(--fontsize-subscript);
 }
 
+
 #header_small_text {
+    display: flex;
+    justify-content: space-between;
     overflow: auto;
+    flex-direction: row;
 }
 
 #header_small_text {
@@ -206,9 +206,6 @@ ul li:before {
 #top_section {
     margin-top:    1rem;
 }
-.rtl #top_section {
-    text-align: right;
-}
 
 #content {
     margin-top:     0.6rem;
@@ -220,11 +217,11 @@ ul li:before {
     margin-right: 4px;
     vertical-align:middle;
     margin-bottom:2px;
+    margin-left: 0px !important;
     width:16px !important;
     height:16px !important;
 }
 .rtl #imgFavicon {
-    float: right;
-    margin-right: 0;
-    margin-left: 4px;
+    margin-right: 0 !important;
+    margin-left: 4px !important;
 }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
index 888eacde..6bb0b970 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
@@ -35,16 +35,16 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
     private static final double SUBSCRIPT_FONT_SIZE = 0.7;
     private static final String TAG = RssItemToHtmlTask.class.getCanonicalName();
 
-    private static Pattern PATTERN_PRELOAD_VIDEOS_REMOVE = Pattern.compile("(<video[^>]*)(preload=\".*?\")(.*?>)");
-    private static Pattern PATTERN_PRELOAD_VIDEOS_INSERT = Pattern.compile("(<video[^>]*)(.*?)(.*?>)");
-    private static Pattern PATTERN_AUTOPLAY_VIDEOS_1 = Pattern.compile("(<video[^>]*)(autoplay=\".*?\")(.*?>)");
-    private static Pattern PATTERN_AUTOPLAY_VIDEOS_2 = Pattern.compile("(<video[^>]*)(\\sautoplay)(.*?>)");
-    private static Pattern PATTERN_AUTOPLAY_REGEX_CB = Pattern.compile("(.*?)^(Unser Feedsponsor:\\s*<\\/p><p>\\s*.*?\\s*<\\/p>)(.*)", Pattern.MULTILINE);
+    private static final Pattern PATTERN_PRELOAD_VIDEOS_REMOVE = Pattern.compile("(<video[^>]*)(preload=\".*?\")(.*?>)");
+    private static final Pattern PATTERN_PRELOAD_VIDEOS_INSERT = Pattern.compile("(<video[^>]*)(.*?)(.*?>)");
+    private static final Pattern PATTERN_AUTOPLAY_VIDEOS_1 = Pattern.compile("(<video[^>]*)(autoplay=\".*?\")(.*?>)");
+    private static final Pattern PATTERN_AUTOPLAY_VIDEOS_2 = Pattern.compile("(<video[^>]*)(\\sautoplay)(.*?>)");
+    // private static final Pattern PATTERN_AUTOPLAY_REGEX_CB = Pattern.compile("(.*?)^(Unser Feedsponsor:\\s*<\\/p><p>\\s*.*?\\s*<\\/p>)(.*)", Pattern.MULTILINE);
 
-    private RssItem mRssItem;
-    private Listener mListener;
-    private SharedPreferences mPrefs;
-    private boolean isRightToLeft;
+    private final RssItem mRssItem;
+    private final Listener mListener;
+    private final SharedPreferences mPrefs;
+    private final boolean isRightToLeft;
 
 
     public interface Listener {
@@ -106,9 +106,10 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
         Log.v(TAG, "Selected Theme: " + body_id);
 
         String rtlClass = isRightToLeft ? "rtl" : "";
+        String rtlDir = isRightToLeft ? "rtl" : "ltr";
 
         StringBuilder builder = new StringBuilder();
-        builder.append("<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=0\" />");
+        builder.append(String.format("<html dir=\"%s\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=0\" />", rtlDir));
         builder.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"web.css\" />");
 
         // font size scaling
@@ -116,7 +117,7 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
         builder.append(getFontSizeScalingCss(mPrefs));
         builder.append("</style>");
 
-        builder.append(String.format("</head><body class=\"%s\" class=\"%s\">", body_id, rtlClass));
+        builder.append(String.format("</head><body class=\"%s %s\">", body_id, rtlClass));
 
         if (showHeader) {
             builder.append(
@@ -190,7 +191,7 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
 
         builder.append("<div id=\"subscription\">");
         builder.append(String.format("<img id=\"imgFavicon\" src=\"%s\" />", favIconUrl));
-        builder.append(authorLine.trim());
+        builder.append(String.format("<span>%s</span>", authorLine.trim()));
         builder.append("</div>");
 
         Date date = rssItem.getPubDate();