From d74783a3fd91d1be45ac95f6b99df0d71eb3ed71 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finnmglas@gmail.com>
Date: Sat, 30 May 2020 01:23:05 +0200
Subject: [PATCH] A few related fixes

+ Prevent opening app when clicking close to 3 dots icon
+ Enable dark popup background on older APIs
+ Prevent closing `ChooseActivity` when app is uninstalled
---
 .../main/java/com/finnmglas/launcher/ChooseActivity.kt |  5 ++++-
 .../finnmglas/launcher/choose/AppsRecyclerAdapter.kt   |  3 +++
 app/src/main/res/layout/recycler_apps_row.xml          |  4 ++--
 app/src/main/res/values/styles.xml                     | 10 ++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
index 3b9b2bd..7c1c533 100644
--- a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
@@ -12,6 +12,8 @@ import com.finnmglas.launcher.choose.AppsRecyclerAdapter
 import com.finnmglas.launcher.extern.*
 import kotlinx.android.synthetic.main.activity_choose.*
 
+var intendedChoosePause = false // know when to close
+
 class ChooseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -63,11 +65,12 @@ class ChooseActivity : AppCompatActivity() {
     override fun onPause() {
         super.onPause()
         intendedSettingsPause = false
-        finish()
+        if(!intendedChoosePause) finish()
     }
 
     override fun onResume() {
         super.onResume()
+        intendedChoosePause = false
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
index c70f59a..df1ed41 100644
--- a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
+++ b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
@@ -17,6 +17,7 @@ import com.finnmglas.launcher.extern.FontAwesome
 import com.finnmglas.launcher.extern.REQUEST_CHOOSE_APP
 import com.finnmglas.launcher.extern.REQUEST_UNINSTALL
 import com.finnmglas.launcher.extern.openAppSettings
+import com.finnmglas.launcher.intendedChoosePause
 
 class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forApp: String?):
     RecyclerView.Adapter<AppsRecyclerAdapter.ViewHolder>() {
@@ -70,6 +71,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
             popup.setOnMenuItemClickListener {
                 when (it.itemId) {
                     R.id.app_menu_delete -> { // delete
+                        intendedChoosePause = true
                         val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
                         intent.data = Uri.parse("package:$appPackageName")
                         intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
@@ -78,6 +80,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
                         true
                     }
                     R.id.app_menu_info -> { // open app settings
+                        intendedChoosePause = true
                         openAppSettings(appPackageName, activity)
                         true
                     }
diff --git a/app/src/main/res/layout/recycler_apps_row.xml b/app/src/main/res/layout/recycler_apps_row.xml
index b5146df..80da072 100644
--- a/app/src/main/res/layout/recycler_apps_row.xml
+++ b/app/src/main/res/layout/recycler_apps_row.xml
@@ -33,8 +33,8 @@
 
     <com.finnmglas.launcher.extern.FontAwesome
         android:id="@+id/choose_row_app_menu"
-        android:layout_width="20sp"
-        android:layout_height="wrap_content"
+        android:layout_width="30sp"
+        android:layout_height="0dp"
         android:gravity="center"
         android:text="@string/fas_three_dots"
         android:textSize="20sp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 916ab05..695101d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,8 @@
         <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="colorButtonNormal">@color/finnmglasTheme_accent_color</item>
 
+        <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
+
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
     </style>
@@ -27,6 +29,8 @@
         <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="colorButtonNormal">@color/darkTheme_accent_color</item>
 
+        <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
+
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
     </style>
@@ -37,10 +41,16 @@
         <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="colorButtonNormal">#252827</item>
 
+        <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
+
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
     </style>
 
+    <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu">
+        <item name="android:popupBackground">#252827</item>
+    </style>
+
     <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:textColor">#000000</item>
     </style>