From c945dc0bd432da5929fb19ec9d3aa07bf6f088c5 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 7 Sep 2021 20:02:30 -0400
Subject: [PATCH] Move Extension app info button beside uninstall button

---
 .../details/ExtensionDetailsController.kt     | 11 ---------
 .../details/ExtensionDetailsHeaderAdapter.kt  | 10 ++++++++
 .../res/layout/extension_detail_header.xml    | 23 ++++++++++++++++---
 app/src/main/res/menu/extension_details.xml   |  5 ----
 app/src/main/res/values/styles.xml            |  7 ++++++
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt
index f99710c5c3..17434993bb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt
@@ -2,10 +2,7 @@ package eu.kanade.tachiyomi.ui.extension.details
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.provider.Settings
 import android.util.TypedValue
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
@@ -156,7 +153,6 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_history -> openCommitHistory()
-            R.id.action_app_info -> openInSettings()
         }
         return super.onOptionsItemSelected(item)
     }
@@ -171,13 +167,6 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
         openInBrowser(url)
     }
 
-    private fun openInSettings() {
-        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-            data = Uri.fromParts("package", presenter.pkgName, null)
-        }
-        startActivity(intent)
-    }
-
     private fun addPreferencesForSource(screen: PreferenceScreen, source: Source, isMultiSource: Boolean, isMultiLangSingleSource: Boolean) {
         val context = screen.context
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsHeaderAdapter.kt
index e1775bf7b7..4bdb4120ea 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsHeaderAdapter.kt
@@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.ui.extension.details
 
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
@@ -49,6 +52,13 @@ class ExtensionDetailsHeaderAdapter(private val presenter: ExtensionDetailsPrese
                 presenter.uninstallExtension()
             }
 
+            binding.extensionAppInfoButton.setOnClickListener {
+                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                    data = Uri.fromParts("package", presenter.pkgName, null)
+                }
+                it.context.startActivity(intent)
+            }
+
             if (extension.isObsolete) {
                 binding.extensionWarningBanner.isVisible = true
                 binding.extensionWarningBanner.setText(R.string.obsolete_extension_message)
diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml
index 7c873075d8..06a3890229 100644
--- a/app/src/main/res/layout/extension_detail_header.xml
+++ b/app/src/main/res/layout/extension_detail_header.xml
@@ -90,14 +90,15 @@
             android:layout_height="wrap_content"
             android:elevation="3dp"
             android:ellipsize="middle"
-            android:singleLine="true"
+            android:layout_marginTop="6dp"
+            android:maxLines="1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/extension_title"
             app:layout_constraintTop_toBottomOf="@id/extension_nsfw"
             tools:text="eu.kanade.tachiyomi.extension.en.myext" />
 
         <Button
-            android:id="@+id/extension_uninstall_button"
+            android:id="@+id/extension_app_info_button"
             style="@style/Theme.Widget.Button.Colored"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -105,8 +106,24 @@
             android:paddingStart="32dp"
             android:textAllCaps="false"
             android:paddingEnd="32dp"
-            android:text="@string/uninstall"
+            android:layout_marginStart="4dp"
+            android:text="@string/app_info"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/extension_uninstall_button"
+            app:layout_constraintTop_toBottomOf="@id/extension_pkg" />
+
+        <Button
+            android:id="@+id/extension_uninstall_button"
+            style="@style/Theme.Widget.Button.OutlinedButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:paddingStart="32dp"
+            android:layout_marginEnd="4dp"
+            android:paddingEnd="32dp"
+            android:text="@string/uninstall"
+            app:layout_constraintEnd_toStartOf="@id/extension_app_info_button"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/extension_pkg" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/extension_details.xml b/app/src/main/res/menu/extension_details.xml
index c717ec1e02..73d7d2e76b 100644
--- a/app/src/main/res/menu/extension_details.xml
+++ b/app/src/main/res/menu/extension_details.xml
@@ -7,9 +7,4 @@
         android:title="@string/whats_new"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_app_info"
-        android:title="@string/app_info"
-        app:showAsAction="never" />
-
 </menu>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5ac1c4f0f4..dedc6cb69d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -312,6 +312,13 @@
     </style>
 
 
+    <style name="Theme.Widget.Button.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="backgroundTint">@color/ext_bg_selector</item>
+        <item name="android:textColor">@color/ext_button_text_selector</item>
+        <item name="rippleColor">?colorControlHighlight</item>
+    </style>
+
+
     <style name="Theme.Widget.Button.Borderless.Small">
         <item name="android:minHeight">48dip</item>
         <item name="android:minWidth">48dip</item>