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

Protected/spring cleaning

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

1 files changed, 18 insertions, 30 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index 6779a950..f4954259 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -1,40 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="120dp"
+    android:layout_height="72dp"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:weightSum="1"
     android:clickable="false">
 
-    <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:id="@+id/imageView"
-        android:scaleType="fitXY"
-        android:background="?colorPrimaryDark"
-        android:src="?drawer_header" />
-
     <FrameLayout
         android:layout_width="match_parent"
-        android:background="@android:color/transparent"
         android:layout_height="match_parent">
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings"
+            android:scaleX="1.5"
+            android:scaleY="1.5"
+            app:icon="@drawable/baseline_settings_24"
             android:id="@+id/drawer_settings_btn"
-            android:layout_gravity="bottom|end"
-            android:clickable="true"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="12dp"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginEnd="8dp"
             android:transitionName="SETTINGS_REVEAL"
-            android:background="@drawable/ripple" />
+            />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
@@ -47,25 +40,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:textColor="@android:color/primary_text_dark"
-                tools:text="test"
-                android:textSize="14sp"
-                android:textStyle="bold"
-
-                />
+                tools:text="user"
+                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                android:textColor="?attr/colorOnSurface"/>
 
             <TextView
                 android:id="@+id/drawer_header_server"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/primary_text_dark"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="5dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 tools:text="example.org"
-                android:textSize="14sp"
-                android:textStyle="normal"
-
-                />
+                android:textAppearance="?attr/textAppearanceTitleSmall"
+                android:textColor="?attr/colorOnSurfaceVariant"/>
         </LinearLayout>
     </FrameLayout>