Update wear-os app: Use SwipeToReveal, convert delete Screens to AlertDialogs (#360)

Author: serbelga

gradle/libs.versions.toml

@@ -7,6 +7,7 @@ androidJunit = "1.1.3"
 androidMinSdk = "24"
 androidTargetSdk = "34"
 androidWearMinSdk = "25"
+animationGraphicsAndroid = "1.5.0"
 appcompat = "1.6.1"
 composeCompiler = "1.4.8"
 composeMultiplatform = "1.5.1"
@@ -49,7 +50,11 @@ wearInput = "1.2.0-alpha02"
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 
 androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
+
+androidx-compose-animationGraphicsAndroid = { module = "androidx.compose.animation:animation-graphics-android", version.ref = "animationGraphicsAndroid" }
+
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+
 androidx-coreKtx = { module = "androidx.core:core-ktx", version.ref = "androidCore" }
 
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "dataStore" }

wearos/build.gradle.kts

@@ -74,16 +74,18 @@ dependencies {
 
     implementation(libs.androidx.activityCompose)
 
+    implementation(libs.androidx.compose.animationGraphicsAndroid)
+
     implementation(libs.androidx.coreKtx)
 
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.viewmodel)
 
-    implementation(libs.wear.wear)
     implementation(libs.wear.compose.foundation)
     implementation(libs.wear.compose.material)
     implementation(libs.wear.compose.navigation)
     implementation(libs.wear.input)
+    implementation(libs.wear.wear)
 
     implementation(libs.koin.android)
     implementation(libs.koin.compose)

wearos/src/main/java/dev/sergiobelda/todometer/wear/di/ViewModelModule.kt

@@ -16,8 +16,6 @@
 
 package dev.sergiobelda.todometer.wear.di
 
-import dev.sergiobelda.todometer.wear.ui.deletetask.DeleteTaskViewModel
-import dev.sergiobelda.todometer.wear.ui.deletetasklist.DeleteTaskListViewModel
 import dev.sergiobelda.todometer.wear.ui.home.HomeViewModel
 import dev.sergiobelda.todometer.wear.ui.taskdetail.TaskDetailViewModel
 import dev.sergiobelda.todometer.wear.ui.tasklisttasks.TaskListTasksViewModel
@@ -35,16 +33,12 @@ internal val viewModelModule = module {
             get(),
             get(),
             get(),
+            get(),
+            get(),
             get()
         )
     }
     viewModel { parameters ->
-        DeleteTaskListViewModel(taskListId = parameters.get(), get())
-    }
-    viewModel { parameters ->
-        TaskDetailViewModel(taskId = parameters.get(), get(), get())
-    }
-    viewModel { parameters ->
-        DeleteTaskViewModel(taskId = parameters.get(), get())
+        TaskDetailViewModel(taskId = parameters.get(), get(), get(), get())
     }
 }

wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/ToDometerNavHost.kt

@@ -22,15 +22,8 @@ import androidx.navigation.NavHostController
 import androidx.wear.compose.navigation.SwipeDismissableNavHost
 import androidx.wear.compose.navigation.composable
 import dev.sergiobelda.todometer.common.navigation.Action
-import dev.sergiobelda.todometer.wear.ui.deletetask.DeleteTaskDestination
-import dev.sergiobelda.todometer.wear.ui.deletetask.DeleteTaskScreen
-import dev.sergiobelda.todometer.wear.ui.deletetask.navigateToDeleteTask
-import dev.sergiobelda.todometer.wear.ui.deletetasklist.DeleteTaskListDestination
-import dev.sergiobelda.todometer.wear.ui.deletetasklist.DeleteTaskListScreen
-import dev.sergiobelda.todometer.wear.ui.deletetasklist.navigateToDeleteTaskList
 import dev.sergiobelda.todometer.wear.ui.home.HomeDestination
 import dev.sergiobelda.todometer.wear.ui.home.HomeScreen
-import dev.sergiobelda.todometer.wear.ui.home.popBackStackToHome
 import dev.sergiobelda.todometer.wear.ui.taskdetail.TaskDetailDestination
 import dev.sergiobelda.todometer.wear.ui.taskdetail.TaskDetailScreen
 import dev.sergiobelda.todometer.wear.ui.taskdetail.navigateToTaskDetail
@@ -60,32 +53,13 @@ fun ToDometerNavHost(
             TaskListTasksScreen(
                 taskListId = taskListId,
                 openTask = action.navigateToTaskDetail,
-                deleteTaskList = { action.navigateToDeleteTaskList(taskListId) }
-            )
-        }
-        composable(DeleteTaskListDestination.route) { navBackStackEntry ->
-            val taskListId = DeleteTaskListDestination.navArgsTaskListId(navBackStackEntry)
-            DeleteTaskListScreen(
-                taskListId = taskListId,
-                onDeleteTaskList = action.popBackStackToHome,
                 navigateBack = { action.popBackStack() }
             )
         }
         composable(TaskDetailDestination.route) { navBackStackEntry ->
             val taskId = TaskDetailDestination.navArgsTaskId(navBackStackEntry)
             TaskDetailScreen(
                 taskId = taskId,
-                deleteTask = { action.navigateToDeleteTask(taskId) }
-            )
-        }
-        composable(DeleteTaskDestination.route) { navBackStackEntry ->
-            val taskId = DeleteTaskDestination.navArgsTaskId(navBackStackEntry)
-            DeleteTaskScreen(
-                taskId = taskId,
-                onDeleteTask = {
-                    action.popBackStack()
-                    action.navigateUp()
-                },
                 navigateBack = { action.popBackStack() }
             )
         }

