.github/FUNDING.yml

@@ -1,3 +1,3 @@
-# How you can support jrpie/Launcher
+# How you can support finnmglas/Launcher
 
-custom: https://s.jrpie.de/launcher-donate
+custom: sponsor.finnmglas.com

.scripts/release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-export JAVA_HOME="/usr/lib/jvm/java-21-openjdk/"
+export JAVA_HOME="/usr/lib/jvm/java-23-openjdk/"
 OUTPUT_DIR="$HOME/launcher-release"
 BUILD_TOOLS_DIR="$HOME/Android/Sdk/build-tools/35.0.0"
 KEYSTORE="$HOME/data/keys/launcher_jrpie.jks"

app/build.gradle

@@ -23,8 +23,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 35
         compileSdk 35
-        versionCode 44
-        versionName "0.1.4"
+        versionCode 39
+        versionName "0.0.23"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -85,17 +85,17 @@ android {
         // Disables dependency metadata when building Android App Bundles.
         includeInBundle = false
     }
-    lint {
+
+    lintOptions {
         abortOnError false
     }
 
-
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.activity:activity-ktx:1.8.0'
+    implementation 'androidx.activity:activity:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0'

app/src/main/AndroidManifest.xml

@@ -85,7 +85,7 @@
         <service
             android:name=".actions.lock.LauncherAccessibilityService"
             android:exported="true"
-            android:label="@string/app_name"
+            android:label="@string/accessibility_service_name"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService" />

app/src/main/java/de/jrpie/android/launcher/Application.kt

@@ -7,6 +7,7 @@ import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.content.pm.LauncherApps
 import android.content.pm.ShortcutInfo
+import android.os.AsyncTask
 import android.os.Build
 import android.os.Build.VERSION_CODES
 import android.os.UserHandle
@@ -14,18 +15,15 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.MutableLiveData
 import androidx.preference.PreferenceManager
 import de.jrpie.android.launcher.actions.TorchManager
-import de.jrpie.android.launcher.apps.AbstractAppInfo
-import de.jrpie.android.launcher.apps.AbstractDetailedAppInfo
+import de.jrpie.android.launcher.apps.AppInfo
+import de.jrpie.android.launcher.apps.DetailedAppInfo
 import de.jrpie.android.launcher.apps.isPrivateSpaceLocked
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.preferences.migratePreferencesToNewVersion
 import de.jrpie.android.launcher.preferences.resetPreferences
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class Application : android.app.Application() {
-    val apps = MutableLiveData<List<AbstractDetailedAppInfo>>()
+    val apps = MutableLiveData<List<DetailedAppInfo>>()
     val privateSpaceLocked = MutableLiveData<Boolean>()
 
     private val profileAvailabilityBroadcastReceiver = object : BroadcastReceiver() {
@@ -84,12 +82,10 @@ class Application : android.app.Application() {
     }
 
     var torchManager: TorchManager? = null
-    private var customAppNames: HashMap<AbstractAppInfo, String>? = null
+    private var customAppNames: HashMap<AppInfo, String>? = null
     private val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, pref ->
         if (pref == getString(R.string.settings_apps_custom_names_key)) {
             customAppNames = LauncherPreferences.apps().customNames()
-        } else if (pref == LauncherPreferences.apps().keys().pinnedShortcuts()) {
-            loadApps()
         }
     }
 
@@ -110,10 +106,12 @@ class Application : android.app.Application() {
         // Try to restore old preferences
         migratePreferencesToNewVersion(this)
 
-        // First time opening the app: set defaults
-        // The tutorial is started from HomeActivity#onStart, as starting it here is blocked by android
+        // First time opening the app: set defaults and start tutorial
         if (!LauncherPreferences.internal().started()) {
             resetPreferences(this)
+
+            LauncherPreferences.internal().started(true)
+            openTutorial(this)
         }
 
 
@@ -134,8 +132,7 @@ class Application : android.app.Application() {
                     it.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)
                 }
             }
-            ContextCompat.registerReceiver(
-                this, profileAvailabilityBroadcastReceiver, filter,
+            ContextCompat.registerReceiver(this, profileAvailabilityBroadcastReceiver, filter,
                 ContextCompat.RECEIVER_EXPORTED
             )
         }
@@ -146,15 +143,13 @@ class Application : android.app.Application() {
         loadApps()
     }
 
-    fun getCustomAppNames(): HashMap<AbstractAppInfo, String> {
+    fun getCustomAppNames(): HashMap<AppInfo, String> {
         return (customAppNames ?: LauncherPreferences.apps().customNames() ?: HashMap())
             .also { customAppNames = it }
     }
 
     private fun loadApps() {
         privateSpaceLocked.postValue(isPrivateSpaceLocked(this))
-        CoroutineScope(Dispatchers.Default).launch {
-            apps.postValue(getApps(packageManager, applicationContext))
-        }
+        AsyncTask.execute { apps.postValue(getApps(packageManager, applicationContext)) }
     }
 }

app/src/main/java/de/jrpie/android/launcher/Functions.kt

@@ -12,6 +12,7 @@ import android.content.pm.LauncherApps
 import android.content.pm.LauncherApps.ShortcutQuery
 import android.content.pm.PackageManager
 import android.content.pm.ShortcutInfo
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.UserHandle
@@ -23,23 +24,24 @@ import androidx.annotation.RequiresApi
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.ShortcutAction
-import de.jrpie.android.launcher.apps.AbstractAppInfo.Companion.INVALID_USER
-import de.jrpie.android.launcher.apps.AbstractDetailedAppInfo
+import de.jrpie.android.launcher.actions.shortcuts.PinnedShortcutInfo
 import de.jrpie.android.launcher.apps.AppInfo
 import de.jrpie.android.launcher.apps.DetailedAppInfo
-import de.jrpie.android.launcher.apps.DetailedPinnedShortcutInfo
-import de.jrpie.android.launcher.apps.PinnedShortcutInfo
 import de.jrpie.android.launcher.apps.getPrivateSpaceUser
 import de.jrpie.android.launcher.apps.isPrivateSpaceSupported
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
-import androidx.core.net.toUri
 
 
-const val LOG_TAG = "Launcher"
+/* REQUEST CODES */
+
+const val REQUEST_CHOOSE_APP = 1
+const val REQUEST_UNINSTALL = 2
 
 const val REQUEST_SET_DEFAULT_HOME = 42
 
+const val LOG_TAG = "Launcher"
+
 fun isDefaultHomeScreen(context: Context): Boolean {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
         val roleManager = context.getSystemService(RoleManager::class.java)
@@ -61,7 +63,7 @@ fun setDefaultHomeScreen(context: Context, checkDefault: Boolean = false) {
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
         && context is Activity
-        && checkDefault // using role manager only works when µLauncher is not already the default.
+        && !isDefault // using role manager only works when µLauncher is not already the default.
     ) {
         val roleManager = context.getSystemService(RoleManager::class.java)
         context.startActivityForResult(
@@ -88,24 +90,18 @@ fun getUserFromId(userId: Int?, context: Context): UserHandle {
 fun removeUnusedShortcuts(context: Context) {
     val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
     fun getShortcuts(profile: UserHandle): List<ShortcutInfo>? {
-        return try {
-            launcherApps.getShortcuts(
+        return launcherApps.getShortcuts(
             ShortcutQuery().apply {
                 setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
             },
             profile
         )
-        } catch (e: Exception) {
-            // https://github.com/jrpie/launcher/issues/116
-            return null
-        }
     }
 
     val userManager = context.getSystemService(Service.USER_SERVICE) as UserManager
-    val boundActions: MutableSet<PinnedShortcutInfo> =
+    val boundActions: Set<PinnedShortcutInfo> =
         Gesture.entries.mapNotNull { Action.forGesture(it) as? ShortcutAction }.map { it.shortcut }
-            .toMutableSet()
-    LauncherPreferences.apps().pinnedShortcuts()?.let { boundActions.addAll(it) }
+            .toSet()
     try {
         userManager.userProfiles.filter { !userManager.isQuietModeEnabled(it) }.forEach { profile ->
             getShortcuts(profile)?.groupBy { it.`package` }?.forEach { (p, shortcuts) ->
@@ -120,7 +116,7 @@ fun removeUnusedShortcuts(context: Context) {
 }
 
 fun openInBrowser(url: String, context: Context) {
-    val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
     intent.putExtras(Bundle().apply { putBoolean("new_window", true) })
     try {
         context.startActivity(intent)
@@ -130,19 +126,18 @@ fun openInBrowser(url: String, context: Context) {
 }
 
 fun openTutorial(context: Context) {
-    context.startActivity(Intent(context, TutorialActivity::class.java))
+    context.startActivity(Intent(context, TutorialActivity::class.java).apply {
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    })
 }
 
 
 /**
  * Load all apps.
  */
-fun getApps(
-    packageManager: PackageManager,
-    context: Context
-): MutableList<AbstractDetailedAppInfo> {
-    var start = System.currentTimeMillis()
-    val loadList = mutableListOf<AbstractDetailedAppInfo>()
+fun getApps(packageManager: PackageManager, context: Context): MutableList<DetailedAppInfo> {
+    val start = System.currentTimeMillis()
+    val loadList = mutableListOf<DetailedAppInfo>()
 
     val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
     val userManager = context.getSystemService(Service.USER_SERVICE) as UserManager
@@ -179,7 +174,7 @@ fun getApps(
         i.addCategory(Intent.CATEGORY_LAUNCHER)
         val allApps = packageManager.queryIntentActivities(i, 0)
         for (ri in allApps) {
-            val app = AppInfo(ri.activityInfo.packageName, null, INVALID_USER)
+            val app = AppInfo(ri.activityInfo.packageName, null, AppInfo.INVALID_USER)
             val detailedAppInfo = DetailedAppInfo(
                 app,
                 ri.loadLabel(packageManager),
@@ -189,24 +184,22 @@ fun getApps(
             loadList.add(detailedAppInfo)
         }
     }
-    loadList.sortBy { it.getCustomLabel(context) }
+    loadList.sortBy { it.getCustomLabel(context).toString() }
 
-    var end = System.currentTimeMillis()
+    val end = System.currentTimeMillis()
     Log.i(LOG_TAG, "${loadList.size} apps loaded (${end - start}ms)")
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-        start = System.currentTimeMillis()
-        LauncherPreferences.apps().pinnedShortcuts()
-            ?.mapNotNull { DetailedPinnedShortcutInfo.fromPinnedShortcutInfo(it, context) }
-            ?.let {
-                end = System.currentTimeMillis()
-                Log.i(LOG_TAG, "${it.size} shortcuts loaded (${end - start}ms)")
-                loadList.addAll(it)
-            }
-    }
 
     return loadList
 }
 
+
+// Used in Tutorial and Settings `ActivityOnResult`
+fun saveListActivityChoice(data: Intent?) {
+    val forGesture = data?.getStringExtra("forGesture") ?: return
+    Gesture.byId(forGesture)?.let { Action.setActionForGesture(it, Action.fromIntent(data)) }
+}
+
+
 // used for the bug report button
 fun getDeviceInfo(): String {
     return """

app/src/main/java/de/jrpie/android/launcher/actions/Action.kt

@@ -2,6 +2,7 @@ package de.jrpie.android.launcher.actions
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.content.SharedPreferences.Editor
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
@@ -11,7 +12,6 @@ import de.jrpie.android.launcher.preferences.LauncherPreferences
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import androidx.core.content.edit
 
 
 @Serializable
@@ -29,6 +29,10 @@ sealed interface Action {
         prefEditor.putString(id, Json.encodeToString(this))
     }
 
+    fun writeToIntent(intent: Intent) {
+        intent.putExtra("action", Json.encodeToString(this))
+    }
+
     companion object {
 
         fun forGesture(gesture: Gesture): Action? {
@@ -40,7 +44,7 @@ sealed interface Action {
         }
 
         fun resetToDefaultActions(context: Context) {
-            LauncherPreferences.getSharedPreferences().edit {
+            val editor = LauncherPreferences.getSharedPreferences().edit()
             val boundActions = HashSet<String>()
             Gesture.entries.forEach { gesture ->
                 context.resources
@@ -53,10 +57,10 @@ sealed interface Action {
                         if (second != LauncherAction.CHOOSE) {
                             boundActions.add(first)
                         }
-                            second.bindToGesture(this@edit, gesture.id)
-                        }
+                        second.bindToGesture(editor, gesture.id)
                     }
             }
+            editor.apply()
         }
 
         fun setActionForGesture(gesture: Gesture, action: Action?) {
@@ -64,15 +68,15 @@ sealed interface Action {
                 clearActionForGesture(gesture)
                 return
             }
-            LauncherPreferences.getSharedPreferences().edit {
-                action.bindToGesture(this, gesture.id)
-            }
+            val editor = LauncherPreferences.getSharedPreferences().edit()
+            action.bindToGesture(editor, gesture.id)
+            editor.apply()
         }
 
         fun clearActionForGesture(gesture: Gesture) {
-            LauncherPreferences.getSharedPreferences().edit {
-                remove(gesture.id)
-            }
+            LauncherPreferences.getSharedPreferences().edit()
+                .remove(gesture.id)
+                .apply()
         }
 
         fun launch(
@@ -83,9 +87,6 @@ sealed interface Action {
         ) {
             if (action != null && action.invoke(context)) {
                 if (context is Activity) {
-                    // There does not seem to be a good alternative to overridePendingTransition.
-                    // Note that we can't use overrideActivityTransition here.
-                    @Suppress("deprecation")
                     context.overridePendingTransition(animationIn, animationOut)
                 }
             } else {
@@ -96,5 +97,10 @@ sealed interface Action {
                 ).show()
             }
         }
+
+        fun fromIntent(data: Intent): Action? {
+            val json = data.getStringExtra("action") ?: return null
+            return Json.decodeFromString(json)
+        }
     }
 }

app/src/main/java/de/jrpie/android/launcher/actions/AppAction.kt

@@ -11,7 +11,7 @@ import android.graphics.drawable.Drawable
 import android.util.Log
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.apps.AppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo.Companion.INVALID_USER
+import de.jrpie.android.launcher.apps.AppInfo.Companion.INVALID_USER
 import de.jrpie.android.launcher.apps.DetailedAppInfo
 import de.jrpie.android.launcher.ui.list.apps.openSettings
 import kotlinx.serialization.SerialName
@@ -67,7 +67,7 @@ class AppAction(val app: AppInfo) : Action {
     }
 
     override fun getIcon(context: Context): Drawable? {
-        return DetailedAppInfo.fromAppInfo(app, context)?.getIcon(context)
+        return DetailedAppInfo.fromAppInfo(app, context)?.icon
     }
 
     override fun isAvailable(context: Context): Boolean {

app/src/main/java/de/jrpie/android/launcher/actions/Gesture.kt

@@ -250,7 +250,7 @@ enum class Gesture(
         "action.back",
         R.string.settings_gesture_back,
         R.string.settings_gesture_description_back,
-        R.array.default_back
+        R.array.default_up
     );
 
     enum class Edge {

app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt

@@ -11,11 +11,8 @@ import android.view.KeyEvent
 import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
 import de.jrpie.android.launcher.Application
-import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.actions.lock.LauncherAccessibilityService
 import de.jrpie.android.launcher.apps.AppFilter
-import de.jrpie.android.launcher.apps.hidePrivateSpaceWhenLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceSupported
 import de.jrpie.android.launcher.apps.togglePrivateSpaceLock
 import de.jrpie.android.launcher.preferences.LauncherPreferences
@@ -69,11 +66,7 @@ enum class LauncherAction(
         R.string.list_other_list_private_space,
         R.drawable.baseline_security_24,
         { context ->
-            if ((context.applicationContext as Application).privateSpaceLocked.value != true
-                || !hidePrivateSpaceWhenLocked(context)
-            ) {
             openAppsList(context, private = true)
-            }
         },
         available = { _ ->
             isPrivateSpaceSupported()
@@ -90,37 +83,31 @@ enum class LauncherAction(
         "volume_up",
         R.string.list_other_volume_up,
         R.drawable.baseline_volume_up_24,
-        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_RAISE) }
+        { context -> audioVolumeAdjust(context, true)}
     ),
     VOLUME_DOWN(
         "volume_down",
         R.string.list_other_volume_down,
         R.drawable.baseline_volume_down_24,
-        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_LOWER) }
-    ),
-    VOLUME_ADJUST(
-        "volume_adjust",
-        R.string.list_other_volume_adjust,
-        R.drawable.baseline_volume_adjust_24,
-        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_SAME) }
+        { context -> audioVolumeAdjust(context, false)}
     ),
     TRACK_PLAY_PAUSE(
         "play_pause_track",
         R.string.list_other_track_play_pause,
         R.drawable.baseline_play_arrow_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) }
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)}
     ),
     TRACK_NEXT(
         "next_track",
         R.string.list_other_track_next,
         R.drawable.baseline_skip_next_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_NEXT) }
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_NEXT)}
     ),
     TRACK_PREV(
         "previous_track",
         R.string.list_other_track_previous,
         R.drawable.baseline_skip_previous_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PREVIOUS) }
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PREVIOUS)}
     ),
     EXPAND_NOTIFICATIONS_PANEL(
         "expand_notifications_panel",
@@ -134,14 +121,6 @@ enum class LauncherAction(
         R.drawable.baseline_settings_applications_24,
         ::expandSettingsPanel
     ),
-    RECENT_APPS(
-        "recent_apps",
-        R.string.list_other_recent_apps,
-        R.drawable.baseline_apps_24,
-        LauncherAccessibilityService::openRecentApps,
-        false,
-        { _ -> BuildConfig.USE_ACCESSIBILITY_SERVICE }
-    ),
     LOCK_SCREEN(
         "lock_screen",
         R.string.list_other_lock_screen,
@@ -152,13 +131,7 @@ enum class LauncherAction(
         "toggle_torch",
         R.string.list_other_torch,
         R.drawable.baseline_flashlight_on_24,
-        ::toggleTorch,
-    ),
-    LAUNCH_OTHER_LAUNCHER(
-        "launcher_other_launcher",
-        R.string.list_other_launch_other_launcher,
-        R.drawable.baseline_home_24,
-        ::launchOtherLauncher
+        ::toggleTorch
     ),
     NOP("nop", R.string.list_other_nop, R.drawable.baseline_not_interested_24, {});
 
@@ -203,13 +176,17 @@ private fun audioManagerPressKey(context: Context, key: Int) {
 
 }
 
-private fun audioVolumeAdjust(context: Context, direction: Int) {
+private fun audioVolumeAdjust(context: Context, louder: Boolean) {
     val audioManager =
         context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
 
     audioManager.adjustStreamVolume(
         AudioManager.STREAM_MUSIC,
-        direction,
+        if (louder) {
+            AudioManager.ADJUST_RAISE
+        } else {
+            AudioManager.ADJUST_LOWER
+        },
         AudioManager.FLAG_SHOW_UI
     )
 }
@@ -264,15 +241,6 @@ private fun expandSettingsPanel(context: Context) {
     }
 }
 
-private fun launchOtherLauncher(context: Context) {
-    context.startActivity(
-        Intent.createChooser(
-            Intent(Intent.ACTION_MAIN).also { it.addCategory(Intent.CATEGORY_HOME) },
-            context.getString(R.string.list_other_launch_other_launcher)
-        )
-    )
-}
-
 private fun openSettings(context: Context) {
     context.startActivity(Intent(context, SettingsActivity::class.java))
 }

app/src/main/java/de/jrpie/android/launcher/actions/ShortcutAction.kt

@@ -6,7 +6,7 @@ import android.content.pm.LauncherApps
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.os.Build
-import de.jrpie.android.launcher.apps.PinnedShortcutInfo
+import de.jrpie.android.launcher.actions.shortcuts.PinnedShortcutInfo
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt

@@ -22,44 +22,26 @@ class LauncherAccessibilityService : AccessibilityService() {
 
     companion object {
         private const val TAG = "Launcher Accessibility"
-        private const val ACTION_REQUEST_ENABLE = "ACTION_REQUEST_ENABLE"
         const val ACTION_LOCK_SCREEN = "ACTION_LOCK_SCREEN"
-        const val ACTION_RECENT_APPS = "ACTION_RECENT_APPS"
 
-        private fun invoke(context: Context, action: String, failureMessageRes: Int) {
+        fun lockScreen(context: Context) {
             try {
                 context.startService(
                     Intent(
                         context,
                         LauncherAccessibilityService::class.java
                     ).apply {
-                        this.action = action
+                        action = ACTION_LOCK_SCREEN
                     })
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                 Toast.makeText(
                     context,
-                    context.getString(failureMessageRes),
+                    context.getString(R.string.alert_lock_screen_failed),
                     Toast.LENGTH_LONG
                 ).show()
             }
         }
 
-        fun lockScreen(context: Context) {
-            if (!isEnabled(context)) {
-                showEnableDialog(context)
-            } else {
-                invoke(context, ACTION_LOCK_SCREEN, R.string.alert_lock_screen_failed)
-            }
-        }
-
-        fun openRecentApps(context: Context) {
-            if (!isEnabled(context)) {
-                showEnableDialog(context)
-            } else {
-                invoke(context, ACTION_RECENT_APPS, R.string.alert_recent_apps_failed)
-            }
-        }
-
         fun isEnabled(context: Context): Boolean {
             val enabledServices = Settings.Secure.getString(
                 context.contentResolver,
@@ -76,7 +58,7 @@ class LauncherAccessibilityService : AccessibilityService() {
                 setView(R.layout.dialog_consent_accessibility)
                 setTitle(R.string.dialog_consent_accessibility_title)
                 setPositiveButton(R.string.dialog_consent_accessibility_ok) { _, _ ->
-                    invoke(context, ACTION_REQUEST_ENABLE, R.string.alert_enable_accessibility_failed)
+                    lockScreen(context)
                 }
                 setNegativeButton(R.string.dialog_cancel) { _, _ -> }
             }.create().also { it.show() }.apply {
@@ -112,9 +94,7 @@ class LauncherAccessibilityService : AccessibilityService() {
             }
 
             when (action) {
-                ACTION_REQUEST_ENABLE -> {} // do nothing
                 ACTION_LOCK_SCREEN -> handleLockScreen()
-                ACTION_RECENT_APPS -> performGlobalAction(GLOBAL_ACTION_RECENTS)
             }
         }
         return super.onStartCommand(intent, flags, startId)

app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt

@@ -6,10 +6,10 @@ import android.widget.Button
 import androidx.appcompat.app.AlertDialog
 import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.actions.lock.LauncherAccessibilityService
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
 
+@Suppress("unused")
 enum class LockMethod(
     private val lock: (Context) -> Unit,
     private val isEnabled: (Context) -> Boolean,

app/src/main/java/de/jrpie/android/launcher/actions/shortcuts/PinnedShortcutInfo.kt

@@ -0,0 +1,60 @@
+package de.jrpie.android.launcher.actions.shortcuts
+
+import android.app.Service
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.LauncherApps
+import android.content.pm.LauncherApps.ShortcutQuery
+import android.content.pm.ShortcutInfo
+import android.os.Build
+import androidx.annotation.RequiresApi
+import de.jrpie.android.launcher.getUserFromId
+import kotlinx.serialization.Serializable
+
+
+@RequiresApi(Build.VERSION_CODES.N_MR1)
+@Serializable
+class PinnedShortcutInfo(
+    val id: String,
+    val packageName: String,
+    val activityName: String,
+    val user: Int
+) {
+
+    constructor(info: ShortcutInfo) : this(info.id, info.`package`, info.activity?.className ?: "", info.userHandle.hashCode())
+
+    fun getShortcutInfo(context: Context): ShortcutInfo? {
+        val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
+
+        return launcherApps.getShortcuts(
+            ShortcutQuery().apply {
+                setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
+                setPackage(packageName)
+                setActivity(ComponentName(packageName, activityName))
+                setShortcutIds(listOf(id))
+            },
+            getUserFromId(user, context)
+        )?.firstOrNull()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return (other as? PinnedShortcutInfo)?.let {
+            packageName == this.packageName &&
+                    activityName == this.activityName &&
+                    id == this.id &&
+                    user == this.user
+        } ?: false
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + packageName.hashCode()
+        result = 31 * result + activityName.hashCode()
+        result = 31 * result + user
+        return result
+    }
+
+    override fun toString(): String {
+        return "PinnedShortcutInfo { package=$packageName, activity=$activityName, user=$user, id=$id}"
+    }
+}

app/src/main/java/de/jrpie/android/launcher/apps/AbstractAppInfo.kt

@@ -1,22 +0,0 @@
-package de.jrpie.android.launcher.apps
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-
-/**
- * This interface is implemented by [AppInfo] and [PinnedShortcutInfo].
- */
-@Serializable
-sealed interface AbstractAppInfo {
-    fun serialize(): String {
-        return Json.encodeToString(this)
-    }
-    companion object {
-        const val INVALID_USER = -1
-
-        fun deserialize(serialized: String): AbstractAppInfo {
-            return Json.decodeFromString(serialized)
-        }
-    }
-}

app/src/main/java/de/jrpie/android/launcher/apps/AbstractDetailedAppInfo.kt

@@ -1,42 +0,0 @@
-package de.jrpie.android.launcher.apps
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.os.UserHandle
-import android.util.Log
-import de.jrpie.android.launcher.Application
-import de.jrpie.android.launcher.actions.Action
-import de.jrpie.android.launcher.preferences.LauncherPreferences
-
-/**
- * This interface is implemented by [DetailedAppInfo] and [DetailedPinnedShortcutInfo]
- */
-sealed interface AbstractDetailedAppInfo {
-    fun getRawInfo(): AbstractAppInfo
-    fun getLabel(): String
-    fun getIcon(context: Context): Drawable
-    fun getUser(context: Context): UserHandle
-    fun isPrivate(): Boolean
-    fun isRemovable(): Boolean
-    fun getAction(): Action
-
-
-    fun getCustomLabel(context: Context): String {
-        val map = (context.applicationContext as? Application)?.getCustomAppNames()
-        return map?.get(getRawInfo()) ?: getLabel()
-    }
-
-
-    fun setCustomLabel(label: CharSequence?) {
-        Log.i("Launcher", "Setting custom label for ${this.getRawInfo()} to ${label}.")
-        val map = LauncherPreferences.apps().customNames() ?: HashMap<AbstractAppInfo, String>()
-
-        if (label.isNullOrEmpty()) {
-            map.remove(getRawInfo())
-        } else {
-            map[getRawInfo()] = label.toString()
-        }
-        LauncherPreferences.apps().customNames(map)
-    }
-
-}

app/src/main/java/de/jrpie/android/launcher/apps/AppFilter.kt

@@ -6,7 +6,6 @@ import android.os.Build
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.AppAction
 import de.jrpie.android.launcher.actions.Gesture
-import de.jrpie.android.launcher.actions.ShortcutAction
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import java.util.Locale
 import kotlin.text.Regex.Companion.escape
@@ -19,14 +18,13 @@ class AppFilter(
     var privateSpaceVisibility: AppSetVisibility = AppSetVisibility.VISIBLE
 ) {
 
-    operator fun invoke(apps: List<AbstractDetailedAppInfo>): List<AbstractDetailedAppInfo> {
+    operator fun invoke(apps: List<DetailedAppInfo>): List<DetailedAppInfo> {
         var apps =
-            apps.sortedBy { app -> app.getCustomLabel(context).lowercase(Locale.ROOT) }
+            apps.sortedBy { app -> app.getCustomLabel(context).toString().lowercase(Locale.ROOT) }
 
         val hidden = LauncherPreferences.apps().hidden() ?: setOf()
         val favorites = LauncherPreferences.apps().favorites() ?: setOf()
-        val private = apps.filter { it.isPrivate() }
-            .map { it.getRawInfo() }.toSet()
+        val private = apps.filter { it.isPrivateSpaceApp }.map { it.app }.toSet()
 
         apps = apps.filter { info ->
             favoritesVisibility.predicate(favorites, info)
@@ -37,13 +35,9 @@ class AppFilter(
         if (LauncherPreferences.apps().hideBoundApps()) {
             val boundApps = Gesture.entries
                 .filter(Gesture::isEnabled)
-                .mapNotNull { g -> Action.forGesture(g) }
-                .mapNotNull {
-                    (it as? AppAction)?.app
-                    ?: (it as? ShortcutAction)?.shortcut
-                }
+                .mapNotNull { g -> (Action.forGesture(g) as? AppAction)?.app }
                 .toSet()
-            apps = apps.filterNot { info -> boundApps.contains(info.getRawInfo()) }
+            apps = apps.filterNot { info -> boundApps.contains(info.app) }
         }
 
         // normalize text for search
@@ -63,11 +57,11 @@ class AppFilter(
         if (query.isEmpty()) {
             return apps
         } else {
-            val r: MutableList<AbstractDetailedAppInfo> = ArrayList()
-            val appsSecondary: MutableList<AbstractDetailedAppInfo> = ArrayList()
+            val r: MutableList<DetailedAppInfo> = ArrayList()
+            val appsSecondary: MutableList<DetailedAppInfo> = ArrayList()
             val normalizedQuery: String = normalize(query)
             for (item in apps) {
-                val itemLabel: String = normalize(item.getCustomLabel(context))
+                val itemLabel: String = normalize(item.getCustomLabel(context).toString())
 
                 if (itemLabel.startsWith(normalizedQuery)) {
                     r.add(item)
@@ -83,11 +77,11 @@ class AppFilter(
 
     companion object {
         enum class AppSetVisibility(
-            val predicate: (set: Set<AbstractAppInfo>, AbstractDetailedAppInfo) -> Boolean
+            val predicate: (set: Set<AppInfo>, DetailedAppInfo) -> Boolean
         ) {
             VISIBLE({ _, _ -> true }),
-            HIDDEN({ set, appInfo -> !set.contains(appInfo.getRawInfo()) }),
-            EXCLUSIVE({ set, appInfo -> set.contains(appInfo.getRawInfo()) }),
+            HIDDEN({ set, appInfo -> !set.contains(appInfo.app) }),
+            EXCLUSIVE({ set, appInfo -> set.contains(appInfo.app) }),
             ;
         }
 

app/src/main/java/de/jrpie/android/launcher/apps/AppInfo.kt

@@ -4,18 +4,33 @@ import android.app.Service
 import android.content.Context
 import android.content.pm.LauncherActivityInfo
 import android.content.pm.LauncherApps
-import de.jrpie.android.launcher.apps.AbstractAppInfo.Companion.INVALID_USER
 import de.jrpie.android.launcher.getUserFromId
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 /**
  * Represents an app installed on the users device.
  * Contains the minimal amount of data required to identify the app.
  */
 @Serializable
-@SerialName("app")
-data class AppInfo(val packageName: String, val activityName: String?, val user: Int = INVALID_USER): AbstractAppInfo {
+class AppInfo(val packageName: String, val activityName: String?, val user: Int = INVALID_USER) {
+
+    fun serialize(): String {
+        return Json.encodeToString(this)
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if(other is AppInfo) {
+            return other.user == user && other.packageName == packageName
+                    && other.activityName == activityName
+        }
+        return super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        return packageName.hashCode()
+    }
 
     fun getLauncherActivityInfo(
         context: Context
@@ -26,4 +41,17 @@ data class AppInfo(val packageName: String, val activityName: String?, val user:
         return activityList.firstOrNull { app -> app.name == activityName }
             ?: activityList.firstOrNull()
     }
+
+
+    override fun toString(): String {
+        return "AppInfo {package=$packageName, activity=$activityName, user=$user}"
+    }
+
+    companion object {
+        const val INVALID_USER = -1
+
+        fun deserialize(serialized: String): AppInfo {
+            return Json.decodeFromString(serialized)
+        }
+    }
 }

app/src/main/java/de/jrpie/android/launcher/apps/DetailedAppInfo.kt

@@ -4,21 +4,20 @@ import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.LauncherActivityInfo
 import android.graphics.drawable.Drawable
-import android.os.UserHandle
-import de.jrpie.android.launcher.actions.Action
-import de.jrpie.android.launcher.actions.AppAction
-import de.jrpie.android.launcher.getUserFromId
+import android.util.Log
+import de.jrpie.android.launcher.Application
+import de.jrpie.android.launcher.preferences.LauncherPreferences
 
 /**
  * Stores information used to create [de.jrpie.android.launcher.ui.list.apps.AppsRecyclerAdapter] rows.
  */
 class DetailedAppInfo(
-    private val app: AppInfo,
-    private val label: CharSequence,
-    private val icon: Drawable,
-    private val privateSpace: Boolean,
-    private val removable: Boolean = true,
-): AbstractDetailedAppInfo {
+    val app: AppInfo,
+    val label: CharSequence,
+    val icon: Drawable,
+    val isPrivateSpaceApp: Boolean,
+    val isSystemApp: Boolean = false,
+) {
 
     constructor(activityInfo: LauncherActivityInfo, private: Boolean) : this(
         AppInfo(
@@ -29,41 +28,29 @@ class DetailedAppInfo(
         activityInfo.label,
         activityInfo.getBadgedIcon(0),
         private,
-        // App can be uninstalled iff it is not a system app
-        activityInfo.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) == 0
+        activityInfo.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) != 0
     )
 
+    fun getCustomLabel(context: Context): CharSequence {
+        val map = (context.applicationContext as? Application)?.getCustomAppNames() ?: return label
 
-
-    override fun getLabel(): String {
-       return label.toString()
+        return map[app] ?: label
     }
 
-    override fun getIcon(context: Context): Drawable {
-        return icon
+    fun setCustomLabel(label: CharSequence?) {
+
+        Log.i("Launcher", "Setting custom label for ${this.app} to ${label}.")
+        val map = LauncherPreferences.apps().customNames() ?: HashMap<AppInfo, String>()
+
+        if (label.isNullOrEmpty()) {
+            map.remove(app)
+        } else {
+            map[app] = label.toString()
         }
 
-    override fun getRawInfo(): AppInfo {
-        return app
+        LauncherPreferences.apps().customNames(map)
     }
 
-    override fun getUser(context: Context): UserHandle {
-        return getUserFromId(app.user, context)
-    }
-
-    override fun isPrivate(): Boolean {
-        return privateSpace
-    }
-
-    override fun isRemovable(): Boolean {
-        return removable
-    }
-
-    override fun getAction(): Action {
-        return AppAction(app)
-    }
-
-
     companion object {
         fun fromAppInfo(appInfo: AppInfo, context: Context): DetailedAppInfo? {
             return appInfo.getLauncherActivityInfo(context)?.let {

app/src/main/java/de/jrpie/android/launcher/apps/DetailedPinnedShortcutInfo.kt

@@ -1,66 +0,0 @@
-package de.jrpie.android.launcher.apps
-
-import android.app.Service
-import android.content.Context
-import android.content.pm.LauncherApps
-import android.content.pm.ShortcutInfo
-import android.graphics.drawable.Drawable
-import android.os.Build
-import android.os.UserHandle
-import androidx.annotation.RequiresApi
-import de.jrpie.android.launcher.actions.Action
-import de.jrpie.android.launcher.actions.ShortcutAction
-import de.jrpie.android.launcher.getUserFromId
-
-@RequiresApi(Build.VERSION_CODES.N_MR1)
-class DetailedPinnedShortcutInfo(
-    private val shortcutInfo: PinnedShortcutInfo,
-    private val label: String,
-    private val icon: Drawable,
-    private val privateSpace: Boolean
-) : AbstractDetailedAppInfo {
-
-    constructor(context: Context, shortcut: ShortcutInfo) : this(
-        PinnedShortcutInfo(shortcut),
-        shortcut.longLabel.toString(),
-        (context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps)
-            .getShortcutBadgedIconDrawable(shortcut, 0),
-        shortcut.userHandle == getPrivateSpaceUser(context)
-    )
-
-    override fun getRawInfo(): AbstractAppInfo {
-        return shortcutInfo
-    }
-
-    override fun getLabel(): String {
-        return label
-    }
-
-    override fun getIcon(context: Context): Drawable {
-        return icon
-    }
-
-    override fun getUser(context: Context): UserHandle {
-        return getUserFromId(shortcutInfo.user, context)
-    }
-
-    override fun isPrivate(): Boolean {
-        return privateSpace
-    }
-
-    override fun isRemovable(): Boolean {
-        return true
-    }
-
-    override fun getAction(): Action {
-       return ShortcutAction(shortcutInfo)
-    }
-
-    companion object {
-        fun fromPinnedShortcutInfo(shortcutInfo: PinnedShortcutInfo, context: Context): DetailedPinnedShortcutInfo? {
-            return shortcutInfo.getShortcutInfo(context)?.let {
-                DetailedPinnedShortcutInfo(context, it)
-            }
-        }
-    }
-}

app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt

@@ -1,46 +0,0 @@
-package de.jrpie.android.launcher.apps
-
-import android.app.Service
-import android.content.ComponentName
-import android.content.Context
-import android.content.pm.LauncherApps
-import android.content.pm.LauncherApps.ShortcutQuery
-import android.content.pm.ShortcutInfo
-import android.os.Build
-import androidx.annotation.RequiresApi
-import de.jrpie.android.launcher.getUserFromId
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-
-@RequiresApi(Build.VERSION_CODES.N_MR1)
-@Serializable
-@SerialName("shortcut")
-data class PinnedShortcutInfo(
-    val id: String,
-    val packageName: String,
-    val activityName: String,
-    val user: Int
-): AbstractAppInfo {
-
-    constructor(info: ShortcutInfo) : this(info.id, info.`package`, info.activity?.className ?: "", info.userHandle.hashCode())
-
-    fun getShortcutInfo(context: Context): ShortcutInfo? {
-        val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
-
-        return try {
-            launcherApps.getShortcuts(
-                ShortcutQuery().apply {
-                    setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
-                    setPackage(packageName)
-                    setActivity(ComponentName(packageName, activityName))
-                    setShortcutIds(listOf(id))
-                },
-                getUserFromId(user, context)
-            )?.firstOrNull()
-        } catch(_: Exception) {
-            // can throw SecurityException or IllegalStateException when profile is locked
-            null
-        }
-    }
-}

app/src/main/java/de/jrpie/android/launcher/apps/PrivateSpace.kt

@@ -91,17 +91,10 @@ fun isPrivateSpaceLocked(context: Context): Boolean {
     val privateSpaceUser = getPrivateSpaceUser(context) ?: return false
     return userManager.isQuietModeEnabled(privateSpaceUser)
 }
-
 fun lockPrivateSpace(context: Context, lock: Boolean) {
     if (!isPrivateSpaceSupported()) {
         return
     }
-
-    // silently return when trying to unlock but hide when locked is set
-    if (!lock && hidePrivateSpaceWhenLocked(context)) {
-        return
-    }
-
     val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager
     val privateSpaceUser = getPrivateSpaceUser(context) ?: return
     userManager.requestQuietModeEnabled(lock, privateSpaceUser)
@@ -123,18 +116,3 @@ fun togglePrivateSpaceLock(context: Context) {
     }
 }
 
-@Suppress("SameReturnValue")
-fun hidePrivateSpaceWhenLocked(context: Context): Boolean {
-    // Trying to access the setting as a 3rd party launcher raises a security exception.
-    // This is an Android bug: https://issuetracker.google.com/issues/352276244#comment5
-    // The logic for this is implemented.
-    // TODO: replace this once the Android bug is fixed
-    return false
-
-    // TODO: perhaps this should be cached
-    // https://cs.android.com/android/platform/superproject/main/+/main:packages/apps/Launcher3/src/com/android/launcher3/util/SettingsCache.java;l=61;drc=56bf7ad33bc9d5ed3c18e7abefeec5c177ec75d7
-
-    // val key = "hide_privatespace_entry_point"
-    // return Settings.Secure.getInt(context.contentResolver, key, 0) == 1
-}
-

app/src/main/java/de/jrpie/android/launcher/preferences/ColorPreference.kt

@@ -17,7 +17,6 @@ import androidx.core.graphics.green
 import androidx.core.graphics.red
 import androidx.preference.Preference
 import de.jrpie.android.launcher.R
-import androidx.core.graphics.toColorInt
 
 class ColorPreference(context: Context, attrs: AttributeSet?) :
     Preference(context, attrs) {
@@ -53,7 +52,7 @@ class ColorPreference(context: Context, attrs: AttributeSet?) :
         AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
             setView(R.layout.dialog_choose_color)
             setTitle(R.string.dialog_choose_color_title)
-            setPositiveButton(android.R.string.ok) { _, _ ->
+            setPositiveButton(R.string.dialog_select_color_ok) { _, _ ->
                 persistInt(currentColor)
                 summary = currentColor.getHex()
             }
@@ -84,10 +83,10 @@ class ColorPreference(context: Context, attrs: AttributeSet?) :
                 override fun onTextChanged(text: CharSequence?, p1: Int, p2: Int, p3: Int) {}
                 override fun afterTextChanged(editable: Editable?) {
                     preview.hasFocus() || return
-                    val newText = editable?.toString() ?: return
-                    newText.isBlank() && return
+                    val newText = editable?.toString()
+                    newText.isNullOrBlank() && return
                     try {
-                        val newColor = newText.toColorInt()
+                        val newColor = Color.parseColor(newText.toString())
                         currentColor = newColor
                         updateColor(false)
                     } catch (_: IllegalArgumentException) {

app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java

@@ -5,9 +5,8 @@ import java.util.Set;
 
 import de.jrpie.android.launcher.R;
 import de.jrpie.android.launcher.actions.lock.LockMethod;
-import de.jrpie.android.launcher.preferences.serialization.MapAbstractAppInfoStringPreferenceSerializer;
-import de.jrpie.android.launcher.preferences.serialization.SetAbstractAppInfoPreferenceSerializer;
-import de.jrpie.android.launcher.preferences.serialization.SetPinnedShortcutInfoPreferenceSerializer;
+import de.jrpie.android.launcher.preferences.serialization.MapAppInfoStringPreferenceSerializer;
+import de.jrpie.android.launcher.preferences.serialization.SetAppInfoPreferenceSerializer;
 import de.jrpie.android.launcher.preferences.theme.Background;
 import de.jrpie.android.launcher.preferences.theme.ColorTheme;
 import de.jrpie.android.launcher.preferences.theme.Font;
@@ -21,24 +20,20 @@ import eu.jonahbauer.android.preference.annotations.Preferences;
         r = R.class,
         value = {
                 @PreferenceGroup(name = "internal", prefix = "settings_internal_", suffix = "_key", value = {
-                        // set after the user finished the tutorial
                         @Preference(name = "started", type = boolean.class, defaultValue = "false"),
                         @Preference(name = "started_time", type = long.class),
-                        // see PREFERENCE_VERSION in de.jrpie.android.launcher.preferences.Preferences.kt
                         @Preference(name = "version_code", type = int.class, defaultValue = "-1"),
                 }),
                 @PreferenceGroup(name = "apps", prefix = "settings_apps_", suffix = "_key", value = {
-                        @Preference(name = "favorites", type = Set.class, serializer = SetAbstractAppInfoPreferenceSerializer.class),
-                        @Preference(name = "hidden", type = Set.class, serializer = SetAbstractAppInfoPreferenceSerializer.class),
-                        @Preference(name = "pinned_shortcuts", type = Set.class, serializer = SetPinnedShortcutInfoPreferenceSerializer.class),
-                        @Preference(name = "custom_names", type = HashMap.class, serializer = MapAbstractAppInfoStringPreferenceSerializer.class),
+                        @Preference(name = "favorites", type = Set.class, serializer = SetAppInfoPreferenceSerializer.class),
+                        @Preference(name = "hidden", type = Set.class, serializer = SetAppInfoPreferenceSerializer.class),
+                        @Preference(name = "custom_names", type = HashMap.class, serializer = MapAppInfoStringPreferenceSerializer.class),
                         @Preference(name = "hide_bound_apps", type = boolean.class, defaultValue = "false"),
                         @Preference(name = "hide_paused_apps", type = boolean.class, defaultValue = "false"),
                         @Preference(name = "hide_private_space_apps", type = boolean.class, defaultValue = "false"),
                 }),
                 @PreferenceGroup(name = "list", prefix = "settings_list_", suffix = "_key", value = {
-                        @Preference(name = "layout", type = ListLayout.class, defaultValue = "DEFAULT"),
-                        @Preference(name = "reverse_layout", type = boolean.class, defaultValue = "false")
+                        @Preference(name = "layout", type = ListLayout.class, defaultValue = "DEFAULT")
                 }),
                 @PreferenceGroup(name = "gestures", prefix = "settings_gesture_", suffix = "_key", value = {
                 }),
@@ -64,8 +59,7 @@ import eu.jonahbauer.android.preference.annotations.Preferences;
                 }),
                 @PreferenceGroup(name = "display", prefix = "settings_display_", suffix = "_key", value = {
                         @Preference(name = "screen_timeout_disabled", type = boolean.class, defaultValue = "false"),
-                        @Preference(name = "hide_status_bar", type = boolean.class, defaultValue = "true"),
-                        @Preference(name = "hide_navigation_bar", type = boolean.class, defaultValue = "false"),
+                        @Preference(name = "full_screen", type = boolean.class, defaultValue = "true"),
                         @Preference(name = "rotate_screen", type = boolean.class, defaultValue = "true"),
                 }),
                 @PreferenceGroup(name = "functionality", prefix = "settings_functionality_", suffix = "_key", value = {

app/src/main/java/de/jrpie/android/launcher/preferences/ListLayout.kt

@@ -1,7 +1,6 @@
 package de.jrpie.android.launcher.preferences
 
 import android.content.Context
-import android.util.TypedValue
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -28,10 +27,8 @@ enum class ListLayout(
     GRID(
         { c ->
             val displayMetrics = c.resources.displayMetrics
-            val widthColumnPx =
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 90f, displayMetrics)
-            val numColumns = (displayMetrics.widthPixels / widthColumnPx).toInt()
-            GridLayoutManager(c, numColumns)
+            val widthSp = displayMetrics.widthPixels / displayMetrics.scaledDensity
+            GridLayoutManager(c, (widthSp / 90).toInt())
         },
         R.layout.list_apps_row_variant_grid,
         false

app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt

@@ -5,12 +5,9 @@ import android.util.Log
 import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.apps.AppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo.Companion.INVALID_USER
 import de.jrpie.android.launcher.apps.DetailedAppInfo
 import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersion1
 import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersion2
-import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersion3
 import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersionUnknown
 import de.jrpie.android.launcher.ui.HomeActivity
 
@@ -18,7 +15,7 @@ import de.jrpie.android.launcher.ui.HomeActivity
  * Increase when breaking changes are introduced and write an appropriate case in
  * `migratePreferencesToNewVersion`
  */
-const val PREFERENCE_VERSION = 4
+const val PREFERENCE_VERSION = 3
 const val UNKNOWN_PREFERENCE_VERSION = -1
 private const val TAG = "Launcher - Preferences"
 
@@ -47,10 +44,6 @@ fun migratePreferencesToNewVersion(context: Context) {
                 migratePreferencesFromVersion2()
                 Log.i(TAG, "migration of preferences  complete (2 -> ${PREFERENCE_VERSION}).")
             }
-            3 -> {
-                migratePreferencesFromVersion3()
-                Log.i(TAG, "migration of preferences  complete (3 -> ${PREFERENCE_VERSION}).")
-            }
 
             else -> {
                 Log.w(
@@ -73,16 +66,16 @@ fun resetPreferences(context: Context) {
     LauncherPreferences.internal().versionCode(PREFERENCE_VERSION)
 
 
-    val hidden: MutableSet<AbstractAppInfo> = mutableSetOf()
+    val hidden: MutableSet<AppInfo> = mutableSetOf()
     val launcher = DetailedAppInfo.fromAppInfo(
         AppInfo(
             BuildConfig.APPLICATION_ID,
             HomeActivity::class.java.name,
-            INVALID_USER
+            AppInfo.INVALID_USER
         ), context
     )
-    launcher?.getRawInfo()?.let { hidden.add(it) }
-    Log.i(TAG,"Hiding ${launcher?.getRawInfo()}")
+    launcher?.app?.let { hidden.add(it) }
+    Log.i(TAG,"Hiding ${launcher?.app}")
     LauncherPreferences.apps().hidden(hidden)
 
     Action.resetToDefaultActions(context)

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/Version1.kt

@@ -5,27 +5,14 @@ import de.jrpie.android.launcher.actions.AppAction
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.apps.AppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo.Companion.INVALID_USER
+import de.jrpie.android.launcher.apps.AppInfo.Companion.INVALID_USER
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.preferences.PREFERENCE_VERSION
-import kotlinx.serialization.Serializable
+import de.jrpie.android.launcher.preferences.serialization.MapAppInfoStringPreferenceSerializer
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONException
 import org.json.JSONObject
-import androidx.core.content.edit
-
-
-@Serializable
-@Suppress("unused")
-private class LegacyMapEntry(val key: AppInfo, val value: String)
-
-private fun serializeMapAppInfo(value: Map<AppInfo, String>?): Set<String>? {
-    return value?.map { (key, value) ->
-        Json.encodeToString(LegacyMapEntry(key, value))
-    }?.toSet()
-}
-
 
 val oldLauncherActionIds: Map<String, LauncherAction> =
     mapOf(
@@ -90,7 +77,7 @@ private fun Action.Companion.legacyFromPreference(id: String): Action? {
 
 private fun migrateAppInfoStringMap(key: String) {
     val preferences = LauncherPreferences.getSharedPreferences()
-    serializeMapAppInfo(
+    MapAppInfoStringPreferenceSerializer().serialize(
         preferences.getStringSet(key, setOf())?.mapNotNull { entry ->
             try {
                 val obj = JSONObject(entry)
@@ -102,7 +89,7 @@ private fun migrateAppInfoStringMap(key: String) {
             }
         }?.toMap(HashMap())
     )?.let {
-        preferences.edit { putStringSet(key, it) }
+        preferences.edit().putStringSet(key, it as Set<String>).apply()
     }
 }
 
@@ -111,16 +98,16 @@ private fun migrateAppInfoSet(key: String) {
         .map(AppInfo.Companion::legacyDeserialize)
         .map(AppInfo::serialize)
         .toSet()
-        .let { LauncherPreferences.getSharedPreferences().edit { putStringSet(key, it) } }
+        .let { LauncherPreferences.getSharedPreferences().edit().putStringSet(key, it).apply() }
 }
 
 private fun migrateAction(key: String) {
     Action.legacyFromPreference(key)?.let { action ->
-        LauncherPreferences.getSharedPreferences().edit {
-            putString(key, Json.encodeToString(action))
+        LauncherPreferences.getSharedPreferences().edit()
+            .putString(key, Json.encodeToString(action))
             .remove("$key.app")
             .remove("$key.user")
-        }
+            .apply()
     }
 
 }

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/Version2.kt

@@ -12,9 +12,9 @@ import de.jrpie.android.launcher.preferences.PREFERENCE_VERSION
  * (see [PREFERENCE_VERSION])
  */
 fun migratePreferencesFromVersion2() {
+    assert(PREFERENCE_VERSION == 3)
     assert(LauncherPreferences.internal().versionCode() == 2)
     // previously there was no setting for this
     Action.setActionForGesture(Gesture.BACK, LauncherAction.CHOOSE)
     LauncherPreferences.internal().versionCode(3)
-    migratePreferencesFromVersion3()
 }

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/Version3.kt

@@ -1,85 +0,0 @@
-package de.jrpie.android.launcher.preferences.legacy
-
-import android.content.SharedPreferences
-import android.content.SharedPreferences.Editor
-import de.jrpie.android.launcher.apps.AppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo
-import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.preferences.PREFERENCE_VERSION
-import de.jrpie.android.launcher.preferences.serialization.MapAbstractAppInfoStringPreferenceSerializer
-import de.jrpie.android.launcher.preferences.serialization.SetAbstractAppInfoPreferenceSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import java.util.HashSet
-import androidx.core.content.edit
-
-/**
- * Migrate preferences from version 3 (used until version 0.0.23) to the current format
- * (see [PREFERENCE_VERSION])
- */
-
-
-fun deserializeSet(value: Set<String>?): Set<AppInfo>? {
-    return value?.map {
-        Json.decodeFromString<AppInfo>(it)
-    }?.toHashSet()
-}
-
-fun deserializeMap(value: Set<String>?): HashMap<AppInfo, String>? {
-    return value?.associateTo(HashMap()) {
-        val entry = Json.decodeFromString<MapEntry>(it)
-        Pair(entry.key, entry.value)
-    }
-}
-
-@Serializable
-private class MapEntry(val key: AppInfo, val value: String)
-
-private fun migrateSetAppInfo(key: String, preferences: SharedPreferences, editor: Editor) {
-    try {
-        val serializer = SetAbstractAppInfoPreferenceSerializer()
-        val set = HashSet<AbstractAppInfo>()
-
-        deserializeSet(preferences.getStringSet(key, null))?.let {
-            set.addAll(it)
-        }
-        @Suppress("UNCHECKED_CAST")
-        editor.putStringSet(
-            key,
-            serializer.serialize(set as java.util.Set<AbstractAppInfo>) as Set<String>?
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-        editor.putStringSet(key, null)
-    }
-
-}
-private fun migrateMapAppInfoString(key: String, preferences: SharedPreferences, editor: Editor ) {
-    try {
-        val serializer = MapAbstractAppInfoStringPreferenceSerializer()
-        val map = HashMap<AbstractAppInfo, String>()
-
-        deserializeMap(preferences.getStringSet(key, null))?.let {
-            map.putAll(it)
-        }
-        @Suppress("UNCHECKED_CAST")
-        editor.putStringSet(key, serializer.serialize(map) as Set<String>?)
-    } catch (e: Exception) {
-        e.printStackTrace()
-        editor.putStringSet(key, null)
-    }
-}
-
-fun migratePreferencesFromVersion3() {
-    assert(PREFERENCE_VERSION == 4)
-    assert(LauncherPreferences.internal().versionCode() == 3)
-
-    val preferences = LauncherPreferences.getSharedPreferences()
-    preferences.edit {
-        migrateSetAppInfo(LauncherPreferences.apps().keys().favorites(), preferences, this)
-        migrateSetAppInfo(LauncherPreferences.apps().keys().hidden(), preferences, this)
-        migrateMapAppInfoString(LauncherPreferences.apps().keys().customNames(), preferences, this)
-    }
-
-    LauncherPreferences.internal().versionCode(4)
-}

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/VersionUnknown.kt

@@ -6,7 +6,7 @@ import android.util.Log
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.preferences.theme.Background
 import de.jrpie.android.launcher.preferences.theme.ColorTheme
-import androidx.core.content.edit
+
 
 
 private fun migrateStringPreference(
@@ -64,11 +64,11 @@ fun migratePreferencesFromVersionUnknown(context: Context) {
         return
     }
 
-    LauncherPreferences.getSharedPreferences().edit {
+    val newPrefs = LauncherPreferences.getSharedPreferences().edit()
 
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "startedBefore",
         "internal.started_before",
         false
@@ -76,305 +76,306 @@ fun migratePreferencesFromVersionUnknown(context: Context) {
 
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_volumeUpApp",
         "action.volume_up.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_volumeUpApp_user",
         "action.volume_up.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_volumeDownApp",
         "action.volume_down.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_volumeDownApp_user",
         "action.volume_down.user",
         -1
     )
-        migrateStringPreference(oldPrefs, this, "action_timeApp", "action.time.app", "")
-        migrateIntPreference(oldPrefs, this, "action_timeApp_user", "action.time.user", -1)
-        migrateStringPreference(oldPrefs, this, "action_dateApp", "action.date.app", "")
-        migrateIntPreference(oldPrefs, this, "action_dateApp_user", "action.date.user", -1)
+    migrateStringPreference(oldPrefs, newPrefs, "action_timeApp", "action.time.app", "")
+    migrateIntPreference(oldPrefs, newPrefs, "action_timeApp_user", "action.time.user", -1)
+    migrateStringPreference(oldPrefs, newPrefs, "action_dateApp", "action.date.app", "")
+    migrateIntPreference(oldPrefs, newPrefs, "action_dateApp_user", "action.date.user", -1)
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_longClickApp",
         "action.long_click.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_longClickApp_user",
         "action.long_click.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleClickApp",
         "action.double_click.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleClickApp_user",
         "action.double_click.user",
         -1
     )
-        migrateStringPreference(oldPrefs, this, "action_upApp", "action.up.app", "")
-        migrateIntPreference(oldPrefs, this, "action_upApp_user", "action.up.user", -1)
+    migrateStringPreference(oldPrefs, newPrefs, "action_upApp", "action.up.app", "")
+    migrateIntPreference(oldPrefs, newPrefs, "action_upApp_user", "action.up.user", -1)
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_up_leftApp",
         "action.up_left.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_up_leftApp_user",
         "action.up_left.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_up_rightApp",
         "action.up_right.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_up_rightApp_user",
         "action.up_right.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleUpApp",
         "action.double_up.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleUpApp_user",
         "action.double_up.user",
         -1
     )
-        migrateStringPreference(oldPrefs, this, "action_downApp", "action.down.app", "")
-        migrateIntPreference(oldPrefs, this, "action_downApp_user", "action.down.user", -1)
+    migrateStringPreference(oldPrefs, newPrefs, "action_downApp", "action.down.app", "")
+    migrateIntPreference(oldPrefs, newPrefs, "action_downApp_user", "action.down.user", -1)
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_down_leftApp",
         "action.down_left.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_down_leftApp_user",
         "action.down_left.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_down_rightApp",
         "action.down_right.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_down_rightApp_user",
         "action.down_right.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleDownApp",
         "action.double_down.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleDownApp_user",
         "action.double_down.user",
         -1
     )
-        migrateStringPreference(oldPrefs, this, "action_leftApp", "action.left.app", "")
-        migrateIntPreference(oldPrefs, this, "action_leftApp_user", "action.left.user", -1)
+    migrateStringPreference(oldPrefs, newPrefs, "action_leftApp", "action.left.app", "")
+    migrateIntPreference(oldPrefs, newPrefs, "action_leftApp_user", "action.left.user", -1)
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_left_topApp",
         "action.left_top.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_left_topApp_user",
         "action.left_top.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_left_bottomApp",
         "action.left_bottom.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_left_bottomApp_user",
         "action.left_bottom.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleLeftApp",
         "action.double_left.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleLeftApp_user",
         "action.double_left.user",
         -1
     )
-        migrateStringPreference(oldPrefs, this, "action_rightApp", "action.right.app", "")
+    migrateStringPreference(oldPrefs, newPrefs, "action_rightApp", "action.right.app", "")
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_rightApp_user",
         "action.right.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_right_topApp",
         "action.right_top.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_right_topApp_user",
         "action.right_top.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_right_bottomApp",
         "action.right_bottom.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_right_bottomApp_user",
         "action.right_bottom.user",
         -1
     )
     migrateStringPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleRightApp",
         "action.double_right.app",
         ""
     )
     migrateIntPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "action_doubleRightApp_user",
         "action.double_right.user",
         -1
     )
-        migrateBooleanPreference(oldPrefs, this, "timeVisible", "clock.time_visible", true)
-        migrateBooleanPreference(oldPrefs, this, "dateVisible", "clock.date_visible", true)
+    migrateBooleanPreference(oldPrefs, newPrefs, "timeVisible", "clock.time_visible", true)
+    migrateBooleanPreference(oldPrefs, newPrefs, "dateVisible", "clock.date_visible", true)
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "dateLocalized",
         "clock.date_localized",
         false
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "dateTimeFlip",
         "clock.date_time_flip",
         false
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "disableTimeout",
         "display.disable_timeout",
         false
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "useFullScreen",
         "display.use_full_screen",
         true
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "enableDoubleActions",
         "enabled_gestures.double_actions",
         true
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "enableEdgeActions",
         "enabled_gestures.edge_actions",
         true
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "searchAutoLaunch",
         "functionality.search_auto_launch",
         true
     )
     migrateBooleanPreference(
         oldPrefs,
-            this,
+        newPrefs,
         "searchAutoKeyboard",
         "functionality.search_auto_keyboard",
         true
     )
-    }
+
+    newPrefs.apply()
 
     when (oldPrefs.getString("theme", "finn")) {
         "finn" -> {

app/src/main/java/de/jrpie/android/launcher/preferences/serialization/PreferenceSerializers.kt

@@ -2,8 +2,7 @@
 
 package de.jrpie.android.launcher.preferences.serialization
 
-import de.jrpie.android.launcher.apps.AbstractAppInfo
-import de.jrpie.android.launcher.apps.PinnedShortcutInfo
+import de.jrpie.android.launcher.apps.AppInfo
 import eu.jonahbauer.android.preference.annotations.serializer.PreferenceSerializationException
 import eu.jonahbauer.android.preference.annotations.serializer.PreferenceSerializer
 import kotlinx.serialization.Serializable
@@ -11,61 +10,40 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 
-
+// Serializers for [LauncherPreference$Config]
 @Suppress("UNCHECKED_CAST")
-class SetAbstractAppInfoPreferenceSerializer :
-    PreferenceSerializer<java.util.Set<AbstractAppInfo>?, java.util.Set<java.lang.String>?> {
+class SetAppInfoPreferenceSerializer :
+    PreferenceSerializer<java.util.Set<AppInfo>?, java.util.Set<java.lang.String>?> {
     @Throws(PreferenceSerializationException::class)
-    override fun serialize(value: java.util.Set<AbstractAppInfo>?): java.util.Set<java.lang.String> {
-        return value?.map(AbstractAppInfo::serialize)
-            ?.toHashSet() as java.util.Set<java.lang.String>
+    override fun serialize(value: java.util.Set<AppInfo>?): java.util.Set<java.lang.String> {
+        return value?.map(AppInfo::serialize)?.toHashSet() as java.util.Set<java.lang.String>
     }
 
     @Throws(PreferenceSerializationException::class)
-    override fun deserialize(value: java.util.Set<java.lang.String>?): java.util.Set<AbstractAppInfo>? {
-        return value?.map(java.lang.String::toString)?.map(AbstractAppInfo::deserialize)
-            ?.toHashSet() as? java.util.Set<AbstractAppInfo>
+    override fun deserialize(value: java.util.Set<java.lang.String>?): java.util.Set<AppInfo>? {
+        return value?.map (java.lang.String::toString)?.map(AppInfo::deserialize)?.toHashSet() as? java.util.Set<AppInfo>
     }
 }
 
 @Suppress("UNCHECKED_CAST")
-class SetPinnedShortcutInfoPreferenceSerializer :
-    PreferenceSerializer<java.util.Set<PinnedShortcutInfo>?, java.util.Set<java.lang.String>?> {
-    @Throws(PreferenceSerializationException::class)
-    override fun serialize(value: java.util.Set<PinnedShortcutInfo>?): java.util.Set<java.lang.String> {
-        return value?.map { Json.encodeToString<PinnedShortcutInfo>(it) }
-            ?.toHashSet() as java.util.Set<java.lang.String>
-    }
-
-    @Throws(PreferenceSerializationException::class)
-    override fun deserialize(value: java.util.Set<java.lang.String>?): java.util.Set<PinnedShortcutInfo>? {
-        return value?.map(java.lang.String::toString)
-            ?.map { Json.decodeFromString<PinnedShortcutInfo>(it) }
-            ?.toHashSet() as? java.util.Set<PinnedShortcutInfo>
-    }
-}
-
-
-@Suppress("UNCHECKED_CAST")
-class MapAbstractAppInfoStringPreferenceSerializer :
-    PreferenceSerializer<java.util.HashMap<AbstractAppInfo, String>?, java.util.Set<java.lang.String>?> {
+class MapAppInfoStringPreferenceSerializer :
+    PreferenceSerializer<java.util.HashMap<AppInfo, String>?, java.util.Set<java.lang.String>?> {
 
     @Serializable
-    private class MapEntry(val key: AbstractAppInfo, val value: String)
+    private class MapEntry(val key: AppInfo, val value: String)
 
     @Throws(PreferenceSerializationException::class)
-    override fun serialize(value: java.util.HashMap<AbstractAppInfo, String>?): java.util.Set<java.lang.String>? {
+    override fun serialize(value: java.util.HashMap<AppInfo, String>?): java.util.Set<java.lang.String>? {
         return value?.map { (key, value) ->
             Json.encodeToString(MapEntry(key, value))
         }?.toHashSet() as? java.util.Set<java.lang.String>
     }
 
     @Throws(PreferenceSerializationException::class)
-    override fun deserialize(value: java.util.Set<java.lang.String>?): java.util.HashMap<AbstractAppInfo, String>? {
+    override fun deserialize(value: java.util.Set<java.lang.String>?): java.util.HashMap<AppInfo, String>? {
         return value?.associateTo(HashMap()) {
             val entry = Json.decodeFromString<MapEntry>(it.toString())
             Pair(entry.key, entry.value)
         }
     }
 }
-

app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt

@@ -5,6 +5,7 @@ import android.content.res.Resources
 import com.google.android.material.color.DynamicColors
 import de.jrpie.android.launcher.R
 
+@Suppress("unused")
 enum class ColorTheme(
     private val id: Int,
     private val labelResource: Int,

app/src/main/java/de/jrpie/android/launcher/ui/Helper.kt

@@ -27,14 +27,10 @@ fun View.blink(
 }
 
 // Taken from: https://stackoverflow.com/a/30340794/12787264
-fun ImageView.transformGrayscale(grayscale: Boolean) {
-    this.colorFilter = if (grayscale) {
-        ColorMatrixColorFilter(ColorMatrix().apply {
+fun ImageView.transformGrayscale() {
+    this.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply {
         setSaturation(0f)
     })
-    } else {
-        null
-    }
 }
 
 

app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt

@@ -2,10 +2,10 @@ package de.jrpie.android.launcher.ui
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
-import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
@@ -17,7 +17,6 @@ import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.databinding.HomeBinding
-import de.jrpie.android.launcher.openTutorial
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
 import java.util.Locale
@@ -37,7 +36,7 @@ import java.util.Locale
 class HomeActivity : UIObject, AppCompatActivity() {
 
     private lateinit var binding: HomeBinding
-    private var touchGestureDetector: TouchGestureDetector? = null
+    private lateinit var touchGestureDetector: TouchGestureDetector
 
     private var sharedPreferencesListener =
         SharedPreferences.OnSharedPreferenceChangeListener { _, prefKey ->
@@ -57,11 +56,24 @@ class HomeActivity : UIObject, AppCompatActivity() {
         super<UIObject>.onCreate()
 
 
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+
+        val width = displayMetrics.widthPixels
+        val height = displayMetrics.heightPixels
+
+        touchGestureDetector = TouchGestureDetector(
+            this,
+            width,
+            height,
+            LauncherPreferences.enabled_gestures().edgeSwipeEdgeWidth() / 100f
+        )
+
         // Initialise layout
         binding = HomeBinding.inflate(layoutInflater)
-
         setContentView(binding.root)
 
+
         // Handle back key / gesture on Android 13+, cf. onKeyDown()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             onBackInvokedDispatcher.registerOnBackInvokedCallback(
@@ -73,11 +85,8 @@ class HomeActivity : UIObject, AppCompatActivity() {
         binding.buttonFallbackSettings.setOnClickListener {
             LauncherAction.SETTINGS.invoke(this)
         }
-    }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        touchGestureDetector?.updateScreenSize(windowManager)
+
     }
 
     override fun onStart() {
@@ -85,25 +94,11 @@ class HomeActivity : UIObject, AppCompatActivity() {
 
         super<UIObject>.onStart()
 
-        // If the tutorial was not finished, start it
-        if (!LauncherPreferences.internal().started()) {
-            openTutorial(this)
-        }
-
         LauncherPreferences.getSharedPreferences()
             .registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
 
     }
 
-    override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
-
-        if (hasFocus && LauncherPreferences.display().hideNavigationBar()) {
-            hideNavigationBar()
-        }
-    }
-
-
     private fun updateSettingsFallbackButtonVisibility() {
         // If µLauncher settings can not be reached from any action bound to an enabled gesture,
         // show the fallback button.
@@ -171,28 +166,8 @@ class HomeActivity : UIObject, AppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-        /* This should be initialized in onCreate()
-           However on some devices there seems to be a bug where the touchGestureDetector
-           is not working properly after resuming the app.
-           Reinitializing the touchGestureDetector every time the app is resumed might help to fix that.
-           (see issue #138)
-         */
-        touchGestureDetector = TouchGestureDetector(
-            this, 0, 0,
+        touchGestureDetector.edgeWidth =
             LauncherPreferences.enabled_gestures().edgeSwipeEdgeWidth() / 100f
-        ).also {
-            it.updateScreenSize(windowManager)
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            binding.root.setOnApplyWindowInsetsListener { _, windowInsets ->
-                @Suppress("deprecation") // required to support API 29
-                val insets = windowInsets.systemGestureInsets
-                touchGestureDetector?.setSystemGestureInsets(insets)
-
-                windowInsets
-            }
-        }
 
         initClock()
         updateSettingsFallbackButtonVisibility()
@@ -211,7 +186,6 @@ class HomeActivity : UIObject, AppCompatActivity() {
                 // Only used pre Android 13, cf. onBackInvokedDispatcher
                 handleBack()
             }
-
             KeyEvent.KEYCODE_VOLUME_UP -> {
                 if (Action.forGesture(Gesture.VOLUME_UP) == LauncherAction.VOLUME_UP) {
                     // Let the OS handle the key event. This works better with some custom ROMs
@@ -233,8 +207,7 @@ class HomeActivity : UIObject, AppCompatActivity() {
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        touchGestureDetector?.onTouchEvent(event)
-        return true
+        return touchGestureDetector.onTouchEvent(event) || super.onTouchEvent(event)
     }
 
     override fun setOnClicks() {

app/src/main/java/de/jrpie/android/launcher/ui/PinShortcutActivity.kt

@@ -21,16 +21,14 @@ import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.ShortcutAction
-import de.jrpie.android.launcher.apps.PinnedShortcutInfo
+import de.jrpie.android.launcher.actions.shortcuts.PinnedShortcutInfo
 import de.jrpie.android.launcher.databinding.ActivityPinShortcutBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import androidx.core.content.edit
 
 class PinShortcutActivity : AppCompatActivity(), UIObject {
     private lateinit var binding: ActivityPinShortcutBinding
 
     private var isBound = false
-    private var request: PinItemRequest? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super<AppCompatActivity>.onCreate(savedInstanceState)
@@ -48,7 +46,6 @@ class PinShortcutActivity : AppCompatActivity(), UIObject {
         val launcherApps = getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
 
         val request = launcherApps.getPinItemRequest(intent)
-        this.request = request
         if (request == null || request.requestType != PinItemRequest.REQUEST_TYPE_SHORTCUT) {
             finish()
             return
@@ -73,12 +70,9 @@ class PinShortcutActivity : AppCompatActivity(), UIObject {
                             isBound = true
                             request.accept()
                         }
-                        LauncherPreferences.getSharedPreferences().edit {
-                            ShortcutAction(PinnedShortcutInfo(request.shortcutInfo!!)).bindToGesture(
-                                this,
-                                gesture.id
-                            )
-                        }
+                        val editor = LauncherPreferences.getSharedPreferences().edit()
+                        ShortcutAction(PinnedShortcutInfo(request.shortcutInfo!!)).bindToGesture(editor, gesture.id)
+                        editor.apply()
                         dialog.dismiss()
                     }
                     dialog.findViewById<RecyclerView>(R.id.dialog_select_gesture_recycler).apply {
@@ -90,7 +84,6 @@ class PinShortcutActivity : AppCompatActivity(), UIObject {
         }
 
         binding.pinShortcutClose.setOnClickListener { finish() }
-        binding.pinShortcutButtonOk.setOnClickListener { finish() }
     }
 
     override fun onStart() {
@@ -98,34 +91,16 @@ class PinShortcutActivity : AppCompatActivity(), UIObject {
         super<UIObject>.onStart()
     }
 
-    override fun onDestroy() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            super.onDestroy()
-            return
-        }
-        if(binding.pinShortcutSwitchVisible.isChecked) {
-            if(!isBound) {
-                request?.accept()
-            }
-            request?.shortcutInfo?.let {
-                val set = LauncherPreferences.apps().pinnedShortcuts() ?: mutableSetOf()
-                set.add(PinnedShortcutInfo(it))
-                LauncherPreferences.apps().pinnedShortcuts(set)
-            }
-        }
-        super.onDestroy()
-    }
-
     override fun getTheme(): Resources.Theme {
         return modifyTheme(super.getTheme())
     }
 
     inner class GestureRecyclerAdapter(val context: Context, val onClick: (Gesture) -> Unit): RecyclerView.Adapter<GestureRecyclerAdapter.ViewHolder>() {
-        private val gestures = Gesture.entries.filter { it.isEnabled() }.toList()
+        val gestures = Gesture.entries.filter { it.isEnabled() }.toList()
         inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-            val label: TextView = itemView.findViewById(R.id.dialog_select_gesture_row_name)
-            val description: TextView = itemView.findViewById(R.id.dialog_select_gesture_row_description)
-            val icon: ImageView = itemView.findViewById(R.id.dialog_select_gesture_row_icon)
+            val label = itemView.findViewById<TextView>(R.id.dialog_select_gesture_row_name)
+            val description = itemView.findViewById<TextView>(R.id.dialog_select_gesture_row_description)
+            val icon = itemView.findViewById<ImageView>(R.id.dialog_select_gesture_row_icon)
         }
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -149,6 +124,5 @@ class PinShortcutActivity : AppCompatActivity(), UIObject {
         override fun getItemCount(): Int {
             return gestures.size
         }
-
     }
 }

app/src/main/java/de/jrpie/android/launcher/ui/TouchGestureDetector.kt

@@ -1,15 +1,8 @@
 package de.jrpie.android.launcher.ui
 
 import android.content.Context
-import android.graphics.Insets
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.util.DisplayMetrics
 import android.view.MotionEvent
 import android.view.ViewConfiguration
-import android.view.WindowManager
-import androidx.annotation.RequiresApi
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import kotlin.math.abs
@@ -19,8 +12,8 @@ import kotlin.math.tan
 
 class TouchGestureDetector(
     private val context: Context,
-    var width: Int,
-    var height: Int,
+    val width: Int,
+    val height: Int,
     var edgeWidth: Float
 ) {
     private val ANGULAR_THRESHOLD = tan(Math.PI / 6)
@@ -34,31 +27,20 @@ class TouchGestureDetector(
 
     private val MIN_TRIANGLE_HEIGHT = 250
 
-    private val longPressHandler = Handler(Looper.getMainLooper())
-
-    private var systemGestureInsetTop = 100
-    private var systemGestureInsetBottom = 0
-    private var systemGestureInsetLeft = 0
-    private var systemGestureInsetRight = 0
-
 
     data class Vector(val x: Float, val y: Float) {
         fun absSquared(): Float {
             return this.x * this.x + this.y * this.y
         }
-
         fun plus(vector: Vector): Vector {
             return Vector(this.x + vector.x, this.y + vector.y)
         }
-
         fun max(other: Vector): Vector {
             return Vector(max(this.x, other.x), max(this.y, other.y))
         }
-
         fun min(other: Vector): Vector {
             return Vector(min(this.x, other.x), min(this.y, other.y))
         }
-
         operator fun minus(vector: Vector): Vector {
             return Vector(this.x - vector.x, this.y - vector.y)
         }
@@ -75,35 +57,16 @@ class TouchGestureDetector(
         fun sizeSquared(): Float {
             return (max - min).absSquared()
         }
-
         fun getDirection(): Vector {
             return last - start
         }
-
         fun update(vector: Vector) {
             min = min.min(vector)
             max = max.max(vector)
             last = vector
         }
     }
-
-    private fun PointerPath.startIntersectsSystemGestureInsets(): Boolean {
-        // ignore x, since this makes edge swipes very hard to execute
-        return start.y < systemGestureInsetTop
-                || start.y > height - systemGestureInsetBottom
-    }
-
-    private fun PointerPath.intersectsSystemGestureInsets(): Boolean {
-        return min.x < systemGestureInsetLeft
-                || min.y < systemGestureInsetTop
-                || max.x > width - systemGestureInsetRight
-                || max.y > height - systemGestureInsetBottom
-    }
-
     private fun PointerPath.isTap(): Boolean {
-        if (intersectsSystemGestureInsets()) {
-            return false
-        }
         return sizeSquared() < TOUCH_SLOP_SQUARE
     }
 
@@ -121,48 +84,20 @@ class TouchGestureDetector(
 
     private var paths = HashMap<Int, PointerPath>()
 
-    /* Set when
-     *  - the longPressHandler has detected this gesture as a long press
-     *  - the gesture was cancelled by MotionEvent.ACTION_CANCEL
-     * In any case, the current gesture should be ignored by further detection logic.
-     */
-    private var cancelled = false
-
     private var lastTappedTime = 0L
     private var lastTappedLocation: Vector? = null
 
-    fun onTouchEvent(event: MotionEvent) {
-
-        if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
-            synchronized(this@TouchGestureDetector) {
-                cancelled = true
-            }
-        }
-
+    fun onTouchEvent(event: MotionEvent): Boolean {
         val pointerIdToIndex =
             (0..<event.pointerCount).associateBy { event.getPointerId(it) }
 
         if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-            synchronized(this@TouchGestureDetector) {
             paths = HashMap()
-                cancelled = false
-            }
-            longPressHandler.postDelayed({
-                synchronized(this@TouchGestureDetector) {
-                    if (cancelled) {
-                        return@postDelayed
-                    }
-                    if (paths.entries.size == 1 && paths.entries.firstOrNull()?.value?.isTap() == true) {
-                        cancelled = true
-                        Gesture.LONG_CLICK.invoke(context)
-                    }
-                }
-            }, LONG_PRESS_TIMEOUT.toLong())
         }
 
         // add new pointers
-        for (i in 0..<event.pointerCount) {
-            if (paths.containsKey(event.getPointerId(i))) {
+        for(i in 0..<event.pointerCount){
+            if(paths.containsKey(event.getPointerId(i))) {
                 continue
             }
             val index = pointerIdToIndex[i] ?: continue
@@ -187,17 +122,9 @@ class TouchGestureDetector(
         }
 
         if (event.actionMasked == MotionEvent.ACTION_UP) {
-            synchronized(this@TouchGestureDetector) {
-                // if the long press handler is still running, kill it
-                longPressHandler.removeCallbacksAndMessages(null)
-                // if the gesture was already detected as a long click, there is nothing to do
-                if (cancelled) {
-                    return
-                }
-            }
             classifyPaths(paths, event.downTime, event.eventTime)
         }
-        return
+        return true
     }
 
     private fun getGestureForDirection(direction: Vector): Gesture? {
@@ -225,8 +152,9 @@ class TouchGestureDetector(
 
         val mainPointerPath = paths.entries.firstOrNull { it.value.number == 0 }?.value ?: return
 
-        // Ignore swipes starting at the very top and the very bottom
-        if (paths.entries.any { it.value.startIntersectsSystemGestureInsets() }) {
+        // Ignore swipes at the very top, since this interferes with the status bar.
+        // TODO: replace 100px by sensible dp value (e.g. twice the height of the status bar)
+        if (paths.entries.any { it.value.start.y < 100 }) {
             return
         }
 
@@ -236,14 +164,17 @@ class TouchGestureDetector(
             if (duration in 0..TAP_TIMEOUT) {
                 if (timeStart - lastTappedTime < DOUBLE_TAP_TIMEOUT &&
                     lastTappedLocation?.let {
-                        (mainPointerPath.last - it).absSquared() < DOUBLE_TAP_SLOP_SQUARE
-                    } == true
+                        (mainPointerPath.last - it).absSquared() < DOUBLE_TAP_SLOP_SQUARE} == true
                 ) {
                     Gesture.DOUBLE_CLICK.invoke(context)
                 } else {
                     lastTappedTime = timeEnd
                     lastTappedLocation = mainPointerPath.last
                 }
+            } else if (duration > LONG_PRESS_TIMEOUT) {
+                // TODO: Don't wait until the finger is lifted.
+                // Instead set a timer to start long click as soon as LONG_PRESS_TIMEOUT is reached
+                Gesture.LONG_CLICK.invoke(context)
             }
         } else {
             // detect swipes
@@ -266,38 +197,34 @@ class TouchGestureDetector(
             val startEndMax = mainPointerPath.start.max(mainPointerPath.last)
             when (gesture) {
                 Gesture.SWIPE_DOWN -> {
-                    if (startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) {
+                    if(startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) {
                         gesture = Gesture.SWIPE_LARGER
                     } else if (startEndMin.x - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.x) {
                         gesture = Gesture.SWIPE_SMALLER
                     }
                 }
-
                 Gesture.SWIPE_UP -> {
-                    if (startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) {
+                    if(startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) {
                         gesture = Gesture.SWIPE_LARGER_REVERSE
                     } else if (startEndMin.x - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.x) {
                         gesture = Gesture.SWIPE_SMALLER_REVERSE
                     }
                 }
-
                 Gesture.SWIPE_RIGHT -> {
-                    if (startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) {
+                    if(startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) {
                         gesture = Gesture.SWIPE_V
                     } else if (startEndMin.y - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.y) {
                         gesture = Gesture.SWIPE_LAMBDA
                     }
                 }
-
                 Gesture.SWIPE_LEFT -> {
-                    if (startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) {
+                    if(startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) {
                         gesture = Gesture.SWIPE_V_REVERSE
                     } else if (startEndMin.y - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.y) {
                         gesture = Gesture.SWIPE_LAMBDA_REVERSE
                     }
                 }
-
-                else -> {}
+                else -> { }
             }
 
             if (edgeActions) {
@@ -320,20 +247,4 @@ class TouchGestureDetector(
             gesture?.invoke(context)
         }
     }
-
-    fun updateScreenSize(windowManager: WindowManager) {
-        val displayMetrics = DisplayMetrics()
-        @Suppress("deprecation") // required to support API < 30
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-        width = displayMetrics.widthPixels
-        height = displayMetrics.heightPixels
-    }
-
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun setSystemGestureInsets(insets: Insets) {
-        systemGestureInsetTop = insets.top
-        systemGestureInsetBottom = insets.bottom
-        systemGestureInsetLeft = insets.left
-        systemGestureInsetRight = insets.right
-    }
 }

app/src/main/java/de/jrpie/android/launcher/ui/UIObject.kt

@@ -3,11 +3,7 @@ package de.jrpie.android.launcher.ui
 import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.content.res.Resources
-import android.os.Build
-import android.view.View
 import android.view.Window
-import android.view.WindowInsets
-import android.view.WindowInsetsController
 import android.view.WindowManager
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
@@ -15,12 +11,10 @@ import de.jrpie.android.launcher.preferences.LauncherPreferences
  * An interface implemented by every [Activity], Fragment etc. in Launcher.
  * It handles themes and window flags - a useful abstraction as it is the same everywhere.
  */
-@Suppress("deprecation") // FLAG_FULLSCREEN is required to support API level < 30
 fun setWindowFlags(window: Window, homeScreen: Boolean) {
     window.setFlags(0, 0) // clear flags
-
     // Display notification bar
-    if (LauncherPreferences.display().hideStatusBar())
+    if (LauncherPreferences.display().fullScreen())
         window.setFlags(
             WindowManager.LayoutParams.FLAG_FULLSCREEN,
             WindowManager.LayoutParams.FLAG_FULLSCREEN
@@ -42,19 +36,17 @@ fun setWindowFlags(window: Window, homeScreen: Boolean) {
 
 }
 
-
 interface UIObject {
     fun onCreate() {
-        if (this !is Activity) {
-            return
-        }
+        if (this is Activity) {
             setWindowFlags(window, isHomeScreen())
 
             if (!LauncherPreferences.display().rotateScreen()) {
                 requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
             }
-    }
 
+        }
+    }
     fun onStart() {
         setOnClicks()
         adjustLayout()
@@ -78,26 +70,4 @@ interface UIObject {
     fun isHomeScreen(): Boolean {
         return false
     }
-
-
-    @Suppress("DEPRECATION")
-    fun hideNavigationBar() {
-        if (this !is Activity) {
-            return
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.apply {
-                hide(WindowInsets.Type.navigationBars())
-                systemBarsBehavior =
-                    WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            }
-        } else {
-            // Try to hide the navigation bar but do not hide the status bar
-            window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                    or View.SYSTEM_UI_FLAG_IMMERSIVE
-                    or View.SYSTEM_UI_FLAG_LAYOUT_STABLE)
-        }
-    }
 }

app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt

@@ -1,20 +1,27 @@
 package de.jrpie.android.launcher.ui.list
 
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
 import android.content.res.Resources
 import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import android.window.OnBackInvokedDispatcher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
 import de.jrpie.android.launcher.Application
 import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.REQUEST_UNINSTALL
 import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.apps.AppFilter
-import de.jrpie.android.launcher.apps.hidePrivateSpaceWhenLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceSetUp
 import de.jrpie.android.launcher.apps.togglePrivateSpaceLock
@@ -25,6 +32,14 @@ import de.jrpie.android.launcher.ui.list.apps.ListFragmentApps
 import de.jrpie.android.launcher.ui.list.other.ListFragmentOther
 
 
+// TODO: Better solution for this intercommunication functionality (used in list-fragments)
+var intention = ListActivity.ListActivityIntention.VIEW
+var favoritesVisibility: AppFilter.Companion.AppSetVisibility = AppFilter.Companion.AppSetVisibility.VISIBLE
+var privateSpaceVisibility: AppFilter.Companion.AppSetVisibility =
+    AppFilter.Companion.AppSetVisibility.VISIBLE
+var hiddenVisibility: AppFilter.Companion.AppSetVisibility = AppFilter.Companion.AppSetVisibility.HIDDEN
+var forGesture: String? = null
+
 /**
  * The [ListActivity] is the most general purpose activity in Launcher:
  * - used to view all apps and edit their settings
@@ -34,34 +49,9 @@ import de.jrpie.android.launcher.ui.list.other.ListFragmentOther
  */
 class ListActivity : AppCompatActivity(), UIObject {
     private lateinit var binding: ListBinding
-    var intention = ListActivityIntention.VIEW
-    var favoritesVisibility: AppFilter.Companion.AppSetVisibility =
-        AppFilter.Companion.AppSetVisibility.VISIBLE
-    var privateSpaceVisibility: AppFilter.Companion.AppSetVisibility =
-        AppFilter.Companion.AppSetVisibility.VISIBLE
-    var hiddenVisibility: AppFilter.Companion.AppSetVisibility =
-        AppFilter.Companion.AppSetVisibility.HIDDEN
-    var forGesture: String? = null
 
 
     private fun updateLockIcon(locked: Boolean) {
-        if (
-        // only show lock for VIEW intention
-            (intention != ListActivityIntention.VIEW)
-            // hide lock when private space does not exist
-            || !isPrivateSpaceSetUp(this)
-            // hide lock when private space apps are hidden from the main list and we are not in the private space list
-            || (LauncherPreferences.apps().hidePrivateSpaceApps()
-                    && privateSpaceVisibility != AppFilter.Companion.AppSetVisibility.EXCLUSIVE)
-            // hide lock when private space is locked and the hidden when locked setting is set
-            || (locked && hidePrivateSpaceWhenLocked(this))
-        ) {
-            binding.listLock.visibility = View.GONE
-            return
-        }
-
-        binding.listLock.visibility = View.VISIBLE
-
         binding.listLock.setImageDrawable(
             AppCompatResources.getDrawable(
                 this,
@@ -84,6 +74,7 @@ class ListActivity : AppCompatActivity(), UIObject {
     }
 
 
+
     enum class ListActivityIntention(val titleResource: Int) {
         VIEW(R.string.list_title_view), /* view list of apps */
         PICK(R.string.list_title_pick)  /* choose app or action to associate to a gesture */
@@ -108,13 +99,10 @@ class ListActivity : AppCompatActivity(), UIObject {
                 ?.let { ListActivityIntention.valueOf(it) }
                 ?: ListActivityIntention.VIEW
 
-            @Suppress("deprecation") // required to support API level < 33
             favoritesVisibility = bundle.getSerializable("favoritesVisibility")
                     as? AppFilter.Companion.AppSetVisibility ?: favoritesVisibility
-            @Suppress("deprecation") // required to support API level < 33
             privateSpaceVisibility = bundle.getSerializable("privateSpaceVisibility")
                     as? AppFilter.Companion.AppSetVisibility ?: privateSpaceVisibility
-            @Suppress("deprecation") // required to support API level < 33
             hiddenVisibility = bundle.getSerializable("hiddenVisibility")
                     as? AppFilter.Companion.AppSetVisibility ?: hiddenVisibility
 
@@ -131,6 +119,20 @@ class ListActivity : AppCompatActivity(), UIObject {
             LauncherAction.SETTINGS.launch(this@ListActivity)
         }
 
+        binding.listLock.visibility =
+            if (intention != ListActivityIntention.VIEW) {
+                View.GONE
+            } else if (!isPrivateSpaceSetUp(this)) {
+                View.GONE
+            } else if (LauncherPreferences.apps().hidePrivateSpaceApps()) {
+                if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
+            } else {
+                View.VISIBLE
+            }
 
         if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
             isPrivateSpaceSetUp(this, showToast = true, launchSettings = true)
@@ -153,7 +155,7 @@ class ListActivity : AppCompatActivity(), UIObject {
                     binding.listContainer.context.resources.displayMetrics.heightPixels
                 val diff = height - r.bottom
                 if (diff != 0 &&
-                    LauncherPreferences.display().hideStatusBar()
+                    LauncherPreferences.display().fullScreen()
                 ) {
                     if (binding.listContainer.paddingBottom != diff) {
                         binding.listContainer.setPadding(0, 0, 0, diff)
@@ -181,11 +183,24 @@ class ListActivity : AppCompatActivity(), UIObject {
         finish()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_UNINSTALL) {
+            if (resultCode == Activity.RESULT_OK) {
+                Toast.makeText(this, getString(R.string.list_removed), Toast.LENGTH_LONG).show()
+                finish()
+            } else if (resultCode == Activity.RESULT_FIRST_USER) {
+                Toast.makeText(this, getString(R.string.list_not_removed), Toast.LENGTH_LONG).show()
+                finish()
+            }
+        }
+    }
+
+
     fun updateTitle() {
         var titleResource = intention.titleResource
         if (intention == ListActivityIntention.VIEW) {
-            titleResource =
-                if (hiddenVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
+            titleResource = if (hiddenVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
                 R.string.list_title_hidden
             } else if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
                 R.string.list_title_private_space
@@ -223,11 +238,11 @@ class ListActivity : AppCompatActivity(), UIObject {
 
         updateTitle()
 
-        val sectionsPagerAdapter = ListSectionsPagerAdapter(this)
-        binding.listViewpager.let {
-            it.adapter = sectionsPagerAdapter
-            binding.listTabs.setupWithViewPager(it)
-        }
+        val sectionsPagerAdapter = ListSectionsPagerAdapter(this, supportFragmentManager)
+        val viewPager: ViewPager = findViewById(R.id.list_viewpager)
+        viewPager.adapter = sectionsPagerAdapter
+        val tabs: TabLayout = findViewById(R.id.list_tabs)
+        tabs.setupWithViewPager(viewPager)
     }
 }
 
@@ -239,15 +254,9 @@ private val TAB_TITLES = arrayOf(
 /**
  * The [ListSectionsPagerAdapter] returns the fragment,
  * which corresponds to the selected tab in [ListActivity].
- *
- * This should eventually be replaced by a [FragmentStateAdapter]
- * However this keyboard does not open when using [ViewPager2]
- * so currently [ViewPager] is used here.
- * https://github.com/jrpie/launcher/issues/130
  */
-@Suppress("deprecation")
-class ListSectionsPagerAdapter(private val activity: ListActivity) :
-    FragmentPagerAdapter(activity.supportFragmentManager) {
+class ListSectionsPagerAdapter(private val context: Context, fm: FragmentManager) :
+    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getItem(position: Int): Fragment {
         return when (position) {
@@ -258,11 +267,11 @@ class ListSectionsPagerAdapter(private val activity: ListActivity) :
     }
 
     override fun getPageTitle(position: Int): CharSequence {
-        return activity.resources.getString(TAB_TITLES[position])
+        return context.resources.getString(TAB_TITLES[position])
     }
 
     override fun getCount(): Int {
-        return when (activity.intention) {
+        return when (intention) {
             ListActivity.ListActivityIntention.VIEW -> 1
             else -> 2
         }

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt

@@ -2,6 +2,7 @@ package de.jrpie.android.launcher.ui.list.apps
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
 import android.graphics.Rect
 import android.view.LayoutInflater
 import android.view.View
@@ -14,12 +15,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import de.jrpie.android.launcher.Application
 import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.actions.Action
-import de.jrpie.android.launcher.actions.Gesture
-import de.jrpie.android.launcher.apps.AbstractDetailedAppInfo
+import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
+import de.jrpie.android.launcher.actions.AppAction
 import de.jrpie.android.launcher.apps.AppFilter
 import de.jrpie.android.launcher.apps.AppInfo
 import de.jrpie.android.launcher.apps.DetailedAppInfo
+import de.jrpie.android.launcher.getUserFromId
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.preferences.ListLayout
 import de.jrpie.android.launcher.ui.list.ListActivity
@@ -46,8 +47,7 @@ class AppsRecyclerAdapter(
     RecyclerView.Adapter<AppsRecyclerAdapter.ViewHolder>() {
 
     private val apps = (activity.applicationContext as Application).apps
-    private val appsListDisplayed: MutableList<AbstractDetailedAppInfo> = mutableListOf()
-    private val grayscale = LauncherPreferences.theme().monochromeIcons()
+    private val appsListDisplayed: MutableList<DetailedAppInfo> = mutableListOf()
 
     // temporarily disable auto launch
     var disableAutoLaunch: Boolean = false
@@ -68,7 +68,7 @@ class AppsRecyclerAdapter(
         override fun onClick(v: View) {
             val rect = Rect()
             img.getGlobalVisibleRect(rect)
-            selectItem(bindingAdapterPosition, rect)
+            selectItem(adapterPosition, rect)
         }
 
         init {
@@ -80,19 +80,20 @@ class AppsRecyclerAdapter(
     override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
         var appLabel = appsListDisplayed[i].getCustomLabel(activity)
 
-        val appIcon = appsListDisplayed[i].getIcon(activity)
-
-        viewHolder.img.transformGrayscale(grayscale)
-        viewHolder.img.setImageDrawable(appIcon.constantState?.newDrawable() ?: appIcon)
-
         if (layout.useBadgedText) {
             appLabel = activity.packageManager.getUserBadgedLabel(
                 appLabel,
-                appsListDisplayed[i].getUser(activity)
+                getUserFromId(appsListDisplayed[i].app.user, activity)
             ).toString()
         }
-        viewHolder.textView.text = appLabel
 
+        val appIcon = appsListDisplayed[i].icon
+
+        viewHolder.textView.text = appLabel
+        viewHolder.img.setImageDrawable(appIcon)
+
+        if (LauncherPreferences.theme().monochromeIcons())
+            viewHolder.img.transformGrayscale()
 
         // decide when to show the options popup menu about
         if (intention == ListActivity.ListActivityIntention.VIEW) {
@@ -117,26 +118,22 @@ class AppsRecyclerAdapter(
     @Suppress("SameReturnValue")
     private fun showOptionsPopup(
         viewHolder: ViewHolder,
-        appInfo: AbstractDetailedAppInfo
+        appInfo: DetailedAppInfo
     ): Boolean {
         //create the popup menu
 
         val popup = PopupMenu(activity, viewHolder.img)
         popup.inflate(R.menu.menu_app)
 
-        if (!appInfo.isRemovable()) {
+        if (appInfo.isSystemApp) {
             popup.menu.findItem(R.id.app_menu_delete).setVisible(false)
         }
 
-        if (appInfo !is DetailedAppInfo) {
-            popup.menu.findItem(R.id.app_menu_info).setVisible(false)
-        }
-
-        if (LauncherPreferences.apps().hidden()?.contains(appInfo.getRawInfo()) == true) {
+        if (LauncherPreferences.apps().hidden()?.contains(appInfo.app) == true) {
             popup.menu.findItem(R.id.app_menu_hidden).setTitle(R.string.list_app_hidden_remove)
         }
 
-        if (LauncherPreferences.apps().favorites()?.contains(appInfo.getRawInfo()) == true) {
+        if (LauncherPreferences.apps().favorites()?.contains(appInfo.app) == true) {
             popup.menu.findItem(R.id.app_menu_favorite).setTitle(R.string.list_app_favorite_remove)
         }
 
@@ -144,19 +141,19 @@ class AppsRecyclerAdapter(
         popup.setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.app_menu_delete -> {
-                    appInfo.getRawInfo().uninstall(activity); true
+                    appInfo.app.uninstall(activity); true
                 }
 
                 R.id.app_menu_info -> {
-                    (appInfo.getRawInfo() as? AppInfo)?.openSettings(activity); true
+                    appInfo.app.openSettings(activity); true
                 }
 
                 R.id.app_menu_favorite -> {
-                    appInfo.getRawInfo().toggleFavorite(); true
+                    appInfo.app.toggleFavorite(); true
                 }
 
                 R.id.app_menu_hidden -> {
-                    appInfo.getRawInfo().toggleHidden(root); true
+                    appInfo.app.toggleHidden(root); true
                 }
 
                 R.id.app_menu_rename -> {
@@ -191,14 +188,15 @@ class AppsRecyclerAdapter(
         val appInfo = appsListDisplayed[pos]
         when (intention) {
             ListActivity.ListActivityIntention.VIEW -> {
-                appInfo.getAction().invoke(activity, rect)
+                AppAction(appInfo.app).invoke(activity, rect)
             }
 
             ListActivity.ListActivityIntention.PICK -> {
+                val returnIntent = Intent()
+                AppAction(appInfo.app).writeToIntent(returnIntent)
+                returnIntent.putExtra("forGesture", forGesture)
+                activity.setResult(REQUEST_CHOOSE_APP, returnIntent)
                 activity.finish()
-                forGesture ?: return
-                val gesture = Gesture.byId(forGesture) ?: return
-                Action.setActionForGesture(gesture, appInfo.getAction())
             }
         }
     }
@@ -213,8 +211,8 @@ class AppsRecyclerAdapter(
             && !disableAutoLaunch
             && LauncherPreferences.functionality().searchAutoLaunch()
         ) {
-            val app = appsListDisplayed[0]
-            app.getAction().invoke(activity)
+            val info = appsListDisplayed[0]
+            AppAction(info.app).invoke(activity)
 
             val inputMethodManager =
                 activity.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/ContextMenuActions.kt

@@ -1,11 +1,11 @@
 package de.jrpie.android.launcher.ui.list.apps
 
-import android.app.Activity
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.pm.LauncherApps
 import android.graphics.Rect
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -13,13 +13,11 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.snackbar.Snackbar
 import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.REQUEST_UNINSTALL
 import de.jrpie.android.launcher.apps.AppInfo
-import de.jrpie.android.launcher.apps.AbstractAppInfo
-import de.jrpie.android.launcher.apps.AbstractDetailedAppInfo
-import de.jrpie.android.launcher.apps.PinnedShortcutInfo
+import de.jrpie.android.launcher.apps.DetailedAppInfo
 import de.jrpie.android.launcher.getUserFromId
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import androidx.core.net.toUri
 
 private const val LOG_TAG = "AppContextMenu"
 
@@ -34,29 +32,27 @@ fun AppInfo.openSettings(
     }
 }
 
-fun AbstractAppInfo.uninstall(activity: Activity) {
-    if (this is AppInfo) {
+fun AppInfo.uninstall(activity: android.app.Activity) {
     val packageName = this.packageName
     val userId = this.user
 
     Log.i(LOG_TAG, "uninstalling $this")
 
-        val intent = Intent(Intent.ACTION_DELETE)
-        intent.data = "package:$packageName".toUri()
+    val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
+    intent.data = Uri.parse("package:$packageName")
     getUserFromId(userId, activity).let { user ->
         intent.putExtra(Intent.EXTRA_USER, user)
     }
-        activity.startActivity(intent)
 
-    } else if(this is PinnedShortcutInfo) {
-        val pinned = LauncherPreferences.apps().pinnedShortcuts() ?: mutableSetOf()
-        pinned.remove(this)
-        LauncherPreferences.apps().pinnedShortcuts(pinned)
-    }
+    intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
+    activity.startActivityForResult(
+        intent,
+        REQUEST_UNINSTALL
+    )
 }
 
-fun AbstractAppInfo.toggleFavorite() {
-    val favorites: MutableSet<AbstractAppInfo> =
+fun AppInfo.toggleFavorite() {
+    val favorites: MutableSet<AppInfo> =
         LauncherPreferences.apps().favorites() ?: mutableSetOf()
 
     if (favorites.contains(this)) {
@@ -73,8 +69,8 @@ fun AbstractAppInfo.toggleFavorite() {
 /**
  * @param view: used to show a snackbar letting the user undo the action
  */
-fun AbstractAppInfo.toggleHidden(view: View) {
-    val hidden: MutableSet<AbstractAppInfo> =
+fun AppInfo.toggleHidden(view: View) {
+    val hidden: MutableSet<AppInfo> =
         LauncherPreferences.apps().hidden() ?: mutableSetOf()
     if (hidden.contains(this)) {
         hidden.remove(this)
@@ -91,12 +87,12 @@ fun AbstractAppInfo.toggleHidden(view: View) {
     LauncherPreferences.apps().hidden(hidden)
 }
 
-fun AbstractDetailedAppInfo.showRenameDialog(context: Context) {
+fun DetailedAppInfo.showRenameDialog(context: Context) {
     AlertDialog.Builder(context, R.style.AlertDialogCustom).apply {
-        setTitle(context.getString(R.string.dialog_rename_title, getLabel()))
+        setTitle(context.getString(R.string.dialog_rename_title, label))
         setView(R.layout.dialog_rename_app)
-        setNegativeButton(android.R.string.cancel) { d, _ -> d.cancel() }
-        setPositiveButton(android.R.string.ok) { d, _ ->
+        setNegativeButton(R.string.dialog_cancel) { d, _ -> d.cancel() }
+        setPositiveButton(R.string.dialog_rename_ok) { d, _ ->
             setCustomLabel(
                 (d as? AlertDialog)
                     ?.findViewById<EditText>(R.id.dialog_rename_app_edit_text)
@@ -106,7 +102,7 @@ fun AbstractDetailedAppInfo.showRenameDialog(context: Context) {
     }.create().also { it.show() }.apply {
         val input = findViewById<EditText>(R.id.dialog_rename_app_edit_text)
         input?.setText(getCustomLabel(context))
-        input?.hint = getLabel()
+        input?.hint = label
     }
 }
 

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/ListFragmentApps.kt

@@ -9,14 +9,17 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.apps.AppFilter
 import de.jrpie.android.launcher.databinding.ListAppsBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.UIObject
 import de.jrpie.android.launcher.ui.list.ListActivity
+import de.jrpie.android.launcher.ui.list.favoritesVisibility
+import de.jrpie.android.launcher.ui.list.forGesture
+import de.jrpie.android.launcher.ui.list.hiddenVisibility
+import de.jrpie.android.launcher.ui.list.intention
+import de.jrpie.android.launcher.ui.list.privateSpaceVisibility
 import de.jrpie.android.launcher.ui.openSoftKeyboard
 
 
@@ -49,7 +52,7 @@ class ListFragmentApps : Fragment(), UIObject {
             .registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
 
         binding.listAppsCheckBoxFavorites.isChecked =
-            ((activity as? ListActivity)?.favoritesVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE)
+            (favoritesVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE)
     }
 
     override fun onStop() {
@@ -62,33 +65,25 @@ class ListFragmentApps : Fragment(), UIObject {
     override fun setOnClicks() {}
 
     override fun adjustLayout() {
-        val listActivity = activity as? ListActivity ?: return
 
         appsRecyclerAdapter =
             AppsRecyclerAdapter(
-                listActivity, binding.root, listActivity.intention, listActivity.forGesture,
+                requireActivity(), binding.root, intention, forGesture,
                 appFilter = AppFilter(
                     requireContext(),
                     "",
-                    favoritesVisibility = listActivity.favoritesVisibility,
-                    privateSpaceVisibility = listActivity.privateSpaceVisibility,
-                    hiddenVisibility = listActivity.hiddenVisibility
+                    favoritesVisibility = favoritesVisibility,
+                    privateSpaceVisibility = privateSpaceVisibility,
+                    hiddenVisibility = hiddenVisibility
                 ),
                 layout = LauncherPreferences.list().layout()
             )
 
-
         // set up the list / recycler
         binding.listAppsRview.apply {
             // improve performance (since content changes don't change the layout size)
             setHasFixedSize(true)
             layoutManager = LauncherPreferences.list().layout().layoutManager(context)
-                .also {
-                    if (LauncherPreferences.list().reverseLayout()) {
-                        (it as? LinearLayoutManager)?.reverseLayout = true
-                        (it as? GridLayoutManager)?.reverseLayout = true
-                    }
-                }
             adapter = appsRecyclerAdapter
         }
 
@@ -120,8 +115,7 @@ class ListFragmentApps : Fragment(), UIObject {
 
                 if (newText == " " &&
                     !appsRecyclerAdapter.disableAutoLaunch &&
-                    (activity as? ListActivity)?.intention
-                        == ListActivity.ListActivityIntention.VIEW &&
+                    intention == ListActivity.ListActivityIntention.VIEW &&
                     LauncherPreferences.functionality().searchAutoLaunch()
                 ) {
                     appsRecyclerAdapter.disableAutoLaunch = true
@@ -138,17 +132,17 @@ class ListFragmentApps : Fragment(), UIObject {
         })
 
         binding.listAppsCheckBoxFavorites.setOnClickListener {
-            listActivity.favoritesVisibility =
+            favoritesVisibility =
                 if (binding.listAppsCheckBoxFavorites.isChecked) {
                     AppFilter.Companion.AppSetVisibility.EXCLUSIVE
                 } else {
                     AppFilter.Companion.AppSetVisibility.VISIBLE
                 }
-            appsRecyclerAdapter.setFavoritesVisibility(listActivity.favoritesVisibility)
+            appsRecyclerAdapter.setFavoritesVisibility(favoritesVisibility)
             (activity as? ListActivity)?.updateTitle()
         }
 
-        if (listActivity.intention == ListActivity.ListActivityIntention.VIEW
+        if (intention == ListActivity.ListActivityIntention.VIEW
             && LauncherPreferences.functionality().searchAutoOpenKeyboard()
         ) {
             binding.listAppsSearchview.openSoftKeyboard(requireContext())

app/src/main/java/de/jrpie/android/launcher/ui/list/other/OtherRecyclerAdapter.kt

@@ -1,6 +1,7 @@
 package de.jrpie.android.launcher.ui.list.other
 
 import android.app.Activity
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,10 +9,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.actions.Action
-import de.jrpie.android.launcher.actions.Gesture
+import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
 import de.jrpie.android.launcher.actions.LauncherAction
-import de.jrpie.android.launcher.ui.list.ListActivity
+import de.jrpie.android.launcher.ui.list.forGesture
 
 /**
  * The [OtherRecyclerAdapter] will only be displayed in the ListActivity,
@@ -33,13 +33,10 @@ class OtherRecyclerAdapter(val activity: Activity) :
 
 
         override fun onClick(v: View) {
-            val pos = bindingAdapterPosition
+            val pos = adapterPosition
             val content = othersList[pos]
 
-            activity.finish()
-            val gestureId = (activity as? ListActivity)?.forGesture ?: return
-            val gesture = Gesture.byId(gestureId) ?: return
-            Action.setActionForGesture(gesture, content)
+            forGesture?.let { returnChoiceIntent(it, content) }
         }
 
         init {
@@ -64,4 +61,12 @@ class OtherRecyclerAdapter(val activity: Activity) :
         val view: View = inflater.inflate(R.layout.list_other_row, parent, false)
         return ViewHolder(view)
     }
+
+    private fun returnChoiceIntent(forGesture: String, action: LauncherAction) {
+        val returnIntent = Intent()
+        returnIntent.putExtra("forGesture", forGesture)
+        action.writeToIntent(returnIntent)
+        activity.setResult(REQUEST_CHOOSE_APP, returnIntent)
+        activity.finish()
+    }
 }

app/src/main/java/de/jrpie/android/launcher/ui/settings/SettingsActivity.kt

@@ -1,5 +1,6 @@
 package de.jrpie.android.launcher.ui.settings
 
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.Resources
@@ -7,14 +8,17 @@ import android.os.Bundle
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayoutMediator
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
 import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
 import de.jrpie.android.launcher.databinding.SettingsBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.preferences.theme.Background
 import de.jrpie.android.launcher.preferences.theme.ColorTheme
+import de.jrpie.android.launcher.saveListActivityChoice
 import de.jrpie.android.launcher.ui.UIObject
 import de.jrpie.android.launcher.ui.settings.actions.SettingsFragmentActions
 import de.jrpie.android.launcher.ui.settings.launcher.SettingsFragmentLauncher
@@ -45,7 +49,7 @@ class SettingsActivity : AppCompatActivity(), UIObject {
                 // This ugly workaround causes a jump to the top of the list, but at least
                 // the text stays readable.
                 val i = Intent(this, SettingsActivity::class.java)
-                    .also { it.putExtra(EXTRA_TAB, 1) }
+                    .also { it.putExtra("tab", 1) }
                 finish()
                 startActivity(i)
             } else
@@ -67,14 +71,15 @@ class SettingsActivity : AppCompatActivity(), UIObject {
         setContentView(binding.root)
 
         // set up tabs and swiping in settings
-        val sectionsPagerAdapter = SettingsSectionsPagerAdapter(this)
-        binding.settingsViewpager.apply {
-            adapter = sectionsPagerAdapter
-            setCurrentItem(intent.getIntExtra(EXTRA_TAB, 0), false)
+        val sectionsPagerAdapter = SettingsSectionsPagerAdapter(this, supportFragmentManager)
+        val viewPager: ViewPager = findViewById(R.id.settings_viewpager)
+        viewPager.adapter = sectionsPagerAdapter
+
+        val tabs: TabLayout = findViewById(R.id.settings_tabs)
+        tabs.setupWithViewPager(viewPager)
+        if (intent.hasExtra("tab")) {
+            tabs.getTabAt(intent.getIntExtra("tab", 0))?.select()
         }
-        TabLayoutMediator(binding.settingsTabs, binding.settingsViewpager) { tab, position ->
-            tab.text = sectionsPagerAdapter.getPageTitle(position)
-        }.attach()
     }
 
     override fun onStart() {
@@ -103,21 +108,24 @@ class SettingsActivity : AppCompatActivity(), UIObject {
         }
     }
 
-    companion object {
-        private const val EXTRA_TAB = "tab"
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when (requestCode) {
+            REQUEST_CHOOSE_APP -> saveListActivityChoice(data)
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
     }
 }
 
 private val TAB_TITLES = arrayOf(
-    R.string.settings_tab_actions,
+    R.string.settings_tab_app,
     R.string.settings_tab_launcher,
     R.string.settings_tab_meta
 )
 
-class SettingsSectionsPagerAdapter(private val activity: FragmentActivity) :
-    FragmentStateAdapter(activity) {
+class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentManager) :
+    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
-    override fun createFragment(position: Int): Fragment {
+    override fun getItem(position: Int): Fragment {
         return when (position) {
             0 -> SettingsFragmentActions()
             1 -> SettingsFragmentLauncher()
@@ -126,11 +134,11 @@ class SettingsSectionsPagerAdapter(private val activity: FragmentActivity) :
         }
     }
 
-    fun getPageTitle(position: Int): CharSequence {
-        return activity.resources.getString(TAB_TITLES[position])
+    override fun getPageTitle(position: Int): CharSequence {
+        return context.resources.getString(TAB_TITLES[position])
     }
 
-    override fun getItemCount(): Int {
+    override fun getCount(): Int {
         return 3
     }
 }

app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt

@@ -11,11 +11,11 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.apps.AppFilter
@@ -94,8 +94,6 @@ class SettingsFragmentActionsRecycler : Fragment(), UIObject {
 class ActionsRecyclerAdapter(val activity: Activity) :
     RecyclerView.Adapter<ActionsRecyclerAdapter.ViewHolder>() {
 
-    private val drawableUnknown = AppCompatResources.getDrawable(activity, R.drawable.baseline_question_mark_24)
-
     private val gesturesList: ArrayList<Gesture> =
         Gesture.entries.filter(Gesture::isEnabled) as ArrayList<Gesture>
 
@@ -117,18 +115,15 @@ class ActionsRecyclerAdapter(val activity: Activity) :
 
     private fun updateViewHolder(gesture: Gesture, viewHolder: ViewHolder) {
         val action = Action.forGesture(gesture)
+        val drawable = action?.getIcon(activity)
 
-        if (action == null) {
+        if (action == null || drawable == null) {
             viewHolder.img.visibility = View.INVISIBLE
             viewHolder.removeAction.visibility = View.GONE
             viewHolder.chooseButton.visibility = View.VISIBLE
             return
         }
 
-        // Use the unknown icon if there is an action, but we can't find its icon.
-        // Probably an app was uninstalled.
-        val drawable = action.getIcon(activity) ?: drawableUnknown
-
         viewHolder.img.visibility = View.VISIBLE
         viewHolder.removeAction.visibility = View.VISIBLE
         viewHolder.chooseButton.visibility = View.INVISIBLE
@@ -142,7 +137,9 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         val description = gesture.getDescription(activity)
         viewHolder.descriptionTextView.text = description
 
-        viewHolder.img.transformGrayscale(LauncherPreferences.theme().monochromeIcons())
+
+        if (LauncherPreferences.theme().monochromeIcons())
+            viewHolder.img.transformGrayscale()
 
         updateViewHolder(gesture, viewHolder)
         viewHolder.img.setOnClickListener { chooseApp(gesture) }
@@ -178,6 +175,9 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         intent.putExtra("intention", ListActivity.ListActivityIntention.PICK.toString())
         intent.putExtra("hiddenVisibility", AppFilter.Companion.AppSetVisibility.VISIBLE)
         intent.putExtra("forGesture", gesture.id) // for which action we choose the app
-        activity.startActivity(intent)
+        activity.startActivityForResult(
+            intent,
+            REQUEST_CHOOSE_APP
+        )
     }
 }

app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt

@@ -2,6 +2,7 @@ package de.jrpie.android.launcher.ui.settings.meta
 
 import android.app.AlertDialog
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,10 +16,10 @@ import de.jrpie.android.launcher.copyToClipboard
 import de.jrpie.android.launcher.databinding.SettingsMetaBinding
 import de.jrpie.android.launcher.getDeviceInfo
 import de.jrpie.android.launcher.openInBrowser
-import de.jrpie.android.launcher.openTutorial
 import de.jrpie.android.launcher.preferences.resetPreferences
 import de.jrpie.android.launcher.ui.LegalInfoActivity
 import de.jrpie.android.launcher.ui.UIObject
+import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
 
 /**
  * The [SettingsFragmentMeta] is a used as a tab in the SettingsActivity.
@@ -46,17 +47,8 @@ class SettingsFragmentMeta : Fragment(), UIObject {
 
     override fun setOnClicks() {
 
-        fun bindURL(view: View, urlRes: Int) {
-            view.setOnClickListener {
-                openInBrowser(
-                    getString(urlRes),
-                    requireContext()
-                )
-            }
-        }
-
         binding.settingsMetaButtonViewTutorial.setOnClickListener {
-            openTutorial(requireContext())
+            startActivity(Intent(this.context, TutorialActivity::class.java))
         }
 
         // prompting for settings-reset confirmation
@@ -77,7 +69,12 @@ class SettingsFragmentMeta : Fragment(), UIObject {
 
 
         // view code
-        bindURL(binding.settingsMetaButtonViewCode, R.string.settings_meta_link_github)
+        binding.settingsMetaButtonViewCode.setOnClickListener {
+            openInBrowser(
+                getString(R.string.settings_meta_link_github),
+                requireContext()
+            )
+        }
 
         // report a bug
         binding.settingsMetaButtonReportBug.setOnClickListener {
@@ -113,19 +110,37 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
         // join chat
-        bindURL(binding.settingsMetaButtonJoinChat, R.string.settings_meta_chat_url)
+        binding.settingsMetaButtonJoinChat.setOnClickListener {
+            openInBrowser(
+                getString(R.string.settings_meta_chat_url),
+                requireContext()
+            )
+        }
+
 
         // contact developer
-        // bindURL(binding.settingsMetaButtonContact, R.string.settings_meta_contact_url)
+        binding.settingsMetaButtonContact.setOnClickListener {
+            openInBrowser(
+                getString(R.string.settings_meta_contact_url),
+                requireContext()
+            )
+        }
 
         // contact fork developer
-        bindURL(binding.settingsMetaButtonForkContact, R.string.settings_meta_fork_contact_url)
-
-        // donate
-        bindURL(binding.settingsMetaButtonDonate, R.string.settings_meta_donate_url)
+        binding.settingsMetaButtonForkContact.setOnClickListener {
+            openInBrowser(
+                getString(R.string.settings_meta_fork_contact_url),
+                requireContext()
+            )
+        }
 
         // privacy policy
-        bindURL(binding.settingsMetaButtonPrivacy, R.string.settings_meta_privacy_url)
+        binding.settingsMetaButtonPrivacy.setOnClickListener {
+            openInBrowser(
+                getString(R.string.settings_meta_privacy_url),
+                requireContext()
+            )
+        }
 
         // legal info
         binding.settingsMetaButtonLicenses.setOnClickListener {

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt

@@ -1,26 +1,24 @@
 package de.jrpie.android.launcher.ui.tutorial
 
+import android.content.Intent
 import android.content.res.Resources
-import android.os.Build
 import android.os.Bundle
-import android.view.View
-import android.window.OnBackInvokedDispatcher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.tabs.TabLayoutMediator
-import de.jrpie.android.launcher.databinding.TutorialBinding
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
+import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
 import de.jrpie.android.launcher.preferences.LauncherPreferences
+import de.jrpie.android.launcher.saveListActivityChoice
 import de.jrpie.android.launcher.ui.UIObject
-import de.jrpie.android.launcher.ui.blink
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment0Start
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment1Concept
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment2Usage
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment3AppList
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment4Setup
-import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment5Finish
+import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentConcept
+import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentFinish
+import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentSetup
+import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentStart
+import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragmentUsage
 
 /**
  * The [TutorialActivity] is displayed automatically on new installations.
@@ -31,75 +29,19 @@ import de.jrpie.android.launcher.ui.tutorial.tabs.TutorialFragment5Finish
  */
 class TutorialActivity : AppCompatActivity(), UIObject {
 
-    private lateinit var binding: TutorialBinding
-
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super<AppCompatActivity>.onCreate(savedInstanceState)
         super<UIObject>.onCreate()
 
         // Initialise layout
-        binding = TutorialBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        // Handle back key / gesture on Android 13+
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            onBackInvokedDispatcher.registerOnBackInvokedCallback(
-                OnBackInvokedDispatcher.PRIORITY_OVERLAY
-            ) {
-                // prevent going back when the tutorial is shown for the first time
-                if (!LauncherPreferences.internal().started()) {
-                    return@registerOnBackInvokedCallback
-                }
-                finish()
-            }
-        }
-
+        setContentView(R.layout.tutorial)
 
         // set up tabs and swiping in settings
-        val sectionsPagerAdapter = TutorialSectionsPagerAdapter(this)
-        binding.tutorialViewpager.apply {
-            adapter = sectionsPagerAdapter
-            currentItem = 0
-            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    binding.tutorialButtonNext.apply {
-                        val lastItem = sectionsPagerAdapter.itemCount - 1
-                        visibility = if (position == lastItem) {
-                            View.INVISIBLE
-                        } else {
-                            View.VISIBLE
-                        }
-                        if (position == 0) {
-                            blink()
-                        } else {
-                            clearAnimation()
-                        }
-                    }
-                    binding.tutorialButtonBack.apply {
-                        visibility = if (position == 0) {
-                            View.INVISIBLE
-                        } else {
-                            View.VISIBLE
-                        }
-                    }
-                }
-            })
-        }
-        TabLayoutMediator(binding.tutorialTabs, binding.tutorialViewpager) { _, _ -> }.attach()
-        binding.tutorialButtonNext.setOnClickListener {
-            binding.tutorialViewpager.apply {
-                setCurrentItem(
-                    (currentItem + 1).coerceAtMost(sectionsPagerAdapter.itemCount - 1),
-                    true
-                )
-            }
-        }
-        binding.tutorialButtonBack.setOnClickListener {
-            binding.tutorialViewpager.apply {
-                setCurrentItem((currentItem - 1).coerceAtLeast(0), true)
-            }
-        }
+        val sectionsPagerAdapter = TutorialSectionsPagerAdapter(supportFragmentManager)
+        val viewPager: ViewPager = findViewById(R.id.tutorial_viewpager)
+        viewPager.adapter = sectionsPagerAdapter
+        val tabs: TabLayout = findViewById(R.id.tutorial_tabs)
+        tabs.setupWithViewPager(viewPager)
     }
 
     override fun getTheme(): Resources.Theme {
@@ -111,9 +53,14 @@ class TutorialActivity : AppCompatActivity(), UIObject {
         super<UIObject>.onStart()
     }
 
-    // prevent going back when the tutorial is shown for the first time
-    @Deprecated("Deprecated in Java", ReplaceWith("use anyway"))
-    @Suppress("deprecation") // support API level < 33
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when (requestCode) {
+            REQUEST_CHOOSE_APP -> saveListActivityChoice(data)
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+    // Default: prevent going back, allow if viewed again later
     override fun onBackPressed() {
         if (LauncherPreferences.internal().started())
             super.onBackPressed()
@@ -127,22 +74,26 @@ class TutorialActivity : AppCompatActivity(), UIObject {
  *
  * Tabs: (Start | Concept | Usage | Setup | Finish)
  */
-class TutorialSectionsPagerAdapter(activity: FragmentActivity) :
-    FragmentStateAdapter(activity) {
+class TutorialSectionsPagerAdapter(fm: FragmentManager) :
+    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
-    override fun getItemCount(): Int {
-        return 6
-    }
-
-    override fun createFragment(position: Int): Fragment {
+    override fun getItem(position: Int): Fragment {
         return when (position) {
-            0 -> TutorialFragment0Start()
-            1 -> TutorialFragment1Concept()
-            2 -> TutorialFragment2Usage()
-            3 -> TutorialFragment3AppList()
-            4 -> TutorialFragment4Setup()
-            5 -> TutorialFragment5Finish()
+            0 -> TutorialFragmentStart()
+            1 -> TutorialFragmentConcept()
+            2 -> TutorialFragmentUsage()
+            3 -> TutorialFragmentSetup()
+            4 -> TutorialFragmentFinish()
             else -> Fragment()
         }
     }
+
+    /* We don't use titles here, as we have the dots */
+    override fun getPageTitle(position: Int): CharSequence {
+        return ""
+    }
+
+    override fun getCount(): Int {
+        return 5
+    }
 }

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragment3AppList.kt

@@ -1,30 +0,0 @@
-package de.jrpie.android.launcher.ui.tutorial.tabs
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.ui.UIObject
-
-/**
- * The [TutorialFragment3AppList] is a used as a tab in the TutorialActivity.
- *
- * Tells the user how his screen will look and how the app can be used
- */
-class TutorialFragment3AppList : Fragment(), UIObject {
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.tutorial_3_app_list, container, false)
-    }
-
-    override fun onStart() {
-        super<Fragment>.onStart()
-        super<UIObject>.onStart()
-    }
-
-}

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragmentConcept.kt

@@ -6,22 +6,22 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import de.jrpie.android.launcher.BuildConfig
-import de.jrpie.android.launcher.databinding.Tutorial1ConceptBinding
+import de.jrpie.android.launcher.databinding.TutorialConceptBinding
 import de.jrpie.android.launcher.ui.UIObject
 
 /**
- * The [TutorialFragment1Concept] is a used as a tab in the TutorialActivity.
+ * The [TutorialFragmentConcept] is a used as a tab in the TutorialActivity.
  *
  * It is used to display info about Launchers concept (open source, efficiency ...)
  */
-class TutorialFragment1Concept : Fragment(), UIObject {
-    private lateinit var binding: Tutorial1ConceptBinding
+class TutorialFragmentConcept : Fragment(), UIObject {
+    private lateinit var binding: TutorialConceptBinding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = Tutorial1ConceptBinding.inflate(inflater, container, false)
+        binding = TutorialConceptBinding.inflate(inflater, container, false)
         binding.tutorialConceptBadgeVersion.text = BuildConfig.VERSION_NAME
         return binding.root
     }

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragmentFinish.kt

@@ -6,25 +6,25 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import de.jrpie.android.launcher.BuildConfig.VERSION_CODE
-import de.jrpie.android.launcher.databinding.Tutorial5FinishBinding
+import de.jrpie.android.launcher.databinding.TutorialFinishBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.setDefaultHomeScreen
 import de.jrpie.android.launcher.ui.UIObject
 
 /**
- * The [TutorialFragment5Finish] is a used as a tab in the TutorialActivity.
+ * The [TutorialFragmentFinish] is a used as a tab in the TutorialActivity.
  *
  * It is used to display further resources and let the user start Launcher
  */
-class TutorialFragment5Finish : Fragment(), UIObject {
+class TutorialFragmentFinish : Fragment(), UIObject {
 
-    private lateinit var binding: Tutorial5FinishBinding
+    private lateinit var binding: TutorialFinishBinding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = Tutorial5FinishBinding.inflate(inflater, container, false)
+        binding = TutorialFinishBinding.inflate(inflater, container, false)
         return binding.root
     }
 

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragmentSetup.kt

@@ -9,17 +9,17 @@ import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.ui.UIObject
 
 /**
- * The [TutorialFragment4Setup] is a used as a tab in the TutorialActivity.
+ * The [TutorialFragmentSetup] is a used as a tab in the TutorialActivity.
  *
  * It is used to display info in the tutorial
  */
-class TutorialFragment4Setup : Fragment(), UIObject {
+class TutorialFragmentSetup : Fragment(), UIObject {
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.tutorial_4_setup, container, false)
+        return inflater.inflate(R.layout.tutorial_setup, container, false)
     }
 
     override fun onStart() {

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragmentStart.kt

@@ -5,22 +5,24 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import de.jrpie.android.launcher.databinding.Tutorial0StartBinding
+import de.jrpie.android.launcher.databinding.TutorialStartBinding
 import de.jrpie.android.launcher.ui.UIObject
+import de.jrpie.android.launcher.ui.blink
 
 /**
- * The [TutorialFragment0Start] is a used as a tab in the TutorialActivity.
+ * The [TutorialFragmentStart] is a used as a tab in the TutorialActivity.
  *
  * It displays info about the app and gets the user into the tutorial
  */
-class TutorialFragment0Start : Fragment(), UIObject {
+class TutorialFragmentStart : Fragment(), UIObject {
 
-    private lateinit var binding: Tutorial0StartBinding
+    private lateinit var binding: TutorialStartBinding
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = Tutorial0StartBinding.inflate(inflater, container, false)
+        binding = TutorialStartBinding.inflate(inflater, container, false)
+        binding.tutorialStartIconRight.blink()
         return binding.root
     }
 

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/tabs/TutorialFragmentUsage.kt

@@ -9,17 +9,17 @@ import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.ui.UIObject
 
 /**
- * The [TutorialFragment2Usage] is a used as a tab in the TutorialActivity.
+ * The [TutorialFragmentUsage] is a used as a tab in the TutorialActivity.
  *
  * Tells the user how his screen will look and how the app can be used
  */
-class TutorialFragment2Usage : Fragment(), UIObject {
+class TutorialFragmentUsage : Fragment(), UIObject {
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.tutorial_2_usage, container, false)
+        return inflater.inflate(R.layout.tutorial_usage, container, false)
     }
 
     override fun onStart() {

app/src/main/java/de/jrpie/android/launcher/ui/util/HtmlTextView.kt

@@ -12,7 +12,6 @@ class HtmlTextView(context: Context, attr: AttributeSet?, int: Int) :
     constructor(context: Context) : this(context, null, 0)
 
     init {
-        @Suppress("deprecation") // required to support API level < 24
         text = Html.fromHtml(text.toString())
         movementMethod = LinkMovementMethod.getInstance()
     }

app/src/main/res/drawable/baseline_apps_24.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:textColor"
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
-
-</vector>

app/src/main/res/drawable/baseline_home_24.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:textColor"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-
-</vector>

app/src/main/res/drawable/baseline_more_horiz_24.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+
+</vector>

app/src/main/res/drawable/baseline_navigate_before_24.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:textColor"
-        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z" />
-
-</vector>

app/src/main/res/drawable/baseline_navigate_next_24.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:textColor"
-        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
-
-</vector>

app/src/main/res/drawable/baseline_question_mark_24.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11.07,12.85c0.77,-1.39 2.25,-2.21 3.11,-3.44c0.91,-1.29 0.4,-3.7 -2.18,-3.7c-1.69,0 -2.52,1.28 -2.87,2.34L6.54,6.96C7.25,4.83 9.18,3 11.99,3c2.35,0 3.96,1.07 4.78,2.41c0.7,1.15 1.11,3.3 0.03,4.9c-1.2,1.77 -2.35,2.31 -2.97,3.45c-0.25,0.46 -0.35,0.76 -0.35,2.24h-2.89C10.58,15.22 10.46,13.95 11.07,12.85zM14,20c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2S14,18.9 14,20z" />
-
-</vector>

app/src/main/res/drawable/baseline_volume_adjust_24.xml

@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:textColor"
-        android:pathData="m 3,9 v 6 h 4 l 5,5 V 4 L 7,9 Z m 13.5,3 C 16.5,10.23 15.48,8.71 14,7.97 v 8.05 c 1.48,-0.73 2.5,-2.25 2.5,-4.02 z" />
-    <path
-        android:fillAlpha="0.5"
-        android:fillColor="?android:textColor"
-        android:pathData="m 14,3.23 v 2.06 c 2.89,0.86 5,3.54 5,6.71 0,3.17 -2.11,5.85 -5,6.71 v 2.06 C 18.01,19.86 21,16.28 21,12 21,7.72 18.01,4.14 14,3.23 Z"
-        android:strokeAlpha="0.5" />
-
-</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#252827"
+        android:pathData="M0,0h108v108h-108z" />
+</vector>

app/src/main/res/layout/activity_pin_shortcut.xml

@@ -80,6 +80,7 @@
                 android:minHeight="40dp"
                 tools:drawableLeft="@drawable/baseline_settings_24"
                 tools:text="Shortcut name" />
+            <!--
             <Space
                 android:layout_width="match_parent"
                 android:layout_height="10dp" />
@@ -89,8 +90,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="?android:textColor"
-                android:checked="true"
                 android:text="@string/pin_shortcut_switch_visible" />
+            -->
 
             <Space
                 android:layout_width="match_parent"
@@ -102,21 +103,8 @@
                 android:layout_height="wrap_content"
                 android:text="@string/pin_shortcut_button_bind" />
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="10dp" />
-
         </LinearLayout>
 
 
     </ScrollView>
-
-    <Button
-        android:id="@+id/pin_shortcut_button_ok"
-        android:layout_margin="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@android:string/ok"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/list.xml

@@ -40,7 +40,8 @@
                 android:src="@drawable/baseline_settings_24"
                 custom:layout_constraintBottom_toBottomOf="parent"
                 custom:layout_constraintStart_toStartOf="parent"
-                custom:layout_constraintTop_toTopOf="parent" />
+                custom:layout_constraintTop_toTopOf="parent"
+                custom:type="solid" />
 
             <TextView
                 android:id="@+id/list_heading"
@@ -69,7 +70,8 @@
                 android:src="@drawable/baseline_close_24"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                custom:type="solid" />
             <ImageView
                 android:id="@+id/list_lock"
                 android:visibility="gone"
@@ -83,7 +85,8 @@
                 android:src="@drawable/baseline_lock_24"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/list_close"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                custom:type="solid" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.tabs.TabLayout
@@ -95,11 +98,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <!--
-    Should be replaced by androidx.viewpager2.widget.ViewPager2
-    but there is an issue with opening the keyboard:
-    https://github.com/jrpie/launcher/issues/130
-    -->
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/list_viewpager"
         android:layout_width="0dp"

app/src/main/res/layout/list_apps_row.xml

@@ -15,21 +15,18 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@mipmap/ic_launcher_round"
         tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@+id/list_apps_row_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20sp"
+        android:layout_marginStart="60sp"
         android:gravity="start"
         android:text=""
         android:textSize="20sp"
-        tools:text="@string/app_name"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/list_apps_row_icon"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/list_apps_row_variant_grid.xml

@@ -15,7 +15,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:src="@mipmap/ic_launcher_round"
         tools:ignore="ContentDescription" />
 
     <TextView
@@ -26,7 +25,7 @@
         android:paddingTop="5dp"
         android:text=""
         android:textSize="11sp"
-        tools:text="@string/app_name"
+        tools:text="some app"
         app:layout_constraintTop_toBottomOf="@id/list_apps_row_icon"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/list_apps_row_variant_text.xml

@@ -32,6 +32,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/app_name" />
+        tools:text="some app" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/settings.xml

@@ -47,7 +47,8 @@
                 android:src="@drawable/baseline_close_24"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                custom:type="solid" />
 
             <ImageView
                 android:id="@+id/settings_system"
@@ -62,7 +63,8 @@
                 android:src="@drawable/baseline_settings_applications_24"
                 custom:layout_constraintBottom_toBottomOf="parent"
                 custom:layout_constraintStart_toStartOf="parent"
-                custom:layout_constraintTop_toTopOf="parent" />
+                custom:layout_constraintTop_toTopOf="parent"
+                custom:type="solid" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.tabs.TabLayout
@@ -73,7 +75,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager2.widget.ViewPager2
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/settings_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/settings_actions_row.xml

@@ -43,15 +43,13 @@
         android:id="@+id/settings_actions_row_button_choose"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:maxWidth="100dp"
         android:text="@string/settings_apps_choose"
         android:textAllCaps="false"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
     <ImageView
         android:id="@+id/settings_actions_row_icon_img"

app/src/main/res/layout/settings_meta.xml

@@ -59,12 +59,12 @@
             android:text="@string/settings_meta_join_chat"
             android:textAllCaps="false" />
 
-        <!--<Button
+        <Button
             android:id="@+id/settings_meta_button_contact"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_meta_contact"
-            android:textAllCaps="false" />-->
+            android:textAllCaps="false" />
 
         <Button
             android:id="@+id/settings_meta_button_fork_contact"
@@ -73,13 +73,6 @@
             android:text="@string/settings_meta_fork_contact"
             android:textAllCaps="false" />
 
-        <Button
-            android:id="@+id/settings_meta_button_donate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_meta_donate"
-            android:textAllCaps="false" />
-
         <Space
             android:layout_width="match_parent"
             android:layout_height="64sp" />

app/src/main/res/layout/tutorial.xml

@@ -10,7 +10,7 @@
     tools:context=".ui.tutorial.TutorialActivity">
 
 
-    <androidx.viewpager2.widget.ViewPager2
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/tutorial_viewpager"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -22,37 +22,15 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
-    <ImageView
-        android:id="@+id/tutorial_button_back"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:alpha="0.5"
-        android:src="@drawable/baseline_navigate_before_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tutorial_viewpager" />
-
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tutorial_tabs"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tutorial_button_next"
-        app:layout_constraintStart_toEndOf="@+id/tutorial_button_back"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:tabBackground="@drawable/tutorial_tab_selector"
         app:tabGravity="center"
-        app:tabIndicatorHeight="0dp" />
-
-    <ImageView
-        android:id="@+id/tutorial_button_next"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:src="@drawable/baseline_navigate_next_24"
+        app:tabIndicatorHeight="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tutorial_viewpager" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tutorial_3_app_list.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/tutorial_usage_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="32sp"
-    android:paddingRight="32sp"
-    tools:context=".ui.tutorial.tabs.TutorialFragment3AppList">
-
-    <TextView
-        android:id="@+id/tutorial_app_list_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/tutorial_app_list_title"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tutorial_app_list_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="32dp"
-        android:gravity="center"
-        android:text="@string/tutorial_app_list_text"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/tutorial_app_list_screen"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tutorial_app_list_title" />
-
-    <ImageView
-        android:id="@+id/tutorial_app_list_screen"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerInside"
-        android:src="@drawable/tutorial_app_list"
-        app:layout_constraintBottom_toTopOf="@id/tutorial_app_list_text_2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/tutorial_app_list_text"
-        app:layout_constraintTop_toBottomOf="@id/tutorial_app_list_text"
-        app:srcCompat="@drawable/tutorial_app_list"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/tutorial_app_list_text_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="@string/tutorial_app_list_text_2"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tutorial_app_list_screen" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tutorial_concept.xml

@@ -8,7 +8,7 @@
     android:paddingRight="32sp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.tutorial.tabs.TutorialFragment1Concept">
+    tools:context=".ui.tutorial.tabs.TutorialFragmentConcept">
 
     <TextView
         android:id="@+id/tutorial_concept_title"
@@ -28,10 +28,11 @@
         android:gravity="center"
         android:text="@string/tutorial_concept_text"
         android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tutorial_concept_title"
-        app:layout_constraintBottom_toTopOf="@id/tutorial_concept_badge_version_label"/>
+        app:layout_constraintVertical_bias="0.19999999" />
 
     <TextView
         android:id="@+id/tutorial_concept_text_2"
@@ -59,22 +60,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tutorial_concept_text"
-        tools:text="0.0.7"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/tutorial_concept_badge_version_label"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:gravity="center"
-        android:textSize="18sp"
-        android:text="@string/tutorial_concept_label_version"
-        app:layout_constraintBottom_toTopOf="@+id/tutorial_concept_badge_version"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
         tools:ignore="ContentDescription" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tutorial_finish.xml

@@ -7,7 +7,7 @@
     android:paddingRight="32sp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.tutorial.tabs.TutorialFragment5Finish">
+    tools:context=".ui.tutorial.tabs.TutorialFragmentFinish">
 
     <TextView
         android:id="@+id/tutorial_finish_title"
@@ -24,7 +24,6 @@
         android:id="@+id/tutorial_finish_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:text="@string/tutorial_finish_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@id/tutorial_finish_button_start"

app/src/main/res/layout/tutorial_setup.xml

@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:paddingLeft="32sp"
     android:paddingRight="32sp"
-    tools:context=".ui.tutorial.tabs.TutorialFragment4Setup">
+    tools:context=".ui.tutorial.tabs.TutorialFragmentSetup">
 
     <TextView
         android:id="@+id/tutorial_setup_title"
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tutorial_setup_title" />
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
         android:id="@+id/tutorial_setup_actions_rview_fragment"
         android:name="de.jrpie.android.launcher.ui.settings.actions.SettingsFragmentActionsRecycler"
         android:layout_width="0dp"

app/src/main/res/layout/tutorial_start.xml

@@ -8,7 +8,7 @@
     android:paddingRight="32sp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.tutorial.tabs.TutorialFragment0Start">
+    tools:context=".ui.tutorial.tabs.TutorialFragmentStart">
 
     <TextView
         android:id="@+id/tutorial_start_text"
@@ -21,4 +21,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tutorial_start_icon_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=">>>>>>"
+        android:textSize="64sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tutorial_start_text" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tutorial_usage.xml

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:paddingLeft="32sp"
     android:paddingRight="32sp"
-    tools:context=".ui.tutorial.tabs.TutorialFragment2Usage">
+    tools:context=".ui.tutorial.tabs.TutorialFragmentUsage">
 
     <TextView
         android:id="@+id/tutorial_usage_title"
@@ -39,12 +39,12 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerInside"
-        android:src="@drawable/tutorial_home_screen"
+        android:src="@drawable/home_round_screen"
         app:layout_constraintBottom_toTopOf="@id/tutorial_usage_text_2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/tutorial_usage_text"
         app:layout_constraintTop_toBottomOf="@id/tutorial_usage_text"
-        app:srcCompat="@drawable/tutorial_home_screen"
+        app:srcCompat="@drawable/home_round_screen"
         tools:ignore="ContentDescription" />
 
     <TextView

app/src/main/res/values-ar/strings.xml

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="alert_cant_open_title">لا يمكن فتح التطبيق</string>
-    <string name="alert_cant_open_message">هل تريد تعديل اعداداته؟</string>
-    <string name="toast_cant_open_message">افتح الاعدادات لاختيار أمر لهذه الإيماءة</string>
-    <string name="settings_title">الاعدادات</string>
-    <string name="settings_tab_actions">الأوامر</string>
-    <string name="settings_tab_launcher">المشغل</string>
-    <string name="settings_tab_meta">بيانات</string>
-    <string name="settings_gesture_back">رجوع</string>
-    <string name="settings_gesture_up">أعلى</string>
-    <string name="settings_gesture_double_up">لأعلى بأصبعين</string>
-    <string name="settings_gesture_description_double_up">اسحب لأعلى بأصبعين</string>
-    <string name="settings_gesture_description_tap_up">أنقر ثم اسحب لأعلى</string>
-    <string name="settings_gesture_description_back">اضغط على زر الرجوع</string>
-    <string name="settings_gesture_description_up">اسحب لأعلى</string>
-    <string name="settings_gesture_tap_up">نقرة + أعلى</string>
-    <string name="settings_gesture_down">أسفل</string>
-    <string name="settings_gesture_description_down">اسحب لأسفل</string>
-    <string name="settings_gesture_tap_down">نقرة + لأسفل</string>
-    <string name="settings_gesture_double_down">لأسفل بأصبعين</string>
-    <string name="settings_gesture_left">يسار</string>
-    <string name="settings_gesture_description_left">اسحب من اليسار</string>
-    <string name="settings_gesture_tap_left">نقرة + يسار</string>
-    <string name="settings_gesture_description_tap_left">أنقر ثم اسحب إلى اليسار</string>
-    <string name="settings_gesture_double_left">يسار بأصبعين</string>
-    <string name="settings_gesture_right">يمين</string>
-    <string name="settings_gesture_description_right">اسحب إلى اليمين</string>
-    <string name="settings_gesture_tap_right">نقرة + يمين</string>
-    <string name="settings_gesture_description_tap_right">أنقر ثم اسحب إلى اليمين</string>
-    <string name="settings_gesture_double_right">يمين بأصبعين</string>
-    <string name="settings_gesture_description_double_right">اسحب إلى اليمين بأصبعين</string>
-    <string name="settings_gesture_right_top_edge">يمين (في الأعلى)</string>
-    <string name="settings_gesture_right_bottom_edge">يمين (في الأسفل)</string>
-    <string name="settings_gesture_description_right_bottom_edge">اسحب إلى اليمين من أسفل الشاشة</string>
-    <string name="settings_gesture_left_top_edge">يسار (في الأعلى)</string>
-    <string name="settings_gesture_description_left_top_edge">اسحب إلى اليسار من أعلى الشاشة</string>
-    <string name="settings_gesture_up_left_edge">أعلى (الحافة اليسرى)</string>
-    <string name="settings_gesture_description_up_left_edge">اسحب إلى الأعلى من حافة الشاشة اليسرى</string>
-    <string name="settings_gesture_up_right_edge">أعلى (الحافة اليمنى)</string>
-    <string name="settings_gesture_down_left_edge">أسفل (الحافة اليسرى)</string>
-    <string name="settings_gesture_description_down_left_edge">اسحب إلى الأسفل من حافة الشاشة اليسرى</string>
-    <string name="settings_gesture_down_right_edge">أسفل (الحافة اليمنى)</string>
-    <string name="settings_gesture_description_swipe_larger">أعلى اليسار -&gt; وسط اليمين -&gt; أسفل اليسار</string>
-    <string name="settings_gesture_description_swipe_larger_reverse">أسفل اليسار -&gt; وسط اليمين -&gt; أعلى اليسار</string>
-    <string name="settings_gesture_description_swipe_smaller">أعلى اليمين -&gt; وسط اليسار -&gt; أسفل اليمين</string>
-    <string name="settings_gesture_description_swipe_v">أعلى اليسار -&gt; الأسفل الوسط -&gt; أعلى اليمين</string>
-    <string name="settings_gesture_swipe_v_reverse">V (معكوس)</string>
-    <string name="settings_gesture_description_swipe_v_reverse">أعلى اليمين -&gt; الأسفل الوسط -&gt; أعلى اليسار</string>
-    <string name="settings_gesture_description_swipe_lambda">أسفل اليسار -&gt; أعلى الوسط -&gt; أسفل اليمين</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ (معكوس)</string>
-    <string name="settings_gesture_vol_up">زر رفع الصوت</string>
-    <string name="settings_gesture_description_vol_up">اضغط على زر رفع الصوت</string>
-    <string name="settings_gesture_vol_down">زر خفض الصوت</string>
-    <string name="settings_gesture_description_vol_down">اضغط على زر خفض الصوت</string>
-    <string name="settings_gesture_double_click">نقرة مزدوجة</string>
-    <string name="settings_gesture_long_click">نقرة مطولة</string>
-    <string name="settings_gesture_description_long_click">أنقر مطولًا في مكان فارغ على الشاشة</string>
-    <string name="settings_gesture_date">التاريخ</string>
-    <string name="settings_gesture_description_date">أنقر على التاريخ</string>
-    <string name="settings_gesture_time">الوقت</string>
-    <string name="settings_gesture_description_time">أنقر على الوقت</string>
-    <string name="settings_apps_choose">اختر تطبيق</string>
-    <string name="settings_apps_install">ثبت تطبيقات</string>
-    <string name="settings_launcher_section_appearance">المظهر</string>
-    <string name="settings_theme_color_theme">السمة</string>
-    <string name="settings_gesture_swipe_larger"><![CDATA[>]]></string>
-    <string name="settings_gesture_swipe_larger_reverse"><![CDATA[> (معكوس)]]></string>
-    <string name="settings_gesture_swipe_smaller"><![CDATA[<]]></string>
-    <string name="settings_gesture_swipe_smaller_reverse"><![CDATA[< (Reverse)]]></string>
-    <string name="settings_gesture_swipe_v">V</string>
-    <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_theme_color_theme_item_dark">داكن</string>
-    <string name="settings_theme_color_theme_item_light">فاتح</string>
-    <string name="settings_theme_color_theme_item_dynamic">متغير</string>
-    <string name="settings_theme_text_shadow">ظل النص</string>
-    <string name="settings_theme_background_item_transparent">شفاف</string>
-    <string name="settings_theme_background_item_dim">مظلل</string>
-    <string name="settings_theme_background_item_blur">مُموه</string>
-    <string name="settings_theme_background_item_solid">لون ثابت</string>
-    <string name="settings_theme_font">الخط</string>
-    <string name="settings_theme_font_item_system_default">خط النظام</string>
-    <string name="settings_theme_font_item_sans_serif">بدون تذييل</string>
-    <string name="settings_theme_font_item_serif">مذيل</string>
-    <string name="settings_theme_font_item_monospace">أحادي المسافة</string>
-    <string name="settings_theme_monochrome_icons">أيقونات تطبيقات أحادية اللون</string>
-    <string name="settings_clock_color">اللون</string>
-    <string name="settings_clock_time_visible">أظهر الوقت</string>
-    <string name="settings_clock_date_visible">أظهر التاريخ</string>
-    <string name="settings_clock_localized">استخدم تنسيق التاريخ المحلي</string>
-    <string name="settings_clock_flip_date_time">إقلب مكان التاريخ مع الوقت</string>
-    <string name="settings_theme_wallpaper">اختر خلفية</string>
-    <string name="settings_launcher_section_display">العرض</string>
-    <string name="settings_display_screen_timeout_disabled">حافظ على بقاء الشاشة قيد التشغيل</string>
-    <string name="settings_display_hide_status_bar">إخفِ شريط الحالة</string>
-    <string name="settings_display_rotate_screen">تدوير الشاشة</string>
-    <string name="settings_launcher_section_functionality">الوظائف</string>
-    <string name="settings_enabled_gestures_double_swipe">أوامر السحب بأصبعين</string>
-    <string name="settings_enabled_gestures_double_swipe_summary">اسحب باستخدام أصبعين</string>
-    <string name="settings_enabled_gestures_edge_swipe">أوامر السحب من الحواف</string>
-    <string name="settings_enabled_gestures_edge_swipe_edge_width">عرض الحواف</string>
-    <string name="settings_functionality_auto_launch">إظهار نتائج البحث</string>
-    <string name="settings_functionality_auto_launch_summary">اضغط مسافة لتعطيل هذه الميزة مؤقتًا</string>
-    <string name="settings_functionality_search_web">ابحث في الويب</string>
-    <string name="settings_functionality_auto_keyboard">أظهر لوحة المفاتيح عند البحث</string>
-    <string name="settings_launcher_sensitivity">الحساسية</string>
-    <string name="settings_launcher_section_apps">التطبيقات</string>
-    <string name="settings_apps_hidden">التطبيقات المخفية</string>
-    <string name="settings_launcher_section_date_time"><![CDATA[Date & time]]></string>
-    <string name="settings_apps_hide_private_space_apps">إخفِ المساحة الخاصة من قائمة التطبيقات</string>
-    <string name="settings_list_layout">تخطيط قائمة التطبيقات</string>
-    <string name="settings_list_layout_item_default">الافتراضي</string>
-    <string name="settings_list_layout_item_text">نص</string>
-    <string name="settings_list_layout_item_grid">شبكة</string>
-    <string name="settings_general_choose_home_screen">تعيين μauncher كشاشة المنزل</string>
-    <string name="settings_meta_cant_select_launcher">معلومات التطبيق</string>
-    <string name="settings_meta_reset">إعادة تعيين الإعدادات</string>
-    <string name="settings_meta_reset_confirm">أنت على وشك تجاهل كل تفضيلاتك، هل تريد الإكمال؟</string>
-    <string name="settings_meta_view_code">عرض شيفرة المصدر</string>
-    <string name="settings_meta_report_bug">الإبلاغ عن خطأ</string>
-    <string name="dialog_report_bug_button_clipboard">النسخ إلى الحافظة</string>
-    <string name="dialog_report_bug_security_info">يرجى عدم الإبلاغ عن الثغرات الأمنية علنًا على Github ، استخدم ما يلي بدلاً من ذلك:</string>
-    <string name="dialog_report_bug_button_security">الإبلاغ عن ثغرة أمنية</string>
-    <string name="dialog_report_bug_create_report">إنشاء تقرير</string>
-    <string name="settings_meta_fork_contact">اتصل بمطور النسخة</string>
-    <string name="settings_meta_join_chat">انضم إلى دردشة μauncher</string>
-    <string name="settings_meta_donate">تبرع</string>
-    <string name="settings_meta_privacy">سياسة الخصوصية</string>
-    <string name="list_title_view">كل التطبيقات</string>
-    <string name="list_title_favorite">التطبيقات المفضلة</string>
-    <string name="list_title_hidden">التطبيقات المخفية</string>
-    <string name="list_title_private_space">المساحة الخاصة</string>
-    <string name="list_title_pick">اختر تطبيق</string>
-    <string name="list_tab_app">التطبيقات</string>
-    <string name="list_tab_other">أخرى</string>
-    <string name="list_app_delete">إلغاء التثبيت</string>
-    <string name="list_app_favorite_remove">إزالة من المفضلة</string>
-    <string name="list_app_hidden_add">إخفِ</string>
-    <string name="list_app_hidden_remove">أظهر</string>
-    <string name="list_app_rename">إعادة التسمية</string>
-    <string name="list_apps_search_hint">بحث</string>
-    <string name="list_apps_search_hint_no_auto_launch">بحث (بدون تشغيل تلقائي)</string>
-    <string name="list_other_settings">اعدادات التطبيق</string>
-    <string name="list_other_list">درج التطبيقات</string>
-    <string name="list_other_list_private_space">المساحة الخاصة</string>
-    <string name="list_other_toggle_private_space_lock">تبديل قفل المساحة الخاصة</string>
-    <string name="list_other_volume_up">ارفع الصوت</string>
-    <string name="settings_meta_discord">إنضم إلى مجموعة discord!</string>
-    <string name="list_other_volume_adjust">ضبط مستوى الصوت</string>
-    <string name="list_other_track_previous">الموسيقى: السابق</string>
-    <string name="list_other_track_play_pause">الموسيقى: تشغيل / ايقاف مؤقت</string>
-    <string name="list_other_recent_apps">التطبيقات الحديثة</string>
-    <string name="list_other_nop">لا تفعل شيئًا</string>
-    <string name="list_other_lock_screen">قفل الشاشة</string>
-    <string name="list_other_torch">تبديل الفلاش</string>
-    <string name="list_other_launch_other_launcher">شغل شاشة منزل أخرى</string>
-    <string name="pin_shortcut_title">أضف اختصارًا</string>
-    <string name="pin_shortcut_button_bind">اربط بإيماءة</string>
-    <string name="tutorial_title">درس تعليمي</string>
-    <string name="tutorial_start_text">👋\n\nخذ بضع ثوان لمعرفة كيفية استخدام هذا المشغل!</string>
-    <string name="tutorial_concept_title">المفهوم</string>
-    <string name="tutorial_concept_text_2">إنه برنامج مجاني (ترخيص MIT)!\nتأكد من مراجعة المستودع!</string>
-    <string name="tutorial_concept_label_version">النسخة</string>
-    <string name="tutorial_usage_title">الاستخدام</string>
-    <string name="tutorial_usage_text">تحتوي شاشتك الرئيسية على التاريخ والوقت المحليين. لا الهاء.</string>
-    <string name="tutorial_app_list_title">كل التطبيقات</string>
-    <string name="tutorial_app_list_text_2">بمجرد تطابق تطبيق واحد فقط، يتم تشغيله تلقائيًا.\nيمكن تعطيل ذلك عن طريق اضافة مساحة في بداية استعلام.</string>
-    <string name="tutorial_setup_title">الإعداد</string>
-    <string name="tutorial_setup_text">اخترنا بعض التطبيقات الافتراضية لك. يمكنك تغييرها الآن إذا كنت تريد:</string>
-    <string name="tutorial_setup_text_2">يمكنك أيضًا تغيير اختيارك لاحقًا.</string>
-    <string name="tutorial_finish_title">لنبدأ!</string>
-    <string name="tutorial_finish_button">ابدأ</string>
-    <string name="settings">الإعدادات</string>
-    <string name="ic_menu_alt">المزيد من الخيارات</string>
-    <string name="alert_requires_android_m">هذه الوظيفة تتطلب أندرويد 6 أو أحدث.</string>
-    <string name="alert_requires_android_v">هذه الوظيفة تتطلب أندرويد 15 أو أحدث.</string>
-    <string name="undo">تراجع</string>
-    <string name="snackbar_app_hidden">تم إخفاء التطبيق. يمكنك جعله مرئيًا مرة أخرى في الإعدادات.</string>
-    <string name="list_other_expand_settings_panel">الاعدادات السريعة</string>
-    <string name="toast_device_admin_not_enabled">يجب أن يكون μlauncher مسؤولًا من أجل قفل الشاشة.</string>
-    <string name="device_admin_explanation">هذا مطلوب لإجراء شاشة القفل.</string>
-    <string name="device_admin_description">تمكين إجراء شاشة القفل</string>
-    <string name="alert_no_torch_found">لم يتم اكتشاف كاميرا مع فلاش.</string>
-    <string name="alert_torch_access_exception">خطأ: لا يمكن الوصول إلى الفلاش.</string>
-    <string name="alert_recent_apps_failed">خطأ: فشل في إظهار التطبيقات الحديثة. (إذا قمت للتو بترقية التطبيق ، فحاول تعطيل خدمة الوصول وإعادة تمكينها في إعدادات الهاتف)</string>
-    <string name="alert_enable_accessibility_failed">خطأ: فشل في تمكين خدمة الوصول.</string>
-    <string name="toast_accessibility_service_not_enabled">لم يتم تمكين خدمة الوصول إلى μlauncher. يرجى تمكينه في الإعدادات</string>
-    <string name="toast_private_space_locked">المساحة الخاصة مقفلة</string>
-    <string name="toast_private_space_unlocked">المساحة الخاصة مفتوحة</string>
-    <string name="toast_private_space_not_available">المساحة الخاصة غير متوافرة</string>
-    <string name="tooltip_lock_private_space">قفل المساحة الخاصة</string>
-    <string name="tooltip_unlock_private_space">فتح المساحة الخاصة</string>
-    <string name="accessibility_service_name">μLauncher</string>
-    <string name="screen_lock_method_dialog_title">اختر طريقة القفل</string>
-    <string name="screen_lock_method_use_accessibility">استخدام خدمة إمكانية الوصول</string>
-    <string name="screen_lock_method_use_device_admin">استخدم مسؤول الجهاز</string>
-    <string name="settings_actions_lock_method">اختر طريقة لقفل الشاشة</string>
-    <string name="dialog_rename_title">اعادة تسمية %1$s</string>
-    <string name="dialog_select_color_red">أحمر</string>
-    <string name="dialog_select_color_alpha">شفافية</string>
-    <string name="dialog_select_color_blue">أزرق</string>
-    <string name="dialog_select_color_green">أخضر</string>
-    <string name="dialog_select_color_color_hex">اللون</string>
-    <string name="dialog_choose_color_title">اختر لونًا</string>
-    <string name="dialog_consent_accessibility_privileges">أدرك أن هذا سيمنح أذونات كثيرة لـμauncher.</string>
-    <string name="dialog_consent_accessibility_other_options">أدرك وجود خيارات أخرى (باستخدام أذونات مسؤول الجهاز أو زر الطاقة).</string>
-    <string name="dialog_consent_accessibility_consent">أوافق لـμlauncher باستخدام خدمة إمكانية الوصول لتوفير الوظائف ليس لها صلة بإمكانية الوصول.</string>
-    <string name="dialog_consent_accessibility_data_collection">أوافق على أن μlauncher لا يجمع أي بيانات.</string>
-    <string name="dialog_consent_accessibility_title">يتم تفعيل خدمة إمكانية الوصول</string>
-    <string name="dialog_consent_accessibility_ok">تفعيل خدمة إمكانية الوصول</string>
-    <string name="dialog_cancel">إلغاء</string>
-    <string name="settings_meta_licenses">تراخيص المصادر المفتوحة</string>
-    <string name="legal_info_title">تراخيص المصادر المفتوحة</string>
-    <string name="toast_activity_not_found_search_web">لم يتم العثور على تطبيق للتعامل مع البحث.</string>
-    <string name="toast_activity_not_found_browser">لا يمكن فتح عنوان URL: لم يتم العثور على متصفح.</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[أنت على وشك تنشيط خدمة إمكانية الوصول. سيمنح هذا <strong> أذونات كثيرة </strong> إلى التطبيق:
-    <ul>
-        <li>قفل الشاشة</li>
-        <li>التطبيقات الحديثة</li>
-    </ul>
-      <strong> لن يقومμlauncher أبدًا بجمع أي بيانات </strong>. على وجه الخصوص ، لا يستخدم μlauncher خدمة إمكانية الوصول لجمع أي بيانات.]]></string>
-    <string name="settings_gesture_description_tap_down">أنقر ثم اسحب لأسفل</string>
-    <string name="settings_theme_color_theme_item_default">الافتراضي</string>
-    <string name="pin_shortcut_switch_visible">أظهر في قائمة التطبيقات</string>
-    <string name="settings_gesture_description_double_down">اسحب لأسفل بأصبعين</string>
-    <string name="settings_clock_show_seconds">أظهر الثواني</string>
-    <string name="dialog_report_bug_title">الإبلاغ عن خطأ</string>
-    <string name="settings_gesture_description_double_left">اسحب إلى اليسار بأصبعين</string>
-    <string name="settings_gesture_description_double_click">أنقر مرتين في مكان فارغ على الشاشة</string>
-    <string name="settings_functionality_search_web_summary">اضغط على زر الرجوع أثناء البحث في قائمة التطبيقات لإظهار البحث على الويب</string>
-    <string name="settings_gesture_description_right_top_edge">اسحب إلى اليمين من أعلى الشاشة</string>
-    <string name="settings_gesture_left_bottom_edge">يسار (في الأسفل)</string>
-    <string name="settings_gesture_description_up_right_edge">اسحب إلى الأعلى من حافة الشاشة اليمنى</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">أسفل اليمين -&gt; أعلى الوسط -&gt; أسفل اليسار</string>
-    <string name="settings_apps_hide_bound_apps">لا تظهر التطبيقات المرتبطة بإيماءة في قائمة التطبيقات</string>
-    <string name="list_other_list_favorites">درج التطبيقات المفضلة</string>
-    <string name="list_other_track_next">الموسيقى: التالي</string>
-    <string name="tutorial_concept_text">تم تصميم μlauncher ليكون فعال، وخالي من الهاء.\n\nلا يحتوي على أي إعلانات ولا يجمع أي بيانات.</string>
-    <string name="tutorial_finish_text">أنت مستعد للبدء!\n\nآمل أن يكون هذا ذا قيمة كبيرة بالنسبة لك!\n\n- المطورين</string>
-    <string name="toast_private_space_default_home_screen">يجب أن يكون μlauncher الشاشة الرئيسية الافتراضية للوصول إلى مساحة خاصة.</string>
-    <string name="settings_gesture_description_left_bottom_edge">اسحب إلى اليسار من أسفل الشاشة</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">أسفل اليمين -&gt; وسط اليسار -&gt; أعلى اليمين</string>
-    <string name="settings_apps_toast_store_not_found">لم يتم العثور على تطبيق المتجر</string>
-    <string name="settings_display_hide_navigation_bar">إخفِ شريط التنقل</string>
-    <string name="list_app_info">معلومات التطبيق</string>
-    <string name="list_app_favorite_add">أضف إلى المفضلة</string>
-    <string name="list_other_expand_notifications_panel">توسيع لوحة الاشعارات</string>
-    <string name="tutorial_app_list_text">يمكنك البحث بسرعة من خلال جميع التطبيقات في قائمة التطبيقات.\n\nاسحب لأعلى لفتح القائمة، أو ربطها بإيماءة ما.</string>
-    <string name="alert_lock_screen_failed">خطأ: فشل في قفل الشاشة. (إذا قمت للتو بترقية التطبيق ، فحاول تعطيل خدمة الوصول وإعادة تمكينها في إعدادات الهاتف)</string>
-    <string name="settings_gesture_description_down_right_edge">اسحب إلى الأسفل من حافة الشاشة اليمنى</string>
-    <string name="settings_theme_font_item_serif_monospace">أحادي المسافة مذيل</string>
-    <string name="settings_list_reverse_layout">عكس قائمة التطبيقات</string>
-    <string name="alert_cant_expand_status_bar_panel">خطأ: لا يمكن توسيع شريط الحالة. يستخدم هذا الإجراء وظيفة ليست جزءًا من نظام أندرويد. لسوء الحظ ، لا يبدو أنه يعمل على جهازك.</string>
-    <string name="settings_theme_background">خلفية القوائم</string>
-    <string name="settings_apps_hide_paused_apps">إخفِ التطبيقات المتوقفة</string>
-    <string name="settings_meta_show_tutorial">أظهر العرض التعليمي للتطبيق</string>
-    <string name="dialog_report_bug_info">شكرا لك على المساعدة في تحسين μLauncher!\nيرجى إضافة المعلومات التالية إلى تقرير الأخطاء الخاص بك:</string>
-    <string name="settings_meta_contact">اتصل بالمطور الأصلي</string>
-    <string name="list_other_volume_down">اخفض الصوت</string>
-    <string name="tutorial_usage_text_2">يمكنك تشغيل أهم تطبيقاتك بوسطة إيماءات اللمس أو الضغط على الأزرار.</string>
-    <string name="settings_enabled_gestures_edge_swipe_summary">اسحب من حواف الشاشة</string>
-    <string name="toast_lock_screen_not_supported">خطأ: قفل الشاشة باستخدام إمكانية الوصول غير مدعوم على هذا الجهاز. الرجاء استخدام طريقة مسؤول الجهاز بدلاً من ذلك.</string>
-    <string name="accessibility_service_description">يتيح تعيين μlauncher كخدمة إمكانية الوصول قفل الشاشة وفتح قائمة التطبيقات الحديثة. يرجى ملاحظة أنه يتطلب كمية كبيرة من الأذونات. يجب ألا تمنح مثل هذه الأذونات باستخفاف لأي تطبيق. سوف يستخدم μlauncher خدمة إمكانية الوصول فقط لأداء الإجراءات التالية عند طلب المستخدم: * قفل شاشة * فتح التطبيقات الحديثة μlauncher لن يستخدم أبدًا خدمة إمكانية الوصول لجمع البيانات. يمكنك التحقق من شيفرة المصدر للتأكد. يرجى ملاحظة أنه يمكنك قفل الشاشة من خلال منح أذونات مسؤول الجهاز، لكنها لا تعمل مع بصمات الأصابع وفتح الوجه.</string>
-</resources>

app/src/main/res/values-de/strings.xml

@@ -6,15 +6,15 @@
       -
       -->
     <string name="alert_cant_open_title">App kann nicht geöffnet werden</string>
-    <string name="alert_cant_open_message">App-Einstellungen anpassen?</string>
-    <string name="toast_cant_open_message">Einstellungen öffnen um für diese Geste eine Aktion zu wählen</string>
+    <string name="alert_cant_open_message">Möchtest du die App-Einstellungen anpassen?</string>
+    <string name="toast_cant_open_message">Öffne die Einstellungen um für diese Geste eine Aktion zu wählen</string>
     <!--
       -
       - Settings
       -
       -->
     <string name="settings_title">Einstellungen</string>
-    <string name="settings_tab_actions">Aktionen</string>
+    <string name="settings_tab_app">Apps</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--
@@ -54,9 +54,9 @@
     <string name="settings_gesture_description_down_left_edge">An der linken Kante nach unten wischen</string>
     <string name="settings_gesture_down_right_edge">Abwärts (rechts)</string>
     <string name="settings_gesture_description_down_right_edge">An der rechten Kanten nach unten wischen</string>
-    <string name="settings_gesture_vol_up">Lauter-Taste</string>
+    <string name="settings_gesture_vol_up">Lautstärke +</string>
     <string name="settings_gesture_description_vol_up">Die Taste \"Lauter\" drücken</string>
-    <string name="settings_gesture_vol_down">Leiser-Taste</string>
+    <string name="settings_gesture_vol_down">Lautstärke -</string>
     <string name="settings_gesture_description_vol_down">Die Taste \"Leiser\" drücken</string>
     <string name="settings_gesture_double_click">Doppelklick</string>
     <string name="settings_gesture_description_double_click">In einem leeren Bereich doppelt klicken</string>
@@ -67,6 +67,7 @@
     <string name="settings_gesture_time">Uhr</string>
     <string name="settings_gesture_description_time">Auf die Uhrzeit klicken</string>
     <string name="settings_apps_choose">App wählen</string>
+    <string name="settings_apps_view_all">Alle Anwendungen</string>
     <string name="settings_apps_install">Apps installieren</string>
     <string name="settings_apps_toast_store_not_found">Store nicht gefunden</string>
     <!--
@@ -93,8 +94,10 @@
     <string name="settings_theme_color_theme_item_dark">Dunkel</string>
     <string name="settings_theme_color_theme_item_light">Hell</string>
     <string name="settings_theme_wallpaper">Hintergrund auswählen</string>
+    <string name="settings_launcher_change_wallpaper">Hintergrund ändern</string>
     <string name="settings_launcher_section_display">Bildschirm</string>
     <string name="settings_display_screen_timeout_disabled">Bildschirm nicht ausschalten</string>
+    <string name="settings_display_full_screen">Vollbild</string>
     <string name="settings_display_rotate_screen">Bildschirm drehen</string>
     <string name="settings_launcher_section_functionality">Funktionalität</string>
     <string name="settings_enabled_gestures_double_swipe">Doppelte Wischaktionen</string>
@@ -102,7 +105,7 @@
     <string name="settings_enabled_gestures_edge_swipe">Kantenaktionen</string>
     <string name="settings_enabled_gestures_edge_swipe_edge_width">Kantenbreite</string>
     <string name="settings_functionality_auto_launch">Suchergebnis starten</string>
-    <string name="settings_functionality_search_web_summary">Beim Durchsuchen der Apps Enter drücken, um stattdessen im Internet zu suchen.</string>
+    <string name="settings_functionality_search_web_summary">Beim Durchsuchen der Apps Enter drücken um stattdessen im Internet zu suchen</string>
     <string name="settings_functionality_auto_keyboard">Tastatur automatisch öffnen</string>
     <string name="settings_launcher_sensitivity">Empfindlichkeit</string>
     <!--
@@ -115,6 +118,7 @@
     <string name="settings_list_layout_item_grid">Raster</string>
     <string name="settings_general_choose_home_screen">Launcher wählen</string>
     <string name="settings_meta_cant_select_launcher">App Info</string>
+    <string name="settings_meta_cant_select_launcher_msg">Dein Gerät unterstützt diese Funktion nicht. Stattdessen die App Details bearbeiten?</string>
     <string name="settings_meta_show_tutorial">Zum Tutorial</string>
     <string name="settings_meta_reset">Einstellungen zurücksetzen</string>
     <string name="settings_meta_reset_confirm">Alle Einstellungen gehen verloren. Weitermachen?</string>
@@ -124,8 +128,7 @@
     <string name="settings_meta_contact">Entwickler kontaktieren</string>
     <string name="dialog_report_bug_create_report">Report erstellen</string>
     <string name="settings_meta_fork_contact">Entwickler des Fork kontaktieren</string>
-    <string name="settings_meta_join_chat">Dem μLauncher-Chat beitreten</string>
-    <string name="settings_meta_donate">Spenden</string>
+    <string name="settings_meta_join_chat">Dem µLauncher-Chat beitreten</string>
     <string name="settings_meta_privacy">Datenschutzerklärung</string>
     <!--
       -
@@ -141,15 +144,16 @@
     <string name="list_app_info">App Info</string>
     <string name="list_app_hidden_remove">Sichtbar machen</string>
     <string name="list_app_rename">Umbenennen</string>
-    <string name="list_apps_search_hint">Suchen</string>
+    <string name="list_removed">Die App wurde entfernt</string>
+    <string name="list_not_removed">Die App konnte nicht entfernt werden</string>
+    <string name="list_apps_search_hint">Anwendungen suchen</string>
     <string name="list_apps_search_hint_no_auto_launch">Suchen (kein Schnellstart)</string>
-    <string name="list_other_settings">μLauncher Einstellungen</string>
+    <string name="list_other_settings">µLauncher Einstellungen</string>
     <string name="list_other_list">Alle Anwendungen</string>
     <string name="list_other_list_favorites">Favoriten</string>
     <string name="list_other_toggle_private_space_lock">Privaten Bereich (ent)sperren</string>
-    <string name="list_other_volume_up">Lauter</string>
-    <string name="list_other_volume_down">Leiser</string>
-    <string name="list_other_volume_adjust">Lautstärke ändern</string>
+    <string name="list_other_volume_up">Musik: Lauter</string>
+    <string name="list_other_volume_down">Musik: Leiser</string>
     <string name="list_other_track_next">Musik: Weiter</string>
     <string name="list_other_track_previous">Musik: Zurück</string>
     <string name="list_other_nop">Nichts tun</string>
@@ -160,23 +164,23 @@
       -->
     <string name="list_other_torch">Taschenlampe umschalten</string>
     <string name="tutorial_title">Tutorial</string>
-    <string name="tutorial_start_text">👋\n\nHier eine kurze Erklärung, wie dieser Launcher funktioniert.</string>
+    <string name="tutorial_start_text">Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!</string>
     <string name="tutorial_concept_title">Konzept</string>
-    <string name="tutorial_concept_text">µLauncher bietet eine minimalistische, effiziente und ablenkungsfreie Umgebung.\n\nDie App ist freie Software, enthält keine Werbung und sammelt keinerlei Daten.</string>
-    <string name="tutorial_concept_text_2">Der Quellcode ist bei GitHub zu finden.</string>
+    <string name="tutorial_concept_text">µLauncher bietet eine minimalistische, effiziente und ablenkungsfreie digitale Umgebung.\n\nDie App kostet dich nichts, enthält keine Werbung und sammelt keinerlei Daten.</string>
+    <string name="tutorial_concept_text_2">Launcher ist open-source (MIT license) und auf GitHub!\n\nSchau gerne mal dort vorbei!</string>
     <string name="tutorial_usage_title">Benutzung</string>
-    <string name="tutorial_usage_text">Der Homescreen zeigt nur das Datum und die Uhrzeit. Keine Ablenkung.</string>
-    <string name="tutorial_usage_text_2">Häufig verwendete Apps können mittels Gesten, z.B. Wischen oder den Lautstärketasten geöffnet werden.</string>
+    <string name="tutorial_usage_text">Auf deinem Homescreen siehst du nur das Datum und die Uhrzeit. Keine Ablenkung.</string>
+    <string name="tutorial_usage_text_2">Du öffnest Apps indem du über den Bildschirm wischt oder die Lautstärketasten drückst. Gleich wählst du deine Apps.</string>
     <string name="tutorial_setup_title">Einrichtung</string>
-    <string name="tutorial_setup_text">Es wurden Standardapps ausgewählt, die Zuordnung kann hier angepasst werden:</string>
-    <string name="tutorial_setup_text_2">Die Auswahl kann in den Einstellungen später jederzeit geändert werden.</string>
+    <string name="tutorial_setup_text">Wir haben dir ein paar Standardapps ausgewählt, du kannst sie hier gerne ändern:</string>
+    <string name="tutorial_setup_text_2">Du kannst deine Auswahl in den Einstellungen später jederzeit ändern.</string>
     <string name="tutorial_finish_title">Los gehts!</string>
-    <string name="tutorial_finish_text">Es kann losgehen!\n\nWir hoffen, dass diese App hilfreich ist!\n\n- Finn (der Entwickler)\nund Josia (der einige Änderungen vorgenommen hat und den Fork μLauncher entwickelt)</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>
     <string name="ic_menu_alt">Mehr Optionen</string>
     <string name="list_other_expand_notifications_panel">Benachrichtigungen</string>
-    <string name="alert_cant_expand_status_bar_panel">Fehler: Die Funktion wird von diesem Gerät leider nicht unterstützt.</string>
+    <string name="alert_cant_expand_status_bar_panel">Fehler: Diese Funktion wird von deinem Gerät leider nicht unterstützt.</string>
     <string name="settings_clock_show_seconds">Sekunden anzeigen</string>
     <string name="undo">Rückgängig</string>
     <string name="list_other_expand_settings_panel">Schnelleinstellungen</string>
@@ -191,24 +195,33 @@
     <string name="alert_requires_android_v">Diese Funktionalität benötigt Android 15 oder neuer.</string>
     <string name="snackbar_app_hidden">Die App wurde versteckt. Sie kann in den Einstellungen wieder sichtbar gemacht werden.</string>
     <string name="toast_device_admin_not_enabled">µLauncher muss Geräteadministrator sein, um den Bildschirm sperren zu dürfen.</string>
-    <string name="device_admin_explanation">Dies ist erforderlich, damit µLauncher den Bildschirm sperren kann.</string>
+    <string name="device_admin_explanation">Dies ist erforderlich, damit µLauncher den Bildschirm spreen kann.</string>
     <string name="device_admin_description">Die Aktion \"Bildschirm sperren\" aktivieren</string>
     <string name="alert_no_torch_found">Es wurde keine geeignete Kamera gefunden.</string>
     <string name="alert_torch_access_exception">Fehler: Kein Zugriff auf die Kamera möglich.</string>
     <string name="settings_actions_lock_method">Methode zum Sperren des Bildschirms wählen</string>
+    <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">%1$s umbenennen</string>
-    <string name="toast_private_space_default_home_screen">μLauncher muss als Standardlauncher eingerichtet sein um auf den privaten Bereich zugreifen zu können.</string>
+    <string name="toast_private_space_default_home_screen">µLauncher muss als Standardlauncher eingerichtet sein um auf den privaten Bereich zugreifen zu können.</string>
     <string name="toast_lock_screen_not_supported">Fehler: Auf diesem Gerät kann der Bildschirm nicht mittels Bedienungshilfe gesperrt werden. Bitte stattdessen Geräteadministrator verwenden.</string>
-    <string name="accessibility_service_name">μLauncher - Bildschirm sperren</string>
+    <string name="accessibility_service_name">µLauncher - Bildschirm sperren</string>
     <string name="alert_lock_screen_failed">Fehler: Bildschirm konnte nicht gesperrt werden.</string>
     <string name="toast_accessibility_service_not_enabled">Die Bedienungshilfe ist nicht aktiviert. Bitte in den Einstellungen aktivieren</string>
     <string name="screen_lock_method_dialog_title">Methode zum Sperren wählen</string>
     <string name="screen_lock_method_use_accessibility">Bedienungshilfe verwenden</string>
     <string name="screen_lock_method_use_device_admin">Geräteadministrator verwenden</string>
-    <string name="accessibility_service_description">μLauncher als Bedienungshilfe zu aktivieren ermöglicht es μLauncher, den Bildschirm zu sperren. Achtung: Hierfür sind weitgehende Berechtigungen erforderlich. Solche Berechtigungen sollten niemals leichtfertig vergeben werden. μLauncher wird diese Berechtigungen ausschließlich zum Sperren des Bildschirms verwenden. Alternativ kann der Bildschirm auch mithilfe von Geräteadministratorberechtigungen gesperrt werden. Dann ist jedoch ein Entsperren mit Fingerabdruck oder Gesichtserkennung nicht möglich.</string>
+    <string name="accessibility_service_description">
+        µLauncher als Bedienungshilfe zu aktivieren ermöglicht es µLauncher, den Bildschirm zu sperren.
+        Achtung: Hierfür sind weitgehende Berechtigungen erforderlich.
+        Solche Berechtigungen sollten niemals leichtfertig vergeben werden.
+        µLauncher wird diese Berechtigungen ausschließlich zum Sperren des Bildschirms verwenden.
+
+        Alternativ kann der Bildschirm auch mithilfe von Geräteadministratorberechtigungen gesperrt werden.
+        Dann ist jedoch ein Entsperren mit Fingerabdruck oder Gesichtserkennung nicht möglich.
+    </string>
     <string name="screen_lock_method_dialog_text"><![CDATA[
         <h1>Methode zum Sperren auswählen</h1>
-        Es gibt zwei Möglichkeiten, wie μLauncher den Bildschirm sperren kann.
+        Es gibt zwei Möglichkeiten, wie µLauncher den Bildschirm sperren kann.
         Leider haben beide Nachteile:<br/><br/>
 
 
@@ -221,8 +234,8 @@
         Dies erfordert sehr weitgehende Berechtigungen.
         µLauncher wird diese ausschließlich zum Sperren des Bildschirms verwenden.
         <br/>
-        (Irgendeiner gerade heruntergeladenen App sollte man eine solche Behauptung natürlich nicht einfach glauben.
-        Der <a href=\"https://github.com/jrpie/Launcher\">Quelltext</a> dieser App ist jedoch frei verfügbar und kann überprüft werden.)
+        (Irgeneiner gerade heruntergeladenen App sollte man eine solche Behauptung natürlich nicht einfach glauben.
+        Du kannst jedoch den <a href=\"https://github.com/jrpie/Launcher\">Source Code</a> selbst prüfen.)
 
 
         <br/><br/><br/><br/>
@@ -252,61 +265,16 @@
     <string name="dialog_select_color_alpha">Transparenz</string>
     <string name="dialog_select_color_blue">Blau</string>
     <string name="dialog_select_color_green">Grün</string>
+    <string name="dialog_select_color_ok">Ok</string>
     <string name="dialog_select_color_color_hex">Farbe</string>
     <string name="dialog_choose_color_title">Farbe wählen</string>
     <string name="settings_meta_licenses">Open Source Lizenzen</string>
     <string name="legal_info_title">Open Source Lizenzen</string>
     <string name="toast_activity_not_found_search_web">Keine App gefunden um die Suche durchzuführen.</string>
     <string name="toast_activity_not_found_browser">URL kann nicht geöffnet werden: kein Browser gefunden.</string>
-    <string name="dialog_consent_accessibility_privileges">Mir ist bewusst, dass μLauncher hierdurch weitreichende Berechtigungen erhält.</string>
+    <string name="dialog_consent_accessibility_privileges">Mir ist bewusst, dass µLauncher hierdurch weitreichende Berechtigungen erhält.</string>
     <string name="dialog_consent_accessibility_other_options">Mir ist bewusst, dass Alternativen existieren (Geräteadministrator oder der Power-Button).</string>
-    <string name="dialog_consent_accessibility_consent">Ich willige ein, dass μLauncher eine Bedienungshilfe für Zwecke verwendet, die nicht unter Barrierefreiheit fallen.</string>
+    <string name="dialog_consent_accessibility_consent">Ich willige ein, dass µLauncher eine Bedienungshilfe für Zwecke verwendet, die nicht unter Barrierefreiheit fallen.</string>
     <string name="dialog_consent_accessibility_data_collection">Ich willige ein, dass µLauncher keine Daten sammelt.</string>
     <string name="dialog_consent_accessibility_title">Bedienungshilfe aktivieren</string>
-    <string name="dialog_report_bug_info">Danke für die Mithilfe, μLauncher zu verbessern!\nEs wird darum gebeten, Bug Reports die folgenden Informationen anzufügen, um diese besser nachvollziehen zu können:</string>
-    <string name="settings_gesture_back">Zurück</string>
-    <string name="settings_gesture_description_back">Zurück-Taste oder -Geste</string>
-    <string name="settings_gesture_swipe_larger_reverse"><![CDATA[> (Rückwärts)]]></string>
-    <string name="settings_gesture_description_swipe_larger_reverse">Unten links -&gt; mitte rechts -&gt; oben links</string>
-    <string name="settings_gesture_swipe_smaller"><![CDATA[<]]></string>
-    <string name="settings_gesture_swipe_smaller_reverse"><![CDATA[< (Rückwärts)]]></string>
-    <string name="settings_gesture_swipe_v">V</string>
-    <string name="settings_gesture_description_swipe_v">Oben links -&gt; unten mitte -&gt; oben rechts</string>
-    <string name="settings_gesture_swipe_v_reverse">V (Rückwärts)</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">Unten rechts -&gt; mitte links -&gt; oben rechts</string>
-    <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_gesture_description_swipe_lambda">Unten links -&gt; oben mitte -&gt; unten rechts</string>
-    <string name="settings_gesture_description_swipe_v_reverse">Oben rechts -&gt; unten mitte -&gt; oben links</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ (Rückwärts)</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">Unten rechts -&gt; oben mtte -&gt; unten links</string>
-    <string name="dialog_report_bug_button_security">Sicherheitslücke melden</string>
-    <string name="settings_apps_hide_private_space_apps">Privaten Bereich nicht in der App Liste anzeigen</string>
-    <string name="list_title_private_space">Privater Bereich</string>
-    <string name="pin_shortcut_title">Shortcut hinzufügen</string>
-    <string name="pin_shortcut_button_bind">An Geste binden</string>
-    <string name="pin_shortcut_switch_visible">In Appliste anzeigen</string>
-    <string name="tooltip_unlock_private_space">Privaten Bereich entsperren</string>
-    <string name="settings_display_hide_status_bar">Statusleiste verstecken</string>
-    <string name="settings_display_hide_navigation_bar">Navigationsleiste verstecken</string>
-    <string name="tooltip_lock_private_space">Privaten Bereich sperren</string>
-    <string name="tutorial_concept_label_version">Version</string>
-    <string name="tutorial_app_list_title">Alle Apps</string>
-    <string name="tutorial_app_list_text_2">Sobald nur noch eine App passt, wird diese automatisch gestartet.\nDas lässt sich unterdrücken, indem der Suche ein Leerzeichen vorangestellt wird.</string>
-    <string name="settings_gesture_swipe_larger"><![CDATA[>]]></string>
-    <string name="settings_gesture_description_swipe_smaller">Oben rechts -&gt; mitte links -&gt; unten rechts</string>
-    <string name="settings_gesture_description_swipe_larger">Oben links -&gt; mitte rechts -&gt; unten links</string>
-    <string name="tutorial_app_list_text">In der Appliste kann effizient nach Apps gesucht werden.\n\nDie Liste wird standardmäßig durch Wischen nach oben geöffnet (auch das lässt sich einstellen).</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[Das Aktivieren der Bedienungshilfe erteilt μLauncher <strong>weitreichende Zugriffsrechte</strong> .<br/>μLauncher wird diese <strong>ausschließlich zum Sperren des Bildschirms</strong> verwenden. μLauncher wird <strong>niemals irgendwelche Daten sammeln</strong>. Insbesondere werden mittels der Bedienungshilfe keine Daten gesammelt.]]></string>
-    <string name="settings_gesture_tap_up">Tippen und hoch</string>
-    <string name="settings_gesture_description_tap_up">Tippen, dann nach oben wischen</string>
-    <string name="settings_gesture_tap_down">Tippen und nach unten</string>
-    <string name="settings_gesture_description_tap_down">Tippen, dann nach unten wischen</string>
-    <string name="settings_gesture_tap_left">Tippen und links</string>
-    <string name="settings_gesture_description_tap_left">Tippen, dann nach links wischen</string>
-    <string name="settings_gesture_tap_right">Tippen und rechts</string>
-    <string name="settings_gesture_description_tap_right">Tippen, dann nach rechts wischen</string>
-    <string name="dialog_report_bug_security_info">Sicherheitslücken bitte nicht öffentlich bei GitHub melden, sondern auf dem folgenden Weg:</string>
-    <string name="list_other_list_private_space">Privater Bereich</string>
-    <string name="list_other_track_play_pause">Musik: Wiedergabe / Pause</string>
-    <string name="settings_list_reverse_layout">Appliste umkehren</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -16,13 +16,14 @@
       -->
     <string name="alert_cant_open_title">No se pudo abrir la aplicación</string>
     <string name="alert_cant_open_message">¿Desea cambiar la configuración?</string>
-    <string name="toast_cant_open_message">Abra la configuración para elegir una acción para este gesto</string>
+    <string name="toast_cant_open_message">Abra la configuración para elegir una aplicación para esta acción</string>
     <!--
       -
       - Settings
       -
       -->
     <string name="settings_title">Configuración</string>
+    <string name="settings_tab_app">Aplicaciones</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--
@@ -30,21 +31,22 @@
       - Settings : Apps
       -
       -->
-    <string name="settings_gesture_up">Arriba</string>
+    <string name="settings_gesture_up">Deslizar Arriba</string>
     <string name="settings_gesture_double_up">Doble Arriba</string>
-    <string name="settings_gesture_down">Abajo</string>
+    <string name="settings_gesture_down">Deslizar Abajo</string>
     <string name="settings_gesture_double_down">Doble Abajo</string>
-    <string name="settings_gesture_left">Izquierda</string>
+    <string name="settings_gesture_left">Deslizar Izquierda</string>
     <string name="settings_gesture_double_left">Doble Izquierda</string>
-    <string name="settings_gesture_right">Derecha</string>
+    <string name="settings_gesture_right">Deslizar Derecha</string>
     <string name="settings_gesture_double_right">Doble Derecha</string>
-    <string name="settings_gesture_vol_up">Tecla para subir el volumen</string>
-    <string name="settings_gesture_vol_down">Tecla para bajar el volumen</string>
+    <string name="settings_gesture_vol_up">Subir Volumen</string>
+    <string name="settings_gesture_vol_down">Bajar Volumen</string>
     <string name="settings_gesture_double_click">Doble Click</string>
     <string name="settings_gesture_long_click">Click Largo</string>
-    <string name="settings_gesture_date">Fecha</string>
-    <string name="settings_gesture_time">reloj</string>
+    <string name="settings_gesture_date">Toca la fecha</string>
+    <string name="settings_gesture_time">Toca el reloj</string>
     <string name="settings_apps_choose">Elegir Aplicación</string>
+    <string name="settings_apps_view_all">Todas las aplicaciones</string>
     <string name="settings_apps_install">Instalar aplicaciones</string>
     <string name="settings_apps_toast_store_not_found">No se encontró la Store</string>
     <!--
@@ -58,8 +60,10 @@
     <string name="settings_theme_color_theme_item_dark">Oscuro</string>
     <string name="settings_theme_color_theme_item_light">Luminoso</string>
     <string name="settings_theme_wallpaper">Seleccionar fondo de pantalla</string>
+    <string name="settings_launcher_change_wallpaper">Cambiar fondo de pantalla</string>
     <string name="settings_launcher_section_display">Pantalla</string>
     <string name="settings_display_screen_timeout_disabled">Mantener encendida</string>
+    <string name="settings_display_full_screen">Pantalla completa</string>
     <string name="settings_launcher_section_functionality">Funciones</string>
     <string name="settings_enabled_gestures_double_swipe">Deslizar con dos dedos</string>
     <string name="settings_functionality_auto_launch">Auto-lanzar búsquedas</string>
@@ -72,7 +76,8 @@
       -->
     <string name="settings_general_choose_home_screen">Seleccionar Launcher</string>
     <string name="settings_meta_cant_select_launcher">Información de la aplicación</string>
-    <string name="settings_meta_show_tutorial">Ver el tutorial de µLauncher</string>
+    <string name="settings_meta_cant_select_launcher_msg">Su dispositivo no posee esta caracrerística. Desea cambiar los detalles de la aplicación?</string>
+    <string name="settings_meta_show_tutorial">Ver tutorial de Launcher</string>
     <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_report_bug">Reportar un error</string>
@@ -91,11 +96,13 @@
     <string name="list_tab_other">Otros</string>
     <string name="list_app_delete">Desinstalar</string>
     <string name="list_app_info">Información</string>
-    <string name="list_apps_search_hint">Buscar</string>
-    <string name="list_other_settings">Configuración de μLauncher</string>
+    <string name="list_removed">Se eliminó la aplicación</string>
+    <string name="list_not_removed">No se pudo eliminar la aplicación</string>
+    <string name="list_apps_search_hint">Buscar Aplicaciones</string>
+    <string name="list_other_settings">Configuración de Launcher</string>
     <string name="list_other_list">Aplicaciones</string>
-    <string name="list_other_volume_up">Subir el volumen</string>
-    <string name="list_other_volume_down">Bajar volumen</string>
+    <string name="list_other_volume_up">Música: Subir</string>
+    <string name="list_other_volume_down">Música: Bajar</string>
     <string name="list_other_track_next">Música: Siguiente</string>
     <string name="list_other_track_previous">Música: Anterior</string>
     <string name="list_other_nop">Nada</string>
@@ -105,214 +112,19 @@
       -
       -->
     <string name="tutorial_title">Tutorial</string>
-    <string name="tutorial_start_text">👋\n\n¡Tómate unos segundos para aprender a utilizar este Launcher!</string>
+    <string name="tutorial_start_text">Tómate unos segundos para aprender a usar este launcher</string>
     <string name="tutorial_concept_title">Concepto</string>
-    <string name="tutorial_concept_text">μLauncher está diseñado para ser mínimo, eficiente y libre de distracciones.\n\nNo contiene anuncios ni recopila datos.</string>
-    <string name="tutorial_concept_text_2">¡Es software libre (licencia MIT)!\n¡No olvides visitar el repositorio!</string>
+    <string name="tutorial_concept_text">Launcher está diseñado para ser minimalista, eficiente y libre de distracciones.\n\nEs gratis y libre de anuncios y servicios de rastreo.</string>
+    <string name="tutorial_concept_text_2">La aplicación es de código abierto (licencia MIT) y está disponible en GitHub!\n\nNo olvides echarle un vistazo al repositorio!</string>
     <string name="tutorial_usage_title">Uso</string>
     <string name="tutorial_usage_text">Tu pantalla de inicio contiene la fecha y hora local. Sin distracciones.</string>
-    <string name="tutorial_usage_text_2">Puede iniciar sus aplicaciones más importantes con gestos táctiles o presionando botones.</string>
+    <string name="tutorial_usage_text_2">Puedes iniciar tus aplicaciones con solo presionar o deslizar una vez. Elige algunas en la siguiente pantalla.</string>
     <string name="tutorial_setup_title">Puesta a punto</string>
-    <string name="tutorial_setup_text">Elegimos algunas aplicaciones predeterminadas para ti. Puedes cambiarlos ahora si lo deseas:</string>
+    <string name="tutorial_setup_text">Elegimos algunas aplicaciones por defecto para ti, si lo deseas puedes cambiarlas ahora.</string>
     <string name="tutorial_setup_text_2">También puedes cambiar tu selección más tarde.</string>
     <string name="tutorial_finish_title">Vamos!</string>
-    <string name="tutorial_finish_text">¡Estás listo para comenzar!\n\n¡Espero que esto sea de gran valor para ti!\n\n- Finn (quien creó Launcher) y Josia (quien hizo algunas mejoras y mantiene la bifurcación μLauncher)</string>
+    <string name="tutorial_finish_text">Estás listo para iniciar!\n\n Esperamos que esto te sea de gran ayuda!\n\n- Finn M Glas\n(el desarrollador)</string>
     <string name="tutorial_finish_button">Iniciar</string>
     <string name="settings">Configuración</string>
     <string name="ic_menu_alt">Más opciones</string>
-    <string name="settings_gesture_back">atrás</string>
-    <string name="settings_gesture_description_tap_right">Toca + Derecha Toca y desliza hacia la derecha</string>
-    <string name="settings_gesture_description_left_bottom_edge">Desliza el dedo hacia la izquierda en la parte inferior de la pantalla</string>
-    <string name="settings_gesture_description_down_right_edge">Desliza hacia abajo en el borde derecho de la pantalla</string>
-    <string name="settings_gesture_description_back">Botón de retroceso / gesto de retroceso</string>
-    <string name="settings_gesture_description_up_left_edge">Desliza el dedo hacia arriba en el borde izquierdo de la pantalla</string>
-    <string name="settings_gesture_description_up_right_edge">Desliza el dedo hacia arriba en el borde derecho de la pantalla</string>
-    <string name="settings_gesture_description_down_left_edge">Desliza el dedo hacia abajo en el borde izquierdo de la pantalla</string>
-    <string name="settings_theme_color_theme_item_dynamic">Dinámico</string>
-    <string name="settings_clock_color">Color</string>
-    <string name="settings_gesture_description_tap_up">Toca y desliza hacia arriba</string>
-    <string name="settings_gesture_tap_left">Toque + Izquierda</string>
-    <string name="settings_gesture_description_right_bottom_edge">Desliza el dedo hacia la derecha en la parte inferior de la pantalla</string>
-    <string name="settings_gesture_description_left_top_edge">Desliza el dedo hacia la izquierda en la parte superior de la pantalla</string>
-    <string name="settings_gesture_down_left_edge">Abajo (borde izquierdo)</string>
-    <string name="settings_gesture_description_vol_up">Presione el botón para subir el volumen</string>
-    <string name="settings_functionality_auto_launch_summary">Presione la barra espaciadora para desactivar esta función temporalmente.</string>
-    <string name="settings_launcher_section_apps">Aplicaciones</string>
-    <string name="settings_gesture_description_swipe_v">Arriba a la izquierda -&gt; Abajo en el medio -&gt; Arriba a la derecha</string>
-    <string name="settings_functionality_search_web_summary">Presione regresar mientras busca en la lista de aplicaciones para iniciar una búsqueda web.</string>
-    <string name="alert_torch_access_exception">Error: No se puede acceder a la antorcha.</string>
-    <string name="settings_theme_background">Fondo (lista de aplicaciones y configuración)</string>
-    <string name="settings_theme_color_theme">Tema de color</string>
-    <string name="settings_theme_font">Fuente</string>
-    <string name="settings_theme_monochrome_icons">Iconos de aplicaciones monocromáticos</string>
-    <string name="settings_gesture_right_top_edge">Derecha (arriba)</string>
-    <string name="settings_gesture_right_bottom_edge">Derecha (Abajo)</string>
-    <string name="settings_gesture_left_top_edge">Izquierda (arriba)</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[Está a punto de activar el servicio de accesibilidad. Esto otorgará privilegios de amplio alcance a μLauncher. μLauncher utilizará estos privilegios solo para bloquear la pantalla. μLauncher <strong>nunca recopilará ningún dato</strong>. En particular, μLauncher no utiliza el servicio de accesibilidad para recopilar ningún dato.]]></string>
-    <string name="accessibility_service_description">Configurar μLauncher como un servicio de accesibilidad le permite bloquear la pantalla. Tenga en cuenta que se requieren permisos excesivos. Nunca debe otorgar dichos permisos a la ligera a ninguna aplicación. μLauncher utilizará el servicio de accesibilidad solo para bloquear la pantalla. Puedes consultar el código fuente para asegurarte. Tenga en cuenta que también se puede bloquear la pantalla otorgando permisos de administrador del dispositivo μLauncher. Sin embargo, ese método no funciona con el desbloqueo mediante huellas dactilares y rostro.</string>
-    <string name="settings_apps_hide_private_space_apps">Ocultar el espacio privado de la lista de aplicaciones</string>
-    <string name="settings_list_layout">Diseño de la lista de aplicaciones</string>
-    <string name="list_title_private_space">Espacio privado</string>
-    <string name="alert_no_torch_found">No se detectó ninguna cámara con linterna.</string>
-    <string name="list_other_toggle_private_space_lock">Activar o desactivar el bloqueo del espacio privado</string>
-    <string name="list_other_torch">Activar o desactivar la antorcha</string>
-    <string name="settings_apps_hide_paused_apps">Ocultar aplicaciones pausadas</string>
-    <string name="settings_apps_hidden">Aplicaciones ocultas</string>
-    <string name="dialog_rename_title">Cambiar el nombre de %1$s</string>
-    <string name="dialog_cancel">Cancelar</string>
-    <string name="settings_gesture_swipe_v">V</string>
-    <string name="dialog_report_bug_title">Informar un error</string>
-    <string name="list_app_hidden_remove">mostrar</string>
-    <string name="toast_private_space_default_home_screen">μLauncher debe ser la pantalla de inicio predeterminada para acceder al espacio privado.</string>
-    <string name="dialog_report_bug_security_info">No informe vulnerabilidades de seguridad públicamente en GitHub, sino utilice lo siguiente:</string>
-    <string name="dialog_report_bug_button_security">Informar sobre una vulnerabilidad de seguridad</string>
-    <string name="dialog_report_bug_create_report">Crear informe</string>
-    <string name="settings_meta_join_chat">Únete al chat de μLauncher</string>
-    <string name="settings_meta_donate">Donar</string>
-    <string name="list_other_volume_adjust">Ajustar el volumen</string>
-    <string name="list_other_expand_notifications_panel">Expandir el panel de notificaciones</string>
-    <string name="toast_private_space_not_available">El espacio privado no está disponible</string>
-    <string name="settings_gesture_description_up">Desliza hacia arriba</string>
-    <string name="settings_gesture_description_double_click">Haga doble clic en un área vacía</string>
-    <string name="settings_gesture_description_vol_down">Presione el botón para bajar el volumen</string>
-    <string name="settings_gesture_description_long_click">Haga clic largo en un área vacía</string>
-    <string name="settings_gesture_description_date">Haga clic en la fecha</string>
-    <string name="settings_gesture_description_time">Haga clic en el reloj</string>
-    <string name="settings_clock_time_visible">Mostrar la hora</string>
-    <string name="settings_theme_text_shadow">Sombra de texto</string>
-    <string name="settings_display_hide_status_bar">Ocultar la barra de estado</string>
-    <string name="settings_display_hide_navigation_bar">Ocultar la barra de navegación</string>
-    <string name="settings_enabled_gestures_double_swipe_summary">Deslizar con dos dedos</string>
-    <string name="settings_list_layout_item_default">predeterminado</string>
-    <string name="list_title_favorite">Aplicaciones favoritas</string>
-    <string name="list_title_hidden">Aplicaciones ocultas</string>
-    <string name="undo">Deshacer</string>
-    <string name="dialog_consent_accessibility_consent">Doy mi consentimiento para que μLauncher utilice el servicio de accesibilidad para proporcionar una funcionalidad no relacionada con la accesibilidad.</string>
-    <string name="list_apps_search_hint_no_auto_launch">Buscar (sin inicio automático)</string>
-    <string name="dialog_consent_accessibility_privileges">Soy consciente de que esto otorgará privilegios de gran alcance a μLauncher.</string>
-    <string name="dialog_consent_accessibility_other_options">Soy consciente de que existen otras opciones (utilizando privilegios de administrador del dispositivo o el botón de encendido).</string>
-    <string name="settings_meta_licenses">Licencias de código abierto</string>
-    <string name="legal_info_title">Licencias de código abierto</string>
-    <string name="tutorial_concept_label_version">versión</string>
-    <string name="tutorial_app_list_title">Todas las aplicaciones</string>
-    <string name="screen_lock_method_dialog_title">Elija el método para bloquear</string>
-    <string name="screen_lock_method_dialog_text"><![CDATA[
- Elegir método de bloqueo
- Hay dos métodos para bloquear la pantalla.
- Desafortunadamente, ambos tienen desventajas:<br/><br/>
-
- Administrador del dispositivo
- No funciona con desbloqueo por huella dactilar ni reconocimiento facial.
-
- <br/>
- <br/>
-
- Servicio de Accesibilidad
- Requiere privilegios excesivos.
- μLauncher utilizará esos privilegios solo para bloquear la pantalla.
- <br/>
- (Realmente no deberías confiar en una aplicación aleatoria que acabas de descargar con tal afirmación, pero puedes consultar el <a href=\"https://github.com/jrpie/Launcher\">código fuente</a>).
- <br/>
- En algunos dispositivos, el PIN de inicio ya no se utilizará para cifrar datos después de activar un servicio de accesibilidad.
- Esto se puede <a href="https://issuetracker.google.com/issues/37010136#comment36">reactivar</a> posteriormente.
-
- <br/><br/><br/><br/>
- Puede cambiar su selección más tarde en la configuración.
- ]]></string>
-    <string name="screen_lock_method_use_accessibility">Utilice el servicio de accesibilidad</string>
-    <string name="screen_lock_method_use_device_admin">Usar el administrador del dispositivo</string>
-    <string name="settings_actions_lock_method">Elija el método para bloquear la pantalla</string>
-    <string name="dialog_select_color_red">Rojo</string>
-    <string name="dialog_select_color_alpha">alfa</string>
-    <string name="dialog_select_color_blue">Azul</string>
-    <string name="dialog_select_color_green">Verde</string>
-    <string name="settings_theme_font_item_sans_serif">Sans serif</string>
-    <string name="settings_theme_font_item_serif">Serif</string>
-    <string name="settings_theme_font_item_monospace">Monoespaciado</string>
-    <string name="settings_theme_font_item_serif_monospace">Serif monoespaciado</string>
-    <string name="settings_clock_date_visible">Mostrar la fecha</string>
-    <string name="settings_clock_localized">Utilice el formato de fecha localizado</string>
-    <string name="settings_clock_show_seconds">Mostrar segundos</string>
-    <string name="settings_clock_flip_date_time">Cambiar fecha y hora</string>
-    <string name="settings_display_rotate_screen">Girar la pantalla</string>
-    <string name="settings_enabled_gestures_edge_swipe">Acciones de deslizamiento de borde</string>
-    <string name="settings_enabled_gestures_edge_swipe_summary">Desliza el dedo por el borde de la pantalla</string>
-    <string name="settings_enabled_gestures_edge_swipe_edge_width">Ancho del borde</string>
-    <string name="settings_apps_hide_bound_apps">No mostrar aplicaciones que estén vinculadas a un gesto en la lista de aplicaciones</string>
-    <string name="settings_meta_view_code">Ver el código fuente</string>
-    <string name="dialog_report_bug_info">¡Gracias por ayudarnos a mejorar μLauncher!\nConsidere agregar la siguiente información a su informe de error:</string>
-    <string name="dialog_report_bug_button_clipboard">Copiar al portapapeles</string>
-    <string name="list_app_favorite_add">Añadir a favoritos</string>
-    <string name="list_app_favorite_remove">Eliminar de favoritos</string>
-    <string name="list_app_hidden_add">Esconder</string>
-    <string name="list_app_rename">Renombrar</string>
-    <string name="list_other_list_favorites">Aplicaciones favoritas</string>
-    <string name="list_other_list_private_space">Espacio privado</string>
-    <string name="tutorial_app_list_text">Puede buscar rápidamente entre todas las aplicaciones en la lista de aplicaciones.\n\nDesliza hacia arriba para abrirlo o asigne un gesto diferente.</string>
-    <string name="tutorial_app_list_text_2">Una vez que sólo coincide una aplicación, se inicia automáticamente.\nEsto se puede desactivar anteponiendo un espacio a la consulta.</string>
-    <string name="alert_cant_expand_status_bar_panel">Error: No se puede expandir la barra de estado. Esta acción utiliza una funcionalidad que no forma parte de la API de Android publicada. Lamentablemente, no parece funcionar en su dispositivo.</string>
-    <string name="alert_requires_android_m">Esta funcionalidad requiere Android 6 o posterior.</string>
-    <string name="alert_requires_android_v">Esta funcionalidad requiere Android 15 o posterior.</string>
-    <string name="snackbar_app_hidden">Aplicación oculta. Puedes hacerlo visible nuevamente en la configuración.</string>
-    <string name="list_other_expand_settings_panel">Configuración rápida</string>
-    <string name="toast_device_admin_not_enabled">μLauncher debe ser administrador del dispositivo para poder bloquear la pantalla.</string>
-    <string name="device_admin_explanation">Esto es necesario para la acción de la pantalla de bloqueo.</string>
-    <string name="device_admin_description">Habilitar la acción de bloqueo de pantalla</string>
-    <string name="alert_lock_screen_failed">Error: Error al bloquear la pantalla. (Si acaba de actualizar la aplicación, intente deshabilitar y volver a habilitar el servicio de accesibilidad en la configuración del teléfono)</string>
-    <string name="toast_accessibility_service_not_enabled">El servicio de accesibilidad de μLauncher no está habilitado. Por favor, habilítelo en la configuración</string>
-    <string name="toast_private_space_locked">Espacio privado bloqueado</string>
-    <string name="toast_private_space_unlocked">Espacio privado desbloqueado</string>
-    <string name="tooltip_lock_private_space">Bloquear el espacio privado</string>
-    <string name="tooltip_unlock_private_space">Desbloquear espacio privado</string>
-    <string name="toast_lock_screen_not_supported">Error: El bloqueo de la pantalla mediante accesibilidad no es compatible con este dispositivo. En su lugar, utilice el administrador del dispositivo.</string>
-    <string name="accessibility_service_name">μLauncher - pantalla de bloqueo</string>
-    <string name="dialog_select_color_color_hex">Color</string>
-    <string name="dialog_choose_color_title">Elige el color</string>
-    <string name="dialog_consent_accessibility_data_collection">Doy mi consentimiento para que μLauncher no recopile ningún dato.</string>
-    <string name="dialog_consent_accessibility_title">Activación del servicio de accesibilidad</string>
-    <string name="dialog_consent_accessibility_ok">Activar el servicio de accesibilidad</string>
-    <string name="toast_activity_not_found_search_web">No se encontró ninguna aplicación para gestionar la búsqueda.</string>
-    <string name="toast_activity_not_found_browser">No se puede abrir la URL: no se encontró ningún navegador.</string>
-    <string name="settings_tab_actions">Acciones</string>
-    <string name="settings_gesture_tap_up">Toca + Arriba</string>
-    <string name="settings_gesture_description_double_up">Desliza hacia arriba con dos dedos</string>
-    <string name="settings_gesture_description_down">Desliza hacia abajo</string>
-    <string name="settings_gesture_tap_down">Toque + Abajo</string>
-    <string name="settings_gesture_description_tap_down">Toca y desliza hacia abajo</string>
-    <string name="settings_gesture_description_double_down">Desliza hacia abajo con dos dedos</string>
-    <string name="settings_gesture_description_left">Desliza hacia la izquierda</string>
-    <string name="settings_gesture_description_tap_left">Toca y desliza hacia la izquierda</string>
-    <string name="settings_gesture_description_double_left">Desliza dos dedos hacia la izquierda</string>
-    <string name="settings_gesture_description_right">Desliza hacia la derecha</string>
-    <string name="settings_gesture_tap_right">Toque + Derecha</string>
-    <string name="settings_gesture_description_double_right">Desliza con dos dedos hacia la derecha</string>
-    <string name="settings_gesture_description_right_top_edge">Desliza el dedo hacia la derecha en la parte superior de la pantalla</string>
-    <string name="settings_gesture_left_bottom_edge">Izquierda (Abajo)</string>
-    <string name="settings_gesture_up_left_edge">Arriba (borde izquierdo)</string>
-    <string name="settings_gesture_up_right_edge">Arriba (borde derecho)</string>
-    <string name="settings_gesture_down_right_edge">Abajo (borde derecho)</string>
-    <string name="settings_gesture_description_swipe_larger">Arriba a la izquierda -&gt; centro a la derecha -&gt; abajo a la izquierda</string>
-    <string name="settings_gesture_description_swipe_larger_reverse">Abajo a la izquierda -&gt; centro a la derecha -&gt; arriba a la izquierda</string>
-    <string name="settings_gesture_description_swipe_smaller">Arriba a la derecha -&gt; centro a la izquierda -&gt; abajo a la derecha</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">Abajo a la derecha -&gt; centro a la izquierda -&gt; arriba a la derecha</string>
-    <string name="settings_gesture_swipe_v_reverse">V (Reversa)</string>
-    <string name="settings_gesture_description_swipe_v_reverse">Arriba a la derecha -&gt; Abajo en el medio -&gt; Arriba a la izquierda</string>
-    <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_gesture_description_swipe_lambda">Abajo a la izquierda -&gt; arriba en el medio -&gt; abajo a la derecha</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ (Inverso)</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">Abajo a la derecha -&gt; arriba en el medio -&gt; abajo a la izquierda</string>
-    <string name="settings_theme_background_item_dim">Atenuación</string>
-    <string name="settings_theme_background_item_solid">Sólido</string>
-    <string name="settings_theme_font_item_system_default">Valor predeterminado del sistema</string>
-    <string name="settings_theme_background_item_transparent">Transparente</string>
-    <string name="settings_theme_background_item_blur">Difuminar</string>
-    <string name="settings_functionality_search_web">Buscar en la web</string>
-    <string name="settings_list_layout_item_text">texto</string>
-    <string name="settings_list_layout_item_grid">Red</string>
-    <string name="list_other_track_play_pause">Música: Reproducir / Pausa</string>
-    <string name="list_other_lock_screen">Pantalla de bloqueo</string>
-    <string name="pin_shortcut_title">Agregar acceso directo</string>
-    <string name="pin_shortcut_button_bind">Vincular al gesto</string>
-    <string name="pin_shortcut_switch_visible">Mostrar en la lista de aplicaciones</string>
-    <string name="settings_list_reverse_layout">Invertir la lista de aplicaciones</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -14,6 +14,7 @@
       -
       -->
     <string name="settings_title">Réglages</string>
+    <string name="settings_tab_app">Applications</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--
@@ -36,6 +37,7 @@
     <string name="settings_gesture_date">Date</string>
     <string name="settings_gesture_time">Horloge</string>
     <string name="settings_apps_choose">Choisir une application</string>
+    <string name="settings_apps_view_all">Voir toutes les applications</string>
     <string name="settings_apps_install">Installer des applications</string>
     <string name="settings_apps_toast_store_not_found">Magasin d\'applications introuvable</string>
     <!--
@@ -50,8 +52,10 @@
     <string name="settings_theme_color_theme_item_dark">Sombre</string>
     <string name="settings_theme_color_theme_item_light">Clair</string>
     <string name="settings_theme_wallpaper">Choisir un fond d\'écran</string>
+    <string name="settings_launcher_change_wallpaper">Changer le fond d\'écran</string>
     <string name="settings_launcher_section_display">Écran</string>
     <string name="settings_display_screen_timeout_disabled">Garder l\'écran allumé</string>
+    <string name="settings_display_full_screen">Utiliser le plein écran</string>
     <string name="settings_launcher_section_functionality">Fonctions</string>
     <string name="settings_enabled_gestures_double_swipe">Actions de double balayage</string>
     <string name="settings_functionality_auto_launch">Lancer apps par recherche</string>
@@ -64,6 +68,7 @@
       -->
     <string name="settings_general_choose_home_screen">Choisir μLauncher comme application d\'écran d\'accueil par défaut</string>
     <string name="settings_meta_cant_select_launcher">Informations sur l\'application</string>
+    <string name="settings_meta_cant_select_launcher_msg">Votre appareil ne prend pas en charge cette fonctionnalité. Souhaitez-vous plutôt accéder aux détails de l\'application ?</string>
     <string name="settings_meta_show_tutorial">Regarder le tutoriel</string>
     <string name="settings_meta_reset">Réinitialiser</string>
     <string name="settings_meta_reset_confirm">Vous allez réinitialiser tous vos paramètres. Souhaitez-vous poursuivre ?</string>
@@ -83,6 +88,8 @@
     <string name="list_tab_other">Autre</string>
     <string name="list_app_delete">Désinstaller</string>
     <string name="list_app_info">Informations</string>
+    <string name="list_removed">Application supprimée</string>
+    <string name="list_not_removed">Impossible de désinstaller l\'application</string>
     <string name="list_apps_search_hint">Chercher des applications</string>
     <string name="list_other_settings">Réglages d\'µLauncher</string>
     <string name="list_other_list">Toutes les Applications</string>
@@ -168,6 +175,7 @@
     <string name="dialog_consent_accessibility_privileges">Je suis conscient que cela accordera des privilèges importants à µLauncher.</string>
     <string name="dialog_choose_color_title">Choisir une couleur</string>
     <string name="dialog_consent_accessibility_title">Activation du service d\'accessibilité</string>
+    <string name="dialog_select_color_ok">Ok</string>
     <string name="dialog_select_color_color_hex">Couleur</string>
     <string name="dialog_consent_accessibility_consent">Je consent à µLauncher utilisation du service d’accessibilité pour fournir une fonction non liée à l’accessibilité.</string>
     <string name="dialog_consent_accessibility_data_collection">Je consent à la non-collecte de données par µLauncher.</string>
@@ -214,6 +222,7 @@
     <string name="settings_theme_background_item_solid">Plein</string>
     <string name="dialog_rename_title">Renommer %1$s</string>
     <string name="screen_lock_method_use_accessibility">Utiliser le service d’accessibilité</string>
+    <string name="dialog_rename_ok">Ok</string>
     <string name="settings_functionality_search_web">Chercher sur le web</string>
     <string name="settings_functionality_search_web_summary">Appuyer sur entrée en cherchant une application pour lancer une recherche web.</string>
     <string name="dialog_cancel">Annuler</string>

app/src/main/res/values-it/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="settings_gesture_description_right_bottom_edge">Scorri verso destra sul bordo inferiore dello schermo</string>
     <string name="settings_launcher_section_appearance">Aspetto</string>
-    <string name="settings_apps_choose">Scegliere</string>
+    <string name="settings_apps_choose">Scegliere l\'applicazione</string>
     <string name="settings_theme_color_theme">Tema</string>
     <string name="tutorial_concept_text">Questo launcher è progettato per essere minimale, efficiente e privo di distrazioni. Non contiene pagamenti, pubblicità o servizi di tracciamento.</string>
     <string name="settings_theme_color_theme_item_default">Predefinito</string>
@@ -34,10 +34,12 @@
         <br/><br/><br/><br/>
         Puoi cambiare le tue scelte in seguito nelle impostazioni.
         ]]></string>
+    <string name="settings_meta_cant_select_launcher_msg">Il tuo dispositivo non supporta questa funzione. Vuoi aprire la pagina di dettaglio dell\'applicazione?</string>
     <string name="alert_cant_open_title">Impossibile aprire l\'applicazione</string>
     <string name="alert_cant_open_message">Desideri modificare le impostazioni?</string>
     <string name="toast_cant_open_message">Apri le impostazioni per abbinare un\'azione a questo gesto</string>
     <string name="settings_title">Impostazioni</string>
+    <string name="settings_tab_app">Applicazioni</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <string name="settings_gesture_description_double_down">Scorri verso il basso con due dita</string>
@@ -81,6 +83,7 @@
     <string name="settings_gesture_description_vol_up">Premi il pulsante di aumento del volume</string>
     <string name="settings_gesture_vol_down">Riduci il volume</string>
     <string name="settings_gesture_description_vol_down">Premi il pulsante per ridurre il volume</string>
+    <string name="settings_apps_view_all">Vedi tutte le applicazioni</string>
     <string name="settings_apps_install">Installa le applicazioni</string>
     <string name="settings_theme_monochrome_icons">Icone monocromatiche</string>
     <string name="settings_clock_time_visible">Mostra l\'ora</string>
@@ -109,8 +112,10 @@
     <string name="settings_theme_font">Font</string>
     <string name="settings_clock_flip_date_time">Inverti data e ora</string>
     <string name="settings_theme_wallpaper">Scegli uno sfondo</string>
+    <string name="settings_launcher_change_wallpaper">Cambia immagine di sfondo</string>
     <string name="settings_launcher_section_display">Schermo</string>
     <string name="settings_display_screen_timeout_disabled">Mantieni lo schermo acceso</string>
+    <string name="settings_display_full_screen">Schermo intero</string>
     <string name="settings_display_rotate_screen">Ruota lo schermo</string>
     <string name="settings_launcher_section_functionality">Funzionalità</string>
     <string name="settings_functionality_auto_keyboard">Apri automaticamente la tastiera per cercare</string>
@@ -176,6 +181,7 @@
     <string name="list_app_hidden_add">Nascondi</string>
     <string name="list_app_hidden_remove">Mostra</string>
     <string name="list_app_rename">Rinomina</string>
+    <string name="list_removed">Le applicazioni selezionate sono state rimosse</string>
     <string name="list_apps_search_hint">Cerca</string>
     <string name="list_other_settings">Impostazioni μLauncher</string>
     <string name="list_other_expand_notifications_panel">Espandi il pannello notifiche</string>
@@ -189,7 +195,9 @@
     <string name="tutorial_usage_title">Utilizzo</string>
     <string name="tutorial_usage_text">La schermata principale contiene solo data e ora. Nessuna distrazione.</string>
     <string name="alert_requires_android_m">Questa funzione richiede Android 6 o successivi.</string>
+    <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">Rinomina %1$s</string>
+    <string name="list_not_removed">Impossibile rimuovere l\'applicazione</string>
     <string name="settings_theme_color_theme_item_dynamic">Dinamico</string>
     <string name="settings_clock_color">Colore</string>
     <string name="settings_gesture_double_up">Due dita verso l\'alto</string>
@@ -203,6 +211,7 @@
     <string name="dialog_select_color_alpha">Trasparente</string>
     <string name="dialog_select_color_blue">Blu</string>
     <string name="dialog_select_color_green">Verde</string>
+    <string name="dialog_select_color_ok">Ok</string>
     <string name="dialog_select_color_color_hex">Colore</string>
     <string name="dialog_choose_color_title">Scegli colore</string>
     <string name="dialog_consent_accessibility_ok">Attiva Servizi di Accessibilità</string>

app/src/main/res/values-ja/strings.xml

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="alert_cant_open_title">アプリを開けません</string>
-    <string name="alert_cant_open_message">設定を変更しますか？</string>
-    <string name="settings_title">設定</string>
-    <string name="settings_tab_launcher">ランチャー</string>
-    <string name="settings_tab_meta">その他</string>
-    <string name="toast_cant_open_message">このジェスチャのアクションを選択するには設定を開きます</string>
-    <string name="settings_gesture_description_up">上にスワイプ</string>
-    <string name="settings_gesture_description_tap_up">タップしてから上にスワイプ</string>
-    <string name="settings_gesture_double_up">Double Up</string>
-    <string name="settings_gesture_tap_up">Tap + Up</string>
-    <string name="settings_gesture_up">Up</string>
-    <string name="settings_gesture_back">Back</string>
-    <string name="settings_gesture_description_double_up">2本指で上にスワイプ</string>
-    <string name="settings_gesture_down">Down</string>
-    <string name="settings_gesture_description_down">下にスワイプ</string>
-    <string name="settings_gesture_tap_down">Tap + Down</string>
-    <string name="settings_gesture_description_tap_down">タップしてから下にスワイプ</string>
-    <string name="settings_gesture_double_down">Double Down</string>
-    <string name="settings_gesture_description_double_down">2本指で下にスワイプ</string>
-    <string name="settings_gesture_left">Left</string>
-    <string name="settings_gesture_description_left">左にスワイプ</string>
-    <string name="settings_gesture_tap_left">Tap + Left</string>
-    <string name="settings_gesture_description_tap_left">タップしてから左にスワイプ</string>
-    <string name="settings_gesture_double_left">Double Left</string>
-    <string name="settings_gesture_description_double_left">2本指で左にスワイプ</string>
-    <string name="settings_gesture_right">Right</string>
-    <string name="settings_gesture_description_right">右にスワイプ</string>
-    <string name="settings_gesture_description_tap_right">タップしてから右にスワイプ</string>
-    <string name="settings_gesture_double_right">Double Right</string>
-    <string name="settings_gesture_right_top_edge">Right (Top)</string>
-    <string name="settings_gesture_description_right_top_edge">画面の上部で右にスワイプ</string>
-    <string name="settings_gesture_right_bottom_edge">Right (Bottom)</string>
-    <string name="settings_gesture_description_right_bottom_edge">画面の下部で右にスワイプ</string>
-    <string name="settings_gesture_left_bottom_edge">Left (Bottom)</string>
-    <string name="settings_gesture_description_left_bottom_edge">画面の下部で左にスワイプ</string>
-    <string name="settings_gesture_left_top_edge">Left (Top)</string>
-    <string name="settings_gesture_description_left_top_edge">画面の上部で左にスワイプ</string>
-    <string name="settings_gesture_up_left_edge">Up (Left Edge)</string>
-    <string name="settings_gesture_up_right_edge">Up (Right Edge)</string>
-    <string name="settings_gesture_description_up_right_edge">画面の右端で上にスワイプ</string>
-    <string name="settings_gesture_down_left_edge">Down (Left Edge)</string>
-    <string name="settings_gesture_description_down_left_edge">画面の左端で下にスワイプ</string>
-    <string name="settings_gesture_down_right_edge">Down (Right Edge)</string>
-    <string name="settings_gesture_swipe_larger"><![CDATA[>]]></string>
-    <string name="settings_gesture_description_swipe_larger">左上 -&gt; 右中 -&gt; 左下</string>
-    <string name="settings_gesture_swipe_larger_reverse"><![CDATA[> (Reverse)]]></string>
-    <string name="settings_gesture_description_swipe_larger_reverse">左下 -&gt; 右中 -&gt; 左上</string>
-    <string name="settings_gesture_swipe_smaller"><![CDATA[<]]></string>
-    <string name="settings_gesture_description_swipe_smaller">右上 -&gt; 左中 -&gt; 右下</string>
-    <string name="settings_gesture_swipe_smaller_reverse"><![CDATA[< (Reverse)]]></string>
-    <string name="settings_gesture_swipe_v">V</string>
-    <string name="settings_gesture_description_swipe_v">左上 -&gt; 中下 -&gt; 右上</string>
-    <string name="settings_gesture_swipe_v_reverse">V (Reverse)</string>
-    <string name="settings_gesture_description_swipe_v_reverse">右上 -&gt; 中下 -&gt; 左上</string>
-    <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_gesture_description_swipe_lambda">左下 -&gt; 中上 -&gt; 右下</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ (Reverse)</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">右下 -&gt; 中上 -&gt; 左下</string>
-    <string name="settings_gesture_vol_down">Volume Down</string>
-    <string name="settings_gesture_description_vol_down">音量ダウンボタンを押す</string>
-    <string name="settings_gesture_double_click">Double Click</string>
-    <string name="settings_gesture_description_double_click">空白部分をダブルタップ</string>
-    <string name="settings_gesture_long_click">Long Click</string>
-    <string name="settings_gesture_date">Date</string>
-    <string name="settings_gesture_description_date">日付をタップ</string>
-    <string name="settings_gesture_time">Time</string>
-    <string name="settings_gesture_description_time">時刻をタップ</string>
-    <string name="settings_apps_choose">アプリを選択</string>
-    <string name="settings_launcher_section_appearance">外観</string>
-    <string name="settings_theme_color_theme">カラーテーマ</string>
-    <string name="settings_theme_color_theme_item_default">デフォルト</string>
-    <string name="settings_theme_color_theme_item_dark">ダーク</string>
-    <string name="settings_theme_color_theme_item_dynamic">ダイナミック</string>
-    <string name="settings_theme_text_shadow">文字の影</string>
-    <string name="settings_theme_background_item_transparent">透明</string>
-    <string name="settings_theme_background_item_blur">ブラー</string>
-    <string name="settings_theme_background_item_solid">ソリッド</string>
-    <string name="settings_theme_font">フォント</string>
-    <string name="settings_theme_font_item_system_default">システムデフォルト</string>
-    <string name="settings_theme_monochrome_icons">モノクロのアプリアイコン</string>
-    <string name="settings_launcher_section_date_time"><![CDATA[Date & time]]></string>
-    <string name="settings_clock_color">色</string>
-    <string name="settings_clock_time_visible">時刻を表示</string>
-    <string name="settings_clock_date_visible">日付を表示</string>
-    <string name="settings_clock_localized">ローカライズされた日付形式を使用する</string>
-    <string name="settings_clock_show_seconds">秒を表示</string>
-    <string name="settings_clock_flip_date_time">日付と時刻を反転</string>
-    <string name="settings_theme_wallpaper">壁紙を選択</string>
-    <string name="settings_launcher_section_display">表示</string>
-    <string name="settings_display_screen_timeout_disabled">画面オンを維持</string>
-    <string name="settings_display_rotate_screen">画面の回転</string>
-    <string name="settings_enabled_gestures_double_swipe_summary">2本指でスワイプ</string>
-    <string name="settings_enabled_gestures_edge_swipe">Edgeスワイプアクション</string>
-    <string name="settings_enabled_gestures_edge_swipe_summary">画面端でスワイプ</string>
-    <string name="settings_functionality_search_web_summary">アプリリストで検索中にリターンキーを押すとWeb検索が起動します。</string>
-    <string name="settings_functionality_search_web">Webで検索</string>
-    <string name="settings_functionality_auto_keyboard">検索時にキーボードを表示</string>
-    <string name="settings_launcher_section_apps">アプリ</string>
-    <string name="settings_apps_hide_bound_apps">ジェスチャーに設定されたアプリをアプリ一覧に表示しない</string>
-    <string name="settings_apps_hide_paused_apps">一時停止されたアプリを隠す</string>
-    <string name="settings_list_layout">アプリ一覧のレイアウト</string>
-    <string name="settings_list_reverse_layout">アプリ一覧を反転</string>
-    <string name="settings_list_layout_item_default">デフォルト</string>
-    <string name="settings_list_layout_item_text">テキスト</string>
-    <string name="settings_list_layout_item_grid">グリッド</string>
-    <string name="settings_meta_show_tutorial">ランチャーのチュートリアルを見る</string>
-    <string name="settings_meta_reset">設定をリセット</string>
-    <string name="settings_meta_reset_confirm">すべての設定を破棄します。続行しますか？</string>
-    <string name="settings_meta_view_code">ソースコードを見る</string>
-    <string name="dialog_report_bug_title">バグを報告</string>
-    <string name="dialog_report_bug_button_clipboard">クリップボードにコピー</string>
-    <string name="dialog_report_bug_security_info">セキュリティ上の脆弱性をGitHubに公開しないでください。代わりに以下を使用してください。</string>
-    <string name="dialog_report_bug_button_security">セキュリティ上の脆弱性を報告</string>
-    <string name="dialog_report_bug_create_report">レポートを作成</string>
-    <string name="settings_meta_join_chat">µLauncherのチャットに入る</string>
-    <string name="settings_meta_privacy">プライバシーポリシー</string>
-    <string name="settings_meta_discord">Discordに参加してください！</string>
-    <string name="list_title_hidden">非表示のアプリ</string>
-    <string name="list_title_private_space">プライベートスペース</string>
-    <string name="list_title_pick">アプリを選択</string>
-    <string name="list_tab_app">アプリ</string>
-    <string name="list_tab_other">その他</string>
-    <string name="list_app_delete">アンインストール</string>
-    <string name="list_app_info">アプリ情報</string>
-    <string name="list_app_favorite_remove">お気に入りから削除</string>
-    <string name="list_app_hidden_add">隠す</string>
-    <string name="list_app_rename">名称を変更</string>
-    <string name="list_apps_search_hint">検索</string>
-    <string name="list_apps_search_hint_no_auto_launch">検索（自動起動なし）</string>
-    <string name="list_other_settings">µLauncherの設定</string>
-    <string name="list_other_list">すべてのアプリ</string>
-    <string name="list_other_toggle_private_space_lock">プライベートスペースのロックを切り替え</string>
-    <string name="list_other_volume_up">音楽: うるさい</string>
-    <string name="list_other_volume_down">音楽: ひっそり</string>
-    <string name="list_other_track_next">音楽: 次</string>
-    <string name="list_other_track_previous">音楽: 前</string>
-    <string name="list_other_expand_notifications_panel">通知パネルを表示</string>
-    <string name="list_other_nop">なにもしねぇ</string>
-    <string name="list_other_lock_screen">画面をロック</string>
-    <string name="list_other_torch">ライトを切り替え</string>
-    <string name="pin_shortcut_title">ショートカットを追加</string>
-    <string name="pin_shortcut_button_bind">ジェシュチャーに設定</string>
-    <string name="pin_shortcut_switch_visible">アプリ一覧に表示</string>
-    <string name="tutorial_title">チュートリアル</string>
-    <string name="tutorial_concept_title">コンセプト</string>
-    <string name="tutorial_usage_title">使い方</string>
-    <string name="tutorial_usage_text">ホーム画面には現地の日付と時刻が表示されます。邪魔されることはありません。</string>
-    <string name="tutorial_usage_text_2">1回のスワイプまたはボタンのタップでアプリを起動できます。次のスライドでいくつか選択してください。</string>
-    <string name="tutorial_setup_title">セットアップ</string>
-    <string name="tutorial_setup_text_2">選択内容は後で変更することもできます。</string>
-    <string name="tutorial_finish_title">さあ行きましょう！</string>
-    <string name="tutorial_finish_button">始める</string>
-    <string name="settings">設定</string>
-    <string name="settings_gesture_description_back">戻るボタン / 戻るジェスチャ</string>
-    <string name="settings_theme_color_theme_item_light">ライト</string>
-    <string name="settings_enabled_gestures_double_swipe">Doubleスワイプアクション</string>
-    <string name="settings_functionality_auto_launch">検索結果を起動</string>
-    <string name="list_title_favorite">お気に入りのアプリ</string>
-    <string name="settings_gesture_description_vol_up">音量アップボタンを押す</string>
-    <string name="settings_gesture_description_long_click">空白部分をロングタップ</string>
-    <string name="settings_launcher_section_functionality">機能性</string>
-    <string name="dialog_report_bug_info">µLauncherの改善にご協力いただきありがとうございます。\nバグレポートに次の情報を追加することを検討してください。</string>
-    <string name="list_app_favorite_add">お気に入りに追加</string>
-    <string name="settings_gesture_description_up_left_edge">画面の左端で上にスワイプ</string>
-    <string name="settings_gesture_description_down_right_edge">画面の右端で下にスワイプ</string>
-    <string name="settings_apps_install">アプリをインストール</string>
-    <string name="tutorial_finish_text">始める準備はできました！これがあなたにとって大きな価値となることを願っています！ \t- Finn（Launcherの作成者）とJosia（いくつかの改良を行い、フォーク μLauncher を保守）</string>
-    <string name="settings_gesture_tap_right">Tap + Right</string>
-    <string name="settings_gesture_description_double_right">2本指で右にスワイプ</string>
-    <string name="settings_apps_hidden">非表示のアプリ</string>
-    <string name="settings_general_choose_home_screen">μLauncherホーム画面に設定</string>
-    <string name="settings_meta_fork_contact">フォークの開発者に問い合わせ</string>
-    <string name="settings_meta_contact">オリジナルの開発者に問い合わせる</string>
-    <string name="list_other_list_favorites">お気に入りのアプリ</string>
-    <string name="list_other_track_play_pause">音楽: 再生 / 一時停止</string>
-    <string name="settings_theme_background_item_dim">薄暗い</string>
-    <string name="settings_launcher_sensitivity">感度</string>
-    <string name="settings_meta_cant_select_launcher">アプリ情報</string>
-    <string name="settings_gesture_vol_up">Volume Up</string>
-    <string name="list_title_view">すべてのアプリ</string>
-    <string name="list_app_hidden_remove">表示</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">右下 -&gt; 左中 -&gt; 右上</string>
-    <string name="settings_theme_background">背景（アプリ一覧と設定）</string>
-    <string name="settings_enabled_gestures_edge_swipe_edge_width">端の幅</string>
-    <string name="settings_functionality_auto_launch_summary">この機能を一時的に無効にするにはスペースキーを押します。</string>
-    <string name="list_other_list_private_space">プライベートスペース</string>
-    <string name="settings_apps_hide_private_space_apps">アプリ一覧からプライベートスペースを隠す</string>
-    <string name="settings_meta_report_bug">バグを報告</string>
-    <string name="tutorial_start_text">このランチャーの使い方を学ぶのにほんの数秒しかかかりません</string>
-    <string name="tutorial_concept_text">Launcherは、最小限かつ効率的で、邪魔にならないように設計されています。支払い、広告、追跡サービスは一切ありません。</string>
-    <string name="tutorial_concept_text_2">このアプリはオープンソース（MIT ライセンス）であり、GitHub で入手できます！リポジトリを必ずチェックしてください！</string>
-    <string name="tutorial_setup_text">デフォルトのアプリをいくつか選択しました。必要に応じて今すぐ変更できます。</string>
-</resources>

app/src/main/res/values-lt/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="alert_cant_open_message">Norite pakeisti nustatymus?</string>
-    <string name="settings_title">Nustatymai</string>
-    <string name="settings_tab_actions">Veiksmai</string>
-    <string name="settings_tab_launcher">Paleidimo programėlė</string>
-    <string name="settings_tab_meta">Apie</string>
-    <string name="settings_gesture_back">Atgal</string>
-    <string name="settings_gesture_description_back">Grįžimo mygtukas / grįžimo gestas</string>
-    <string name="settings_gesture_description_up">Perbraukimas aukštyn</string>
-    <string name="settings_gesture_tap_up">Bakstelėkite + aukštyn</string>
-    <string name="alert_cant_open_title">Nepavyksta paleisti programėlės</string>
-    <string name="toast_cant_open_message">Atidarykite nustatymus norėdami pasirinkti šio gesto veiksmą</string>
-    <string name="settings_gesture_up">Aukštyn</string>
-    <string name="settings_gesture_description_tap_up">Bakstelėjimas ir perbraukimas aukštyn</string>
-</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -14,6 +14,7 @@
       -
       -->
     <string name="settings_title">Configurações</string>
+    <string name="settings_tab_app">Apps</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
     <!--
@@ -37,13 +38,14 @@
     <string name="settings_gesture_up_right_edge">Para cima (borda direita)</string>
     <string name="settings_gesture_down_left_edge">Para baixo (borda esquerda)</string>
     <string name="settings_gesture_down_right_edge">Para baixo (borda direita)</string>
-    <string name="settings_gesture_vol_up">Botão de aumentar volume</string>
-    <string name="settings_gesture_vol_down">Botão de diminuir volume</string>
+    <string name="settings_gesture_vol_up">Aumento de volume</string>
+    <string name="settings_gesture_vol_down">Diminuição de volume</string>
     <string name="settings_gesture_double_click">Toque duplo</string>
     <string name="settings_gesture_long_click">Toque longo</string>
     <string name="settings_gesture_date">Data</string>
     <string name="settings_gesture_time">Hora</string>
     <string name="settings_apps_choose">Selecione um app</string>
+    <string name="settings_apps_view_all">Ver todos os apps</string>
     <string name="settings_apps_install">Instalar aplicativos</string>
     <string name="settings_apps_toast_store_not_found">Loja não encontrada</string>
     <!--
@@ -61,8 +63,10 @@
     <string name="settings_clock_localized">Use formato de data localizado</string>
     <string name="settings_clock_flip_date_time">Inverter data e hora</string>
     <string name="settings_theme_wallpaper">Escolha papel de parede</string>
+    <string name="settings_launcher_change_wallpaper">Alterar papel de parede</string>
     <string name="settings_launcher_section_display">Exibição</string>
     <string name="settings_display_screen_timeout_disabled">Manter a tela ligada</string>
+    <string name="settings_display_full_screen">Usar tela cheia</string>
     <string name="settings_launcher_section_functionality">Funcionalidades</string>
     <string name="settings_enabled_gestures_double_swipe">Gestos com 2 dedos</string>
     <string name="settings_enabled_gestures_edge_swipe">Ações de deslize nas bordas</string>
@@ -76,7 +80,8 @@
       -->
     <string name="settings_general_choose_home_screen">Definir o μLauncher como tela inicial</string>
     <string name="settings_meta_cant_select_launcher">Informações do aplicativo</string>
-    <string name="settings_meta_show_tutorial">Ver tutorial do µLauncher</string>
+    <string name="settings_meta_cant_select_launcher_msg">Seu dispositivo não é compatível com esse recurso. Gerenciar detalhes do app em vez disso?</string>
+    <string name="settings_meta_show_tutorial">Ver tutorial do launcher</string>
     <string name="settings_meta_reset">Redefinir configuraçãos</string>
     <string name="settings_meta_reset_confirm">Você vai descartar todas as suas preferências. Continuar?</string>
     <string name="settings_meta_report_bug">Reportar um bug</string>
@@ -95,11 +100,13 @@
     <string name="list_tab_other">Outros</string>
     <string name="list_app_delete">Desinstalar</string>
     <string name="list_app_info">Informações do aplicativo</string>
+    <string name="list_removed">O app selecionado foi removido</string>
+    <string name="list_not_removed">Não foi possível remover o app</string>
     <string name="list_apps_search_hint">Busque</string>
-    <string name="list_other_settings">Configurações do μLauncher</string>
+    <string name="list_other_settings">Configurações do µLauncher</string>
     <string name="list_other_list">Todos os apps</string>
-    <string name="list_other_volume_up">Aumentar volume</string>
-    <string name="list_other_volume_down">Diminuir volume</string>
+    <string name="list_other_volume_up">Música: Mais alto</string>
+    <string name="list_other_volume_down">Música: Mais silencioso</string>
     <string name="list_other_track_next">Música: Próximo</string>
     <string name="list_other_track_previous">Música: Anterior</string>
     <string name="list_other_nop">Não faça nada</string>
@@ -109,18 +116,18 @@
       -
       -->
     <string name="tutorial_title">Tutorial</string>
-    <string name="tutorial_start_text">👋\n\nTire alguns segundos para aprender a usar este Launcher!</string>
+    <string name="tutorial_start_text">Tire alguns segundos para aprender a usar este Launcher!</string>
     <string name="tutorial_concept_title">Conceito</string>
-    <string name="tutorial_concept_text">O μLauncher foi criado para ser minimalista, eficiente e livre de distrações. \n\n\nNão contém anúncios e não coleta dados.</string>
-    <string name="tutorial_concept_text_2">É um software livre (sob licença MIT)!\nNão deixe de conferir o repositório!</string>
+    <string name="tutorial_concept_text">O Launcher foi criado para ser minimalista, eficiente e livre de distrações. Ele é livre de pagamentos, anúncios e serviços de rastreamento.</string>
+    <string name="tutorial_concept_text_2">O app é de código aberto (licença MIT) e está disponível no GitHub! Não deixe de conferir o repositório!</string>
     <string name="tutorial_usage_title">Uso</string>
     <string name="tutorial_usage_text">Sua tela inicial contém a data e hora local. Sem distrações.</string>
-    <string name="tutorial_usage_text_2">Você pode iniciar seus aplicativos com gestos de toque ou apertando um botão.</string>
+    <string name="tutorial_usage_text_2">Você pode iniciar seus aplicativos com um gesto único ou apertando um botão. Escolha algumas ações no próximo slide.</string>
     <string name="tutorial_setup_title">Configurar</string>
     <string name="tutorial_setup_text">Selecionamos alguns aplicativos padrão para você. Se quiser, você pode alterá-los agora:</string>
     <string name="tutorial_setup_text_2">Você pode alterar suas escolhas mais tarde.</string>
     <string name="tutorial_finish_title">Vamos lá!</string>
-    <string name="tutorial_finish_text">Tá todo pronto para começar!\n\nEspero que isso seja de grande valor para você!\n\n- Finn (que criou o Launcher) e Josia (que fez algumas melhorias e tb mantém o fork do μLauncher)</string>
+    <string name="tutorial_finish_text">Tá todo pronto para começar! Espero que isso seja de grande valor para você! - Finn (que criou o Launcher) \te Josia (que fez algumas melhorias e tb mantém o fork do μLauncher)</string>
     <string name="tutorial_finish_button">Começar</string>
     <string name="settings">Configurações</string>
     <string name="ic_menu_alt">Mais opções</string>
@@ -147,11 +154,11 @@
     <string name="alert_lock_screen_failed">Erro: Falha ao bloquear a tela. (Se você acabou de atualizar o app, tente desativar e reativar o Serviço de acessibilidade em configurações do aparelho)</string>
     <string name="toast_accessibility_service_not_enabled">O Serviço de acessibilidade do μLauncher não está ativado. Entre em configurações para ativar</string>
     <string name="settings_apps_hide_bound_apps">Não mostrar apps com um gesto atribuído na lista de aplicativos</string>
-    <string name="toast_device_admin_not_enabled">O μLauncher precisa virar um Administrador do dispositivo para poder bloquear a tela.</string>
+    <string name="toast_device_admin_not_enabled">O µLauncher precisa tornar-se o Administrador do dispositivo para poder bloquear a tela.</string>
     <string name="device_admin_explanation">Isto é necessário para realizar a ação de bloqueio da tela.</string>
     <string name="device_admin_description">Permitir a ação de bloqueio da tela</string>
     <string name="alert_torch_access_exception">Erro: Não é possível acessar a lanterna.</string>
-    <string name="accessibility_service_name">μLauncher</string>
+    <string name="accessibility_service_name">µLauncher - bloqueio da tela</string>
     <string name="screen_lock_method_use_accessibility">Usar o Serviço de acessibilidade</string>
     <string name="screen_lock_method_use_device_admin">Usar o Administrador do dispositivo</string>
     <string name="screen_lock_method_dialog_title">Escolha um método de bloqueio</string>
@@ -160,7 +167,7 @@
     <string name="alert_requires_android_m">Essa funcionalidade requer o Android 6 ou mais recente.</string>
     <string name="alert_no_torch_found">Nenhuma câmera com lanterna detectada.</string>
     <string name="toast_lock_screen_not_supported">Erro: O bloqueio da tela via Serviço de acessibilidade não é compatível com este aparelho. Tente usar Administrador do dispositivo como método alternativo.</string>
-    <string name="accessibility_service_description">Definindo o μLauncher como Serviço de acessibilidade permite bloquear a tela e abrir o menu de apps recentes. Considere que é necessário conceder as permissões elevadas. Você nunca deveria autorizar essas permissões a qualquer aplicativo sem avaliação. O μLauncher usará o Serviço de acessibilidade somente para executar as seguintes ações quando solicitado pelo usuário: * bloquear a tela * abrir aplicativos recentes μLauncher nunca usará o Serviço de acessibilidade para coletar os dados. Você pode verificar o código-fonte para ter certeza. O bloqueio da tela também pode ser realizado dando ao μLauncher permissões de Administrador do dispositivo. Apesar de que esse método não funciona com impressão digital e desbloqueio facial.</string>
+    <string name="accessibility_service_description">Definindo µLauncher como Serviço de acessibilidade permite a ele bloquear a tela. Considere que é necessário conceder as permissões elevadas. Você nunca deveria autorizar essas permissões a qualquer aplicativo sem avaliação. O µLauncher usará o Serviço de acessibilidade somente para bloquear a tela. Você pode verificar o código-fonte para ter certeza. O bloqueio da tela também pode ser realizado dando ao µLauncher permissões de Administrador do dispositivo. Apesar de que esse método não funciona com impressão digital e desbloqueio facial.</string>
     <string name="screen_lock_method_dialog_text"><![CDATA[
         <h1>Escolha um método de bloqueio</h1>
         Há dois métodos para bloquear a tela.
@@ -174,9 +181,9 @@
 
         <h3>Serviço de acessibilidade</h3>
         Exige permissões elevadas.
-        O μLauncher usará essas permissões apenas para bloquear a tela.
+        O µLauncher usará essas permissões apenas para bloquear a tela.
         <br/>
-        (Você realmente não deveria confiar num app aleatório que você baixou e tá pedindo estas permissões, mas pode verificar o <a href=\"https://github.com/jrpie/Launcher\">código-fonte</a>.)
+        (Você realmente não deveria confiar num app aleatório que você baixou que tá pedindo estas permissões, mas pode verificar o <a href=\"https://github.com/jrpie/Launcher\">código-fonte</a>.)
         <br/>
         Em alguns aparelhos após ativação do Serviço de acessibilidade não será mais exigido o PIN para acessar dados criptografados, na inicialização do celular.
         Isto pode ser <a href="https://issuetracker.google.com/issues/37010136#comment36">reativado</a> depois.
@@ -210,7 +217,7 @@
     <string name="settings_enabled_gestures_edge_swipe_summary">Deslize na borda da tela</string>
     <string name="settings_enabled_gestures_edge_swipe_edge_width">Largura da borda</string>
     <string name="settings_meta_view_code">Ver código-fonte</string>
-    <string name="settings_meta_join_chat">Entre no chat do μLauncher</string>
+    <string name="settings_meta_join_chat">Entre no chat do µLauncher</string>
     <string name="list_other_lock_screen">Bloquear a tela</string>
     <string name="settings_theme_text_shadow">Sombra no texto</string>
     <string name="settings_theme_background_item_transparent">Transparente</string>
@@ -225,6 +232,7 @@
     <string name="settings_list_layout_item_text">Texto</string>
     <string name="settings_list_layout_item_grid">Grade</string>
     <string name="list_app_rename">Renomear</string>
+    <string name="dialog_rename_ok">beleza</string>
     <string name="dialog_rename_title">Renomear %1$s</string>
     <string name="settings_theme_font_item_serif_monospace">Serif monospace</string>
     <string name="settings_theme_font_item_serif">Serif</string>
@@ -236,18 +244,14 @@
     <string name="dialog_select_color_green">Verde</string>
     <string name="dialog_select_color_color_hex">Cor</string>
     <string name="dialog_choose_color_title">Escola a cor</string>
-    <string name="dialog_consent_accessibility_consent">Autorizo o μLauncher a usar Serviço de acessibilidade para acessar funcionalidades não relacionadas com a acessibilidade.</string>
-    <string name="dialog_consent_accessibility_data_collection">Não autorizo ao μLauncher coletar quaisquer dados.</string>
+    <string name="dialog_consent_accessibility_consent">Autorizo a utilização do Serviço de acessibilidade para disponibilizar funcionalidades não relacionadas com a acessibilidade.</string>
+    <string name="dialog_consent_accessibility_data_collection">Não autorizo ao µLauncher a coleta de quaisquer dados.</string>
     <string name="dialog_consent_accessibility_title">Ativação do Serviço de acessibilidade</string>
     <string name="dialog_consent_accessibility_ok">Ativar o Serviço de acessibilidade</string>
     <string name="dialog_cancel">Cancelar</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[Você está prestes a ativar o Serviço de acessibilidade. Isto concederá <strong>permissões elevadas</strong> ao μLauncher.<br/>μLauncher usará estas permissões <strong>apenas</strong> para executar as seguintes ações:
-    <ul>
-        <li>Bloquear a tela</li>
-        <li>Apps recentes</li>
-    </ul>
-     μLauncher<strong>nunca coletará nenhum dado</strong>. Sobretudo, o μLauncher não implementa o Serviço de acessibilidade para coletar os dados.]]></string>
-    <string name="dialog_consent_accessibility_privileges">Estou ciente de que isto concederá permissões elevadas ao μLauncher.</string>
+    <string name="dialog_consent_accessibility_text"><![CDATA[Você está prestes a ativar o Serviço de acessibilidade. Isto concederá <strong>permissões elevadas</strong> ao µLauncher.<br/>µLauncher usará estas permissões <strong>apenas para bloquear a tela</strong>. µLauncher <strong>nunca coletará nenhum dado</strong>. Sobretudo, o µLauncher não implementa o Serviço de acessibilidade para coletar dados.]]></string>
+    <string name="dialog_select_color_ok">beleza</string>
+    <string name="dialog_consent_accessibility_privileges">Estou ciente de que isto concederá permissões elevadas ao µLauncher.</string>
     <string name="dialog_consent_accessibility_other_options">Estou ciente de que existem outras opções (permissões de Administrador do aparelho ou o botão de ligar).</string>
     <string name="settings_functionality_search_web">Pesquise na internet</string>
     <string name="settings_functionality_search_web_summary">Ao buscar na lista de apps toque no Enter para iniciar uma pesquisa na internet.</string>
@@ -260,13 +264,13 @@
     <string name="toast_private_space_locked">Espaço privado trancado</string>
     <string name="toast_private_space_unlocked">Espaço privado liberado</string>
     <string name="toast_private_space_not_available">Espaço privado indisponível</string>
-    <string name="toast_private_space_default_home_screen">O μLauncher precisa ser definido como a tela inicial padrão para poder usar Espaço privado.</string>
+    <string name="toast_private_space_default_home_screen">O µLauncher precisa ser definido como a tela inicial padrão para poder usar Espaço privado.</string>
     <string name="dialog_report_bug_button_clipboard">Copiar para memória</string>
     <string name="dialog_report_bug_security_info">Não relate vulnerabilidades de segurança publicamente no GitHub, use o seguinte:</string>
     <string name="dialog_report_bug_button_security">Relatar vulnerabilidade de segurança</string>
     <string name="dialog_report_bug_create_report">Criar relatório</string>
     <string name="dialog_report_bug_title">Relatar um bug</string>
-    <string name="dialog_report_bug_info">Obrigado por ajudar a melhorar o μLauncher!\nConsidere adicionar as seguintes informações ao relatório dos bugs:</string>
+    <string name="dialog_report_bug_info">Obrigado por ajudar a melhorar o µLauncher!\nConsidere adicionar as seguintes informações ao relatório de bug:</string>
     <string name="settings_functionality_auto_launch_summary">Toque no espaço para temporariamente desativar esta funcionalidade.</string>
     <string name="toast_activity_not_found_browser">Não foi possível abrir a URL: nenhum navegador encontrado.</string>
     <string name="toast_activity_not_found_search_web">Nenhum app encontrado para efetuar a pesquisa.</string>
@@ -277,46 +281,4 @@
     <string name="list_other_list_private_space">Espaço privado</string>
     <string name="tooltip_lock_private_space">Trancar espaço privado</string>
     <string name="tooltip_unlock_private_space">Liberar espaço privado</string>
-    <string name="settings_gesture_swipe_larger_reverse"><![CDATA[> (Reverse)]]></string>
-    <string name="settings_gesture_description_swipe_larger_reverse">Canto inferior esquerdo -&gt; centro direito -&gt; canto superior esquerdo</string>
-    <string name="settings_gesture_description_swipe_smaller">Canto superior direito -&gt; centro direito -&gt; canto inferior direito</string>
-    <string name="settings_gesture_swipe_smaller_reverse"><![CDATA[< (Reverse)]]></string>
-    <string name="settings_gesture_description_swipe_v">Canto superior esquerdo -&gt; centro médio -&gt; canto superior direito</string>
-    <string name="settings_gesture_description_swipe_v_reverse">Canto superior direito -&gt; centro médio -&gt; canto superior esquerdo</string>
-    <string name="settings_gesture_swipe_v_reverse">V (invertido)</string>
-    <string name="settings_gesture_description_swipe_lambda">Inferior esquerdo -&gt; superior médio -&gt; inferior direito</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ (invertido)</string>
-    <string name="settings_gesture_swipe_larger"><![CDATA[>]]></string>
-    <string name="settings_gesture_swipe_smaller"><![CDATA[<]]></string>
-    <string name="settings_gesture_swipe_v">V</string>
-    <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_gesture_description_swipe_larger">Canto superior esquerdo -&gt; centro direito -&gt; canto inferior esquerdo</string>
-    <string name="settings_gesture_tap_up">Toque + pra cima</string>
-    <string name="settings_gesture_description_tap_up">Toque e deslize pra cima</string>
-    <string name="settings_gesture_tap_down">Toque + pra baixo</string>
-    <string name="settings_gesture_description_tap_down">Toque e deslize pra baixo</string>
-    <string name="settings_gesture_tap_left">Toque + esquerda</string>
-    <string name="settings_gesture_description_tap_left">Toque e deslize pra esquerda</string>
-    <string name="settings_gesture_tap_right">Toque + direita</string>
-    <string name="settings_gesture_description_tap_right">Toque e deslize pra direita</string>
-    <string name="pin_shortcut_title">Adicionar atalho</string>
-    <string name="pin_shortcut_button_bind">Vincular ao gesto</string>
-    <string name="pin_shortcut_switch_visible">Mostrar na lista de apps</string>
-    <string name="list_other_track_play_pause">Música: Reproduzir / Pausar</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">Canto inferior direito -&gt; centro esquerdo -&gt; canto superior direito</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">Inferior direito -&gt; superior médio -&gt; inferior esquerdo</string>
-    <string name="settings_list_reverse_layout">Inverter a lista de apps</string>
-    <string name="settings_meta_donate">Doar</string>
-    <string name="list_other_volume_adjust">Ajustar volume</string>
-    <string name="settings_display_hide_status_bar">Ocultar barra de status</string>
-    <string name="settings_display_hide_navigation_bar">Ocultar barra de navegação</string>
-    <string name="tutorial_concept_label_version">Versão</string>
-    <string name="tutorial_app_list_title">Todos apps</string>
-    <string name="tutorial_app_list_text">Você pode encontrar rápido todos os apps na lista de aplicativos.\n\nDeslize para cima para abrir ou definir um gesto específico.</string>
-    <string name="tutorial_app_list_text_2">Quando apenas um aplicativo corresponde, vai ser iniciado automaticamente.\nIsso pode ser desativado acrescentando um espaço durante a busca.</string>
-    <string name="settings_tab_actions">Ações</string>
-    <string name="list_other_recent_apps">Apps recentes</string>
-    <string name="alert_enable_accessibility_failed">Erro: Falha ao ativar o Serviço de acessibilidade.</string>
-    <string name="list_other_launch_other_launcher">Usar outro iniciador</string>
-    <string name="alert_recent_apps_failed">Erro: Falha ao mostrar apps recentes. (Se você acabou de atualizar o app, tente desativar e reativar o Serviço de acessibilidade em configurações do Android)</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -52,6 +52,7 @@
     <string name="alert_cant_open_message">Ayarlarını değiştirmek ister misiniz?</string>
     <string name="toast_cant_open_message">Bu harekete bir eylem atamak için ayarları açın</string>
     <string name="settings_title">Ayarlar</string>
+    <string name="settings_tab_app">Uygulamalar</string>
     <string name="settings_tab_launcher">Başlatıcı</string>
     <string name="settings_tab_meta">Daha Fazlası</string>
     <string name="settings_gesture_up">Yukarı</string>
@@ -104,6 +105,7 @@
     <string name="settings_gesture_time">Saat</string>
     <string name="settings_gesture_description_time">Saate tıklayın</string>
     <string name="settings_apps_choose">Uygulama Seçin</string>
+    <string name="settings_apps_view_all">Tüm uygulamaları göster</string>
     <string name="settings_apps_install">Uygulamaları yükle</string>
     <string name="settings_apps_toast_store_not_found">Mağaza bulunamadı</string>
     <string name="settings_launcher_section_appearance">Görünüş</string>
@@ -118,6 +120,8 @@
     <string name="list_other_nop">Hiçbir şey yapma</string>
     <string name="settings_meta_view_code">Kaynak kodunu göster</string>
     <string name="settings_meta_report_bug">Hatayı bildirin</string>
+    <string name="list_removed">Seçilen uygulama kaldırıldı</string>
+    <string name="list_not_removed">Uygulama kaldırılamadı</string>
     <string name="list_apps_search_hint">Uygulamaları Ara</string>
     <string name="list_other_list">Tüm Uygulamalar</string>
     <string name="list_other_list_favorites">Favori Uygulamalar</string>
@@ -130,8 +134,10 @@
     <string name="settings_clock_show_seconds">Saniyeleri gösteri</string>
     <string name="settings_clock_flip_date_time">Tarih ile zamanı yer değiştir</string>
     <string name="settings_theme_wallpaper">Duvar kağıdı seç</string>
+    <string name="settings_launcher_change_wallpaper">Duvar kağıdını değiştir</string>
     <string name="settings_launcher_section_display">Ekran</string>
     <string name="settings_display_screen_timeout_disabled">Ekranı açık tut</string>
+    <string name="settings_display_full_screen">Tam ekran kullan</string>
     <string name="settings_display_rotate_screen">Ekranı döndür</string>
     <string name="settings_launcher_section_functionality">İşlevsellik</string>
     <string name="settings_enabled_gestures_edge_swipe_summary">Ekranın köşesinden kaydırın</string>
@@ -159,6 +165,7 @@
     <string name="settings_list_layout_item_text">Metin</string>
     <string name="settings_list_layout_item_grid">Izgara</string>
     <string name="settings_meta_cant_select_launcher">Uygulama Detayı</string>
+    <string name="settings_meta_cant_select_launcher_msg">Sizin cihazınız bu özelliği desteklemiyor. Onun yerine uygulama detaylarını düzenleyin?</string>
     <string name="settings_meta_reset">Ayarları Sıfırlayın</string>
     <string name="settings_meta_reset_confirm">Tüm tercihlerinizi bir kenara bırakacaksınız. Devam mı?</string>
     <string name="settings_theme_font_item_monospace">Tek uzay</string>
@@ -191,6 +198,7 @@
     <string name="alert_torch_access_exception">Hata: Fenere erişilemiyor.</string>
     <string name="settings_actions_lock_method">Ekranı kilitleme yöntemini seçin</string>
     <string name="dialog_cancel">İptal</string>
+    <string name="dialog_rename_ok">OK</string>
     <string name="dialog_rename_title">Yeniden Adlandır %1$s</string>
     <string name="settings_theme_color_theme_item_dynamic">Dinamik</string>
     <string name="settings_clock_color">Renk</string>
@@ -198,6 +206,7 @@
     <string name="dialog_select_color_alpha">Alfa</string>
     <string name="dialog_select_color_blue">Mavi</string>
     <string name="dialog_select_color_green">Yeşil</string>
+    <string name="dialog_select_color_ok">OK</string>
     <string name="dialog_select_color_color_hex">Renk</string>
     <string name="dialog_choose_color_title">Renk seçin</string>
 </resources>

app/src/main/res/values-w820dp/dimens.xml

@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -5,89 +5,96 @@
     <string name="ic_menu_alt">更多选项</string>
     <string name="settings_title">设置</string>
     <string name="settings_launcher_section_appearance">外观</string>
-    <string name="settings_theme_color_theme">色调风格</string>
+    <string name="settings_theme_color_theme">主题</string>
     <string name="settings_launcher_section_display">显示</string>
     <string name="list_tab_other">其他</string>
-    <string name="settings_gesture_up">上滑</string>
-    <string name="settings_gesture_down">下滑</string>
+    <string name="settings_gesture_up">上</string>
+    <string name="settings_gesture_down">下</string>
     <string name="alert_cant_open_title">无法打开应用</string>
     <string name="alert_cant_open_message">要更改其设置吗？</string>
     <string name="toast_cant_open_message">打开设置，为该手势绑定一个应用程序</string>
+    <string name="settings_tab_app">应用程序</string>
     <string name="settings_tab_launcher">启动器</string>
     <string name="settings_tab_meta">杂项</string>
     <string name="settings_gesture_left">左</string>
-    <string name="settings_gesture_double_left">双指左滑</string>
-    <string name="settings_gesture_double_up">双指上滑</string>
-    <string name="settings_gesture_double_down">双指下滑</string>
+    <string name="settings_gesture_double_left">左滑两次</string>
+    <string name="settings_gesture_double_up">上滑两次</string>
+    <string name="settings_gesture_double_down">下滑两次</string>
     <string name="settings_gesture_right">右</string>
-    <string name="settings_gesture_double_right">双指右滑</string>
-    <string name="settings_gesture_right_top_edge">右滑（顶部）</string>
-    <string name="settings_gesture_right_bottom_edge">右滑（底部）</string>
-    <string name="settings_gesture_left_bottom_edge">左滑（底部）</string>
-    <string name="settings_gesture_left_top_edge">左滑（顶部）</string>
-    <string name="settings_gesture_up_left_edge">上滑（左边缘）</string>
-    <string name="settings_gesture_up_right_edge">上滑（右边缘）</string>
-    <string name="settings_gesture_down_left_edge">下滑（左边缘）</string>
-    <string name="settings_gesture_down_right_edge">下滑（右边缘）</string>
-    <string name="settings_gesture_vol_up">音量增加键</string>
-    <string name="settings_gesture_vol_down">音量降低键</string>
+    <string name="settings_gesture_double_right">右滑两次</string>
+    <string name="settings_gesture_right_top_edge">右（顶部）</string>
+    <string name="settings_gesture_right_bottom_edge">右（底部）</string>
+    <string name="settings_gesture_left_bottom_edge">左（底部）</string>
+    <string name="settings_gesture_left_top_edge">左（顶部）</string>
+    <string name="settings_gesture_up_left_edge">上（左边缘）</string>
+    <string name="settings_gesture_up_right_edge">上（右边缘）</string>
+    <string name="settings_gesture_down_left_edge">下（左边缘）</string>
+    <string name="settings_gesture_down_right_edge">下（右边缘）</string>
+    <string name="settings_gesture_vol_up">音量加</string>
+    <string name="settings_gesture_vol_down">音量减</string>
     <string name="settings_gesture_double_click">双击</string>
     <string name="settings_gesture_long_click">长按</string>
-    <string name="settings_gesture_date">桌面日期</string>
-    <string name="settings_gesture_time">桌面时钟</string>
+    <string name="settings_gesture_date">日期</string>
+    <string name="settings_gesture_time">时间</string>
     <string name="settings_apps_choose">选择应用</string>
+    <string name="settings_apps_view_all">浏览全部应用</string>
     <string name="settings_apps_install">安装应用</string>
     <string name="settings_apps_toast_store_not_found">没有找到应用市场</string>
     <string name="settings_launcher_section_date_time"><![CDATA[日期和时间]]></string>
-    <string name="settings_theme_wallpaper">选择壁纸</string>
+    <string name="settings_theme_wallpaper">选择一个壁纸</string>
+    <string name="settings_launcher_change_wallpaper">换壁纸</string>
     <string name="settings_display_screen_timeout_disabled">保持屏幕常亮</string>
+    <string name="settings_display_full_screen">使用全屏</string>
     <string name="settings_launcher_section_functionality">功能</string>
-    <string name="settings_enabled_gestures_edge_swipe">边缘滑动手势</string>
-    <string name="settings_functionality_auto_launch">自动启动搜索匹配项</string>
-    <string name="settings_functionality_auto_keyboard">自动激活搜索</string>
+    <string name="settings_enabled_gestures_edge_swipe">边缘滑动动作</string>
+    <string name="settings_functionality_auto_launch">零点击启动唯一搜索结果</string>
+    <string name="settings_functionality_auto_keyboard">搜索时呼出键盘</string>
     <string name="settings_launcher_sensitivity">灵敏度</string>
     <string name="settings_meta_cant_select_launcher">应用信息</string>
-    <string name="settings_meta_show_tutorial">查看 µLauncher 的使用教程</string>
+    <string name="settings_meta_cant_select_launcher_msg">您的设备不支持此功能。要不打开应用程序详细？</string>
+    <string name="settings_meta_show_tutorial">查看启动器教程</string>
     <string name="settings_meta_reset">重置设置</string>
-    <string name="settings_meta_reset_confirm">该操作将丢弃您的所有配置。是否继续?</string>
-    <string name="settings_meta_report_bug">错误反馈</string>
+    <string name="settings_meta_reset_confirm">你将放弃你所有的配置。继续吗?</string>
+    <string name="settings_meta_report_bug">反馈 BUG</string>
     <string name="settings_meta_fork_contact">联系该 fork 版本的作者</string>
     <string name="settings_meta_privacy">隐私政策</string>
     <string name="settings_meta_contact">联系原作者</string>
-    <string name="settings_meta_discord">加入我们的 Discord 社区！</string>
+    <string name="settings_meta_discord">加入 Discord！</string>
     <string name="list_title_view">全部应用</string>
     <string name="list_title_pick">选择应用</string>
-    <string name="tutorial_start_text">👋\n\n花几秒钟时间，了解一下如何用这个启动器吧！</string>
+    <string name="tutorial_start_text">花几秒时间学下咋用这个启动器吧！</string>
     <string name="tutorial_concept_title">概念</string>
-    <string name="tutorial_concept_text_2">这是一款自由软件（遵循 MIT 许可）！\n欢迎查看项目仓库！</string>
+    <string name="tutorial_concept_text_2">该应用是开源的（MIT许可），并在 GitHub 上可用！一定要来看看代码仓库！</string>
     <string name="tutorial_usage_title">使用方法</string>
-    <string name="tutorial_usage_text">您的桌面仅包含本地日期和时间，没有多余的项目。</string>
+    <string name="tutorial_usage_text">您的主屏幕仅包含本地日期和时间，没有其它纷纷扰扰。</string>
     <string name="tutorial_setup_title">设置</string>
-    <string name="tutorial_setup_text">我们为您预设了一些快捷操作。如果您不满意，现在就试试点击右侧图标：</string>
-    <string name="tutorial_setup_text_2">您也可以稍后更改您的选择。</string>
+    <string name="tutorial_setup_text">我们为您选择了一些默认应用。如果您愿意，现在可以更改它们：</string>
+    <string name="tutorial_setup_text_2">您也可以稍后更改选择。</string>
     <string name="tutorial_finish_title">开始！</string>
     <string name="list_tab_app">应用</string>
     <string name="list_app_delete">卸载</string>
     <string name="list_app_info">应用信息</string>
+    <string name="list_not_removed">无法移除应用</string>
+    <string name="list_removed">移除了选定的应用</string>
     <string name="list_apps_search_hint">搜索</string>
-    <string name="list_other_settings">μLauncher 设置</string>
+    <string name="list_other_settings">启动器设置</string>
     <string name="list_other_list">全部应用</string>
-    <string name="list_other_volume_up">增大音量</string>
-    <string name="list_other_volume_down">降低音量</string>
+    <string name="list_other_volume_up">音乐：大声</string>
+    <string name="list_other_volume_down">音乐：小声</string>
     <string name="list_other_track_previous">音乐：上一首</string>
     <string name="list_other_track_next">音乐：下一首</string>
-    <string name="list_other_nop">不做任何设置</string>
+    <string name="list_other_nop">啥也不干</string>
     <string name="tutorial_title">教程</string>
-    <string name="tutorial_concept_text">μLauncher 的设计理念是简约、高效，无干扰。\n\n不含广告、且不收集任何数据。</string>
-    <string name="tutorial_usage_text_2">您可以通过手势或按键来启动对您来说最重要的应用程序。</string>
-    <string name="settings_general_choose_home_screen">将 μLauncher 设为默认启动器</string>
-    <string name="tutorial_finish_text">您已经准备好开始使用本启动器了！\n\n希望本快捷教程能对您有所帮助！\n\n- Finn（Launcher 的作者）和 Josia（对 μLauncher 进行了改进和维护）</string>
-    <string name="settings_enabled_gestures_double_swipe">双指滑动手势</string>
+    <string name="tutorial_concept_text">μLauncher 的设计是最小、高效且无干扰。它不付费、无广告、不追踪。</string>
+    <string name="tutorial_usage_text_2">您只需滑动屏幕或按下按钮即可启动应用程序。在下一步向导中选择一些应用程序。</string>
+    <string name="settings_general_choose_home_screen">将 μLauncher 设为默认桌面</string>
+    <string name="tutorial_finish_text">您已经准备好开始了！我希望这对您很有价值！——Finn（Launcher 作者）和 Josia（做了一些改进并维护了 μLauncher 分支）</string>
+    <string name="settings_enabled_gestures_double_swipe">双滑动作</string>
     <string name="settings_clock_localized">使用本地日期格式</string>
     <string name="settings_clock_time_visible">显示时间</string>
     <string name="settings_clock_date_visible">显示日期</string>
-    <string name="settings_clock_flip_date_time">交换日期和时间位置</string>
-    <string name="settings_theme_background">背景（应用程序列表和设置页面）</string>
+    <string name="settings_clock_flip_date_time">翻转日期和时间</string>
+    <string name="settings_theme_background">背景（应用列表和设置）</string>
     <string name="settings_theme_font">字体</string>
     <string name="settings_theme_monochrome_icons">黑白应用图标</string>
     <string name="settings_clock_show_seconds">显示秒</string>
@@ -100,12 +107,12 @@
     <string name="alert_torch_access_exception">错误：无法访问闪光灯。</string>
     <string name="screen_lock_method_dialog_title">选择锁屏方法</string>
     <string name="settings_actions_lock_method">选择锁屏的方法</string>
-    <string name="settings_apps_hide_bound_apps">不要在应用程序列表中显示已被绑定到手势操作的应用</string>
+    <string name="settings_apps_hide_bound_apps">不要在应用抽屉中显示被绑定到手势的应用</string>
     <string name="alert_requires_android_m">此功能需要 Android 6 或更高版本。</string>
     <string name="snackbar_app_hidden">应用程序已隐藏。您可在设置中让它再次显示。</string>
-    <string name="toast_device_admin_not_enabled">µLauncher 需要激活“设备管理应用”权限才能够锁定屏幕。</string>
-    <string name="device_admin_explanation">这是执行锁屏操作所必需的。</string>
-    <string name="accessibility_service_name">µLauncher</string>
+    <string name="toast_device_admin_not_enabled">µLauncher 需要是设备管理员才能够锁定屏幕。</string>
+    <string name="device_admin_explanation">这是锁屏动作所必需的。</string>
+    <string name="accessibility_service_name">µLauncher -锁屏</string>
     <string name="list_title_favorite">收藏的应用</string>
     <string name="list_app_favorite_add">添加到收藏夹</string>
     <string name="list_app_favorite_remove">从收藏夹中移除</string>
@@ -114,41 +121,42 @@
     <string name="undo">撤销</string>
     <string name="settings_apps_hidden">隐藏的应用</string>
     <string name="list_title_hidden">隐藏的应用</string>
-    <string name="settings_gesture_description_up">向上滑动</string>
-    <string name="settings_gesture_description_double_up">使用双指向上滑动</string>
-    <string name="settings_gesture_description_down">向下滑动</string>
-    <string name="settings_gesture_description_double_down">使用双指向下滑动</string>
-    <string name="settings_gesture_description_left">向左滑动</string>
-    <string name="settings_gesture_description_double_left">使用双指向左滑动</string>
-    <string name="settings_gesture_description_right">向右滑动</string>
-    <string name="settings_gesture_description_double_right">使用双指向右滑动</string>
-    <string name="settings_gesture_description_right_top_edge">在桌面顶部向右滑动</string>
-    <string name="settings_gesture_description_right_bottom_edge">在桌面底部向右滑动</string>
-    <string name="settings_gesture_description_left_bottom_edge">在桌面底部向左滑动</string>
-    <string name="settings_gesture_description_left_top_edge">在桌面顶部向左滑动</string>
-    <string name="settings_gesture_description_up_left_edge">在桌面左边缘向上滑动</string>
-    <string name="settings_gesture_description_up_right_edge">在桌面右边缘向上滑动</string>
-    <string name="settings_gesture_description_down_left_edge">在桌面左边缘向下滑动</string>
-    <string name="settings_gesture_description_down_right_edge">在桌面右边缘向下滑动</string>
-    <string name="settings_gesture_description_vol_up">按下音量增加键</string>
-    <string name="settings_gesture_description_vol_down">按下音量降低键</string>
+    <string name="settings_gesture_description_up">上滑</string>
+    <string name="settings_gesture_description_double_up">用双指向上滑动</string>
+    <string name="settings_gesture_description_down">下滑</string>
+    <string name="settings_gesture_description_double_down">双指向下滑动</string>
+    <string name="settings_gesture_description_left">左滑</string>
+    <string name="settings_gesture_description_double_left">双指向左滑动</string>
+    <string name="settings_gesture_description_right">右滑</string>
+    <string name="settings_gesture_description_double_right">双指向右滑动</string>
+    <string name="settings_gesture_description_right_top_edge">在屏幕顶部向右滑动</string>
+    <string name="settings_gesture_description_right_bottom_edge">在屏幕底部向右滑动</string>
+    <string name="settings_gesture_description_left_bottom_edge">在屏幕底部向左滑动</string>
+    <string name="settings_gesture_description_left_top_edge">在屏幕顶部向左滑动</string>
+    <string name="settings_gesture_description_up_left_edge">在屏幕左边缘向上滑动</string>
+    <string name="settings_gesture_description_up_right_edge">在屏幕右边缘向上滑动</string>
+    <string name="settings_gesture_description_down_left_edge">在屏幕左边缘向下滑动</string>
+    <string name="settings_gesture_description_down_right_edge">在屏幕右边缘向下滑动</string>
+    <string name="settings_gesture_description_vol_up">按下音量增大按钮</string>
+    <string name="settings_gesture_description_vol_down">按下音量降低按钮</string>
     <string name="settings_gesture_description_double_click">双击空白区域</string>
     <string name="settings_gesture_description_long_click">长按空白区域</string>
-    <string name="settings_gesture_description_date">点击桌面日期</string>
-    <string name="settings_gesture_description_time">点击桌面时钟</string>
+    <string name="settings_gesture_description_date">点击日期</string>
+    <string name="settings_gesture_description_time">点击时间</string>
     <string name="settings_meta_view_code">查看源代码</string>
-    <string name="settings_meta_join_chat">加入 μLauncher 的聊天群</string>
+    <string name="settings_meta_join_chat">加入 µLauncher 聊天群</string>
     <string name="list_other_list_favorites">收藏的应用</string>
     <string name="list_other_lock_screen">锁屏</string>
     <string name="settings_theme_text_shadow">文本阴影</string>
-    <string name="settings_enabled_gestures_double_swipe_summary">使用双指进行滑动手势操作</string>
+    <string name="settings_enabled_gestures_double_swipe_summary">双指滑动</string>
+    <string name="dialog_rename_ok">确定</string>
     <string name="dialog_rename_title">重命名 %1$s</string>
     <string name="settings_theme_color_theme_item_default">默认</string>
-    <string name="settings_theme_color_theme_item_dark">暗色</string>
+    <string name="settings_theme_color_theme_item_dark">深色</string>
     <string name="settings_theme_background_item_transparent">透明</string>
-    <string name="settings_theme_background_item_dim">变暗</string>
+    <string name="settings_theme_background_item_dim">昏暗</string>
     <string name="settings_theme_background_item_blur">模糊</string>
-    <string name="settings_theme_background_item_solid">纯色</string>
+    <string name="settings_theme_background_item_solid">固实</string>
     <string name="settings_theme_font_item_system_default">系统默认</string>
     <string name="settings_theme_font_item_monospace">等宽</string>
     <string name="settings_theme_font_item_serif">衬线</string>
@@ -157,131 +165,52 @@
     <string name="settings_enabled_gestures_edge_swipe_edge_width">边缘宽度</string>
     <string name="list_app_rename">重命名</string>
     <string name="device_admin_description">启用锁屏动作</string>
-    <string name="toast_accessibility_service_not_enabled">μLauncher 的“无障碍”服务未启用，请在设置中启用它。</string>
-    <string name="toast_lock_screen_not_supported">错误：此设备不支持使用“无障碍”服务锁定屏幕。请改用激活“设备管理应用”权限。</string>
-    <string name="screen_lock_method_use_accessibility">使用“无障碍”服务</string>
-    <string name="screen_lock_method_use_device_admin">激活“设备管理应用”权限</string>
+    <string name="toast_accessibility_service_not_enabled">μLauncher 的无障碍服务未启用。请在设置中启用它</string>
+    <string name="toast_lock_screen_not_supported">错误：此设备不支持使用无障碍功能锁定屏幕。请改用设备管理员。</string>
+    <string name="screen_lock_method_use_accessibility">使用无障碍服务</string>
+    <string name="screen_lock_method_use_device_admin">使用设备管理员</string>
     <string name="dialog_cancel">取消</string>
-    <string name="settings_theme_color_theme_item_light">亮色</string>
-    <string name="list_other_expand_settings_panel">启动器设置</string>
-    <string name="alert_lock_screen_failed">错误：锁定屏幕失败。（如果您刚刚升级了本启动器，请尝试在手机设置中手动禁用再重新启用“无障碍”服务。）</string>
-    <string name="settings_enabled_gestures_edge_swipe_summary">在桌面边缘进行滑动手势操作</string>
-    <string name="accessibility_service_description">将 µLauncher 设置为“无障碍”服务以允许其锁定屏幕和展示最近应用屏幕。请注意，这会使 µLauncher 获得额外的权限。你永远不应该轻易地授予任何应用程序这样的权限。μLauncher 仅在被用户要求时才会使用“无障碍”服务权限以实现： * 锁定屏幕 * 展示最近应用屏幕。μLauncher 不会使用“无障碍”服务来收集任何数据。您可以审核我们的源代码。请注意，锁定屏幕也可以通过激活 µLauncher 的“设备管理应用”权限来实现，然而，这种方法无法与于指纹解锁和面部解锁兼容。</string>
-    <string name="settings_gesture_back">返回操作</string>
+    <string name="settings_theme_color_theme_item_light">浅色</string>
+    <string name="list_other_expand_settings_panel">快速设置</string>
+    <string name="alert_lock_screen_failed">错误：锁定屏幕失败。（如果您刚刚升级了应用程序，请尝试在手机设置中手动禁用并重新启用无障碍服务）</string>
+    <string name="settings_enabled_gestures_edge_swipe_summary">在屏幕边缘滑动</string>
+    <string name="accessibility_service_description">将 µLauncher 设为无障碍服务允许其锁定屏幕。请注意，这需要过多的权限。你永远不应该轻易地授予任何应用程序这样的权限。µLauncher 将仅使用无障碍服务功能锁屏。您可以审计源代码。请注意，锁屏也可以通过授予 µLauncher 设备管理员权限来实现，然而，这种方法不适用于以指纹和面部解锁。</string>
+    <string name="settings_gesture_back">返回</string>
     <string name="dialog_select_color_red">红色</string>
     <string name="dialog_select_color_blue">蓝色</string>
     <string name="dialog_select_color_alpha">透明度</string>
     <string name="dialog_select_color_green">绿色</string>
+    <string name="dialog_select_color_ok">确定</string>
     <string name="settings_theme_color_theme_item_dynamic">动态</string>
     <string name="list_title_private_space">私人空间</string>
     <string name="list_other_list_private_space">私人空间</string>
-    <string name="dialog_choose_color_title">设置颜色</string>
+    <string name="dialog_choose_color_title">选择颜色</string>
     <string name="dialog_select_color_color_hex">颜色</string>
-    <string name="dialog_report_bug_title">错误反馈</string>
+    <string name="dialog_report_bug_title">报告错误</string>
     <string name="settings_gesture_swipe_larger"><![CDATA[>]]></string>
     <string name="tooltip_lock_private_space">锁定私人空间</string>
     <string name="settings_gesture_swipe_v">V</string>
     <string name="settings_gesture_swipe_lambda">Λ</string>
-    <string name="settings_list_layout_item_text">纯文本</string>
+    <string name="settings_list_layout_item_text">文本</string>
     <string name="settings_list_layout_item_grid">网格</string>
     <string name="dialog_report_bug_create_report">创建报告</string>
     <string name="tooltip_unlock_private_space">解锁私人空间</string>
     <string name="settings_list_layout_item_default">默认</string>
-    <string name="settings_clock_color">文本颜色</string>
+    <string name="settings_clock_color">颜色</string>
     <string name="settings_gesture_swipe_smaller"><![CDATA[<]]></string>
     <string name="dialog_report_bug_button_clipboard">复制到剪贴板</string>
     <string name="alert_requires_android_v">此功能需要 Android 15 或更高版本。</string>
     <string name="list_other_toggle_private_space_lock">切换私人空间锁</string>
-    <string name="dialog_consent_accessibility_ok">激活“无障碍”服务</string>
-    <string name="dialog_consent_accessibility_title">正在激活“无障碍”服务</string>
+    <string name="dialog_consent_accessibility_ok">激活无障碍服务</string>
+    <string name="dialog_consent_accessibility_title">正在激活无障碍服务</string>
     <string name="settings_meta_licenses">开源许可证</string>
     <string name="legal_info_title">开源许可证</string>
-    <string name="pin_shortcut_switch_visible">在应用程序列表中显示</string>
+    <string name="pin_shortcut_switch_visible">在应用列表中显示</string>
     <string name="pin_shortcut_title">添加快捷方式</string>
     <string name="toast_private_space_locked">私人空间已锁定</string>
     <string name="toast_private_space_unlocked">私人空间已解锁</string>
     <string name="toast_private_space_not_available">私人空间不可用</string>
-    <string name="toast_private_space_default_home_screen">µLauncher 需要作为默认启动器才能访问私人空间。</string>
+    <string name="toast_private_space_default_home_screen">µLauncher 需要作为默认的主屏幕来访问私人空间。</string>
     <string name="toast_activity_not_found_search_web">没有找到处理搜索的应用。</string>
     <string name="toast_activity_not_found_browser">无法打开 URL：找不到浏览器。</string>
-    <string name="dialog_consent_accessibility_privileges">我已知晓，这将赋予 μLauncher 广泛且重要的权限。</string>
-    <string name="settings_apps_hide_private_space_apps">在应用程序列表中隐藏私人空间</string>
-    <string name="settings_apps_hide_paused_apps">隐藏已被暂停的应用</string>
-    <string name="settings_gesture_description_back">返回按键 / 返回手势</string>
-    <string name="settings_gesture_description_tap_down">先单击然后再向下滑动</string>
-    <string name="settings_functionality_search_web">在网络上搜索</string>
-    <string name="settings_gesture_description_swipe_smaller">（从）右上（滑向）中左（滑向）右下</string>
-    <string name="settings_functionality_search_web_summary">输入搜索内容后，按回车键直接在应用程序列表界面启动网络搜索。</string>
-    <string name="settings_gesture_description_swipe_lambda">（从）左下（滑向）中上（滑向）右下</string>
-    <string name="screen_lock_method_dialog_text"><![CDATA[
-        <h1>选择锁定设备的方式</h1>
-        有2种方式可以用来锁定屏幕。
-        遗憾的是，两者都有缺点：<br/><br/>
-
-        <h3>通过激活“设备管理应用”权限</h3>
-        该方法无法和指纹解锁和脸部解锁共同使用。
-
-        <br/>
-        <br/>
-
-        <h3>通过“无障碍”功能</h3>
-        需要更多的权限。
-        μLauncher 将这些权限仅用于锁定屏幕。
-        <br/>
-        （对于任何一个从网上下载的应用所做的类似声明，你都不应该抱持“默认为可信”的态度，你可以并应该检查一下它的<a href=\"https://github.com/jrpie/Launcher\">源代码</a>.）
-        <br/>
-        在某些设备上，激活“无障碍”服务后，启动 PIN 码将不再用于加密数据。
-        如果遇到该问题，可以通过<a href="https://issuetracker.google.com/issues/37010136#comment36">该方法</a>重新激活启动 PIN 码用于数据加密。
-
-        <br/><br/><br/><br/>
-        你可以在设置中随时更改这个选项。
-        ]]></string>
-    <string name="list_apps_search_hint_no_auto_launch">搜索（不触发自动启动匹配项）</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[您即将激活“无障碍”服务。这将授予 μLauncher <strong>广泛且重要的权限</strong>。<br/>但 μLauncher <strong>仅</strong>将这些权限用于：
-    <ul>
-        <li>锁定屏幕</li>
-        <li>展示最近应用屏幕</li>
-    </ul>
-µLauncher <strong>绝不会收集任何数据</strong>。尤其是，μLauncher 不会使用“无障碍”服务来收集任何数据。]]></string>
-    <string name="settings_gesture_description_swipe_larger">（从）左上（滑向）中右（滑向）左下</string>
-    <string name="settings_gesture_tap_up">单击 + 上滑</string>
-    <string name="settings_gesture_tap_down">单击 + 下滑</string>
-    <string name="settings_gesture_tap_left">单击 + 左滑</string>
-    <string name="settings_gesture_description_tap_left">先单击然后再向左滑动</string>
-    <string name="settings_gesture_description_tap_up">先单击然后再向上滑动</string>
-    <string name="settings_gesture_tap_right">单击 + 右滑</string>
-    <string name="settings_gesture_description_tap_right">先单击然后再向右滑动</string>
-    <string name="settings_gesture_description_swipe_larger_reverse">（从）左下（滑向）中右（滑向）左上</string>
-    <string name="settings_gesture_description_swipe_smaller_reverse">（从）右下（滑向）中左（滑向）右上</string>
-    <string name="settings_gesture_description_swipe_v">（从）左上（滑向）中下（滑向）右上</string>
-    <string name="settings_gesture_description_swipe_v_reverse">（从）右上（滑向）中下（滑向）左上</string>
-    <string name="settings_gesture_description_swipe_lambda_reverse">（从）右下（滑向）中上（滑向）左下</string>
-    <string name="settings_gesture_swipe_lambda_reverse">Λ （反向）</string>
-    <string name="settings_gesture_swipe_v_reverse">V（反向）</string>
-    <string name="settings_gesture_swipe_larger_reverse"><![CDATA[>（反向）]]></string>
-    <string name="settings_gesture_swipe_smaller_reverse"><![CDATA[<（反向）]]></string>
-    <string name="settings_functionality_auto_launch_summary">开启后将直接启动搜索所匹配到的应用，可以通过在搜索内容前添加空格来临时停用该功能。</string>
-    <string name="settings_list_layout">应用程序列表样式</string>
-    <string name="pin_shortcut_button_bind">绑定到手势</string>
-    <string name="list_other_track_play_pause">音乐：播放 / 暂停</string>
-    <string name="dialog_report_bug_button_security">报告安全漏洞</string>
-    <string name="dialog_report_bug_security_info">请不要在 Github 上以公开的方式报告安全漏洞，请使用以下方式进行报告：</string>
-    <string name="dialog_report_bug_info">感谢您帮助改进 µLauncher！\n请考虑在您的应用程序错误反馈中添加以下信息：</string>
-    <string name="dialog_consent_accessibility_other_options">我已知晓，还有其他替代方法（激活“设备管理应用”权限或通过电源按键）。</string>
-    <string name="dialog_consent_accessibility_data_collection">我同意 μLauncher 不收集任何数据。</string>
-    <string name="settings_meta_donate">捐赠</string>
-    <string name="list_other_volume_adjust">调整音量</string>
-    <string name="tutorial_concept_label_version">版本</string>
-    <string name="tutorial_app_list_title">所有应用</string>
-    <string name="tutorial_app_list_text">您可以在应用程序列表中快速找到已安装的应用程序。\n\n您可以通过上滑打开应用程序列表，也可以通过绑定其他手势操作来打开应用程序列表。</string>
-    <string name="tutorial_app_list_text_2">您还可以搜索，当匹配到唯一的应用程序后，该应用将自动启动。\n如果你不想触发自动启动，可以在搜索内容前加上空格以禁用。</string>
-    <string name="settings_display_hide_status_bar">隐藏状态栏</string>
-    <string name="settings_display_hide_navigation_bar">隐藏导航栏</string>
-    <string name="settings_list_reverse_layout">倒序排列应用程序</string>
-    <string name="dialog_consent_accessibility_consent">我同意 μLauncher 使用无障碍服务来提供与无障碍服务无关的其他功能。</string>
-    <string name="settings_tab_actions">快捷操作</string>
-    <string name="list_other_recent_apps">最近应用屏幕</string>
-    <string name="alert_enable_accessibility_failed">错误：启用“无障碍”服务失败。</string>
-    <string name="alert_recent_apps_failed">错误：无法展示最近应用屏幕。（如果您刚刚升级了本启动器，请尝试在手机设置中手动禁用再重新启用“无障碍”服务。）</string>
-    <string name="list_other_launch_other_launcher">启动其他启动器</string>
 </resources>

app/src/main/res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This declares attributes for the FontAwesome TextView -->
+<resources>
+    <declare-styleable name="FontAwesome">
+        <attr name="type" format="string" />
+    </declare-styleable>
+</resources>

app/src/main/res/values/donottranslate.xml

@@ -11,13 +11,11 @@
         <string name="settings_internal_version_code_key" translatable="false">internal.version_code</string>
         <string name="settings_apps_favorites_key" translatable="false">apps.favorites</string>
         <string name="settings_apps_hidden_key" translatable="false">apps.hidden</string>
-        <string name="settings_apps_pinned_shortcuts_key" translatable="false">apps.pinned_shortcuts</string>
         <string name="settings_apps_custom_names_key" translatable="false">apps.custom_names</string>
         <string name="settings_apps_hide_bound_apps_key" translatable="false">apps.hide_bound_apps</string>
         <string name="settings_apps_hide_paused_apps_key" translatable="false">apps.hide_paused_apps</string>
         <string name="settings_apps_hide_private_space_apps_key" translatable="false">apps.hide_private_space_apps</string>
         <string name="settings_list_layout_key" translatable="false">list.layout</string>
-        <string name="settings_list_reverse_layout_key" translatable="false">list.reverse_layout</string>
         <string name="settings_general_choose_home_screen_key" translatable="false">general.select_launcher</string>
 
         <!-- values of de.jrpie.android.launcher.preferences.ListLayout -->
@@ -137,9 +135,8 @@
           -
           -->
         <string name="settings_display_screen_timeout_disabled_key" translatable="false">display.disable_timeout</string>
+        <string name="settings_display_full_screen_key" translatable="false">display.use_full_screen</string>
         <string name="settings_display_rotate_screen_key" translatable="false">display.rotate_screen</string>
-        <string name="settings_display_hide_status_bar_key" translatable="false">display.use_full_screen</string>
-        <string name="settings_display_hide_navigation_bar_key" translatable="false">display.hide_navigation</string>
 
         <string name="settings_enabled_gestures_double_swipe_key" translatable="false">enabled_gestures.double_actions</string>
         <string name="settings_enabled_gestures_edge_swipe_key" translatable="false">enabled_gestures.edge_actions</string>
@@ -164,7 +161,6 @@
         <string name="settings_meta_privacy_url" translatable="false">https://s.jrpie.de/android-legal</string>
         <string name="settings_meta_contact_url" translatable="false">https://www.finnmglas.com/contact/</string>
         <string name="settings_meta_chat_url" translatable="false">https://s.jrpie.de/launcher-chat</string>
-        <string name="settings_meta_donate_url" translatable="false">https://s.jrpie.de/launcher-donate</string>
 
         <!--
           -
@@ -176,7 +172,7 @@
 
         <!-- Legal -->
         <string name="legal_info_text"><![CDATA[
-        <h2>μLauncher</h2>
+        <h2>µLauncher</h2>
         Modifications to Launcher.
         <p><a href=\"https://github.com/jrpie/launcher\">github.com/jrpie/launcher</a></p>
 

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -16,7 +16,7 @@
       -->
     <string name="settings_title">Settings</string>
 
-    <string name="settings_tab_actions">Actions</string>
+    <string name="settings_tab_app">Apps</string>
     <string name="settings_tab_launcher">Launcher</string>
     <string name="settings_tab_meta">Meta</string>
 
@@ -85,9 +85,9 @@
     <string name="settings_gesture_swipe_lambda_reverse">Λ (Reverse)</string>
     <string name="settings_gesture_description_swipe_lambda_reverse">Bottom right -> top mid -> bottom left</string>
 
-    <string name="settings_gesture_vol_up">Volume Up Key</string>
+    <string name="settings_gesture_vol_up">Volume Up</string>
     <string name="settings_gesture_description_vol_up">Press the volume up button</string>
-    <string name="settings_gesture_vol_down">Volume Down Key</string>
+    <string name="settings_gesture_vol_down">Volume Down</string>
     <string name="settings_gesture_description_vol_down">Press the volume down button</string>
     <string name="settings_gesture_double_click">Double Click</string>
     <string name="settings_gesture_description_double_click">Double click an empty area</string>
@@ -101,6 +101,8 @@
 
     <string name="settings_apps_choose">Choose App</string>
 
+    <string name="settings_apps_view_all">View all apps</string>
+
     <string name="settings_apps_install">Install apps</string>
     <string name="settings_apps_toast_store_not_found">Store not found</string>
 
@@ -146,12 +148,12 @@
     <string name="settings_clock_flip_date_time">Flip date and time</string>
 
     <string name="settings_theme_wallpaper">Choose a wallpaper</string>
+    <string name="settings_launcher_change_wallpaper">Change wallpaper</string>
 
     <string name="settings_launcher_section_display">Display</string>
 
     <string name="settings_display_screen_timeout_disabled">Keep screen on</string>
-    <string name="settings_display_hide_status_bar">Hide status bar</string>
-    <string name="settings_display_hide_navigation_bar">Hide navigation bar</string>
+    <string name="settings_display_full_screen">Use full screen</string>
     <string name="settings_display_rotate_screen">Rotate screen</string>
 
     <string name="settings_launcher_section_functionality">Functionality</string>
@@ -176,7 +178,6 @@
     <string name="settings_apps_hide_paused_apps">Hide paused apps</string>
     <string name="settings_apps_hide_private_space_apps">Hide private space from app list</string>
     <string name="settings_list_layout">Layout of app list</string>
-    <string name="settings_list_reverse_layout">Reverse the app list</string>
 
     <string name="settings_list_layout_item_default">Default</string>
     <string name="settings_list_layout_item_text">Text</string>
@@ -189,8 +190,9 @@
       -->
     <string name="settings_general_choose_home_screen">Set μLauncher as home screen</string>
     <string name="settings_meta_cant_select_launcher">App Info</string>
+    <string name="settings_meta_cant_select_launcher_msg">Your device does not support this feature. Manage application details instead?</string>
 
-    <string name="settings_meta_show_tutorial">View µLauncher Tutorial</string>
+    <string name="settings_meta_show_tutorial">View Launcher Tutorial</string>
 
     <string name="settings_meta_reset">Reset Settings</string>
     <string name="settings_meta_reset_confirm">You are going to discard all your preferences. Continue?</string>
@@ -199,15 +201,14 @@
     <string name="settings_meta_report_bug">Report a bug</string>
 
     <string name="dialog_report_bug_title">Report a bug</string>
-    <string name="dialog_report_bug_info">Thank you for helping to improve μLauncher!\nPlease consider adding the following information to your bug report:</string>
+    <string name="dialog_report_bug_info">Thank you for helping to improve µLauncher!\nPlease consider adding the following information to your bug report:</string>
     <string name="dialog_report_bug_button_clipboard">Copy to clipboard</string>
     <string name="dialog_report_bug_security_info">Please do not report security vulnerabilities publicly on GitHub, but use the following instead:</string>
     <string name="dialog_report_bug_button_security">Report a security vulnerability</string>
     <string name="dialog_report_bug_create_report">Create report</string>
 
     <string name="settings_meta_fork_contact">Contact the developer of the fork</string>
-    <string name="settings_meta_join_chat">Join μLauncher chat</string>
-    <string name="settings_meta_donate">Donate</string>
+    <string name="settings_meta_join_chat">Join µLauncher chat</string>
 
     <string name="settings_meta_privacy">Privacy Policy</string>
 
@@ -237,26 +238,26 @@
     <string name="list_app_hidden_remove">Show</string>
     <string name="list_app_rename">Rename</string>
 
+    <string name="list_removed">Removed the selected application</string>
+    <string name="list_not_removed">Unable to remove application</string>
+
     <string name="list_apps_search_hint">Search</string>
     <string name="list_apps_search_hint_no_auto_launch">Search (no auto launch)</string>
 
-    <string name="list_other_settings">μLauncher Settings</string>
+    <string name="list_other_settings">µLauncher Settings</string>
     <string name="list_other_list">All Applications</string>
     <string name="list_other_list_favorites">Favorite Applications</string>
     <string name="list_other_list_private_space">Private Space</string>
     <string name="list_other_toggle_private_space_lock">Toggle Private Space Lock</string>
-    <string name="list_other_volume_up">Raise Volume</string>
-    <string name="list_other_volume_down">Lower Volume</string>
-    <string name="list_other_volume_adjust">Adjust Volume</string>
+    <string name="list_other_volume_up">Music: Louder</string>
+    <string name="list_other_volume_down">Music: Quieter</string>
     <string name="list_other_track_next">Music: Next</string>
     <string name="list_other_track_previous">Music: Previous</string>
     <string name="list_other_track_play_pause">Music: Play / Pause</string>
-    <string name="list_other_expand_notifications_panel">Expand Notifications Panel</string>
-    <string name="list_other_recent_apps">Recent Apps</string>
-    <string name="list_other_nop">Do Nothing</string>
+    <string name="list_other_expand_notifications_panel">Expand notifications panel</string>
+    <string name="list_other_nop">Do nothing</string>
     <string name="list_other_lock_screen">Lock Screen</string>
     <string name="list_other_torch">Toggle Torch</string>
-    <string name="list_other_launch_other_launcher">Launch Other Home Screen</string>
 
     <!-- Pin shortcuts -->
     <string name="pin_shortcut_title">Add Shortcut</string>
@@ -269,29 +270,22 @@
       -
       -->
     <string name="tutorial_title">Tutorial</string>
-    <string name="tutorial_start_text">👋\n\nTake a few seconds to learn how to use this Launcher!</string>
+    <string name="tutorial_start_text">Take a few seconds to learn how to use this Launcher!</string>
 
     <string name="tutorial_concept_title">Concept</string>
-    <string name="tutorial_concept_text">μLauncher is designed to be minimal, efficient and free of distraction.
-        \n\nIt contains no ads and collects no data.</string>
-    <string name="tutorial_concept_text_2">It is free software (MIT license)!\nMake sure to check out the repository!</string>
-    <string name="tutorial_concept_label_version">Version</string>
+    <string name="tutorial_concept_text">Launcher is designed to be minimal, efficient and free of distraction.  It is free of payments, ads and tracking services.</string>
+    <string name="tutorial_concept_text_2">The app is open-source (MIT license) and available on GitHub!  Make sure to check out the repository!</string>
 
     <string name="tutorial_usage_title">Usage</string>
     <string name="tutorial_usage_text">Your home screen contains the local date and time. No distraction.</string>
-    <string name="tutorial_usage_text_2">You can launch your most important apps with touch gestures or button presses.</string>
-
-    <string name="tutorial_app_list_title">All Apps</string>
-    <string name="tutorial_app_list_text">You can quickly search through all apps in the app list.\n\nSwipe up to open it, or bind it to a different gesture.</string>
-    <string name="tutorial_app_list_text_2">Once only one app matches, it launches automatically.\nThis can be disabled by prefixing the query with a space.</string>
-
+    <string name="tutorial_usage_text_2">You can launch your apps with a single swipe or button press. Choose some in the next slide.</string>
 
     <string name="tutorial_setup_title">Setup</string>
     <string name="tutorial_setup_text">We chose some default apps for you. You can change them now if you want to:</string>
     <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) and Josia (who made some improvements and maintains the fork μLauncher)</string>
+    <string name="tutorial_finish_text">You are ready to get started!  I hope this is of great value to you!  - Finn (who made Launcher) \tand Josia (who made some improvements and maintains the fork μLauncher)</string>
     <string name="tutorial_finish_button">Start</string>
 
 
@@ -303,35 +297,28 @@
     <string name="snackbar_app_hidden">App hidden. You can make it visible again in settings.</string>
     <string name="undo">Undo</string>
     <string name="list_other_expand_settings_panel">Quick Settings</string>
-    <string name="toast_device_admin_not_enabled">μLauncher needs to be a device admin in order to lock the screen.</string>
+    <string name="toast_device_admin_not_enabled">µLauncher needs to be a device admin in order to lock the screen.</string>
     <string name="device_admin_explanation">This is required for the lock screen action.</string>
     <string name="device_admin_description">Enable the lock screen action</string>
     <string name="alert_no_torch_found">No camera with torch detected.</string>
     <string name="alert_torch_access_exception">Error: Can\'t access torch.</string>
     <string name="alert_lock_screen_failed">Error: Failed to lock screen. (If you just upgraded the app, try to disable and re-enable the accessibility service in phone settings)</string>
-    <string name="alert_recent_apps_failed">Error: Failed to show recent apps. (If you just upgraded the app, try to disable and re-enable the accessibility service in phone settings)</string>
-    <string name="alert_enable_accessibility_failed">Error: Failed to enable the accessibility service.</string>
     <string name="toast_accessibility_service_not_enabled">μLauncher\'s accessibility service is not enabled. Please enable it in settings</string>
     <string name="toast_private_space_locked">Private space locked</string>
     <string name="toast_private_space_unlocked">Private space unlocked</string>
     <string name="toast_private_space_not_available">Private space is not available</string>
-    <string name="toast_private_space_default_home_screen">μLauncher needs to be the default home screen to access private space.</string>
+    <string name="toast_private_space_default_home_screen">µLauncher needs to be the default home screen to access private space.</string>
     <string name="tooltip_lock_private_space">Lock private space</string>
     <string name="tooltip_unlock_private_space">Unlock private space</string>
     <string name="toast_lock_screen_not_supported">Error: Locking the screen using accessibility is not supported on this device. Please use device admin instead.</string>
-    <string name="accessibility_service_name">μLauncher</string>
+    <string name="accessibility_service_name">µLauncher - lock screen</string>
     <string name="accessibility_service_description">
-        Setting μLauncher as an accessibility service allows it to lock the screen and open the recent apps menu.
+        Setting µLauncher as an accessibility service allows it to lock the screen.
         Note that excessive permissions are required. You should never grant such permissions lightly to any app.
 
-        μLauncher will use the accessibility service only for performing the following actions when requested by the user:
+        µLauncher will use the accessibility service only for locking the screen. You can check the source code to make sure.
 
-        * lock screen
-        * open recent apps
-
-        μLauncher will never use the accessibility service to collect data. You can check the source code to make sure.
-
-        Note that locking the screen can also be accomplished by granting μLauncher device administrator permissions. However that method doesn\'t work with fingerprint and face unlock.
+        Note that locking the screen can also be accomplished by granting µLauncher device administrator permissions. However that method doesn\'t work with fingerprint and face unlock.
     </string>
 
 
@@ -349,7 +336,7 @@
 
         <h3>Accessibility Service</h3>
         Requires excessive privileges.
-        μLauncher will use those privileges only for locking the screen.
+        µLauncher will use those privileges only for locking the screen.
         <br/>
         (You really should not trust a random app you just downloaded with such a claim, but you can check the <a href=\"https://github.com/jrpie/Launcher\">source code</a>.)
         <br/>
@@ -363,23 +350,20 @@
     <string name="screen_lock_method_use_accessibility">Use Accessibility Service</string>
     <string name="screen_lock_method_use_device_admin">Use Device Admin</string>
     <string name="settings_actions_lock_method">Choose method for locking the screen</string>
+    <string name="dialog_rename_ok">Ok</string>
     <string name="dialog_rename_title">Rename %1$s</string>
     <string name="dialog_select_color_red">Red</string>
     <string name="dialog_select_color_alpha">Alpha</string>
     <string name="dialog_select_color_blue">Blue</string>
     <string name="dialog_select_color_green">Green</string>
+    <string name="dialog_select_color_ok">Ok</string>
     <string name="dialog_select_color_color_hex">Color</string>
     <string name="dialog_choose_color_title">Choose color</string>
-    <string name="dialog_consent_accessibility_privileges">I am aware that this will grant far-reaching privileges to μLauncher.</string>
+    <string name="dialog_consent_accessibility_privileges">I am aware that this will grant far-reaching privileges to µLauncher.</string>
     <string name="dialog_consent_accessibility_other_options">I am aware that other options exist (using device administrator privileges or the power button).</string>
-    <string name="dialog_consent_accessibility_consent">I consent to μLauncher using the accessibility service to provide functionality unrelated to accessibility.</string>
-    <string name="dialog_consent_accessibility_data_collection">I consent to μLauncher not collecting any data.</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[You are about to activate the accessibility service. This will grant <strong>far-reaching privileges</strong> to μLauncher.<br/>μLauncher will use these privileges <strong>only</strong> to perform the following actions:
-    <ul>
-        <li>Lock Screen</li>
-        <li>Recent Apps</li>
-    </ul>
-     μLauncher <strong>will never collect any data</strong>. In particular, μLauncher does not use the accessibility service to collect any data.]]></string>
+    <string name="dialog_consent_accessibility_consent">I consent to µLauncher using the accessibility service to provide functionality unrelated to accessibility.</string>
+    <string name="dialog_consent_accessibility_data_collection">I consent to µLauncher not collecting any data.</string>
+    <string name="dialog_consent_accessibility_text"><![CDATA[You are about to activate the accessibility service. This will grant <strong>far-reaching privileges</strong> to µLauncher.<br/>µLauncher will use these privileges <strong>only to lock the screen</strong>. µLauncher <strong>will never collect any data</strong>. In particular, µLauncher does not use the accessibility service to collect any data.]]></string>
     <string name="dialog_consent_accessibility_title">Activating the Accessibility Service</string>
     <string name="dialog_consent_accessibility_ok">Activate Accessibility Service</string>
     <string name="dialog_cancel">Cancel</string>

app/src/main/res/values/styles.xml

@@ -105,6 +105,17 @@
         <item name="android:fontFamily">serif</item>
     </style>
 
+    <style name="textColorWhite">
+        <item name="android:textColor">@color/finnmglasTheme_text_color</item>
+    </style>
+
+    <style name="textColorWhiteAndShadow">
+        <item name="android:textColor">@color/finnmglasTheme_text_color</item>
+    </style>
+    <style name="textColorBlack">
+        <item name="android:textColor">#000</item>
+    </style>
+
     <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu" tools:keep="@style/PopupMenuCustom">
         <item name="android:popupBackground">#252827</item>
     </style>
@@ -112,9 +123,6 @@
     <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:color">#000000</item>
         <item name="android:textColor">@color/text_color_toggle</item>
-        <item name="android:shadowRadius">0</item>
-        <item name="android:shadowDx">0</item>
-        <item name="android:shadowDy">0</item>
     </style>
 
     <style name="AlertDialogDanger" parent="AlertDialogCustom">