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

Protected/spring cleaning

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

1 files changed, 9 insertions, 11 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
index 7f47de50..f44bb74b 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -1,9 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/article_images"
     android:layout_width="fill_parent"
     android:animateLayoutChanges="true"
-    android:background="@android:color/black"
     android:layout_height="fill_parent">
 
     <com.bogdwellers.pinchtozoom.view.ImageViewPager
@@ -12,18 +11,16 @@
         android:layout_height="fill_parent"
         android:layout_alignParentTop="true" />
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
+        style="?attr/materialIconButtonStyle"
         android:id="@+id/gallery_overflow"
-        android:clickable="true"
         android:layout_width="wrap_content"
-        android:layout_height="26dp"
+        android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:background="@drawable/ripple"
-        android:src="@drawable/ic_dots_vertical_circle"
+        app:icon="?ic_dots_vertical"
         android:layout_alignParentRight="true"
-        android:tint="?colorAccent"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="@dimen/activity_vertical_margin" />
+        android:layout_marginTop="48dp"
+        app:iconTint="?colorTertiary" />
 
     <ProgressBar
         style="?android:attr/progressBarStyleHorizontal"
@@ -44,7 +41,8 @@
     <me.relex.circleindicator.CircleIndicator
         android:id="@+id/gallery_pager_indicator"
         android:layout_width="fill_parent"
-        android:layout_height="40dp"
+        android:layout_height="32dp"
+        android:layout_marginBottom="55dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"