Explorar el Código

Renamed 'selected' to 'apiUrl'

Vadik Sirekanyan hace 2 años
padre
commit
b1934c89e8

+ 5 - 5
app/src/main/java/org/sirekanyan/outline/MainContent.kt

@@ -82,10 +82,10 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
                         KeysContent(insets, state, keys)
                     }
                 }
-                LaunchedEffect(page.selected) {
+                LaunchedEffect(page.apiUrl) {
                     state.refreshCurrentKeys(showLoading = true)
                 }
-                val apiUrl = page.selected
+                val apiUrl = page.apiUrl
                 val serverName by produceState(state.servers.getDefaultName(apiUrl), apiUrl) {
                     value = state.servers.getName(apiUrl)
                 }
@@ -101,7 +101,7 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
                 state.selectedPage?.let { page ->
                     state.scope.launch {
                         state.isFabLoading = true
-                        api.createAccessKey(page.selected)
+                        api.createAccessKey(page.apiUrl)
                         state.refreshCurrentKeys(showLoading = false)
                     }.invokeOnCompletion {
                         state.isFabLoading = false
@@ -114,8 +114,8 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
                 KeyBottomSheet(
                     key = key,
                     onDismissRequest = { state.selectedKey = null },
-                    onEditClick = { state.dialog = EditKeyDialog(page.selected, key) },
-                    onDeleteClick = { state.dialog = DeleteKeyDialog(page.selected, key) },
+                    onEditClick = { state.dialog = EditKeyDialog(page.apiUrl, key) },
+                    onDeleteClick = { state.dialog = DeleteKeyDialog(page.apiUrl, key) },
                 )
             }
         }

+ 4 - 4
app/src/main/java/org/sirekanyan/outline/MainState.kt

@@ -84,7 +84,7 @@ class MainState(val scope: CoroutineScope, private val api: OutlineApi) {
                 page.keys = KeysLoadingState
             }
             page.keys = try {
-                KeysSuccessState(api.getKeys(page.selected))
+                KeysSuccessState(api.getKeys(page.apiUrl))
             } catch (exception: Exception) {
                 exception.printStackTrace()
                 KeysErrorState
@@ -98,7 +98,7 @@ sealed class Page
 
 data object HelloPage : Page()
 
-data class SelectedPage(val selected: String) : Page() {
+data class SelectedPage(val apiUrl: String) : Page() {
     var keys by mutableStateOf<KeysState>(KeysLoadingState)
 }
 
@@ -106,6 +106,6 @@ sealed class Dialog
 
 data object AddServerDialog : Dialog()
 
-data class EditKeyDialog(val selected: String, val key: Key) : Dialog()
+data class EditKeyDialog(val apiUrl: String, val key: Key) : Dialog()
 
-data class DeleteKeyDialog(val selected: String, val key: Key) : Dialog()
+data class DeleteKeyDialog(val apiUrl: String, val key: Key) : Dialog()

+ 2 - 2
app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt

@@ -33,7 +33,7 @@ fun DrawerContent(dao: ApiUrlDao, state: MainState) {
         )
         val apiUrls by remember { dao.observeUrls() }.collectAsState(listOf())
         apiUrls.forEach { apiUrl ->
-            val selected = state.selectedPage?.selected == apiUrl
+            val isSelected = state.selectedPage?.apiUrl == apiUrl
             val serverName by produceState(state.servers.getDefaultName(apiUrl), state.drawer.isOpen) {
                 value = state.servers.getName(apiUrl)
             }
@@ -41,7 +41,7 @@ fun DrawerContent(dao: ApiUrlDao, state: MainState) {
                 icon = { Icon(Icons.Default.Done, null) },
                 label = { Text(serverName, style = MaterialTheme.typography.labelLarge) },
                 modifier = Modifier.padding(horizontal = 12.dp),
-                selected = selected,
+                selected = isSelected,
                 onClick = {
                     state.page = SelectedPage(apiUrl)
                     state.closeDrawer()

+ 1 - 1
app/src/main/java/org/sirekanyan/outline/ui/EditKeyContent.kt

@@ -39,7 +39,7 @@ fun EditKeyContent(api: OutlineApi, state: MainState, dialog: EditKeyDialog) {
                     val isSuccess = try {
                         isLoading = true
                         val newName = draft.text.ifBlank { accessKey.defaultName }
-                        api.renameAccessKey(dialog.selected, accessKey.id, newName)
+                        api.renameAccessKey(dialog.apiUrl, accessKey.id, newName)
                         state.dialog = null
                         true
                     } catch (exception: Exception) {