…i/components/ToDometerLoadingProgress.kt …/ui/components/ContentLoadingProgress.ktwearos/src/main/java/dev/sergiobelda/todometer/wear/ui/components/ToDometerLoadingProgress.kt renamed to wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/components/ContentLoadingProgress.kt wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/components/ToDometerLoadingProgress.kt renamed to wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/components/ContentLoadingProgress.kt

@@ -23,6 +23,6 @@ import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.CircularProgressIndicator
 
 @Composable
-internal fun ToDometerLoadingProgress() {
+internal fun ContentLoadingProgress() {
     CircularProgressIndicator(modifier = Modifier.padding(top = 24.dp))
 }

…r/wear/ui/deletetask/DeleteTaskScreen.kt …r/ui/deletetask/DeleteTaskAlertDialog.ktwearos/src/main/java/dev/sergiobelda/todometer/wear/ui/deletetask/DeleteTaskScreen.kt renamed to wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/deletetask/DeleteTaskAlertDialog.kt wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/deletetask/DeleteTaskScreen.kt renamed to wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/deletetask/DeleteTaskAlertDialog.kt

@@ -25,15 +25,11 @@ import androidx.wear.compose.material.dialog.Alert
 import dev.sergiobelda.todometer.common.resources.MR
 import dev.sergiobelda.todometer.common.resources.ToDometerIcons
 import dev.sergiobelda.todometer.common.resources.stringResource
-import org.koin.androidx.compose.getViewModel
-import org.koin.core.parameter.parametersOf
 
 @Composable
-internal fun DeleteTaskScreen(
-    taskId: String,
+internal fun DeleteTaskAlertDialog(
     onDeleteTask: () -> Unit,
-    navigateBack: () -> Unit,
-    deleteTaskViewModel: DeleteTaskViewModel = getViewModel(parameters = { parametersOf(taskId) })
+    onCancel: () -> Unit
 ) {
     Alert(
         icon = {
@@ -45,17 +41,12 @@ internal fun DeleteTaskScreen(
         title = {},
         content = { Text(stringResource(MR.strings.delete_task_question)) },
         positiveButton = {
-            Button(
-                onClick = {
-                    deleteTaskViewModel.deleteTask()
-                    onDeleteTask()
-                }
-            ) {
+            Button(onClick = onDeleteTask) {
                 Icon(ToDometerIcons.Check, null)
             }
         },
         negativeButton = {
-            Button(colors = ButtonDefaults.secondaryButtonColors(), onClick = navigateBack) {
+            Button(colors = ButtonDefaults.secondaryButtonColors(), onClick = onCancel) {
                 Icon(ToDometerIcons.Close, null)
             }
         }

wearos/src/main/java/dev/sergiobelda/todometer/wear/ui/deletetask/DeleteTaskNavigation.kt

@@ -25,15 +25,11 @@ import androidx.wear.compose.material.dialog.Alert
 import dev.sergiobelda.todometer.common.resources.MR
 import dev.sergiobelda.todometer.common.resources.ToDometerIcons
 import dev.sergiobelda.todometer.common.resources.stringResource
-import org.koin.androidx.compose.getViewModel
-import org.koin.core.parameter.parametersOf
 
 @Composable
-internal fun DeleteTaskListScreen(
-    taskListId: String,
+internal fun DeleteTaskListAlertDialog(
     onDeleteTaskList: () -> Unit,
-    navigateBack: () -> Unit,
-    deleteTaskListViewModel: DeleteTaskListViewModel = getViewModel { parametersOf(taskListId) }
+    onCancel: () -> Unit
 ) {
     Alert(
         icon = {
@@ -46,16 +42,13 @@ internal fun DeleteTaskListScreen(
         content = { Text(stringResource(MR.strings.delete_task_list_question)) },
         positiveButton = {
             Button(
-                onClick = {
-                    deleteTaskListViewModel.deleteTaskList()
-                    onDeleteTaskList()
-                }
+                onClick = onDeleteTaskList
             ) {
                 Icon(ToDometerIcons.Check, null)
             }
         },
         negativeButton = {
-            Button(colors = secondaryButtonColors(), onClick = navigateBack) {
+            Button(colors = secondaryButtonColors(), onClick = onCancel) {
                 Icon(ToDometerIcons.Close, null)
             }
         }