Selaa lähdekoodia

Renamed 'selected' to 'selectedPage'

Vadik Sirekanyan 2 vuotta sitten
vanhempi
commit
d14b767a35

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

@@ -98,10 +98,10 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
             isVisible = state.isFabVisible,
             isLoading = state.isFabLoading,
             onClick = {
-                state.selected?.let {
+                state.selectedPage?.let { page ->
                     state.scope.launch {
                         state.isFabLoading = true
-                        api.createAccessKey(it)
+                        api.createAccessKey(page.selected)
                         state.refreshCurrentKeys(showLoading = false)
                     }.invokeOnCompletion {
                         state.isFabLoading = false
@@ -109,13 +109,13 @@ fun MainContent(api: OutlineApi, dao: ApiUrlDao, state: MainState) {
                 }
             },
         )
-        state.selected?.let { selected ->
-            state.selectedKey?.let { selectedKey ->
+        state.selectedPage?.let { page ->
+            state.selectedKey?.let { key ->
                 KeyBottomSheet(
-                    key = selectedKey,
+                    key = key,
                     onDismissRequest = { state.selectedKey = null },
-                    onEditClick = { state.dialog = EditKeyDialog(selected, selectedKey) },
-                    onDeleteClick = { state.dialog = DeleteKeyDialog(selected, selectedKey) },
+                    onEditClick = { state.dialog = EditKeyDialog(page.selected, key) },
+                    onDeleteClick = { state.dialog = DeleteKeyDialog(page.selected, key) },
                 )
             }
         }

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

@@ -57,7 +57,7 @@ class MainState(val scope: CoroutineScope, private val api: OutlineApi) {
     val drawer = DrawerState(DrawerValue.Closed)
     var page by mutableStateOf<Page>(HelloPage)
     var dialog by mutableStateOf<Dialog?>(null)
-    val selected by derivedStateOf { (page as? SelectedPage)?.selected }
+    val selectedPage by derivedStateOf { page as? SelectedPage }
     var selectedKey by mutableStateOf<Key?>(null)
     val isFabVisible by derivedStateOf { (page as? SelectedPage)?.keys is KeysSuccessState }
     var isFabLoading by mutableStateOf(false)

+ 1 - 1
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.selected == apiUrl
+            val selected = state.selectedPage?.selected == apiUrl
             val serverName by produceState(state.servers.getDefaultName(apiUrl), state.drawer.isOpen) {
                 value = state.servers.getName(apiUrl)
             }