Merge branch 'protected/spring-cleaning' into 'master'

Protected/spring cleaning

See merge request tt-rss/tt-rss-android!29

1 files changed, 67 insertions, 114 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 61215a40..e75980b0 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:background="?articleBackground">
+    android:background="?colorSurfaceContainer"
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/article_fullscreen_video"
@@ -17,105 +17,63 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:background="?articleHeader"
-            android:elevation="0dp"
-            app:elevation="0dp"
             android:layout_width="match_parent"
+            android:background="?colorSurfaceContainer"
             android:layout_height="match_parent">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 app:layout_scrollFlags="scroll|enterAlways"
-                android:padding="16dp"
+                app:strokeWidth="0dp"
+                app:shapeAppearance="@style/ShapeAppearanceArticleHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <LinearLayout
                 android:id="@+id/article_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="6dp">
+                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">
 
                     <TextView
                         android:id="@+id/title"
-                        android:background="@drawable/ripple"
                         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"
-                        android:textColor="?articleHeaderTextColor"
                         android:textSize="18sp"
-                        android:layout_marginRight="8dp"
                         android:gravity="start" />
 
-                    <ImageView
-                        android:id="@+id/score"
-                        android:layout_width="wrap_content"
-                        android:layout_height="24dp"
-                        android:layout_weight="0"
-                        android:background="@drawable/ripple"
-                        android:clickable="true"
-                        android:layout_marginLeft="8dp"
-                        android:src="?ic_action_trending_flat"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <ImageView
-                        android:id="@+id/attachments"
-                        android:background="@drawable/ripple"
-                        android:layout_width="wrap_content"
-                        android:layout_height="24dp"
-                        android:layout_weight="0"
-                        android:layout_marginLeft="8dp"
-                        android:clickable="true"
-                        android:src="?ic_attachment_vert"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <ImageView
-                        android:id="@+id/share"
-                        android:background="@drawable/ripple"
-                        android:layout_width="wrap_content"
-                        android:layout_height="24dp"
-                        android:layout_weight="0"
-                        android:clickable="true"
-                        android:src="?ic_share"
-                        android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
                 <TextView
                     android:id="@+id/comments"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     tools:text="comments"
-                    android:background="@drawable/ripple"
                     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:textColor="?headlineSecondaryTextColor"
+                    android:layout_marginTop="8dp"
+                    android:textColor="?colorPrimary"
                     android:textSize="12sp" />
 
-                <TextView
-                    android:id="@+id/host"
-                    tools:text="host"
-                    android:background="@drawable/ripple"
-                    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:textColor="?headlineSecondaryTextColor"
-                    android:textSize="12sp"
-                    android:visibility="gone"/>
-
                 <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"
@@ -127,7 +85,7 @@
                         android:textAlignment="viewStart"
                         android:singleLine="true"
                         android:fontFamily="sans-serif-light"
-                        android:textColor="?headlineSecondaryTextColor"
+                        android:textColor="?colorSecondary"
                         android:textSize="12sp" />
 
                     <TextView
@@ -136,69 +94,64 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.3"
-                        android:gravity=""
                         android:textAlignment="viewEnd"
                         android:fontFamily="sans-serif-light"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="?headlineSecondaryTextColor"
+                        android:textColor="?colorSecondary"
                         android:textSize="12sp" />
 
                 </LinearLayout>
 
-            </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-            <View
-                android:layout_gravity="top|center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?articleHeaderSeparator"/>
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/note_container"
+                        android:layout_width="match_parent"
+                        app:cardBackgroundColor="?colorTertiaryContainer"
+                        android:layout_margin="8dp"
+                        app:strokeWidth="0dp"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_margin="8dp"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/note"
+                                tools:text="Article note (if any...)"
+                                android:layout_gravity="center_vertical"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="8dp"
+                                android:textColor="?colorOnTertiaryContainer"
+                                android:layout_weight="1"
+                                android:textSize="12sp"/>
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                app:tint="?colorOnTertiaryContainer"
+                                android:src="@drawable/baseline_note_24"/>
+
+                        </LinearLayout>
+                    </com.google.android.material.card.MaterialCardView>
+
+                </LinearLayout>
+            </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
         </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"
             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="?articleNoteBackground"
-                    android:textColor="?articleNoteTextColor"
-                    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