Add repo branch option

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/network/Github.kt

@@ -3,7 +3,6 @@ package com.paulcoding.hviewer.network
 import com.google.gson.Gson
 import com.paulcoding.hviewer.MainApp.Companion.appContext
 import com.paulcoding.hviewer.R
-import com.paulcoding.hviewer.helper.alsoLog
 import com.paulcoding.hviewer.helper.extractTarGzFromResponseBody
 import com.paulcoding.hviewer.helper.log
 import com.paulcoding.hviewer.helper.readConfigFile
@@ -55,11 +54,12 @@ object Github {
 
     private suspend fun getRemoteVersion(): Int {
         val repoUrl = Preferences.getRemote()
+        val branch = Preferences.branch
 
         val (owner, repo) = parseRepo(repoUrl)
 
         val configUrl =
-            "https://raw.githubusercontent.com/$owner/$repo/refs/heads/main/config.json?v=1"
+            "https://raw.githubusercontent.com/$owner/$repo/refs/heads/$branch/config.json?v=1"
 
         ktorClient.use { client ->
             val response = client.get(configUrl)
@@ -73,11 +73,12 @@ object Github {
 
     private suspend fun downloadAndGetConfig() {
         val repoUrl = Preferences.getRemote()
+        val branch = Preferences.branch
 
         val (owner, repo) = parseRepo(repoUrl)
 
         val tarUrl =
-            "https://api.github.com/repos/$owner/$repo/tarball".alsoLog("tarUrl")
+            "https://api.github.com/repos/$owner/$repo/tarball/$branch"
 
         ktorClient.use { client ->
             val inputStream = client.get(tarUrl).readRawBytes().inputStream()

app/src/main/java/com/paulcoding/hviewer/preference/MMKV.kt

@@ -4,6 +4,7 @@ import com.tencent.mmkv.MMKV
 
 
 const val REMOTE_URL = "remote_url"
+const val BRANCH = "branch"
 const val SECURE_SCREEN = "secure_screen"
 const val PIN = "pin"
 const val PIN_COUNT = "pin_count"
@@ -18,6 +19,12 @@ object Preferences {
         kv.putString(REMOTE_URL, url)
     }
 
+    var branch: String
+        get() = kv.getString(BRANCH, "main")!!
+        set(value) {
+            kv.putString(BRANCH, value)
+        }
+
     var secureScreen: Boolean
         get() = kv.getBoolean(SECURE_SCREEN, true)
         set(value) {

app/src/main/java/com/paulcoding/hviewer/ui/component/ConfirmDialog.kt

@@ -1,10 +1,10 @@
 package com.paulcoding.hviewer.ui.component
 
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import com.paulcoding.hviewer.R
 
@@ -24,12 +24,15 @@ fun ConfirmDialog(
             text = { Text(text = text) },
             confirmButton = {
                 TextButton(onClick = { onConfirm() }) {
-                    Text(stringResource(R.string.confirm))
+                    Text(
+                        stringResource(R.string.confirm),
+                        color = MaterialTheme.colorScheme.primary
+                    )
                 }
             },
             dismissButton = {
                 TextButton(onClick = { onDismiss() }) {
-                    Text(stringResource(R.string.cancel), color = Color.Red)
+                    Text(stringResource(R.string.cancel), color = MaterialTheme.colorScheme.error)
                 }
             }
         )

app/src/main/java/com/paulcoding/hviewer/ui/page/settings/InputRemoteModal.kt

@@ -44,10 +44,12 @@ import com.paulcoding.hviewer.network.Github
 @Composable
 fun InputRemoteModal(
     initialText: String = "",
+    initialBranch: String = "main",
     setVisible: (Boolean) -> Unit,
-    onSubmit: (url: String) -> Unit
+    onSubmit: (String, String) -> Unit
 ) {
     var textFieldValue by remember { mutableStateOf(TextFieldValue(initialText)) }
+    var branch by remember { mutableStateOf(initialBranch) }
     val focusRequester = remember { FocusRequester() }
 
     fun submit() {
@@ -56,7 +58,7 @@ fun InputRemoteModal(
             return makeToast(R.string.invalid_repo)
         } else {
             setVisible(false)
-            onSubmit(textFieldValue.text)
+            onSubmit(textFieldValue.text, branch)
         }
     }
 
@@ -102,20 +104,28 @@ fun InputRemoteModal(
                     label = { Text(stringResource(R.string.remote_url)) },
                     keyboardOptions = KeyboardOptions(
                         keyboardType = KeyboardType.Text,
-                        imeAction = ImeAction.Send
+                        imeAction = ImeAction.Go
                     ),
                     keyboardActions = KeyboardActions(
-                        onSend = { submit() }
+                        onGo = { submit() }
                     ),
-                    placeholder = { Text("https://github.com/paulcoding810/h-viewer-scripts") }
+                    placeholder = { Text(stringResource(R.string.h_viewer_scripts_url)) }
                 )
+                OutlinedTextField(value = branch, onValueChange = { branch = it }, label = {
+                    Text(
+                        stringResource(R.string.branch)
+                    )
+                })
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.End
                 ) {
                     TextButton(onClick = { dismiss() }) {
-                        Text("Cancel", color = MaterialTheme.colorScheme.error)
+                        Text(
+                            stringResource(R.string.cancel),
+                            color = MaterialTheme.colorScheme.error
+                        )
                     }
                     Spacer(modifier = Modifier.width(12.dp))
                     TextButton(onClick = { submit() }) {

app/src/main/java/com/paulcoding/hviewer/ui/page/settings/SettingsPage.kt

@@ -153,10 +153,14 @@ fun SettingsPage(
         }
     }
 
-    if (modalVisible) InputRemoteModal(initialText = Preferences.getRemote(), setVisible = {
-        modalVisible = it
-    }) {
-        appViewModel.checkVersionOrUpdate(it, onUpdate = { state ->
+    if (modalVisible) InputRemoteModal(
+        initialText = Preferences.getRemote(),
+        initialBranch = Preferences.branch,
+        setVisible = {
+            modalVisible = it
+        }) { repo, branch ->
+        Preferences.branch = branch
+        appViewModel.checkVersionOrUpdate(repo, onUpdate = { state ->
             makeToast(state.getToastMessage())
             goBack()
         })

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

@@ -43,4 +43,6 @@
     <string name="scripts_installed">Scripts Installed</string>
     <string name="from_repo_">From repo %1$s</string>
     <string name="up_to_Date">Up to date</string>
+    <string name="h_viewer_scripts_url">https://github.com/paulcoding810/h-viewer-scripts</string>
+    <string name="branch">Branch</string>
 </resources>