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

Protected/spring cleaning

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

1 files changed, 126 insertions, 153 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 2e997e2c..52bbae56 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginTop="8dp"
+    app:strokeWidth="0dp"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
@@ -12,162 +17,136 @@
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
 
-
         <TableRow
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
 
-            <FrameLayout
-                android:id="@+id/flavorImageHolder"
+            <RelativeLayout
+                android:id="@+id/headline_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_span="2">
+                android:clickable="true"
+                android:layout_span="2"
+                android:padding="16dp">
 
-                <RelativeLayout
+                <TextView
+                    android:id="@+id/title"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="3"
+                    android:paddingBottom="8dp"
+                    android:singleLine="false"
+                    android:textColor="?colorPrimary"
+                    android:textSize="18sp"
+                    android:textStyle="normal"
+                    tools:text="Sample entry title which is overwhelmingly long blah blah blah" />
 
-                    <ProgressBar
-                        android:id="@+id/flavorImageLoadingBar"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:visibility="visible"
-                        style="?android:attr/progressBarStyleHorizontal"
-                        android:layout_alignParentTop="false"
-                        android:layout_alignParentRight="false"
-                        android:layout_alignParentEnd="true"
-                        android:max="100"
-                        android:indeterminate="false"
-                        android:layout_toRightOf="@+id/flavor_video"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true" />
+                <LinearLayout
+                    android:id="@+id/linearLayout2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/title"
+                    android:orientation="horizontal">
 
-                    <ImageView
-                        android:id="@+id/flavor_image"
-                        android:foreground="@drawable/ripple"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/feed_title"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center"
-                        android:adjustViewBounds="true"
-                        android:background="@android:color/transparent"
-                        android:cropToPadding="true"
-                        android:scaleType="fitCenter"
-                        android:visibility="visible" />
+                        android:layout_weight="0.5"
+                        android:ellipsize="middle"
+                        android:fontFamily="sans-serif-light"
+                        android:singleLine="true"
+                        android:textAlignment="viewStart"
+                        android:textColor="?colorSecondary"
+                        android:textSize="12sp"
+                        tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" />
 
-                    <TextureView
-                        android:id="@+id/flavor_video"
-                        android:foreground="@null"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center"
-                        android:adjustViewBounds="true"
-                        android:background="@null"
-                        android:cropToPadding="true"
-                        android:src="@drawable/drawer_header"
-                        android:scaleType="fitCenter"
-                        android:visibility="gone"
-                        android:layout_alignBottom="@+id/flavor_image"
-                        android:layout_alignTop="@+id/flavor_image" />
+                        android:layout_weight="0.5"
+                        android:ellipsize="none"
+                        android:fontFamily="sans-serif-light"
+                        android:singleLine="true"
+                        android:textAlignment="viewEnd"
+                        android:textColor="?colorSecondary"
+                        android:textSize="12sp"
+                        tools:text="Jan 01, 12:00, 1970" />
 
-                    <RelativeLayout
-                        android:id="@+id/headline_header"
-                        android:clickable="true"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?headlineHeaderBackground"
-                        android:padding="16dp">
+                </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/ripple"
-                            android:ellipsize="end"
-                            android:textAlignment="viewStart"
-                            android:gravity="center_vertical"
-                            android:maxLines="3"
-                            android:paddingBottom="8dp"
-                            android:singleLine="false"
-                            android:textColor="?headlineExcerptTextColor"
-                            android:textSize="18sp"
-                            android:textStyle="normal"
-                            tools:text="Sample entry title" />
+            </RelativeLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/title"
-                            android:orientation="horizontal"
-                            android:id="@+id/linearLayout2">
+        </TableRow>
 
-                            <TextView
-                                android:id="@+id/feed_title"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="0.5"
-                                android:ellipsize="middle"
-                                android:fontFamily="sans-serif-light"
-                                android:gravity="center_vertical"
-                                android:textAlignment="viewStart"
-                                android:singleLine="true"
-                                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                                android:textColor="?headlineSecondaryTextColor"
-                                android:textSize="12sp" />
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
 
-                            <TextView
-                                android:id="@+id/date"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="0.5"
-                                android:ellipsize="none"
-                                android:fontFamily="sans-serif-light"
-                                android:gravity="center_vertical"
-                                android:textAlignment="viewEnd"
-                                android:singleLine="true"
-                                tools:text="Jan 01, 12:00, 1970"
-                                android:textColor="?headlineSecondaryTextColor"
-                                android:textSize="12sp" />
+            <FrameLayout
+                android:id="@+id/flavorImageHolder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_span="2">
 
-                        </LinearLayout>
+                <ProgressBar
+                    android:id="@+id/flavorImageLoadingBar"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:visibility="visible" />
 
-                    </RelativeLayout>
+                <ImageView
+                    android:id="@+id/flavor_image"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:cropToPadding="true"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/ic_launcher_background"
+                    android:visibility="visible" />
 
-                </RelativeLayout>
+                <TextureView
+                    android:id="@+id/flavor_video"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:adjustViewBounds="true"
+                    android:background="@null"
+                    android:cropToPadding="true"
+                    android:foreground="@null"
+                    android:scaleType="fitCenter"
+                    android:visibility="gone" />
 
                 <ImageView
                     android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start|bottom"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginBottom="10dp"
+                    android:elevation="4dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_play_circle"
+                    android:src="@drawable/baseline_play_circle_24"
                     android:visibility="visible"
-                    android:layout_below="@+id/headline_header"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:elevation="4dp"
-                    android:tint="?colorAccent"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginStart="8dp" />
+                    app:tint="?colorTertiary" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/gallery_overflow"
-                    android:clickable="true"
+                    style="?attr/materialIconButtonStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    android:src="@drawable/ic_dots_vertical_circle"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="bottom|end"
-                    android:elevation="4dp"
-                    android:tint="?colorAccent"
-                    android:layout_marginBottom="10dp"
-                    tools:targetApi="lollipop" />
+                    android:layout_marginEnd="-8dp"
+                    app:icon="@drawable/baseline_more_vert_24"
+                    app:iconTint="?colorTertiary"/>
 
             </FrameLayout>
         </TableRow>
@@ -187,7 +166,6 @@
                 android:maxLines="5"
                 android:padding="16dp"
                 tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" />
         </TableRow>
 
@@ -204,7 +182,7 @@
                 android:paddingBottom="8dp"
                 android:paddingLeft="8dp">
 
-                <CheckBox
+                <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/selected"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -222,65 +200,60 @@
                     android:singleLine="true"
                     tools:text="by Author"
                     android:textAlignment="viewStart"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/score"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_action_trending_flat" />
+                    app:icon="?ic_action_trending_flat" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/attachments"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_attachment" />
+                    app:icon="?ic_attachment" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_star_outline" />
+                    app:icon="?ic_star_outline" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_rss_box" />
+                    app:icon="?ic_rss_box" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/article_menu_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_dots_vertical" />
+                    app:icon="?ic_dots_vertical" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
-
-</FrameLayout>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file