From ebc2e5ca2ab58058ea262ebdb3ec5695019de896 Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Tue, 30 Jul 2024 20:07:29 +0200
Subject: [PATCH] version j-0.0.5

---
 .idea/migrations.xml                             | 10 ++++++++++
 app/build.gradle                                 | 16 ++++++++--------
 .../launcher/SettingsFragmentLauncher.kt         | 10 ++++++----
 app/src/main/res/values-de/strings.xml           |  2 +-
 app/src/main/res/values/strings.xml              |  4 ++--
 5 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 .idea/migrations.xml

diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5f7bdc6..6e41727 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "de.jrpie.android.launcher"
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 16
-        versionName "j-0.0.4"
+        versionCode 17
+        versionName "j-0.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,14 +32,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
 }
diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
index eb54d68..85fe6fd 100644
--- a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -101,12 +101,14 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
         bindSwitchToPref(settings_launcher_switch_auto_launch, PREF_SEARCH_AUTO_LAUNCH, false) {}
         bindSwitchToPref(settings_launcher_switch_auto_keyboard, PREF_SEARCH_AUTO_KEYBOARD, true) {}
         bindSwitchToPref(settings_launcher_switch_enable_double, PREF_DOUBLE_ACTIONS_ENABLED, false) {
-            intendedSettingsPause = true
-            activity?.recreate()
+            //intendedSettingsPause = true
+            // TODO fixme: This causes the app to crash on some devices.
+            //activity?.recreate()
         }
         bindSwitchToPref(settings_launcher_switch_enable_edge, PREF_EDGE_ACTIONS_ENABLED, false) {
-            intendedSettingsPause = true
-            activity?.recreate()
+            //intendedSettingsPause = true
+            // TODO fixme
+            //activity?.recreate()
         }
 
         settings_seekbar_sensitivity.setOnSeekBarChangeListener(
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8518b84..6524a4a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -158,7 +158,7 @@
     <string name="tutorial_setup_text_2">Du kannst deine Einstellungen auch später noch ändern.</string>
 
     <string name="tutorial_finish_title">Los gehts!</string>
-    <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist sehr wertvoll für dich!\n\n- Finn (der Entwickler)</string>
+    <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist nützlich für dich!\n\n- Finn (der Entwickler)\n\tund Josia (der einige Änderungen vorgenommen hat und den Fork μLauncher entwickelt.</string>
     <string name="tutorial_finish_button">Starten</string>
 
     <string name="settings">Einstellungen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e81ae78..a21a62c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
       - General
       -
       -->
-    <string name="app_name" translatable="false">Launcher</string>
+    <string name="app_name" translatable="false">μLauncher</string>
     <string name="preference_file_key" translatable="false">V3RYR4ND0MK3YCR4P</string>
 
     <!--
@@ -196,7 +196,7 @@
     <string name="tutorial_setup_text_2">You can also change your selection later.</string>
 
     <string name="tutorial_finish_title">Let\'s go!</string>
-    <string name="tutorial_finish_text">You are ready to get started!\n\nI hope this is of great value to you!\n\n- Finn (who made Launcher)</string>
+    <string name="tutorial_finish_text">You are ready to get started!\n\nI hope this is of great value to you!\n\n- Finn (who made Launcher)\n\tand Josia (who made some improvements and maintains the fork μLauncher)</string>
     <string name="tutorial_finish_button">Start</string>