improve settings core

Author: DerGoogler

app/build.gradle.kts

@@ -184,7 +184,7 @@ android {
     applicationVariants.configureEach {
         outputs.configureEach {
             (this as? ApkVariantOutputImpl)?.outputFileName =
-                "MMRL-${versionName}-${versionCode}-${name}.apk"
+                "MMRL-${versionName.replace("-$name", "")}-${versionCode}-${name}.apk"
         }
     }
 }
@@ -196,51 +196,6 @@ androidComponents {
             tasks.getByName<KotlinCompile>("ksp${capName}Kotlin") {
                 setSource(tasks.getByName("generate${capName}Proto").outputs)
             }
-
-            val versionCode = android.defaultConfig.versionCode
-            val versionName = android.defaultConfig.versionName
-
-            val buildInfoYaml = """
-            versionCode: $versionCode
-            versionName: $versionName
-            variant: ${variant.name}
-        """.trimIndent()
-
-            val projectDir = layout.projectDirectory.asFile
-            val buildDir = projectDir.resolve(variant.name)
-            val baselineProfiles = buildDir.resolve("baselineProfiles")
-            val outputMeta = buildDir.resolve("output-metadata.json")
-
-            if (outputMeta.exists()) {
-                outputMeta.delete()
-            }
-
-            if (baselineProfiles.exists()) {
-                baselineProfiles.deleteRecursively()
-            }
-
-            if (buildDir.exists()) {
-                val buildInfo = buildDir.resolve("metadata.yaml")
-                buildInfo.writeText(buildInfoYaml)
-
-                println("Build information saved to: ${buildInfo.absolutePath}")
-            }
-        }
-    }
-}
-
-protobuf {
-    protoc {
-        artifact = libs.protobuf.protoc.get().toString()
-    }
-
-    generateProtoTasks {
-        all().forEach { task ->
-            task.builtins {
-                register("java") {
-                    option("lite")
-                }
-            }
         }
     }
 }
@@ -290,6 +245,7 @@ dependencies {
     implementation(libs.androidx.navigation.runtime.ktx)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.serialization.protobuf)
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlin.reflect)
     implementation(libs.protobuf.kotlin.lite)

app/src/main/kotlin/com/dergoogler/mmrl/Compat.kt

@@ -3,7 +3,7 @@ package com.dergoogler.mmrl
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.dergoogler.mmrl.datastore.WorkingMode
+import com.dergoogler.mmrl.datastore.model.WorkingMode
 import com.topjohnwu.superuser.Shell
 import dev.dergoogler.mmrl.compat.ServiceManagerCompat
 import dev.dergoogler.mmrl.compat.stub.IFileManager

app/src/main/kotlin/com/dergoogler/mmrl/background/BootBroadcastReceiver.kt

@@ -2,7 +2,7 @@ package com.dergoogler.mmrl.background
 
 import android.content.Context
 import android.content.Intent
-import com.dergoogler.mmrl.datastore.UserPreferencesCompat
+import com.dergoogler.mmrl.datastore.model.UserPreferences
 import dev.dergoogler.mmrl.compat.worker.MMRLBroadcastReceiver
 import kotlinx.coroutines.flow.first
 import timber.log.Timber
@@ -17,7 +17,7 @@ class BootBroadcastReceiver : MMRLBroadcastReceiver() {
     }
 
     companion object {
-        fun startWorkManagers(context: Context, userPreferences: UserPreferencesCompat) {
+        fun startWorkManagers(context: Context, userPreferences: UserPreferences) {
 //            startWorkTask(
 //                workerClass = RepoUpdateWorker::class.java,
 //                context = context,