Merge branch 'dev'

braiso-22 · Apr 29, 2024 · 354dc43 · 354dc43
2 parents ba2a0e1 + b7fa543
commit 354dc43
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 10 deletions.
diff --git a/...o_22/cozycave/feature_execution/presentation/add_edit_execution/AddEditExecutionScreen.kt b/...o_22/cozycave/feature_execution/presentation/add_edit_execution/AddEditExecutionScreen.kt
@@ -1,6 +1,5 @@
 package com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution
 
-import android.widget.Space
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
@@ -83,7 +82,17 @@ fun AddEditExecutionScreenContent(
         modifier = modifier,
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.add_execution)) },
+                title = {
+                    Text(
+                        stringResource(
+                            if (state.isEditExecution) {
+                                R.string.edit_execution
+                            } else {
+                                R.string.add_execution
+                            }
+                        )
+                    )
+                },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.primaryContainer,
                     titleContentColor = MaterialTheme.colorScheme.primary

diff --git a/...2/cozycave/feature_execution/presentation/add_edit_execution/AddEditExecutionViewModel.kt b/...2/cozycave/feature_execution/presentation/add_edit_execution/AddEditExecutionViewModel.kt
@@ -10,11 +10,9 @@ import androidx.lifecycle.viewModelScope
 import com.braiso_22.cozycave.R
 import com.braiso_22.cozycave.feature_execution.domain.use_case.AddExecutionUseCase
 import com.braiso_22.cozycave.feature_execution.domain.use_case.GetExecutionByIdUseCase
-import com.braiso_22.cozycave.feature_execution.domain.use_case.GetExecutionsByRelatedIdUseCase
 import com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution.state.AddEditExecutionUiState
 import com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution.state.asExecution
 import com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution.state.toUiState
-import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.state.toUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -94,4 +92,3 @@ class AddEditExecutionViewModel @Inject constructor(
         data class SavedCloseScreen(val message: Int) : UiEvent()
     }
 }
