Add customizable Hachimi repo

Author: kairusds

app/src/main/java/com/leadrdrk/umapatcher/core/DataStore.kt

@@ -18,12 +18,14 @@ object PrefKey {
     val CHECK_FOR_UPDATES = booleanPreferencesKey("check_for_updates")
     val LAST_UPDATE_CHECK = longPreferencesKey("last_update_check")
     val APP_LIBS_VERSION = stringPreferencesKey("app_libs_version")
+    val HACHIMI_REPO = stringPreferencesKey("hachimi_repo")
 }
 
 val defaultValues = mapOf(
     Pair(PrefKey.CHECK_FOR_UPDATES, true),
     Pair(PrefKey.LAST_UPDATE_CHECK, 0L),
     Pair(PrefKey.APP_LIBS_VERSION, "")
+    Pair(PrefKey.HACHIMI_REPO, "Hachimi-Hachimi/Hachimi")
 )
 
 suspend fun Context.getPrefValue(key: Preferences.Key<*>): Any? {

app/src/main/java/com/leadrdrk/umapatcher/patcher/AppPatcher.kt

@@ -37,8 +37,6 @@ import java.io.File
 import java.io.IOException
 import java.net.URL
 
-private const val LIBS_REPO_PATH = "kairusds/Hachimi-Edge"
-
 private const val MOD_ARM64_LIB_NAME = "libmain-arm64-v8a.so"
 private const val APK_ARM64_LIB_DIR = "lib/arm64-v8a"
 private const val APK_ARM64_LIB_PATH = "$APK_ARM64_LIB_DIR/libmain.so"
@@ -599,10 +597,11 @@ class AppPatcher(
         if (!libsDir.exists()) libsDir.mkdir() || return null
 
         val currentVer = context.getPrefValue(PrefKey.APP_LIBS_VERSION) as String?
+        val modRepo = context.getPrefValue(PrefKey.HACHIMI_REPO) as String?
 
         // Try syncing the libraries
         try {
-            val releases = GitHubReleases(LIBS_REPO_PATH)
+            val releases = GitHubReleases(modRepo)
             val latest = releases.fetchLatest()
             val tagName = latest["tag_name"] as String
 

app/src/main/java/com/leadrdrk/umapatcher/ui/component/Option.kt

@@ -25,10 +25,59 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.core.text.isDigitsOnly
 
+@Composable
+fun rememberDataStoreStringState(
+    key: androidx.datastore.preferences.core.Preferences.Key<String>,
+    defaultValue: String
+): MutableState<String> {
+    val context = LocalContext.current
+    val dataStore = context.dataStore
+    val coroutineScope = rememberCoroutineScope()
+
+    val savedFlow = remember(key) {
+        dataStore.data.map { preferences ->
+            preferences[key] ?: defaultValue
+        }
+    }
+    val savedValue = savedFlow.collectAsState(initial = defaultValue).value
+
+    val state = remember {
+        mutableStateOf(savedValue)
+    }
+
+    LaunchedEffect(savedValue) {
+        if (state.value != savedValue) {
+            state.value = savedValue
+        }
+    }
+
+    return remember {
+        object : MutableState<String> {
+            override var value: String
+                get() = state.value
+                set(newValue) {
+                    if (state.value != newValue) {
+                        state.value = newValue
+
+                        coroutineScope.launch {
+                            dataStore.edit { preferences ->
+                                preferences[key] = newValue
+                            }
+                        }
+                    }
+                }
+
+            override fun component1() = value
+            override fun component2(): (String) -> Unit = { value = it }
+        }
+    }
+}
+
 @Composable
 fun OptionBase(
     title: String,

app/src/main/java/com/leadrdrk/umapatcher/ui/screen/SettingsScreen.kt

@@ -27,6 +27,7 @@ import com.leadrdrk.umapatcher.core.getPrefValue
 import com.leadrdrk.umapatcher.ui.component.BooleanOption
 import com.leadrdrk.umapatcher.ui.component.OptionBase
 import com.leadrdrk.umapatcher.ui.component.TopBar
+import com.leadrdrk.umapatcher.ui.component.rememberDataStoreStringState
 import com.leadrdrk.umapatcher.utils.ksFile
 import com.leadrdrk.umapatcher.utils.showToast
 import com.ramcosta.composedestinations.annotation.Destination
@@ -39,6 +40,11 @@ fun SettingsScreen() {
     val appLibsVersion = remember { mutableStateOf("") }
     var configRead by remember { mutableStateOf(false) }
 
+    val repoState = rememberDataStoreStringState(
+        key = PrefKey.HACHIMI_REPO,
+        defaultValue = defaultValues[PrefKey.HACHIMI_REPO] as String
+    )
+
     val exportKsLauncher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         val uri = it.data?.data ?: return@rememberLauncherForActivityResult
         val ksFile = context.ksFile
@@ -123,6 +129,12 @@ fun SettingsScreen() {
                 state = checkForUpdates
             )
 
+            StringOption(
+                title = stringResource(R.string.hachimi_repo),
+                state = repoState,
+                placeholder = defaultValues[PrefKey.HACHIMI_REPO] as String
+            )
+
             OptionBase(
                 title = stringResource(R.string.export_signing_key),
                 desc = stringResource(R.string.export_signing_key_desc),

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

@@ -21,6 +21,7 @@
 
     <!-- Settings -->
     <string name="check_for_updates_desc">Occasionally check for updates when the app starts.</string>
+    <string name="hachimi_repo">Hachimi repo</string>
     <string name="export_signing_key">Export signing key</string>
     <string name="export_signing_key_desc">Export the BKS keystore used to sign APK files.</string>
     <string name="import_signing_key">Import signing key</string>