From e75c309b34cbc0b507e4edd52e02657888621649 Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sat, 6 Jul 2024 03:12:57 +0200
Subject: [PATCH] removed support for API < 21

---
 .idea/misc.xml                                |  1 -
 app/build.gradle                              |  4 +-
 .../de/jrpie/android/launcher/Functions.kt    |  4 +-
 .../android/launcher/list/ListActivity.kt     |  2 +-
 .../launcher/settings/SettingsActivity.kt     |  2 -
 .../settings/meta/SettingsFragmentMeta.kt     | 48 ++++---------------
 app/src/main/res/values-de/strings.xml        |  3 +-
 app/src/main/res/values-es/strings.xml        |  3 +-
 app/src/main/res/values-fr/strings.xml        |  1 +
 9 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e9d20d9..97021b9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle b/app/build.gradle
index 96b874e..c29211e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         applicationId "de.jrpie.android.launcher"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 35
         versionCode 13
         versionName "j-alpha-0.1"
 
@@ -37,5 +37,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.palette:palette-ktx:1.0.0'
 }
diff --git a/app/src/main/java/de/jrpie/android/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
index 62c32d5..c472209 100644
--- a/app/src/main/java/de/jrpie/android/launcher/Functions.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
@@ -552,7 +552,7 @@ fun openSoftKeyboard(context: Context, view: View) {
 fun setButtonColor(btn: Button, color: Int) {
     if (Build.VERSION.SDK_INT >= 29)
         btn.background.colorFilter = BlendModeColorFilter(color, BlendMode.MULTIPLY)
-    else if(Build.VERSION.SDK_INT >= 21) {
+    else {
         // tested with API 17 (Android 4.4.2 on S4 mini) -> fails
         // tested with API 28 (Android 9 on S8) -> necessary
         btn.background.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
@@ -564,7 +564,7 @@ fun setSwitchColor(sw: Switch, trackColor: Int) {
     if (Build.VERSION.SDK_INT >= 29) {
         sw.trackDrawable.colorFilter = BlendModeColorFilter(trackColor, BlendMode.MULTIPLY)
     }
-    else if(Build.VERSION.SDK_INT >= 21) {
+    else {
         sw.trackDrawable.colorFilter = PorterDuffColorFilter(trackColor, PorterDuff.Mode.SRC_ATOP)
     }
 }
diff --git a/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt b/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt
index 7813d39..432d14d 100644
--- a/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt
@@ -22,7 +22,7 @@ import kotlinx.android.synthetic.main.list_apps.*
 
 var intendedChoosePause = false // know when to close
 
-// TODO: Better solution for this intercommunication fuctionality (used in list-fragments)
+// TODO: Better solution for this intercommunication functionality (used in list-fragments)
 var intention = "view"
 var forApp = ""
 
diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt
index 2ebe690..6fb3003 100644
--- a/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt
@@ -60,8 +60,6 @@ class SettingsActivity: AppCompatActivity(), UIObject {
     }
 
     override fun applyTheme() {
-        // settings_appbar.setBackgroundColor(dominantColor)
-
         //settings_system.setTextColor(vibrantColor)
         //settings_close.setTextColor(vibrantColor)
         settings_tabs.setSelectedTabIndicatorColor(vibrantColor)
diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt
index 1ea8d76..a0e2fb0 100644
--- a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt
@@ -49,11 +49,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
             Uri.parse(String.format("%s?id=%s", url, this.context!!.packageName))
         )
         var flags = Intent.FLAG_ACTIVITY_NO_HISTORY or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
-        flags = if (Build.VERSION.SDK_INT >= 21) {
-            flags or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
-        } else {
-            flags or Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
-        }
+        flags = flags or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
         intent.addFlags(flags)
         return intent
     }
@@ -69,36 +65,10 @@ class SettingsFragmentMeta : Fragment(), UIObject {
 
     override fun setOnClicks() {
 
-        // Button onClicks
-
         settings_meta_button_select_launcher.setOnClickListener {
             intendedSettingsPause = true
-            // on newer sdk: choose launcher
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val callHomeSettingIntent = Intent(Settings.ACTION_HOME_SETTINGS)
-                startActivity(callHomeSettingIntent)
-            }
-            // on older sdk: manage app details
-            else {
-                AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom)
-                    .setTitle(getString(R.string.settings_meta_cant_select_launcher))
-                    .setMessage(getString(R.string.settings_meta_cant_select_launcher_msg))
-                    .setPositiveButton(android.R.string.yes,
-                        DialogInterface.OnClickListener { _, _ ->
-                            try {
-                                openAppSettings(
-                                    this.context!!.packageName,
-                                    this.context!!
-                                )
-                            } catch ( e : ActivityNotFoundException) {
-                                val intent = Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS)
-                                startActivity(intent)
-                            }
-                        })
-                    .setNegativeButton(android.R.string.no, null)
-                    .setIcon(android.R.drawable.ic_dialog_info)
-                    .show()
-            }
+            val callHomeSettingIntent = Intent(Settings.ACTION_HOME_SETTINGS)
+            startActivity(callHomeSettingIntent)
         }
 
         settings_meta_button_view_tutorial.setOnClickListener {
@@ -111,12 +81,12 @@ class SettingsFragmentMeta : Fragment(), UIObject {
             AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom)
                 .setTitle(getString(R.string.settings_meta_reset))
                 .setMessage(getString(R.string.settings_meta_reset_confirm))
-                .setPositiveButton(android.R.string.yes,
-                    DialogInterface.OnClickListener { _, _ ->
-                        resetSettings(this.context!!)
-                        activity!!.finish()
-                    })
-                .setNegativeButton(android.R.string.no, null)
+                .setPositiveButton(android.R.string.ok
+                ) { _, _ ->
+                    resetSettings(this.context!!)
+                    activity!!.finish()
+                }
+                .setNegativeButton(android.R.string.cancel, null)
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .show()
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cb4a98e..d7c4e2e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -99,14 +99,13 @@
     <string name="settings_meta_reset">Zurücksetzen</string>
     <string name="settings_meta_reset_confirm">All deine Einstellungen gehen verloren. Weitermachen?</string>
 
-    <string name="settings_meta_link_github">https://github.de.jrpie.android.launcher#de</string>
-
     <string name="settings_meta_report_bug">Einen Fehler melden</string>
 
     <string name="settings_meta_discord">Unserem Discord beitreten</string>
 
     <string name="settings_meta_contact">Entwickler kontaktieren</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/de/kontakt/</string>
+    <string name="settings_meta_fork_contact">Entwickler des Fork kontaktieren</string>
 
 
     <!--
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 243534d..b0f622a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -123,12 +123,11 @@
     <string name="settings_meta_reset">Configuración por defecto</string>
     <string name="settings_meta_reset_confirm">Todas sus preferencias se eliminarán. Desea continuar?</string>
 
-    <string name="settings_meta_link_github">https://github.de.jrpie.android.launcher#en</string>
-
     <string name="settings_meta_report_bug">Reportar un error</string>
 
     <string name="settings_meta_contact">Contactar al desarrollador</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>
+    <string name="settings_meta_fork_contact">Contact the developer of the fork (desgraciadamente no habla español)</string>
 
     <string name="settings_meta_discord">Unete a nuestro discord!</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8780233..2ffc536 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -107,6 +107,7 @@
 
     <string name="settings_meta_contact">Contacter le développeur</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/fr/contact/</string>
+    <string name="settings_meta_fork_contact">Contact the developer of the fork (malheureusement, il ne parle pas français)</string>
 
 
     <!--