renamed preferences

app/build.gradle

@@ -41,10 +41,12 @@ android {
     }
 
 
+
+
     buildTypes {
         release {
-            minifyEnabled true
+            // minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     namespace 'de.jrpie.android.launcher'
@@ -62,9 +64,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "eu.jonahbauer:android-preference-annotations:1.1.2"
+    annotationProcessor "eu.jonahbauer:android-preference-annotations:1.1.2"
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    //kapt "eu.jonahbauer:android-preference-annotations:1.1.2"
-    //annotationProcessor "eu.jonahbauer:android-preference-annotations:1.1.2"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

app/src/main/AndroidManifest.xml

@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-        android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_HIDDEN_PROFILES" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
@@ -21,15 +20,14 @@
 
         <activity
             android:name=".HomeActivity"
-            android:clearTaskOnLaunch="true"
-            android:excludeFromRecents="true"
             android:exported="true"
+            android:excludeFromRecents="true"
+            android:clearTaskOnLaunch="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -38,12 +36,14 @@
         <activity
             android:name=".tutorial.TutorialActivity"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"></activity>
+            tools:ignore="LockedOrientationActivity">
+        </activity>
         <activity
             android:name=".list.ListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity"></activity>
+            tools:ignore="LockedOrientationActivity">
+        </activity>
         <activity
             android:name=".settings.SettingsActivity"
             android:exported="true"

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

@@ -1,16 +1,14 @@
 package de.jrpie.android.launcher
 
 import android.content.Context
+import androidx.preference.PreferenceManager
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
 class Application: android.app.Application() {
     override fun onCreate() {
         super.onCreate()
 
-        val preferences = getSharedPreferences(
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-            this.getString(R.string.preference_file_key),
-            Context.MODE_PRIVATE
-        )
         LauncherPreferences.init(preferences, this.resources)
     }
 }

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

@@ -10,8 +10,12 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.LauncherActivityInfo
 import android.content.pm.LauncherApps
 import android.content.pm.PackageManager
+import android.graphics.BlendMode
+import android.graphics.BlendModeColorFilter
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.media.AudioManager
@@ -26,11 +30,16 @@ import android.util.DisplayMetrics
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.view.Window
+import android.view.WindowManager
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.inputmethod.InputMethodManager
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.Switch
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import de.jrpie.android.launcher.list.ListActivity
 import de.jrpie.android.launcher.list.apps.AppInfo
 import de.jrpie.android.launcher.list.apps.AppsRecyclerAdapter
@@ -78,14 +87,10 @@ fun setDefaultHomeScreen(context: Context, checkDefault: Boolean = false) {
 
     if (checkDefault
         && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-        && context is Activity
+        && context is Activity) {
-    ) {
         val roleManager = context.getSystemService(RoleManager::class.java)
         if(!roleManager.isRoleHeld(RoleManager.ROLE_HOME)) {
-            context.startActivityForResult(
+            context.startActivityForResult(roleManager.createRequestRoleIntent(RoleManager.ROLE_HOME), REQUEST_SET_DEFAULT_HOME)
-                roleManager.createRequestRoleIntent(RoleManager.ROLE_HOME),
-                REQUEST_SET_DEFAULT_HOME
-            )
         }
         return
     }
@@ -111,8 +116,7 @@ fun isInstalled(uri: String, context: Context): Boolean {
     try {
         context.packageManager.getPackageInfo(uri, PackageManager.GET_ACTIVITIES)
         return true
-    } catch (_: PackageManager.NameNotFoundException) {
+    } catch (_: PackageManager.NameNotFoundException) { }
-    }
     return false
 }
 
@@ -130,7 +134,8 @@ fun launch(
 
     if (LauncherAction.isOtherAction(data)) { // [type]:[info]
         LauncherAction.byId(data)?.let {it.launch(activity) }
-    } else launchApp(data, user, activity) // app
+    }
+    else launchApp(data, user, activity) // app
 
     activity.overridePendingTransition(animationIn, animationOut)
 }
@@ -143,8 +148,7 @@ fun audioNextTrack(activity: Activity) {
 
     val eventTime: Long = SystemClock.uptimeMillis()
 
-    val downEvent =
+    val downEvent = KeyEvent(eventTime, eventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT, 0)
-        KeyEvent(eventTime, eventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT, 0)
     mAudioManager.dispatchMediaKeyEvent(downEvent)
 
     val upEvent = KeyEvent(eventTime, eventTime, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT, 0)
@@ -160,8 +164,7 @@ fun audioPreviousTrack(activity: Activity) {
         KeyEvent(eventTime, eventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PREVIOUS, 0)
     mAudioManager.dispatchMediaKeyEvent(downEvent)
 
-    val upEvent =
+    val upEvent = KeyEvent(eventTime, eventTime, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS, 0)
-        KeyEvent(eventTime, eventTime, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS, 0)
     mAudioManager.dispatchMediaKeyEvent(upEvent)
 }
 
@@ -196,11 +199,7 @@ fun expandNotificationsPanel(context: Context) {
         val showStatusBar = statusBarManager.getMethod("expandNotificationsPanel")
         showStatusBar.invoke(statusBarService)
     } catch (e: Exception) {
-        Toast.makeText(
+        Toast.makeText(context, context.getString(R.string.alert_cant_expand_notifications_panel), Toast.LENGTH_LONG).show()
-            context,
-            context.getString(R.string.alert_cant_expand_notifications_panel),
-            Toast.LENGTH_LONG
-        ).show()
     }
 }
 
@@ -210,39 +209,32 @@ fun getUserFromId(user: Int?, context: Context): UserHandle? {
     val userManager = context.getSystemService(Service.USER_SERVICE) as UserManager
     return userManager.userProfiles.firstOrNull { it.hashCode() == user }
 }
-
+fun getLauncherActivityInfo(packageName: String, user: Int?, context: Context): LauncherActivityInfo? {
-fun getLauncherActivityInfo(
-    packageName: String,
-    user: Int?,
-    context: Context
-): LauncherActivityInfo? {
     val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
-    return getUserFromId(user, context)?.let { userHandle ->
+    return getUserFromId(user,context)?.let {
-        launcherApps.getActivityList(packageName, userHandle).firstOrNull()
+        userHandle -> launcherApps.getActivityList(packageName, userHandle).firstOrNull()
     }
 }
-
 fun uninstallApp(packageName: String, user: Int?, activity: Activity) {
     Log.i("Launcher", "uninstalling $packageName ($user)")
     val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
     intent.data = Uri.parse("package:$packageName")
-    getUserFromId(user, activity)?.let { user ->
+    getUserFromId(user, activity)?.let {
-        intent.putExtra(Intent.EXTRA_USER, user)
+        user -> intent.putExtra(Intent.EXTRA_USER, user)
     }
 
     intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
-    activity.startActivityForResult(
+    activity.startActivityForResult(intent,
-        intent,
         REQUEST_UNINSTALL
     )
 }
 
 fun launchApp(packageName: String, user: Int?, context: Context, rect: Rect? = null) {
     Log.i("Launcher", "Starting: " + packageName + " (user " +user.toString()+ ")")
-    if (user != null) {
+    if (user != null && user != INVALID_USER) {
         val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
-        getLauncherActivityInfo(packageName, user, context)?.let { app ->
+        getLauncherActivityInfo(packageName,user,context)?.let {
-            launcherApps.startMainActivity(app.componentName, app.user, rect, null)
+            app -> launcherApps.startMainActivity(app.componentName, app.user, rect, null)
             return
         }
     }
@@ -260,8 +252,7 @@ fun launchApp(packageName: String, user: Int?, context: Context, rect: Rect? = n
             )
                 .setTitle(context.getString(R.string.alert_cant_open_title))
                 .setMessage(context.getString(R.string.alert_cant_open_message))
-                .setPositiveButton(
+                .setPositiveButton(android.R.string.ok
-                    android.R.string.ok
                 ) { _, _ ->
                     openAppSettings(
                         packageName,
@@ -292,16 +283,10 @@ fun openNewTabWindow(urls: String, context: Context) {
 }
 
 
-fun openAppSettings(
+fun openAppSettings(packageName: String, user: Int?, context: Context, sourceBounds: Rect? = null, opts: Bundle? = null) {
-    packageName: String,
-    user: Int?,
-    context: Context,
-    sourceBounds: Rect? = null,
-    opts: Bundle? = null
-) {
     val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
-    getLauncherActivityInfo(packageName, user, context)?.let { app ->
+    getLauncherActivityInfo(packageName, user, context)?.let {
-        launcherApps.startAppDetailsActivity(app.componentName, app.user, sourceBounds, opts)
+        app -> launcherApps.startAppDetailsActivity(app.componentName, app.user, sourceBounds, opts)
     }
 }
 
@@ -322,9 +307,9 @@ fun openAppsList(activity: Activity) {
 fun getAppIcon(context: Context, packageName: String, user: Int?): Drawable {
     if (user != null) {
         val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
-        getUserFromId(user, context)?.let { userHandle ->
+        getUserFromId(user,context)?.let {
-            launcherApps.getActivityList(packageName, userHandle).firstOrNull()?.let { app ->
+                userHandle -> launcherApps.getActivityList(packageName, userHandle).firstOrNull()?.let {
-                return app.getBadgedIcon(0)
+                    app -> return app.getBadgedIcon(0)
             }
         }
     }
@@ -350,8 +335,7 @@ fun loadApps(packageManager: PackageManager, context: Context) {
             app.packageName = activityInfo.applicationInfo.packageName
             app.icon = activityInfo.getBadgedIcon(0)
             app.user = user.hashCode()
-            app.isSystemApp =
+            app.isSystemApp = activityInfo.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) != 0
-                activityInfo.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) != 0
             loadList.add(app)
         }
     }

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

@@ -2,6 +2,7 @@ package de.jrpie.android.launcher
 
 import android.app.Activity
 import android.content.Context
+import android.util.Log
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
 /**
@@ -11,133 +12,32 @@ import de.jrpie.android.launcher.preferences.LauncherPreferences
  * @param animationIn res id of transition animation (in) when using the gesture to launch an app.
  * @param animationOut res id of transition animation (out) when using the gesture to launch an app.
  */
-enum class Gesture(
+enum class Gesture (val id: String, private val labelResource: Int,
-    val id: String, private val labelResource: Int,
                     private val defaultsResource: Int,
                     private val animationIn: Int = android.R.anim.fade_in,
-    private val animationOut: Int = android.R.anim.fade_out
+                    private val animationOut: Int = android.R.anim.fade_out){
-) {
+    VOLUME_UP("action.volume_up", R.string.settings_gesture_vol_up, R.array.default_volume_up, 0,0),
-    VOLUME_UP(
+    VOLUME_DOWN("action.volume_down", R.string.settings_gesture_vol_down, R.array.default_volume_down,0,0),
-        "action_volumeUpApp",
+    TIME("action.time", R.string.settings_gesture_time, R.array.default_time),
-        R.string.settings_gesture_vol_up,
+    DATE("action.date", R.string.settings_gesture_date, R.array.default_date),
-        R.array.default_volume_up,
+    LONG_CLICK("action.long_click", R.string.settings_gesture_long_click, R.array.default_long_click, 0,0),
-        0,
+    DOUBLE_CLICK("action.double_click", R.string.settings_gesture_double_click, R.array.default_double_click,0,0),
-        0
+    SWIPE_UP("action.up", R.string.settings_gesture_up, R.array.default_up, R.anim.bottom_up),
-    ),
+    SWIPE_UP_LEFT_EDGE("action.up_left", R.string.settings_gesture_up_left_edge, R.array.default_up_left, R.anim.bottom_up),
-    VOLUME_DOWN(
+    SWIPE_UP_RIGHT_EDGE("action.up_right", R.string.settings_gesture_up_right_edge, R.array.default_up_right, R.anim.bottom_up),
-        "action_volumeDownApp",
+    SWIPE_UP_DOUBLE( "action.double_up", R.string.settings_gesture_double_up, R.array.default_double_up, R.anim.bottom_up),
-        R.string.settings_gesture_vol_down,
+    SWIPE_DOWN("action.down", R.string.settings_gesture_down, R.array.default_down, R.anim.top_down),
-        R.array.default_volume_down,
+    SWIPE_DOWN_LEFT_EDGE("action.down_left", R.string.settings_gesture_down_left_edge, R.array.default_down_left, R.anim.top_down),
-        0,
+    SWIPE_DOWN_RIGHT_EDGE("action.down_right", R.string.settings_gesture_down_right_edge, R.array.default_down_right, R.anim.top_down),
-        0
+    SWIPE_DOWN_DOUBLE("action.double_down", R.string.settings_gesture_double_down, R.array.default_double_down, R.anim.top_down),
-    ),
+    SWIPE_LEFT("action.left", R.string.settings_gesture_left, R.array.default_left, R.anim.right_left),
-    TIME("action_timeApp", R.string.settings_gesture_time, R.array.default_time),
+    SWIPE_LEFT_TOP_EDGE("action.left_top", R.string.settings_gesture_left_top_edge, R.array.default_left_top, R.anim.right_left),
-    DATE("action_dateApp", R.string.settings_gesture_date, R.array.default_date),
+    SWIPE_LEFT_BOTTOM_EDGE("action.left_bottom", R.string.settings_gesture_left_bottom_edge, R.array.default_left_bottom, R.anim.right_left),
-    LONG_CLICK(
+    SWIPE_LEFT_DOUBLE("action.double_left", R.string.settings_gesture_double_left, R.array.default_double_left, R.anim.right_left),
-        "action_longClickApp",
+    SWIPE_RIGHT("action.right", R.string.settings_gesture_right, R.array.default_right, R.anim.left_right),
-        R.string.settings_gesture_long_click,
+    SWIPE_RIGHT_TOP_EDGE("action.right_top", R.string.settings_gesture_right_top_edge, R.array.default_right_top, R.anim.left_right),
-        R.array.default_long_click,
+    SWIPE_RIGHT_BOTTOM_EDGE("action.right_bottom", R.string.settings_gesture_right_bottom_edge, R.array.default_right_bottom, R.anim.left_right),
-        0,
+    SWIPE_RIGHT_DOUBLE("action.double_right", R.string.settings_gesture_double_right, R.array.default_double_right, R.anim.left_right);
-        0
-    ),
-    DOUBLE_CLICK(
-        "action_doubleClickApp",
-        R.string.settings_gesture_double_click,
-        R.array.default_double_click,
-        0,
-        0
-    ),
-    SWIPE_UP("action_upApp", R.string.settings_gesture_up, R.array.default_up, R.anim.bottom_up),
-    SWIPE_UP_LEFT_EDGE(
-        "action_up_leftApp",
-        R.string.settings_gesture_up_left_edge,
-        R.array.default_up_left,
-        R.anim.bottom_up
-    ),
-    SWIPE_UP_RIGHT_EDGE(
-        "action_up_rightApp",
-        R.string.settings_gesture_up_right_edge,
-        R.array.default_up_right,
-        R.anim.bottom_up
-    ),
-    SWIPE_UP_DOUBLE(
-        "action_doubleUpApp",
-        R.string.settings_gesture_double_up,
-        R.array.default_double_up,
-        R.anim.bottom_up
-    ),
-    SWIPE_DOWN(
-        "action_downApp",
-        R.string.settings_gesture_down,
-        R.array.default_down,
-        R.anim.top_down
-    ),
-    SWIPE_DOWN_LEFT_EDGE(
-        "action_down_leftApp",
-        R.string.settings_gesture_down_left_edge,
-        R.array.default_down_left,
-        R.anim.top_down
-    ),
-    SWIPE_DOWN_RIGHT_EDGE(
-        "action_down_rightApp",
-        R.string.settings_gesture_down_right_edge,
-        R.array.default_down_right,
-        R.anim.top_down
-    ),
-    SWIPE_DOWN_DOUBLE(
-        "action_doubleDownApp",
-        R.string.settings_gesture_double_down,
-        R.array.default_double_down,
-        R.anim.top_down
-    ),
-    SWIPE_LEFT(
-        "action_leftApp",
-        R.string.settings_gesture_left,
-        R.array.default_left,
-        R.anim.right_left
-    ),
-    SWIPE_LEFT_TOP_EDGE(
-        "action_left_topApp",
-        R.string.settings_gesture_left_top_edge,
-        R.array.default_left_top,
-        R.anim.right_left
-    ),
-    SWIPE_LEFT_BOTTOM_EDGE(
-        "action_left_bottomApp",
-        R.string.settings_gesture_left_bottom_edge,
-        R.array.default_left_bottom,
-        R.anim.right_left
-    ),
-    SWIPE_LEFT_DOUBLE(
-        "action_doubleLeftApp",
-        R.string.settings_gesture_double_left,
-        R.array.default_double_left,
-        R.anim.right_left
-    ),
-    SWIPE_RIGHT(
-        "action_rightApp",
-        R.string.settings_gesture_right,
-        R.array.default_right,
-        R.anim.left_right
-    ),
-    SWIPE_RIGHT_TOP_EDGE(
-        "action_right_topApp",
-        R.string.settings_gesture_right_top_edge,
-        R.array.default_right_top,
-        R.anim.left_right
-    ),
-    SWIPE_RIGHT_BOTTOM_EDGE(
-        "action_right_bottomApp",
-        R.string.settings_gesture_right_bottom_edge,
-        R.array.default_right_bottom,
-        R.anim.left_right
-    ),
-    SWIPE_RIGHT_DOUBLE(
-        "action_doubleRightApp",
-        R.string.settings_gesture_double_right,
-        R.array.default_double_right,
-        R.anim.left_right
-    );
 
     enum class Edge{
                    TOP, BOTTOM, LEFT, RIGHT
@@ -145,26 +45,26 @@ enum class Gesture(
 
     fun getApp(context: Context): Pair<String, Int?> {
         val preferences = LauncherPreferences.getSharedPreferences()
-        var packageName = preferences.getString(this.id, "")!!
+        var packageName = preferences.getString(this.id + ".app", "")!!
-        var u: Int? = preferences.getInt(this.id + "_user", INVALID_USER)
+        var u: Int?  = preferences.getInt(this.id + ".user", INVALID_USER)
         u = if(u == INVALID_USER) null else u
         return Pair(packageName,u)
     }
 
     fun removeApp(context: Context) {
         LauncherPreferences.getSharedPreferences().edit()
-            .putString(this.id, "") // clear it
+            .putString(this.id + ".app", "") // clear it
             .apply()
     }
 
     fun setApp(context: Context, app: String, user: Int?) {
         LauncherPreferences.getSharedPreferences().edit()
-            .putString(this.id, app)
+            .putString(this.id + ".app", app)
             .apply()
 
         val u = user?: INVALID_USER
         LauncherPreferences.getSharedPreferences().edit()
-            .putInt(this.id + "_user", u)
+            .putInt(this.id + ".user", u)
             .apply()
     }
 
@@ -197,21 +97,18 @@ enum class Gesture(
                     SWIPE_RIGHT -> SWIPE_RIGHT_TOP_EDGE
                     else -> this
                 }
-
             Edge.BOTTOM ->
                 when(this) {
                     SWIPE_LEFT -> SWIPE_LEFT_BOTTOM_EDGE
                     SWIPE_RIGHT -> SWIPE_RIGHT_BOTTOM_EDGE
                     else -> this
                 }
-
             Edge.LEFT ->
                 when(this) {
                     SWIPE_UP -> SWIPE_UP_LEFT_EDGE
                     SWIPE_DOWN -> SWIPE_DOWN_LEFT_EDGE
                     else -> this
                 }
-
             Edge.RIGHT ->
                 when(this) {
                     SWIPE_UP -> SWIPE_UP_RIGHT_EDGE
@@ -227,7 +124,6 @@ enum class Gesture(
             SWIPE_DOWN_DOUBLE,
             SWIPE_LEFT_DOUBLE,
             SWIPE_RIGHT_DOUBLE -> true
-
             else -> false
         }
     }
@@ -242,13 +138,13 @@ enum class Gesture(
                 SWIPE_LEFT_BOTTOM_EDGE,
                 SWIPE_RIGHT_TOP_EDGE,
                 SWIPE_RIGHT_BOTTOM_EDGE -> true
-
             else -> false
         }
     }
 
     operator fun invoke(activity: Activity) {
         val app = this.getApp(activity)
+        Log.d("LAUNCHER", "Launching ${app.first} (user: ${app.second}) ${this.toString()}")
         launch(app.first, app.second, activity, this.animationIn, this.animationOut)
     }
 

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.content.res.Resources
 import android.os.AsyncTask
 import android.os.Bundle
+import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
@@ -13,7 +14,6 @@ import androidx.core.view.isVisible
 import de.jrpie.android.launcher.databinding.HomeBinding
 import de.jrpie.android.launcher.list.other.LauncherAction
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.preferences.migrateToNewVersion
 import de.jrpie.android.launcher.tutorial.TutorialActivity
 import java.text.SimpleDateFormat
 import java.util.*
@@ -21,6 +21,9 @@ import kotlin.concurrent.fixedRateTimer
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
+import android.util.DisplayMetrics
+import de.jrpie.android.launcher.preferences.migratePreferencesToNewVersion
+import de.jrpie.android.launcher.preferences.resetPreferences
 
 
 /**
@@ -52,14 +55,15 @@ class HomeActivity : UIObject, AppCompatActivity(),
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // Try to restore old preferences
+        migratePreferencesToNewVersion(this)
 
-        // First time opening the app: show Tutorial, else: check versions
+        // First time opening the app: set defaults and start tutorial
         if (!LauncherPreferences.internal().started()) {
+            resetPreferences(this)
 
             LauncherPreferences.internal().started(true)
             startActivity(Intent(this, TutorialActivity::class.java))
-        } else {
-            migrateToNewVersion(this)
         }
 
         // Preload apps to speed up the Apps Recycler
@@ -151,8 +155,15 @@ class HomeActivity : UIObject, AppCompatActivity(),
 
         if (e1 == null) return false
 
-        val width = displayMetrics.widthPixels
+
-        val height = displayMetrics.heightPixels
+
+        val displayMetrics: DisplayMetrics? = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+
+        val width = displayMetrics!!.widthPixels
+        val height = displayMetrics!!.heightPixels
+
+        Log.i("LAUNCHER", "width: $width, height: $height, ${e1.x}, ${e1.y}, ${e2.x}, ${e2.y}")
 
         val diffX = e1.x - e2.x
         val diffY = e1.y - e2.y
@@ -224,11 +235,7 @@ class HomeActivity : UIObject, AppCompatActivity(),
             }
         }
 
-        return if (mDetector.onTouchEvent(event)) {
+        return if (mDetector.onTouchEvent(event)) { false } else { super.onTouchEvent(event) }
-            false
-        } else {
-            super.onTouchEvent(event)
-        }
     }
 
     override fun setOnClicks() {
@@ -252,22 +259,11 @@ class HomeActivity : UIObject, AppCompatActivity(),
 
     /* TODO: Remove those. For now they are necessary
      *  because this inherits from GestureDetector.OnGestureListener */
-    override fun onDoubleTapEvent(event: MotionEvent): Boolean {
+    override fun onDoubleTapEvent(event: MotionEvent): Boolean { return false }
-        return false
+    override fun onDown(event: MotionEvent): Boolean { return false }
-    }
+    override fun onScroll(e1: MotionEvent?, e2: MotionEvent, dX: Float, dY: Float): Boolean { return false }
-
-    override fun onDown(event: MotionEvent): Boolean {
-        return false
-    }
-
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent, dX: Float, dY: Float): Boolean {
-        return false
-    }
-
     override fun onShowPress(event: MotionEvent) {}
-    override fun onSingleTapUp(event: MotionEvent): Boolean {
+    override fun onSingleTapUp(event: MotionEvent): Boolean { return false }
-        return false
-    }
 
     override fun isHomeScreen(): Boolean {
         return true

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

@@ -2,6 +2,7 @@ package de.jrpie.android.launcher
 
 import android.app.Activity
 import android.content.res.Resources
+import android.os.Build
 import android.view.Window
 import android.view.WindowManager
 import de.jrpie.android.launcher.preferences.LauncherPreferences
@@ -42,7 +43,6 @@ interface UIObject {
         setOnClicks()
         adjustLayout()
     }
-
     fun modifyTheme(theme: Resources.Theme): Resources.Theme {
         LauncherPreferences.theme().colorTheme().applyToTheme(theme)
         LauncherPreferences.theme().background().applyToTheme(theme)

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

@@ -44,7 +44,6 @@ class ListActivity : AppCompatActivity(), UIObject {
         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 */
     }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -67,8 +66,7 @@ class ListActivity : AppCompatActivity(), UIObject {
                     binding.listContainer.context.resources.displayMetrics.heightPixels
                 val diff = height - r.bottom
                 if (diff != 0 &&
-                    LauncherPreferences.display().fullScreen()
+                    LauncherPreferences.display().fullScreen()) {
-                ) {
                     if (binding.listContainer.paddingBottom !== diff) {
                         binding.listContainer.setPadding(0, 0, 0, diff)
                     }
@@ -148,8 +146,8 @@ private val TAB_TITLES = arrayOf(
  * The [ListSectionsPagerAdapter] returns the fragment,
  * which corresponds to the selected tab in [ListActivity].
  */
-class ListSectionsPagerAdapter(private val context: Context, fm: FragmentManager) :
+class ListSectionsPagerAdapter(private val context: Context, fm: FragmentManager)
-    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getItem(position: Int): Fragment {
         return when (position){

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

@@ -34,12 +34,10 @@ import kotlin.text.Regex.Companion.escapeReplacement
  * @param intention - why the list is displayed ("view", "pick")
  * @param forGesture - the action which an app is chosen for (when the intention is "pick")
  */
-class AppsRecyclerAdapter(
+class AppsRecyclerAdapter(val activity: Activity,
-    val activity: Activity,
                           private val intention: ListActivity.ListActivityIntention
                             = ListActivity.ListActivityIntention.VIEW,
-    private val forGesture: String? = ""
+                          private val forGesture: String? = ""):
-) :
     RecyclerView.Adapter<AppsRecyclerAdapter.ViewHolder>() {
 
     private val appsListDisplayed: MutableList<AppInfo>
@@ -55,9 +53,7 @@ class AppsRecyclerAdapter(
             selectItem(adapterPosition, rect)
         }
 
-        init {
+        init { itemView.setOnClickListener(this) }
-            itemView.setOnClickListener(this)
-        }
     }
 
     override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
@@ -76,22 +72,8 @@ class AppsRecyclerAdapter(
 
         // decide when to show the options popup menu about
         if (intention == ListActivity.ListActivityIntention.VIEW) {
-            viewHolder.textView.setOnLongClickListener {
+            viewHolder.textView.setOnLongClickListener{ showOptionsPopup(viewHolder, appPackageName, appUser, isSystemApp) }
-                showOptionsPopup(
+            viewHolder.img.setOnLongClickListener{ showOptionsPopup(viewHolder, appPackageName, appUser, isSystemApp) }
-                    viewHolder,
-                    appPackageName,
-                    appUser,
-                    isSystemApp
-                )
-            }
-            viewHolder.img.setOnLongClickListener {
-                showOptionsPopup(
-                    viewHolder,
-                    appPackageName,
-                    appUser,
-                    isSystemApp
-                )
-            }
             // ensure onClicks are actually caught
             viewHolder.textView.setOnClickListener{ viewHolder.onClick(viewHolder.textView) }
             viewHolder.img.setOnClickListener{ viewHolder.onClick(viewHolder.img) }
@@ -99,12 +81,7 @@ class AppsRecyclerAdapter(
     }
 
     @Suppress("SameReturnValue")
-    private fun showOptionsPopup(
+    private fun showOptionsPopup(viewHolder: ViewHolder, appPackageName: String, user: Int?, isSystemApp: Boolean): Boolean {
-        viewHolder: ViewHolder,
-        appPackageName: String,
-        user: Int?,
-        isSystemApp: Boolean
-    ): Boolean {
         //create the popup menu
 
         val popup = PopupMenu(activity, viewHolder.img)
@@ -120,12 +97,10 @@ class AppsRecyclerAdapter(
                     uninstallApp(appPackageName, user, activity)
                     true
                 }
-
                 R.id.app_menu_info -> {
                     openAppSettings(appPackageName, user, activity)
                     true
                 }
-
                 else -> false
             }
         }
@@ -134,9 +109,7 @@ class AppsRecyclerAdapter(
         return true
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount(): Int { return appsListDisplayed.size }
-        return appsListDisplayed.size
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
@@ -167,7 +140,6 @@ class AppsRecyclerAdapter(
             ListActivity.ListActivityIntention.VIEW -> {
                 launchApp(appPackageName, appUser, activity, rect)
             }
-
             ListActivity.ListActivityIntention.PICK -> {
                 val returnIntent = Intent()
                 returnIntent.putExtra("value", appPackageName)
@@ -215,13 +187,11 @@ class AppsRecyclerAdapter(
         }
 
         if (appsListDisplayed.size == 1 && intention == ListActivity.ListActivityIntention.VIEW
-            && LauncherPreferences.functionality().searchAutoLaunch()
+            && LauncherPreferences.functionality().searchAutoLaunch()) {
-        ) {
             val info = appsListDisplayed[0]
             launch(info.packageName.toString(), info.user, activity)
 
-            val inputMethodManager =
+            val inputMethodManager = activity.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-                activity.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
             inputMethodManager.hideSoftInputFromWindow(View(activity).windowToken, 0)
         }
 

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

@@ -66,8 +66,7 @@ class ListFragmentApps : Fragment(), UIObject {
         })
 
         if (intention == ListActivity.ListActivityIntention.VIEW
-            && LauncherPreferences.functionality().searchAutoOpenKeyboard()
+            && LauncherPreferences.functionality().searchAutoOpenKeyboard()){
-        ) {
             openSoftKeyboard(requireContext(), binding.listAppsSearchview)
         }
     }

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

@@ -10,50 +10,25 @@ import de.jrpie.android.launcher.expandNotificationsPanel
 import de.jrpie.android.launcher.openAppsList
 import de.jrpie.android.launcher.openSettings
 
-enum class LauncherAction(
+enum class LauncherAction(val id: String, val label: Int, val icon: Int, val launch: (Activity) -> Unit) {
-    val id: String,
+    SETTINGS("launcher:settings", R.string.list_other_settings, R.drawable.baseline_settings_24, ::openSettings),
-    val label: Int,
+    CHOOSE("launcher:choose", R.string.list_other_list, R.drawable.baseline_menu_24, ::openAppsList),
-    val icon: Int,
+    VOLUME_UP("launcher:volumeUp",
-    val launch: (Activity) -> Unit
-) {
-    SETTINGS(
-        "launcher:settings",
-        R.string.list_other_settings,
-        R.drawable.baseline_settings_24,
-        ::openSettings
-    ),
-    CHOOSE(
-        "launcher:choose",
-        R.string.list_other_list,
-        R.drawable.baseline_menu_24,
-        ::openAppsList
-    ),
-    VOLUME_UP(
-        "launcher:volumeUp",
         R.string.list_other_volume_up,
-        R.drawable.baseline_volume_up_24, ::audioVolumeUp
+        R.drawable.baseline_volume_up_24, ::audioVolumeUp),
-    ),
+    VOLUME_DOWN("launcher:volumeDown",
-    VOLUME_DOWN(
-        "launcher:volumeDown",
         R.string.list_other_volume_down,
-        R.drawable.baseline_volume_down_24, ::audioVolumeDown
+        R.drawable.baseline_volume_down_24, ::audioVolumeDown),
-    ),
+    TRACK_NEXT("launcher:nextTrack",
-    TRACK_NEXT(
-        "launcher:nextTrack",
         R.string.list_other_track_next,
-        R.drawable.baseline_skip_next_24, ::audioNextTrack
+        R.drawable.baseline_skip_next_24, ::audioNextTrack),
-    ),
+    TRACK_PREV("launcher:previousTrack",
-    TRACK_PREV(
-        "launcher:previousTrack",
         R.string.list_other_track_previous,
-        R.drawable.baseline_skip_previous_24, ::audioPreviousTrack
+        R.drawable.baseline_skip_previous_24, ::audioPreviousTrack),
-    ),
+    EXPAND_NOTIFICATIONS_PANEL("launcher:expandNotificationsPanel",
-    EXPAND_NOTIFICATIONS_PANEL(
-        "launcher:expandNotificationsPanel",
         R.string.list_other_expand_notifications_panel,
         R.drawable.baseline_notifications_24,
-        ::expandNotificationsPanel
+         ::expandNotificationsPanel),
-    ),
     NOP("launcher:nop", R.string.list_other_nop, R.drawable.baseline_not_interested_24, {});
 
     companion object {

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

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.databinding.ListOtherBinding
 
 /**

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

@@ -38,9 +38,7 @@ class OtherRecyclerAdapter(val activity: Activity) :
             forGesture?.let { returnChoiceIntent(it, content.id) }
         }
 
-        init {
+        init { itemView.setOnClickListener(this) }
-            itemView.setOnClickListener(this)
-        }
     }
 
     override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
@@ -51,9 +49,7 @@ class OtherRecyclerAdapter(val activity: Activity) :
         viewHolder.iconView.setImageResource(icon)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount(): Int { return othersList.size }
-        return othersList.size
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)

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

@@ -1,58 +1,141 @@
 package de.jrpie.android.launcher.preferences
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
+import android.content.SharedPreferences
-import de.jrpie.android.launcher.BuildConfig.VERSION_CODE
+import android.util.Log
+import android.widget.Toast
 import de.jrpie.android.launcher.Gesture
-import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.preferences.theme.Background
-import de.jrpie.android.launcher.tutorial.TutorialActivity
+import de.jrpie.android.launcher.preferences.theme.ColorTheme
+
+/* Current version of the structure of preferences.
+ * Increase when breaking changes are introduced and write an appropriate case in
+ * `migratePreferencesToNewVersion`
+ */
+const val PREFERENCE_VERSION = 1
+const val UNKNOWN_PREFERENCE_VERSION = -1
 
 
-fun migrateToNewVersion(activity: Activity) {
+private fun migrateStringPreference(oldPrefs: SharedPreferences, newPreferences: SharedPreferences.Editor, oldKey: String, newKey: String, default: String) {
+    val s = oldPrefs.getString(oldKey, default)
+    newPreferences.putString(newKey, s)
+}
+private fun migrateIntPreference(oldPrefs: SharedPreferences, newPreferences: SharedPreferences.Editor, oldKey: String, newKey: String, default: Int) {
+    val s = oldPrefs.getInt(oldKey, default)
+    newPreferences.putInt(newKey, s)
+}
+private fun migrateBooleanPreference(oldPrefs: SharedPreferences, newPreferences: SharedPreferences.Editor, oldKey: String, newKey: String, default: Boolean) {
+    val s = oldPrefs.getBoolean(oldKey, default)
+    newPreferences.putBoolean(newKey, s)
+}
+
+fun migratePreferencesToNewVersion(context: Context) {
     when (LauncherPreferences.internal().versionCode()) {
         // Check versions, make sure transitions between versions go well
+        PREFERENCE_VERSION -> { /* the version installed and used previously are the same */ }
+        UNKNOWN_PREFERENCE_VERSION -> { /* still using the old preferences file */
+            Log.i("Launcher", "Unknown preference version, trying to restore preferences from old version.")
 
-        VERSION_CODE -> { /* the version installed and used previously are the same */
+
+            val oldPrefs = context.getSharedPreferences(
+                "V3RYR4ND0MK3YCR4P",
+                Context.MODE_PRIVATE
+            )
+            if(!oldPrefs.contains("startedBefore")) {
+                Log.i("Launcher", "No old preferences found.")
+                return
+            }
+            val newPrefs = LauncherPreferences.getSharedPreferences().edit()
+
+            migrateBooleanPreference(oldPrefs, newPrefs, "startedBefore", "internal.started_before", false)
+
+            migrateStringPreference(oldPrefs, newPrefs, "action_volumeUpApp", "action.volume_up.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_volumeUpApp_user", "action.volume_up.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_volumeDownApp", "action.volume_down.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_volumeDownApp_user", "action.volume_down.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, newPrefs, "action_longClickApp", "action.long_click.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_longClickApp_user", "action.long_click.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_doubleClickApp", "action.double_click.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_doubleClickApp_user", "action.double_click.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_upApp", "action.up.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_upApp_user", "action.up.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_up_leftApp", "action.up_left.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_up_leftApp_user", "action.up_left.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_up_rightApp", "action.up_right.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_up_rightApp_user", "action.up_right.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_doubleUpApp", "action.double_up.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_doubleUpApp_user", "action.double_up.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_downApp", "action.down.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_downApp_user", "action.down.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_down_leftApp", "action.down_left.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_down_leftApp_user", "action.down_left.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_down_rightApp", "action.down_right.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_down_rightApp_user", "action.down_right.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_doubleDownApp", "action.double_down.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_doubleDownApp_user", "action.double_down.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_leftApp", "action.left.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_leftApp_user", "action.left.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_left_topApp", "action.left_top.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_left_topApp_user", "action.left_top.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_left_bottomApp", "action.left_bottom.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_left_bottomApp_user", "action.left_bottom.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_doubleLeftApp", "action.double_left.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_doubleLeftApp_user", "action.double_left.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_rightApp", "action.right.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_rightApp_user", "action.right.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_right_topApp", "action.right_top.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_right_topApp_user", "action.right_top.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_right_bottomApp", "action.right_bottom.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_right_bottomApp_user", "action.right_bottom.user", -1)
+            migrateStringPreference(oldPrefs, newPrefs, "action_doubleRightApp", "action.double_right.app", "")
+            migrateIntPreference(oldPrefs, newPrefs, "action_doubleRightApp_user", "action.double_right.user", -1)
+            migrateBooleanPreference(oldPrefs, newPrefs, "timeVisible", "clock.time_visible", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "dateVisible", "clock.date_visible", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "dateLocalized", "clock.date_localized", false)
+            migrateBooleanPreference(oldPrefs, newPrefs, "dateTimeFlip", "clock.date_time_flip", false)
+            migrateBooleanPreference(oldPrefs, newPrefs, "disableTimeout", "display.disable_timeout", false)
+            migrateBooleanPreference(oldPrefs, newPrefs, "useFullScreen", "display.use_full_screen", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "enableDoubleActions", "enabled_gestures.double_actions", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "enableEdgeActions", "enabled_gestures.edge_actions", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "searchAutoLaunch", "functionality.search_auto_launch", true)
+            migrateBooleanPreference(oldPrefs, newPrefs, "searchAutoKeyboard", "functionality.search_auto_keyboard", true)
+
+            newPrefs.apply()
+
+            when(oldPrefs.getString("theme", "finn")) {
+                "finn" -> {
+                    LauncherPreferences.theme().colorTheme(ColorTheme.DEFAULT)
+                    LauncherPreferences.theme().monochromeIcons(false)
+                    LauncherPreferences.theme().background(Background.BLUR)
+                }
+                "dark" -> {
+                    LauncherPreferences.theme().colorTheme(ColorTheme.DARK)
+                    LauncherPreferences.theme().monochromeIcons(true)
+                    LauncherPreferences.theme().background(Background.BLUR)
+                }
             }
 
-        21, 22, 23 -> {
-            // TODO
-        }
 
-        else -> { /* The version used before was pre- v1.3.0,
+            LauncherPreferences.internal().versionCode(PREFERENCE_VERSION)
-                        as version tracking started then */
+            Log.i("Launcher", "migration of preferences complete.")
 
-            /*
-             * before, the dominant and vibrant color of the `finn` and `dark` theme
-             * were not stored anywhere. Now they have to be stored:
-             * -> we just reset them using newly implemented functions
-             */
-            /*when (LauncherPreferences.theme().colorTheme()) {
-                "finn" -> resetToDefaultTheme(activity)
-                "dark" -> resetToDarkTheme(activity)
-            } */
-            LauncherPreferences.internal().versionCode(VERSION_CODE)
             // show the new tutorial
-            activity.startActivity(Intent(activity, TutorialActivity::class.java))
+            // context.startActivity(Intent(context, TutorialActivity::class.java))
         }
+        else -> {}
     }
 }
 
-fun resetSettings(context: Context) {
+fun resetPreferences(context: Context) {
-
+    Log.i("Launcher", "resetting preferences")
+    LauncherPreferences.clear()
+    LauncherPreferences.internal().versionCode(PREFERENCE_VERSION)
     val editor = LauncherPreferences.getSharedPreferences().edit()
-    Gesture.values().forEach { editor.putString(it.id, it.pickDefaultApp(context)) }
+    Gesture.values().forEach { editor.putString(it.id + ".app", it.pickDefaultApp(context)) }
+    Gesture.values().forEach { editor.putInt(it.id + ".user", -1) }
     editor.apply()
-
-    // set default theme
-    val dominantColor = context.resources.getColor(R.color.finnmglasTheme_background_color)
-    val vibrantColor = context.resources.getColor(R.color.finnmglasTheme_accent_color)
-
-
-    LauncherPreferences.theme().dominant(dominantColor)
-    LauncherPreferences.theme().vibrant(vibrantColor)
 }
-
-
-

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

@@ -7,17 +7,14 @@ import android.content.res.Resources
 import android.os.Bundle
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
+import androidx.viewpager.widget.ViewPager
+import de.jrpie.android.launcher.*
+import com.google.android.material.tabs.TabLayout
+import de.jrpie.android.launcher.databinding.SettingsBinding
 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.R
-import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
-import de.jrpie.android.launcher.UIObject
-import de.jrpie.android.launcher.databinding.SettingsBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.saveListActivityChoice
 import de.jrpie.android.launcher.settings.actions.SettingsFragmentActions
 import de.jrpie.android.launcher.settings.launcher.SettingsFragmentLauncher
 import de.jrpie.android.launcher.settings.meta.SettingsFragmentMeta
@@ -59,13 +56,11 @@ class SettingsActivity : AppCompatActivity(), UIObject {
     override fun onStart() {
         super<AppCompatActivity>.onStart()
         super<UIObject>.onStart()
-        LauncherPreferences.getSharedPreferences()
+        LauncherPreferences.getSharedPreferences().registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
-            .registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
     }
 
     override fun onPause() {
-        LauncherPreferences.getSharedPreferences()
+        LauncherPreferences.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(sharedPreferencesListener)
-            .unregisterOnSharedPreferenceChangeListener(sharedPreferencesListener)
         super.onPause()
     }
 
@@ -96,8 +91,8 @@ private val TAB_TITLES = arrayOf(
     R.string.settings_tab_meta
 )
 
-class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentManager) :
+class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentManager)
-    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getItem(position: Int): Fragment {
         return when (position){
@@ -112,7 +107,5 @@ class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentMan
         return context.resources.getString(TAB_TITLES[position])
     }
 
-    override fun getCount(): Int {
+    override fun getCount(): Int { return 3 }
-        return 3
-    }
 }

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

@@ -55,11 +55,7 @@ SettingsFragmentActions : Fragment(), UIObject {
                 intent.addCategory(Intent.CATEGORY_APP_MARKET)
                 startActivity(intent)
             } catch (e: ActivityNotFoundException) {
-                Toast.makeText(
+                Toast.makeText(context, getString(R.string.settings_apps_toast_store_not_found), Toast.LENGTH_SHORT).show()
-                    context,
-                    getString(R.string.settings_apps_toast_store_not_found),
-                    Toast.LENGTH_SHORT
-                ).show()
             }
         }
     }

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

@@ -1,28 +1,25 @@
 package de.jrpie.android.launcher.settings.actions
 
-import android.app.Activity
-import android.content.Intent
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import de.jrpie.android.launcher.*
+import de.jrpie.android.launcher.list.ListActivity
+import android.app.Activity
+import android.content.Intent
+import android.content.SharedPreferences
+import android.util.Log
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import de.jrpie.android.launcher.Gesture
-import de.jrpie.android.launcher.R
-import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
-import de.jrpie.android.launcher.UIObject
-import de.jrpie.android.launcher.databinding.SettingsActionsRecyclerBinding
-import de.jrpie.android.launcher.getAppIcon
-import de.jrpie.android.launcher.list.ListActivity
 import de.jrpie.android.launcher.list.other.LauncherAction
+import de.jrpie.android.launcher.databinding.SettingsActionsRecyclerBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.transformGrayscale
+import java.lang.Exception
 
 /**
  *  The [SettingsFragmentActionsRecycler] is a fragment containing the [ActionsRecyclerAdapter],
@@ -60,15 +57,13 @@ class SettingsFragmentActionsRecycler : Fragment(), UIObject {
             layoutManager = actionViewManager
             adapter = actionViewAdapter
         }
-        LauncherPreferences.getSharedPreferences()
+        LauncherPreferences.getSharedPreferences().registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
-            .registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
 
         super<UIObject>.onStart()
     }
 
     override fun onDestroy() {
-        LauncherPreferences.getSharedPreferences()
+        LauncherPreferences.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(sharedPreferencesListener)
-            .unregisterOnSharedPreferenceChangeListener(sharedPreferencesListener)
 
         super.onDestroy()
     }
@@ -88,9 +83,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
 
         override fun onClick(v: View) { }
 
-        init {
+        init { itemView.setOnClickListener(this) }
-            itemView.setOnClickListener(this)
-        }
     }
 
     private fun updateViewHolder(gesture: Gesture, viewHolder: ViewHolder) {
@@ -103,7 +96,8 @@ class ActionsRecyclerAdapter(val activity: Activity) :
             viewHolder.img.visibility = View.INVISIBLE
             viewHolder.removeAction.visibility = View.GONE
             viewHolder.chooseButton.visibility = View.VISIBLE
-        } else if (LauncherAction.isOtherAction(content)) {
+        }
+        else if (LauncherAction.isOtherAction(content)) {
             LauncherAction.byId(content)?.let {
                 viewHolder.img.setImageResource(it.icon)
             }
@@ -132,9 +126,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         viewHolder.removeAction.setOnClickListener{ gesture.removeApp(activity) }
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount(): Int { return gesturesList.size }
-        return gesturesList.size
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
@@ -147,8 +139,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         val edgeActions = LauncherPreferences.enabled_gestures().edgeSwipe()
         gesturesList = Gesture.values().filter {
             (doubleActions || !it.isDoubleVariant())
-                    && (edgeActions || !it.isEdgeVariant())
+                    && (edgeActions || !it.isEdgeVariant())} as ArrayList<Gesture>
-        } as ArrayList<Gesture>
     }
 
     fun updateActions() {
@@ -157,8 +148,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         this.gesturesList.clear()
         gesturesList.addAll(Gesture.values().filter {
             (doubleActions || !it.isDoubleVariant())
-                    && (edgeActions || !it.isEdgeVariant())
+                    && (edgeActions || !it.isEdgeVariant())})
-        })
 
         notifyDataSetChanged()
     }
@@ -168,8 +158,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         val intent = Intent(activity, ListActivity::class.java)
         intent.putExtra("intention", ListActivity.ListActivityIntention.PICK.toString())
         intent.putExtra("forGesture", gesture.id) // for which action we choose the app
-        activity.startActivityForResult(
+        activity.startActivityForResult(intent,
-            intent,
             REQUEST_CHOOSE_APP
         )
     }

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

@@ -4,8 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
-import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.preferences.LauncherPreferences
+import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.setDefaultHomeScreen
 
 
@@ -17,13 +17,9 @@ import de.jrpie.android.launcher.setDefaultHomeScreen
 class SettingsFragmentLauncher : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        preferenceManager.sharedPreferencesName = getString(R.string.preference_file_key)
-        preferenceManager.sharedPreferencesMode = Context.MODE_PRIVATE
         setPreferencesFromResource(R.xml.preferences, rootKey)
 
-        val selectWallpaper = findPreference<androidx.preference.Preference>(
+        val selectWallpaper = findPreference<androidx.preference.Preference>(LauncherPreferences.theme().keys().wallpaper())
-            LauncherPreferences.theme().keys().wallpaper()
-        )
         selectWallpaper?.setOnPreferenceClickListener {
             // https://github.com/LineageOS/android_packages_apps_Trebuchet/blob/6caab89b21b2b91f0a439e1fd8c4510dcb255819/src/com/android/launcher3/views/OptionsPopupView.java#L271
             val intent = Intent(Intent.ACTION_SET_WALLPAPER)
@@ -32,9 +28,7 @@ class SettingsFragmentLauncher : PreferenceFragmentCompat() {
             startActivity(intent)
             true
         }
-        val chooseHomeScreen = findPreference<androidx.preference.Preference>(
+        val chooseHomeScreen = findPreference<androidx.preference.Preference>(LauncherPreferences.general().keys().chooseHomeScreen())
-            LauncherPreferences.general().keys().chooseHomeScreen()
-        )
         chooseHomeScreen?.setOnPreferenceClickListener {
             setDefaultHomeScreen(requireContext(), checkDefault = false)
             true

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

@@ -10,10 +10,10 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.UIObject
-import de.jrpie.android.launcher.databinding.SettingsMetaBinding
 import de.jrpie.android.launcher.openNewTabWindow
-import de.jrpie.android.launcher.preferences.resetSettings
 import de.jrpie.android.launcher.tutorial.TutorialActivity
+import de.jrpie.android.launcher.databinding.SettingsMetaBinding
+import de.jrpie.android.launcher.preferences.resetPreferences
 
 /**
  * The [SettingsFragmentMeta] is a used as a tab in the SettingsActivity.
@@ -65,10 +65,9 @@ class SettingsFragmentMeta : Fragment(), UIObject {
             AlertDialog.Builder(this.requireContext(), R.style.AlertDialogCustom)
                 .setTitle(getString(R.string.settings_meta_reset))
                 .setMessage(getString(R.string.settings_meta_reset_confirm))
-                .setPositiveButton(
+                .setPositiveButton(android.R.string.ok
-                    android.R.string.ok
                 ) { _, _ ->
-                    resetSettings(this.requireContext())
+                    resetPreferences(this.requireContext())
                     requireActivity().finish()
                 }
                 .setNegativeButton(android.R.string.cancel, null)
@@ -86,6 +85,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
 
+
         // contact developer
         binding.settingsMetaButtonContact.setOnClickListener {
             openNewTabWindow(

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

@@ -1,6 +1,7 @@
 package de.jrpie.android.launcher.tutorial
 
 import android.content.Intent
+import android.content.res.Resources
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -8,11 +9,10 @@ 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.preferences.LauncherPreferences
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
 import de.jrpie.android.launcher.UIObject
-import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.preferences.resetSettings
 import de.jrpie.android.launcher.saveListActivityChoice
 import de.jrpie.android.launcher.tutorial.tabs.TutorialFragmentConcept
 import de.jrpie.android.launcher.tutorial.tabs.TutorialFragmentFinish
@@ -35,10 +35,6 @@ class TutorialActivity : AppCompatActivity(), UIObject {
         // Initialise layout
         setContentView(R.layout.tutorial)
 
-        // Check if the app was started before
-        if (!LauncherPreferences.internal().started())
-            resetSettings(this)
-
         // set up tabs and swiping in settings
         val sectionsPagerAdapter = TutorialSectionsPagerAdapter(supportFragmentManager)
         val viewPager: ViewPager = findViewById(R.id.tutorial_viewpager)
@@ -47,6 +43,10 @@ class TutorialActivity : AppCompatActivity(), UIObject {
         tabs.setupWithViewPager(viewPager)
     }
 
+    override fun getTheme(): Resources.Theme {
+        return modifyTheme(super.getTheme())
+    }
+
     override fun onStart() {
         super<AppCompatActivity>.onStart()
         super<UIObject>.onStart()
@@ -73,8 +73,8 @@ class TutorialActivity : AppCompatActivity(), UIObject {
  *
  * Tabs: (Start | Concept | Usage | Setup | Finish)
  */
-class TutorialSectionsPagerAdapter(fm: FragmentManager) :
+class TutorialSectionsPagerAdapter(fm: FragmentManager)
-    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getItem(position: Int): Fragment {
         return when (position){
@@ -88,11 +88,6 @@ class TutorialSectionsPagerAdapter(fm: FragmentManager) :
     }
 
     /* We don't use titles here, as we have the dots */
-    override fun getPageTitle(position: Int): CharSequence {
+    override fun getPageTitle(position: Int): CharSequence { return "" }
-        return ""
+    override fun getCount(): Int { return 5 }
-    }
-
-    override fun getCount(): Int {
-        return 5
-    }
 }

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

@@ -8,7 +8,6 @@ import androidx.fragment.app.Fragment
 import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.UIObject
 import de.jrpie.android.launcher.databinding.TutorialConceptBinding
-
 /**
  * The [TutorialFragmentConcept] is a used as a tab in the TutorialActivity.
  *

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

@@ -1,15 +1,14 @@
 package de.jrpie.android.launcher.tutorial.tabs
 
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import de.jrpie.android.launcher.*
 import de.jrpie.android.launcher.BuildConfig.VERSION_CODE
-import de.jrpie.android.launcher.UIObject
 import de.jrpie.android.launcher.databinding.TutorialFinishBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
-import de.jrpie.android.launcher.setDefaultHomeScreen
 
 /**
  * The [TutorialFragmentFinish] is a used as a tab in the TutorialActivity.

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

@@ -1,12 +1,11 @@
 package de.jrpie.android.launcher.tutorial.tabs
 
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import de.jrpie.android.launcher.*
-import de.jrpie.android.launcher.UIObject
-import de.jrpie.android.launcher.blink
 import de.jrpie.android.launcher.databinding.TutorialStartBinding
 
 /**

app/src/main/res/anim/bottom_up.xml

@@ -2,9 +2,9 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="100"
         android:fromYDelta="75%p"
+        android:toYDelta="0%p"
         android:interpolator="@android:anim/decelerate_interpolator"
-        android:toYDelta="0%p" />
+        android:duration="100"/>
 
 </set>

app/src/main/res/anim/left_right.xml

@@ -2,9 +2,9 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="100"
         android:fromXDelta="-75%p"
+        android:toXDelta="0%p"
         android:interpolator="@android:anim/decelerate_interpolator"
-        android:toXDelta="0%p" />
+        android:duration="100"/>
 
 </set>

app/src/main/res/anim/right_left.xml

@@ -2,9 +2,9 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="100"
         android:fromXDelta="75%p"
+        android:toXDelta="0%p"
         android:interpolator="@android:anim/decelerate_interpolator"
-        android:toXDelta="0%p" />
+        android:duration="100"/>
 
 </set>

app/src/main/res/anim/top_down.xml

@@ -2,9 +2,9 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="100"
         android:fromYDelta="-75%p"
+        android:toYDelta="0%p"
         android:interpolator="@android:anim/decelerate_interpolator"
-        android:toYDelta="0%p" />
+        android:duration="100"/>
 
 </set>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <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"/>
-        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_not_interested_24.xml

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 
 </vector>

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

@@ -1,12 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
 
 </vector>

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

@@ -1,13 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z" />
 
 </vector>

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

@@ -1,13 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
 
-    <path
+    <path android:fillColor="?android:textColor" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
-        android:fillColor="?android:textColor"
-        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
 
 </vector>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tutorial_selected_dot" android:state_selected="true" />
+    <item android:drawable="@drawable/tutorial_selected_dot"
+        android:state_selected="true"/>
 
     <item android:drawable="@drawable/tutorial_default_dot"/>
 </selector>

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/home_container"
     android:layout_width="match_parent"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -13,9 +14,9 @@
         android:id="@+id/list_appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@null"
-
         android:gravity="center"
+
+        android:background="@null"
         app:elevation="0dp"
 
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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/list_apps_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/list_apps_row_container"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_other_container"
     android:layout_width="match_parent"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_other_row_container"
     android:layout_width="match_parent"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -10,9 +11,9 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/settings_appbar"
+        android:background="@null"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@null"
         app:elevation="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -53,7 +54,6 @@
                 android:id="@+id/settings_system"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:layout_marginLeft="8dp"
                 android:gravity="center"
                 android:includeFontPadding="true"
@@ -63,7 +63,8 @@
                 custom:layout_constraintBottom_toBottomOf="parent"
                 custom:layout_constraintStart_toStartOf="parent"
                 custom:layout_constraintTop_toTopOf="parent"
-                custom:type="solid" />
+                custom:type="solid"
+                android:layout_marginStart="8dp" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.tabs.TabLayout

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/settings_actions_row_container"
@@ -29,7 +30,8 @@
         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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_meta_container"
     android:layout_width="match_parent"

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tutorial_container"
     android:layout_width="match_parent"
@@ -24,11 +26,11 @@
         android:id="@+id/tutorial_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:tabBackground="@drawable/tutorial_tab_selector"
         app:tabGravity="center"
-        app:tabIndicatorHeight="0dp" />
+        app:tabIndicatorHeight="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_concept_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:paddingLeft="32sp"
     android:paddingRight="32sp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".tutorial.tabs.TutorialFragmentConcept">
 
     <TextView
@@ -53,8 +54,8 @@
         android:layout_marginLeft="32dp"
         android:layout_marginEnd="32dp"
         android:layout_marginRight="32dp"
-        android:gravity="center"
         android:textSize="32sp"
+        android:gravity="center"
         app:layout_constraintBottom_toTopOf="@+id/tutorial_concept_text_2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tutorial_finish_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:paddingLeft="32sp"
     android:paddingRight="32sp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".tutorial.tabs.TutorialFragmentFinish">
 
     <TextView

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_setup_container"

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_start_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:paddingLeft="32sp"
     android:paddingRight="32sp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:context=".tutorial.tabs.TutorialFragmentStart">
 
     <TextView

app/src/main/res/menu/menu_app.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
+    <item android:id="@+id/app_menu_delete"
-        android:id="@+id/app_menu_delete"
         android:title="@string/list_app_delete" />
-    <item
+    <item android:id="@+id/app_menu_info"
-        android:id="@+id/app_menu_info"
         android:title="@string/list_app_info" />
 </menu>

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

@@ -80,7 +80,7 @@
     <string name="settings_launcher_section_display">Bildschirm</string>
 
     <string name="settings_display_screen_timeout_disabled">Bildschirm nicht ausschalten</string>
-    <string name="settings_launcher_full_screen">Vollbild</string>
+    <string name="settings_display_full_screen">Vollbild</string>
 
     <string name="settings_launcher_section_functionality">Funktionen</string>
 
@@ -110,7 +110,6 @@
     <string name="settings_meta_discord">Unserem Discord beitreten</string>
 
     <string name="settings_meta_contact">Entwickler kontaktieren</string>
-    <string name="settings_meta_contact_url">https://www.finnmglas.com/de/kontakt/</string>
     <string name="settings_meta_fork_contact">Entwickler des Fork kontaktieren</string>
 
     <string name="settings_meta_privacy">Datenschutzerklärung</string>

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

@@ -76,7 +76,7 @@
     <string name="settings_launcher_section_display">Pantalla</string>
 
     <string name="settings_display_screen_timeout_disabled">Mantener encendida</string>
-    <string name="settings_launcher_full_screen">Pantalla completa</string>
+    <string name="settings_display_full_screen">Pantalla completa</string>
 
     <string name="settings_launcher_section_functionality">Funciones</string>
 
@@ -103,7 +103,6 @@
     <string name="settings_meta_report_bug">Reportar un error</string>
 
     <string name="settings_meta_contact">Contactar al desarrollador</string>
-    <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>
     <string name="settings_meta_fork_contact">Contact the developer of the fork (desgraciadamente no habla español)</string>
 
     <string name="settings_meta_privacy">Política de privacidad</string>

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

@@ -56,7 +56,7 @@
     <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_launcher_full_screen">Utiliser le plein écran</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>
@@ -76,7 +76,6 @@
     <string name="settings_meta_report_bug">Signaler une erreur</string>
     <string name="settings_meta_discord">Rejoins-nous sur Discord !</string>
     <string name="settings_meta_contact">Contacter le développeur</string>
-    <string name="settings_meta_contact_url">https://www.finnmglas.com/fr/contact/</string>
     <string name="settings_meta_fork_contact">Contact the developer of the fork (malheureusement, il ne parle pas français)</string>
     <string name="settings_meta_privacy">Déclaration de confidentialité</string>
     <!--

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

@@ -44,7 +44,7 @@
     <string name="settings_theme_wallpaper">选择一个壁纸</string>
     <string name="settings_launcher_change_wallpaper">换壁纸</string>
     <string name="settings_display_screen_timeout_disabled">保持屏幕常亮</string>
-    <string name="settings_launcher_full_screen">使用全屏</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>
@@ -59,7 +59,6 @@
     <string name="settings_meta_fork_contact">联系该 fork 版本的作者</string>
     <string name="settings_meta_privacy">隐私政策</string>
     <string name="settings_meta_contact">联系原作者</string>
-    <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>
     <string name="settings_meta_discord">加入 Discord！</string>
     <string name="list_title_view">全部应用</string>
     <string name="list_title_pick">选择应用</string>

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

@@ -6,11 +6,10 @@
           - Settings
           -
         -->
-    <string name="preference_file_key" translatable="false">V3RYR4ND0MK3YCR4P</string>
+        <string name="settings_internal_started_key" translatable="false">internal.started_before</string>
-    <string name="settings_internal_started_key" translatable="false">startedBefore</string>
+        <string name="settings_internal_started_time_key" translatable="false">internal.first_startup</string>
-    <string name="settings_internal_started_time_key" translatable="false">firstStartup</string>
+        <string name="settings_internal_version_code_key" translatable="false">internal.version_code</string>
-    <string name="settings_internal_version_code_key" translatable="false">version_code</string>
+        <string name="settings_general_choose_home_screen_key">general.select_launcher</string>
-    <string name="settings_general_choose_home_screen_key">settings.general.select_launcher</string>
         <!--
           -
           - Settings : Gestures
@@ -64,15 +63,16 @@
                 <item>SYSTEM_DEFAULT</item>
         </string-array>
         <string name="settings_theme_monochrome_icons_key" translatable="false">theme.monochrome_icons</string>
+
         <!--
           -
           - Settings : Clock
           -
           -->
-    <string name="settings_clock_time_visible_key" translatable="false">timeVisible</string>
+        <string name="settings_clock_time_visible_key" translatable="false">clock.time_visible</string>
-    <string name="settings_clock_date_visible_key" translatable="false">dateVisible</string>
+        <string name="settings_clock_date_visible_key" translatable="false">clock.date_visible</string>
-    <string name="settings_clock_localized_key" translatable="false">dateLocalized</string>
+        <string name="settings_clock_localized_key" translatable="false">clock.date_localized</string>
-    <string name="settings_clock_flip_date_time_key" translatable="false">dateTimeFlip</string>
+        <string name="settings_clock_flip_date_time_key" translatable="false">clock.date_time_flip</string>
 
 
         <!--
@@ -80,13 +80,14 @@
           - Settings : Functionality
           -
           -->
-    <string name="settings_display_screen_timeout_disabled_key" translatable="false">disableTimeout</string>
+        <string name="settings_display_screen_timeout_disabled_key" translatable="false">display.disable_timeout</string>
-    <string name="settings_display_full_screen_key" translatable="false">useFullScreen</string>
+        <string name="settings_display_full_screen_key" translatable="false">display.use_full_screen</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>
+        <string name="settings_functionality_search_auto_launch_key" translatable="false">functionality.search_auto_launch</string>
+        <string name="settings_functionality_search_auto_open_keyboard_key" translatable="false">functionality.search_auto_keyboard</string>
 
-    <string name="settings_enabled_gestures_double_swipe_key" translatable="false">enableDoubleActions</string>
-    <string name="settings_enabled_gestures_edge_swipe_key" translatable="false">enableEdgeActions</string>
-    <string name="settings_functionality_search_auto_launch_key" translatable="false">searchAutoLaunch</string>
-    <string name="settings_functionality_search_auto_open_keyboard_key" translatable="false">searchAutoKeyboard</string>
 
 
         <!--

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

@@ -185,6 +185,7 @@
     <string name="tutorial_finish_button">Start</string>
 
 
+
     <string name="settings">Settings</string>
     <string name="ic_menu_alt">More options</string>
     <string name="alert_cant_expand_notifications_panel">Error: Can\'t expand status bar.\nThis action is using functionality that is not part of the published Android API. Unfortunately, it does not seem to work on your device.</string>

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

@@ -28,7 +28,6 @@
         <item name="android:colorBackground">@color/darkTheme_background_color</item>
         <item name="android:textColor">@color/darkTheme_text_color</item>
     </style>
-
     <style name="colorThemeDefault">
         <item name="colorPrimary">@color/finnmglasTheme_background_color</item>
         <item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
@@ -62,13 +61,14 @@
     <style name="fontSystemDefault">
         <!--<item name="android:textSize">18sp</item>-->
     </style>
-
     <style name="fontHack">
         <item name="android:fontFamily">@font/hack</item>
         <!--<item name="android:textSize">18sp</item>-->
     </style>
 
 
+
+
     <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu">
         <item name="android:popupBackground">#252827</item>
     </style>

app/src/main/res/xml/preferences.xml

@@ -1,44 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory app:allowDividerAbove="false"> <!-- general -->
+    <PreferenceCategory
+        app:allowDividerAbove="false" > <!-- general -->
         <Preference
             android:key="@string/settings_general_choose_home_screen_key"
             android:title="@string/settings_general_choose_home_screen"/>
 
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/settings_launcher_section_appearance"
+        app:allowDividerAbove="false"
-        app:allowDividerAbove="false">
+        android:title="@string/settings_launcher_section_appearance">
         <Preference
             android:key="@string/settings_theme_wallpaper_key"
             android:title="@string/settings_theme_wallpaper"/>
         <DropDownPreference
-            android:defaultValue="DEFAULT"
             android:entries="@array/settings_theme_color_theme_items"
             android:entryValues="@array/settings_theme_color_theme_values"
-            android:key="@string/settings_theme_color_theme_key"
             android:summary="%s"
+            android:defaultValue="DEFAULT"
+            android:key="@string/settings_theme_color_theme_key"
             android:title="@string/settings_theme_color_theme"/>
 
         <DropDownPreference
-            android:defaultValue="HACK"
-            android:entries="@array/settings_theme_font_items"
-            android:entryValues="@array/settings_theme_font_values"
             android:key="@string/settings_theme_font_key"
+            android:title="@string/settings_theme_font"
+            android:entryValues="@array/settings_theme_font_values"
+            android:entries="@array/settings_theme_font_items"
             android:summary="%s"
-            android:title="@string/settings_theme_font" />
+            android:defaultValue="HACK"/>
         <DropDownPreference
-            android:defaultValue="BLUR"
+            android:key="@string/settings_theme_background_key"
+            android:title="@string/settings_theme_background"
+            android:summary="%s"
             android:entries="@array/settings_theme_background_items"
             android:entryValues="@array/settings_theme_background_values"
-            android:key="@string/settings_theme_background_key"
+            android:defaultValue="BLUR"/>
-            android:summary="%s"
-            android:title="@string/settings_theme_background" />
         <SwitchPreference
-            android:defaultValue="false"
             android:key="@string/settings_theme_monochrome_icons_key"
-            android:title="@string/settings_theme_monochrome_icons" />
+            android:title="@string/settings_theme_monochrome_icons"
+            android:defaultValue="false" />
 
    </PreferenceCategory>
 
@@ -46,20 +47,20 @@
         android:title="@string/settings_launcher_section_date_time"
         app:allowDividerAbove="false">
         <SwitchPreference
-            android:defaultValue="false"
             android:key="@string/settings_clock_localized_key"
+            android:defaultValue="false"
             android:title="@string/settings_clock_localized" />
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_clock_time_visible_key"
+            android:defaultValue="true"
             android:title="@string/settings_clock_time_visible" />
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_clock_date_visible_key"
+            android:defaultValue="true"
             android:title="@string/settings_clock_date_visible" />
         <SwitchPreference
-            android:defaultValue="false"
             android:key="@string/settings_clock_flip_date_time_key"
+            android:defaultValue="false"
             android:title="@string/settings_clock_flip_date_time" />
     </PreferenceCategory>
 
@@ -68,20 +69,20 @@
         app:allowDividerAbove="false">
 
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_functionality_search_auto_launch_key"
+            android:defaultValue="true"
             android:title="@string/settings_functionality_auto_launch" />
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_functionality_search_auto_open_keyboard_key"
+            android:defaultValue="true"
             android:title="@string/settings_functionality_auto_keyboard" />
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_enabled_gestures_double_swipe_key"
+            android:defaultValue="true"
             android:title="@string/settings_enabled_gestures_double_swipe"/>
         <SwitchPreference
-            android:defaultValue="true"
             android:key="@string/settings_enabled_gestures_edge_swipe_key"
+            android:defaultValue="true"
             android:title="@string/settings_enabled_gestures_edge_swipe"/>