show actionbar in prefs activity so it would be more obvious how to exit it, use fullscreen view for gallery activity

3 files changed, 8 insertions, 10 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
index f37d4a98..cd1677c6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
@@ -3,6 +3,7 @@ package org.fox.ttrss;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -12,6 +13,7 @@ import android.view.View;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
index 2f8237bd..7c0c7e3e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
@@ -24,7 +24,6 @@ public class PreferencesActivity extends CommonActivity {
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
-        getSupportActionBar().hide();
 
         if (savedInstanceState == null) {
             android.app.FragmentTransaction ft = getFragmentManager().beginTransaction();
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 9326a19e..60b6ec1e 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -1,10 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:fitsSystemWindows="true"
     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
@@ -13,18 +11,17 @@
         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="?ic_dots_vertical"
+        app:icon="?ic_dots_vertical"
         android:layout_alignParentRight="true"
         android:layout_marginRight="8dp"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        app:tint="?colorTertiary" />
+        android:layout_marginTop="48dp"
+        app:iconTint="?colorTertiary" />
 
     <ProgressBar
         style="?android:attr/progressBarStyleHorizontal"