浏览代码

Removed unnecessary server parameter (refactoring)

Vadik Sirekanyan 2 年之前
父节点
当前提交
ac336da75e

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

@@ -39,14 +39,14 @@ class MainActivity : ComponentActivity() {
                             is RenameServerDialog -> Surface { RenameServerContent(state, dialog) }
                             is RenameKeyDialog -> Surface { RenameKeyContent(state, dialog) }
                             is DeleteKeyDialog -> {
-                                val (server, key) = dialog
+                                val (key) = dialog
                                 DeleteKeyContent(
                                     key = key,
                                     onDismiss = { state.dialog = null },
                                     onConfirm = {
                                         state.scope.launch {
                                             state.deletingKey = key
-                                            state.api.deleteAccessKey(server, key.id)
+                                            state.api.deleteAccessKey(key.server, key.id)
                                             state.refreshCurrentKeys(showLoading = false)
                                             state.refreshHelloPage(key.server)
                                         }.invokeOnCompletion {

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

@@ -197,8 +197,8 @@ fun MainContent(state: MainState) {
             KeyBottomSheet(
                 key = key,
                 onDismissRequest = { state.selectedKey = null },
-                onEditClick = { state.dialog = RenameKeyDialog(key.server, key) },
-                onDeleteClick = { state.dialog = DeleteKeyDialog(key.server, key) },
+                onEditClick = { state.dialog = RenameKeyDialog(key) },
+                onDeleteClick = { state.dialog = DeleteKeyDialog(key) },
             )
         }
         if (isSortingVisible) {

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

@@ -169,8 +169,8 @@ data object AddServerDialog : Dialog()
 
 data class RenameServerDialog(val server: Server) : Dialog()
 
-data class RenameKeyDialog(val server: Server, val key: Key) : Dialog()
+data class RenameKeyDialog(val key: Key) : Dialog()
 
-data class DeleteKeyDialog(val server: Server, val key: Key) : Dialog()
+data class DeleteKeyDialog(val key: Key) : Dialog()
 
 data class DeleteServerDialog(val server: Server) : Dialog()

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

@@ -7,8 +7,8 @@ import org.sirekanyan.outline.RenameKeyDialog
 @Composable
 fun RenameKeyContent(state: MainState, dialog: RenameKeyDialog) {
     RenameContent(state, "Edit key", dialog.key.name, dialog.key.defaultName) { newName ->
-        state.keys.renameKey(dialog.server, dialog.key, newName)
+        state.keys.renameKey(dialog.key.server, dialog.key, newName)
         state.refreshCurrentKeys(showLoading = false)
-        state.refreshHelloPage(dialog.server)
+        state.refreshHelloPage(dialog.key.server)
     }
 }