Merge remote-tracking branch 'origin/main'

costular · Aug 2, 2024 · be91002 · be91002
2 parents ee2b550 + 2df8b27
commit be91002
Show file tree

Hide file tree

Showing 79 changed files with 1,448 additions and 60 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -89,6 +89,7 @@ dependencies {
     implementation(projects.common.tasks)
     implementation(projects.feature.edittask)
     implementation(projects.feature.postponeTask)
+    implementation(projects.feature.detail)
 
     implementation(libs.fragment)
     implementation(libs.compose.activity)

diff --git a/app/src/main/java/com/costular/atomtasks/ui/AppNavigation.kt b/app/src/main/java/com/costular/atomtasks/ui/AppNavigation.kt
@@ -13,7 +13,6 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.costular.atomtasks.ui.home.AppNavigator
 import com.costular.atomtasks.ui.home.AtomAppState
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine
 import com.ramcosta.composedestinations.navigation.dependency
@@ -55,7 +54,6 @@ fun DestinationScopeWithNoDependencies<*>.currentNavigator(): AppNavigator {
     return AppNavigator(navController)
 }
 
-@OptIn(ExperimentalMaterialNavigationApi::class)
 @ExperimentalAnimationApi
 @Composable
 internal fun AppNavigation(

diff --git a/app/src/main/java/com/costular/atomtasks/ui/NavGraphs.kt b/app/src/main/java/com/costular/atomtasks/ui/NavGraphs.kt
@@ -1,5 +1,6 @@
 package com.costular.atomtasks.ui
 
+import com.atomtasks.feature.detail.destinations.TaskDetailScreenDestination
 import com.costular.atomtasks.agenda.destinations.AgendaScreenDestination
 import com.costular.atomtasks.agenda.destinations.TasksActionsBottomSheetDestination
 import com.costular.atomtasks.createtask.destinations.CreateTaskScreenDestination
@@ -20,6 +21,7 @@ object NavGraphs {
         override val destinationsByRoute = listOf<DestinationSpec<*>>(
             AgendaScreenDestination,
             TasksActionsBottomSheetDestination,
+            TaskDetailScreenDestination,
         ).associateBy { it.route }
     }
 

diff --git a/app/src/main/java/com/costular/atomtasks/ui/home/AppNavigator.kt b/app/src/main/java/com/costular/atomtasks/ui/home/AppNavigator.kt
@@ -1,35 +1,59 @@
 package com.costular.atomtasks.ui.home
 
 import androidx.navigation.NavController
-import com.costular.atomtasks.agenda.ui.AgendaNavigator
+import com.atomtasks.feature.detail.destinations.TaskDetailScreenDestination
 import com.costular.atomtasks.agenda.destinations.TasksActionsBottomSheetDestination
+import com.costular.atomtasks.agenda.ui.AgendaNavigator
 import com.costular.atomtasks.createtask.destinations.CreateTaskScreenDestination
 import com.costular.atomtasks.feature.edittask.destinations.EditTaskScreenDestination
 import com.costular.atomtasks.settings.SettingsNavigator
 import com.costular.atomtasks.settings.destinations.ThemeSelectorScreenDestination
-import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.utils.toDestinationsNavigator
+import java.time.LocalDate
 
 class AppNavigator(
     private val navController: NavController,
 ) : SettingsNavigator, AgendaNavigator {
 
-    override fun navigateToCreateTask(date: String, text: String?) {
-        navController.navigate(CreateTaskScreenDestination(text = text, date = date))
+    private val destinationsNavigator by lazy {
+        navController.toDestinationsNavigator()
+    }
+
+    override fun navigateToCreateTask(date: String) {
+        destinationsNavigator.navigate(CreateTaskScreenDestination(date))
     }
 
     override fun navigateToEditTask(taskId: Long) {
-        navController.navigate(EditTaskScreenDestination(taskId))
+        destinationsNavigator.navigate(EditTaskScreenDestination(taskId))
+    }
+
+    override fun navigateToDetailScreenForCreateTask(date: String) {
+        destinationsNavigator.navigate(
+            TaskDetailScreenDestination(
+                defaultDate = LocalDate.parse(date),
+                taskId = null,
+            )
+        )
+    }
+
+    override fun navigateToDetailScreenToEdit(taskId: Long) {
+        destinationsNavigator.navigate(
+            TaskDetailScreenDestination(
+                defaultDate = null,
+                taskId = taskId
+            )
+        )
     }
 
     override fun openTaskActions(taskId: Long, taskName: String, isDone: Boolean) {
-        navController.navigate(TasksActionsBottomSheetDestination(taskId, taskName, isDone))
+        destinationsNavigator.navigate(TasksActionsBottomSheetDestination(taskId, taskName, isDone))
     }
 
     override fun navigateUp() {
-        navController.navigateUp()
+        destinationsNavigator.navigateUp()
     }
 
     override fun navigateToSelectTheme(theme: String) {
-        navController.navigate(ThemeSelectorScreenDestination(theme))
+        destinationsNavigator.navigate(ThemeSelectorScreenDestination(theme))
     }
 }
diff --git a/app/src/main/java/com/costular/atomtasks/ui/home/Home.kt b/app/src/main/java/com/costular/atomtasks/ui/home/Home.kt
@@ -44,13 +44,12 @@ import com.costular.atomtasks.ui.AppNavigation
 import com.costular.atomtasks.ui.NavGraphs
 import com.costular.atomtasks.ui.currentScreenAsState
 import com.costular.designsystem.theme.AtomTheme
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine
 import com.ramcosta.composedestinations.spec.NavGraphSpec
 import com.costular.atomtasks.core.ui.R.string as S
 
-@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialNavigationApi::class)
+@OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun App(
     windowSizeClass: WindowSizeClass,

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,4 +19,5 @@ plugins {
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.kotlin.compose.compiler) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
 }
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/createtask/CreateTaskExpanded.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/createtask/CreateTaskExpanded.kt
@@ -479,7 +479,10 @@ private fun NotificationPermissionEffect(
     onAccept: @Composable () -> Unit,
 ) {
     if (LocalInspectionMode.current) return
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        onAccept()
+        return
+    }
 
     val context = LocalContext.current
     val alarmManager = context.applicationContext.getSystemService<AlarmManager>()

diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/format/RecurrenceTypeFormatter.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/format/RecurrenceTypeFormatter.kt
@@ -6,7 +6,11 @@ import com.costular.atomtasks.tasks.model.RecurrenceType
 import com.costular.atomtasks.core.ui.R.string as S
 
 @Composable
-fun RecurrenceType.localized(): String {
+fun RecurrenceType?.localized(): String {
+    if (this == null) {
+        return stringResource(S.task_recurrence_never)
+    }
+
     val stringRes = when(this) {
         RecurrenceType.DAILY -> S.task_recurrence_daily
         RecurrenceType.WEEKDAYS -> S.task_recurrence_weekdays

diff --git a/core/designsystem/src/main/java/com/costular/designsystem/components/Markable.kt b/core/designsystem/src/main/java/com/costular/designsystem/components/Markable.kt
@@ -13,8 +13,8 @@ import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -59,7 +59,7 @@ fun Markable(
                 isMarked,
                 interactionSource = interaction,
                 role = Role.Checkbox,
-                indication = rememberRipple(bounded = false),
+                indication = ripple(),
                 enabled = true,
                 onClick = onClick,
             )

diff --git a/core/designsystem/src/main/java/com/costular/designsystem/components/OutlinedTextField.kt b/core/designsystem/src/main/java/com/costular/designsystem/components/OutlinedTextField.kt
@@ -3,19 +3,17 @@ package com.costular.designsystem.components
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.VisualTransformation
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AtomOutlinedTextField(
     value: String,
@@ -37,8 +35,6 @@ fun AtomOutlinedTextField(
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     shape: Shape = MaterialTheme.shapes.small,
 ) {
-    val colors = TextFieldDefaults.outlinedTextFieldColors()
-
     OutlinedTextField(
         value = value,
         onValueChange = onValueChange,
@@ -58,6 +54,6 @@ fun AtomOutlinedTextField(
         maxLines = maxLines,
         interactionSource = interactionSource,
         shape = shape,
-        colors = colors,
+        colors = OutlinedTextFieldDefaults.colors(),
     )
 }
diff --git a/core/ui/src/main/java/com/costular/atomtasks/core/ui/DestinationsScaffold.kt b/core/ui/src/main/java/com/costular/atomtasks/core/ui/DestinationsScaffold.kt
@@ -3,20 +3,16 @@ package com.costular.atomtasks.core.ui
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.navigation.ModalBottomSheetLayout
+import androidx.compose.material.navigation.rememberBottomSheetNavigator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.plusAssign
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
-import com.google.accompanist.navigation.material.ModalBottomSheetLayout
-import com.google.accompanist.navigation.material.rememberBottomSheetNavigator
-import androidx.navigation.NavArgs
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DestinationsScaffold(
     navController: NavHostController,
@@ -34,7 +30,6 @@ fun DestinationsScaffold(
     }
 }
 
-@OptIn(ExperimentalMaterialNavigationApi::class)
 @Composable
 fun DestinationsBottomSheet(
     navController: NavHostController,

diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
@@ -29,27 +29,41 @@
     <string name="agenda_mark_as_undone">Mark as undone</string>
     <string name="agenda_create_new_task">New task</string>
     <string name="agenda_tutorial_task_order">Want your tasks in order? Long press and drag!</string>
-
     <string name="today">Today</string>
-    <string name="create_task_set_date">Choose a Date</string>
-    <string name="create_task_set_reminder">Set reminder</string>
-    <string name="create_task_set_recurrence">Repeat</string>
+    <string name="task_recurrence_never">Just once</string>
     <string name="task_recurrence_daily">Daily</string>
     <string name="task_recurrence_weekdays">Weekdays</string>
     <string name="task_recurrence_weekly">Weekly</string>
     <string name="task_recurrence_monthly">Monthly</string>
     <string name="task_recurrence_yearly">Yearly</string>
+    <string name="remove_task_message">Are you sure to remove this task?</string>
+    <string name="no_reminder">No reminder</string>
+    <string name="enable_reminder">Enable reminder</string>
+    <string name="task_list_empty_title">No tasks</string>
+    <string name="task_list_empty_description">Create a task and start organizing your life!</string>
+
+    <!-- Create task -->
+    <string name="create_task_set_date">Choose a Date</string>
+    <string name="create_task_set_reminder">Set reminder</string>
+    <string name="create_task_set_recurrence">Repeat</string>
     <string name="create_task_recurrence_picker_none">Does not repeat</string>
     <string name="create_task_recurrence_picker_daily">Every Day</string>
     <string name="create_task_recurrence_picker_weekdays">Every Weekday</string>
     <string name="create_task_recurrence_picker_weekly">Every Week</string>
     <string name="create_task_recurrence_picker_monthly">Every Month</string>
     <string name="create_task_recurrence_picker_yearly">Every Year</string>
-    <string name="remove_task_message">Are you sure to remove this task?</string>
-    <string name="no_reminder">No reminder</string>
-    <string name="enable_reminder">Enable reminder</string>
-    <string name="task_list_empty_title">No tasks</string>
-    <string name="task_list_empty_description">Create a task and start organizing your life!</string>
+
+    <!-- Task detail -->
+    <string name="task_detail_day_subhead">Date</string>
+    <string name="task_detail_reminder_subhead">Reminder</string>
+    <string name="task_detail_reminder_add_reminder">Reminder</string>
+    <string name="task_detail_recurrence_subhead">Repeat</string>
+    <string name="task_detail_recurrence_picker_none">Does not repeat</string>
+    <string name="task_detail_recurrence_picker_daily">Every Day</string>
+    <string name="task_detail_recurrence_picker_weekdays">Every Weekday</string>
+    <string name="task_detail_recurrence_picker_weekly">Every Week</string>
+    <string name="task_detail_recurrence_picker_monthly">Every Month</string>
+    <string name="task_detail_recurrence_picker_yearly">Every Year</string>
 
     <string name="notification_channel_reminders_title">Reminders</string>
     <string name="notification_channel_reminders_description">Reminders for your tasks</string>

diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaNavigator.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaNavigator.kt
@@ -3,13 +3,20 @@ package com.costular.atomtasks.agenda.ui
 interface AgendaNavigator {
     fun navigateToCreateTask(
         date: String,
-        text: String? = null,
     )
 
     fun navigateToEditTask(
         taskId: Long,
     )
 
+    fun navigateToDetailScreenForCreateTask(
+        date: String,
+    )
+
+    fun navigateToDetailScreenToEdit(
+        taskId: Long,
+    )
+
     fun openTaskActions(
         taskId: Long,
         taskName: String,

diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaScreen.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaScreen.kt
@@ -20,6 +20,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.costular.atomtasks.agenda.actions.TaskActionsResult
 import com.costular.atomtasks.agenda.destinations.TasksActionsBottomSheetDestination
+import com.costular.atomtasks.core.ui.mvi.EventObserver
 import com.costular.atomtasks.core.ui.utils.DevicesPreview
 import com.costular.atomtasks.core.ui.utils.generateWindowSizeClass
 import com.costular.atomtasks.review.ui.ReviewHandler
@@ -74,19 +75,33 @@ internal fun AgendaScreen(
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
 
-    LaunchedEffect(Unit) {
-        setFabOnClick {
-            viewModel.onCreateTask()
-            navigator.navigateToCreateTask(state.selectedDay.date.toString())
+    EventObserver(viewModel.uiEvents) { event ->
+        when (event) {
+            is AgendaUiEvents.GoToNewTaskScreen -> {
+                if (event.shouldShowNewScreen) {
+                    navigator.navigateToDetailScreenForCreateTask(event.date.toString())
+                } else {
+                    navigator.navigateToCreateTask(event.date.toString())
+                }
+            }
+
+            is AgendaUiEvents.GoToEditScreen -> {
+                if (event.shouldShowNewScreen) {
+                    navigator.navigateToDetailScreenToEdit(event.taskId)
+                } else {
+                    navigator.navigateToEditTask(event.taskId)
+                }
+            }
         }
     }
 
+    LaunchedEffect(Unit) {
+        setFabOnClick(viewModel::onCreateTask)
+    }
+
     HandleResultRecipients(
         resultRecipient = resultRecipient,
-        onEdit = { taskId ->
-            viewModel.onEditTask()
-            navigator.navigateToEditTask(taskId)
-        },
+        onEdit = viewModel::onEditTask,
         onDelete = viewModel::actionDelete,
         onMarkTask = viewModel::onMarkTask,
     )

diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaUiEvents.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/ui/AgendaUiEvents.kt
@@ -0,0 +1,17 @@
+package com.costular.atomtasks.agenda.ui
+
+import com.costular.atomtasks.core.ui.mvi.UiEvent
+import java.time.LocalDate
+
+sealed interface AgendaUiEvents : UiEvent {
+
+    data class GoToNewTaskScreen(
+        val date: LocalDate,
+        val shouldShowNewScreen: Boolean,
+    ) : AgendaUiEvents
+
+    data class GoToEditScreen(
+        val taskId: Long,
+        val shouldShowNewScreen: Boolean,
+    ) : AgendaUiEvents
+}