From cef3b2e5931d4a9084b8f855d9e795abcd6f855c Mon Sep 17 00:00:00 2001
From: davidoskky <davidoskky@yahoo.it>
Date: Wed, 25 Jan 2023 01:54:35 +0100
Subject: [PATCH] Adapt the style of the image activity to the rest of the
 application

---
 androidApp/src/main/AndroidManifest.xml                    | 3 ++-
 .../amine/apps/readerforselfossv2/android/ImageActivity.kt | 2 +-
 androidApp/src/main/res/layout/activity_image.xml          | 7 ++-----
 androidApp/src/main/res/values/styles.xml                  | 4 ++++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 6709e23..ee32159 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -69,7 +69,8 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity">
+            android:name=".ImageActivity"
+            android:theme="@style/Theme.AppCompat.Translucent">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt
index fe4bd64..1799e6b 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt
@@ -24,7 +24,6 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -48,6 +47,7 @@ class ImageActivity : AppCompatActivity() {
             override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {
                 if (motionLayout?.currentState == binding.root.endState) {
                     onBackPressedDispatcher.onBackPressed()
+                    overridePendingTransition(0, 0)
                 }
             }
 
diff --git a/androidApp/src/main/res/layout/activity_image.xml b/androidApp/src/main/res/layout/activity_image.xml
index fbf442f..632163a 100644
--- a/androidApp/src/main/res/layout/activity_image.xml
+++ b/androidApp/src/main/res/layout/activity_image.xml
@@ -9,12 +9,9 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml
index 22e1a4b..d64edba 100644
--- a/androidApp/src/main/res/values/styles.xml
+++ b/androidApp/src/main/res/values/styles.xml
@@ -26,4 +26,8 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="actionMenuTextColor">@color/white</item>
     </style>
+
+    <style name="Theme.AppCompat.Translucent" parent="NoBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
 </resources>