-
diff --git a/...zycave/feature_execution/presentation/add_edit_execution/state/AddEditExecutionUiState.kt b/...zycave/feature_execution/presentation/add_edit_execution/state/AddEditExecutionUiState.kt
@@ -7,6 +7,7 @@ import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
 data class AddEditExecutionUiState(
+    val id: Int = 0,
     val startDate: String = "",
     val startTime: String = "",
     val endDate: String = "",
@@ -17,6 +18,7 @@ data class AddEditExecutionUiState(
 )
 
 fun Execution.toUiState() = AddEditExecutionUiState(
+    id = id,
     startDate = startDateTime.toFormatedDate(),
     startTime = startDateTime.toFormatedTime(),
     endDate = endDateTime.toFormatedDate(),
@@ -39,6 +41,7 @@ fun LocalDateTime.toFormatedTime(): String {
 
 fun AddEditExecutionUiState.asExecution(): Execution {
     return Execution(
+        id = id,
         startDateTime = LocalDateTime.of(
             LocalDate.parse(startDate, DateTimeFormatter.ofPattern("dd/MM/yyyy")),
             LocalTime.parse(startTime)

diff --git a/...va/com/braiso_22/cozycave/feature_task/presentation/add_edit_task/AddEditTaskViewModel.kt b/...va/com/braiso_22/cozycave/feature_task/presentation/add_edit_task/AddEditTaskViewModel.kt
@@ -6,15 +6,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.braiso_22.cozycave.feature_task.domain.Task
 import com.braiso_22.cozycave.feature_task.domain.use_case.AddTaskUseCase
 import com.braiso_22.cozycave.feature_task.domain.use_case.GetTaskByIdUseCase
 import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.AddEditTaskEvent.*
 import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.state.AddEditTaskUiState
 import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.state.toTask
 import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.state.toUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch

diff --git a/...ava/com/braiso_22/cozycave/feature_task/presentation/show_task_detail/TaskDetailScreen.kt b/...ava/com/braiso_22/cozycave/feature_task/presentation/show_task_detail/TaskDetailScreen.kt
@@ -1,5 +1,6 @@
 package com.braiso_22.cozycave.feature_task.presentation.show_task_detail
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -27,6 +28,7 @@ import com.braiso_22.cozycave.feature_task.presentation.show_task_detail.state.T
 fun TaskDetailScreen(
     windowSizeClass: WindowSizeClass,
     onBack: () -> Unit,
+    onClickTaskExecution: (taskId: Int, executionId: Int) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: TaskDetailViewModel = hiltViewModel(),
 ) {
@@ -35,6 +37,7 @@ fun TaskDetailScreen(
         state = state,
         windowSizeClass = windowSizeClass,
         onBack = onBack,
+        onClickTaskExecution = onClickTaskExecution,
         modifier = modifier,
     )
 }
@@ -44,6 +47,7 @@ fun TaskDetailScreen(
 fun TaskDetailScreenContent(
     state: TaskDetailUiState,
     windowSizeClass: WindowSizeClass,
+    onClickTaskExecution: (Int, Int) -> Unit,
     onBack: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -113,6 +117,9 @@ fun TaskDetailScreenContent(
                     modifier = Modifier
                         .fillMaxSize()
                         .padding(16.dp)
+                        .clickable {
+                            onClickTaskExecution(state.taskId, execution.id)
+                        }
                 )
                 if (index != state.unFinishedExecutions.lastIndex)
                     HorizontalDivider(
@@ -139,6 +146,9 @@ fun TaskDetailScreenContent(
                     modifier = Modifier
                         .fillMaxSize()
                         .padding(8.dp)
+                        .clickable {
+                            onClickTaskExecution(state.taskId, execution.id)
+                        }
                 )
                 if (index != state.completedExecutions.lastIndex)
                     HorizontalDivider(
@@ -156,13 +166,16 @@ fun TaskDetailScreenContent(
 private fun TaskDetailScreenContentPreview(dpSize: DpSize) {
     val state = remember {
         mutableStateOf(
-            TaskDetailUiState(),
+            TaskDetailUiState(taskId = 0),
         )
     }
     TaskDetailScreenContent(
         state = state.value,
         windowSizeClass = WindowSizeClass.calculateFromSize(dpSize),
         onBack = {},
+        onClickTaskExecution = { taskId, executionId ->
+
+        },
         modifier = Modifier.fillMaxSize()
     )
 }

diff --git a/.../com/braiso_22/cozycave/feature_task/presentation/show_task_detail/TaskDetailViewModel.kt b/.../com/braiso_22/cozycave/feature_task/presentation/show_task_detail/TaskDetailViewModel.kt
@@ -23,7 +23,7 @@ class TaskDetailViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
-    private val _state = mutableStateOf(TaskDetailUiState())
+    private val _state = mutableStateOf(TaskDetailUiState(taskId = 0))
     val state: State<TaskDetailUiState> = _state
 
     private val _taskId = mutableIntStateOf(0)

diff --git a/...cave/feature_task/presentation/show_task_detail/components/CompletedExecutionComponent.kt b/...cave/feature_task/presentation/show_task_detail/components/CompletedExecutionComponent.kt
@@ -71,6 +71,7 @@ fun CompletedExecutionComponent(
 private fun ExecutionComponentPreview() {
     CompletedExecutionComponent(
         state = ExecutionUiState(
+            id = 0,
             startDate = "00/00/0000",
             endDate = "00/07/0000",
             startHour = "00:00",

diff --git a/...ve/feature_task/presentation/show_task_detail/components/UnCompletedExecutionComponent.kt b/...ve/feature_task/presentation/show_task_detail/components/UnCompletedExecutionComponent.kt
@@ -45,6 +45,7 @@ fun UnCompletedExecutionComponent(
 private fun UnCompletedExecutionComponentPreview() {
     UnCompletedExecutionComponent(
         state = ExecutionUiState(
+            id = 0,
             startDate = "22/03/2002",
             endDate = "22/03/2002",
             startHour = "01:00",

diff --git a/...m/braiso_22/cozycave/feature_task/presentation/show_task_detail/state/ExecutionUiState.kt b/...m/braiso_22/cozycave/feature_task/presentation/show_task_detail/state/ExecutionUiState.kt
@@ -5,13 +5,15 @@ import com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution.
 import com.braiso_22.cozycave.feature_execution.presentation.add_edit_execution.state.toFormatedTime
 
 data class ExecutionUiState(
+    val id: Int,
     val startDate: String,
     val endDate: String,
     val startHour: String,
     val endHour: String,
 )
 
 fun Execution.toUiState() = ExecutionUiState(
+    id = this.id,
     startDate = this.startDateTime.toFormatedDate(),
     startHour = this.startDateTime.toFormatedTime(),
     endDate = this.endDateTime.toFormatedDate(),

diff --git a/.../braiso_22/cozycave/feature_task/presentation/show_task_detail/state/TaskDetailUiState.kt b/.../braiso_22/cozycave/feature_task/presentation/show_task_detail/state/TaskDetailUiState.kt
@@ -4,12 +4,14 @@ import com.braiso_22.cozycave.feature_execution.domain.Execution
 import com.braiso_22.cozycave.feature_task.domain.TaskWithExecutions
 
 data class TaskDetailUiState(
+    val taskId: Int,
     val name: String = "Task",
     val completedExecutions: List<ExecutionUiState> = emptyList(),
     val unFinishedExecutions: List<ExecutionUiState> = emptyList(),
 )
 
 fun TaskWithExecutions.toUiState(): TaskDetailUiState = TaskDetailUiState(
+    taskId = this.task.id,
     name = this.task.name,
     completedExecutions = this.executions.filter {
         it.finished

diff --git a/app/src/main/java/com/braiso_22/cozycave/router/AppNavigation.kt b/app/src/main/java/com/braiso_22/cozycave/router/AppNavigation.kt
@@ -1,7 +1,6 @@
 package com.braiso_22.cozycave.router
 
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
@@ -153,6 +152,9 @@ fun AppNavigation(
                     onBack = {
                         navController.popBackStack()
                     },
+                    onClickTaskExecution = { taskId, executionId ->
+                        navController.navigate(AppScreens.AddEditExecution.route + taskId + "/true/" + executionId)
+                    },
                     modifier = modifier.fillMaxSize()
                 )
             }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -13,4 +13,5 @@
     <string name="add_execution">Add execution</string>
     <string name="execution_saved_correctly">Execution saved correctly</string>
     <string name="task_detail">Task detail</string>
+    <string name="edit_execution">Edit execution</string>
 </resources>