attempt to simplify article view a bit

1 files changed, 43 insertions, 56 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 0b1f1f0e..0f156245 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -22,17 +22,16 @@
 
             <LinearLayout
                 app:layout_scrollFlags="scroll|enterAlways"
-                android:paddingTop="0dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp"
                 android:id="@+id/article_header"
+                android:background="?colorSurface"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <LinearLayout
                     android:orientation="horizontal"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
@@ -41,7 +40,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:layout_marginEnd="8dp"
                         android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
@@ -78,34 +76,40 @@
 
                 <TextView
                     android:id="@+id/comments"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     tools:text="comments"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
-                    android:paddingTop="8dp"
+                    android:layout_marginTop="8dp"
                     android:textColor="?colorSecondary"
                     android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/host"
                     tools:text="host"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
-                    android:paddingTop="8dp"
+                    android:layout_marginTop="8dp"
                     android:textColor="?colorSecondary"
-                    android:textSize="12sp"
-                    android:visibility="gone"/>
+                    android:textSize="12sp" />
+
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:paddingTop="8dp">
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp">
 
                     <TextView
                         android:id="@+id/tags"
@@ -134,58 +138,41 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
-            <com.google.android.material.divider.MaterialDivider
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?colorSurfaceContainer">
+
+                    <TextView
+                        android:id="@+id/note"
+                        tools:text="Article note (if any...)"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?colorSecondaryContainer"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:padding="8dp"
+                        android:textColor="?colorOnSecondaryContainer"
+                        android:textSize="12sp"/>
+                </LinearLayout>
+            </LinearLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/article_scrollview"
-            android:scrollbars="vertical|horizontal"
+        <com.telefonica.nestedscrollwebview.NestedScrollWebView
+            android:id="@+id/article_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="blocksDescendants"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/note"
-                    tools:text="Article note (if any...)"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="?colorSecondaryContainer"
-                    android:textColor="?colorOnSecondaryContainer"
-                    android:textSize="12sp"
-                    android:paddingLeft="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingRight="16dp"
-                    android:paddingBottom="8dp" />
-
-                <org.fox.ttrss.util.LessBrokenWebView
-                    android:layout_margin="16dp"
-                    android:id="@+id/article_content"
-                    android:scrollbars="none"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
+            android:layout_height="wrap_content" />
 
     </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/article_status_message"
-        android:gravity="center"
-        android:visibility="gone" />
-
 </FrameLayout>
\ No newline at end of file