Optimize AddDialog in RepositoriesScreen

MRepoApp · Jun 22, 2024 · 078fb82 · 078fb82
1 parent 928df52
commit 078fb82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/repositories/RepositoriesScreen.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/repositories/RepositoriesScreen.kt
@@ -38,8 +38,10 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -159,9 +161,9 @@ private fun AddDialog(
     onClose: () -> Unit,
     onAdd: (String) -> Unit
 ) {
-    var domain by remember { mutableStateOf("") }
+    var url by remember { mutableStateOf(TextFieldValue("https://", TextRange(0, 8))) }
     val onDone: () -> Unit = {
-        onAdd("https://${domain}/")
+        onAdd(url.text)
         onClose()
     }
 
@@ -171,8 +173,7 @@ private fun AddDialog(
         title = { Text(text = stringResource(id = R.string.repo_add_dialog_title)) },
         confirmButton = {
             TextButton(
-                onClick = onDone,
-                enabled = domain.isNotBlank()
+                onClick = onDone
             ) {
                 Text(text = stringResource(id = R.string.dialog_ok))
             }
@@ -188,16 +189,15 @@ private fun AddDialog(
         OutlinedTextField(
             modifier = Modifier.focusRequester(focusRequester),
             textStyle = MaterialTheme.typography.bodyLarge,
-            value = domain,
-            onValueChange = { domain = it },
-            prefix = { Text(text = "https://") },
+            value = url,
+            onValueChange = { url = it },
             singleLine = false,
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Text,
                 imeAction = ImeAction.Done
             ),
             keyboardActions = KeyboardActions {
-                if (domain.isNotBlank()) onDone()
+                onDone()
             },
             shape = RoundedCornerShape(15.dp)
         )

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/RepositoriesViewModel.kt b/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/RepositoriesViewModel.kt
@@ -54,9 +54,10 @@ class RepositoriesViewModel @Inject constructor(
         url: String,
         onFailure: (Throwable) -> Unit
     ) {
+        val repoUrl = if (url.endsWith("/")) url else "${url}/"
         viewModelScope.launch {
             refreshing {
-                modulesRepository.getRepo(url)
+                modulesRepository.getRepo(repoUrl)
                     .onFailure {
                         Timber.e(it, "insert: $url")
                         onFailure(it)