changed ui folder to presentation folder

braiso-22 · Apr 13, 2024 · 9560580 · 9560580
1 parent 4d3c5c1
commit 9560580
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 35 deletions.
diff --git a/app/src/main/java/com/braiso_22/cozycave/MainActivity.kt b/app/src/main/java/com/braiso_22/cozycave/MainActivity.kt
@@ -9,7 +9,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.ui.Modifier
-import com.braiso_22.cozycave.feature_task.ui.tasks.TasksScreen
 import com.braiso_22.cozycave.router.AppNavigation
 import com.braiso_22.cozycave.ui.theme.CozyCaveTheme
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/...task/ui/add_edit_task/AddEditTaskEvent.kt → ...ntation/add_edit_task/AddEditTaskEvent.kt b/...task/ui/add_edit_task/AddEditTaskEvent.kt → ...ntation/add_edit_task/AddEditTaskEvent.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.add_edit_task
+package com.braiso_22.cozycave.feature_task.presentation.add_edit_task
 
 import java.time.LocalDate
 import java.time.LocalTime

diff --git a/...ask/ui/add_edit_task/AddEditTaskScreen.kt → ...tation/add_edit_task/AddEditTaskScreen.kt b/...ask/ui/add_edit_task/AddEditTaskScreen.kt → ...tation/add_edit_task/AddEditTaskScreen.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.add_edit_task
+package com.braiso_22.cozycave.feature_task.presentation.add_edit_task
 
 import android.os.Build
 import androidx.annotation.RequiresApi
@@ -15,8 +15,8 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.braiso_22.cozycave.feature_task.ui.add_edit_task.components.TimePickerDialog
-import com.braiso_22.cozycave.feature_task.ui.add_edit_task.components.selectedTime
+import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.components.TimePickerDialog
+import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.components.selectedTime
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter

diff --git a/...task/ui/add_edit_task/AddEditTaskState.kt → ...ntation/add_edit_task/AddEditTaskState.kt b/...task/ui/add_edit_task/AddEditTaskState.kt → ...ntation/add_edit_task/AddEditTaskState.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.add_edit_task
+package com.braiso_22.cozycave.feature_task.presentation.add_edit_task
 
 import java.time.LocalDate
 import java.time.LocalTime

diff --git a/.../ui/add_edit_task/AddEditTaskViewModel.kt → ...ion/add_edit_task/AddEditTaskViewModel.kt b/.../ui/add_edit_task/AddEditTaskViewModel.kt → ...ion/add_edit_task/AddEditTaskViewModel.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.add_edit_task
+package com.braiso_22.cozycave.feature_task.presentation.add_edit_task
 
 
 import android.os.Build
@@ -12,7 +12,7 @@ import com.braiso_22.cozycave.feature_task.domain.InvalidTaskException
 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.ui.add_edit_task.AddEditTaskEvent.*
+import com.braiso_22.cozycave.feature_task.presentation.add_edit_task.AddEditTaskEvent.*
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow

diff --git a/..._edit_task/components/TimePickerDialog.kt → ..._edit_task/components/TimePickerDialog.kt b/..._edit_task/components/TimePickerDialog.kt → ..._edit_task/components/TimePickerDialog.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.add_edit_task.components
+package com.braiso_22.cozycave.feature_task.presentation.add_edit_task.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column

diff --git a/...cave/feature_task/ui/tasks/TasksScreen.kt → ...re_task/presentation/tasks/TasksScreen.kt b/...cave/feature_task/ui/tasks/TasksScreen.kt → ...re_task/presentation/tasks/TasksScreen.kt
@@ -1,7 +1,5 @@
-package com.braiso_22.cozycave.feature_task.ui.tasks
+package com.braiso_22.cozycave.feature_task.presentation.tasks
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.*
@@ -15,7 +13,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.braiso_22.cozycave.feature_task.ui.tasks.components.TasksList
+import com.braiso_22.cozycave.feature_task.presentation.tasks.components.TasksList
 import com.braiso_22.cozycave.ui.common.isVertical
 
 @Composable

diff --git a/app/src/main/java/com/braiso_22/cozycave/feature_task/presentation/tasks/TasksUiState.kt b/app/src/main/java/com/braiso_22/cozycave/feature_task/presentation/tasks/TasksUiState.kt
@@ -0,0 +1,17 @@
+package com.braiso_22.cozycave.feature_task.presentation.tasks
+
+import com.braiso_22.cozycave.feature_task.domain.Task
+
+data class TasksUiState(val tasks: List<TaskUiState> = emptyList())
+
+data class TaskUiState(
+    val name: String,
+    val description: String = "",
+)
+
+fun Task.toUiState(): TaskUiState {
+    return TaskUiState(
+        name = name,
+        description = description ?: ""
+    )
+}
diff --git a/...e/feature_task/ui/tasks/TasksViewModel.kt → ...task/presentation/tasks/TasksViewModel.kt b/...e/feature_task/ui/tasks/TasksViewModel.kt → ...task/presentation/tasks/TasksViewModel.kt
@@ -1,9 +1,10 @@
-package com.braiso_22.cozycave.feature_task.ui.tasks
+package com.braiso_22.cozycave.feature_task.presentation.tasks
 
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 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.DeleteTaskUseCase
 import com.braiso_22.cozycave.feature_task.domain.use_case.GetTasksUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -29,13 +30,7 @@ class TasksViewModel @Inject constructor(
         updateStateJob?.cancel()
         updateStateJob = getTasksUseCase().onEach { taskList ->
             _state.value = state.value.copy(
-                tasks = taskList.map {
-                    TaskUiState(
-                        name = it.name,
-                        description = it.description,
-                        days = it.days,
-                    )
-                }
+                tasks = taskList.map(Task::toUiState)
             )
         }.launchIn(viewModelScope)
     }

diff --git a/...ture_task/ui/tasks/components/TaskItem.kt → ...presentation/tasks/components/TaskItem.kt b/...ture_task/ui/tasks/components/TaskItem.kt → ...presentation/tasks/components/TaskItem.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.tasks.components
+package com.braiso_22.cozycave.feature_task.presentation.tasks.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.braiso_22.cozycave.feature_task.ui.tasks.TaskUiState
+import com.braiso_22.cozycave.feature_task.presentation.tasks.TaskUiState
 
 @Composable
 fun TaskItem(

diff --git a/...ure_task/ui/tasks/components/TasksList.kt → ...resentation/tasks/components/TasksList.kt b/...ure_task/ui/tasks/components/TasksList.kt → ...resentation/tasks/components/TasksList.kt
@@ -1,4 +1,4 @@
-package com.braiso_22.cozycave.feature_task.ui.tasks.components
+package com.braiso_22.cozycave.feature_task.presentation.tasks.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.braiso_22.cozycave.feature_task.ui.tasks.TaskUiState
+import com.braiso_22.cozycave.feature_task.presentation.tasks.TaskUiState
 
 @Composable
 fun TasksList(

diff --git a/app/src/main/java/com/braiso_22/cozycave/feature_task/ui/tasks/TasksUiState.kt b/app/src/main/java/com/braiso_22/cozycave/feature_task/ui/tasks/TasksUiState.kt
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
@@ -7,7 +7,7 @@ import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.braiso_22.cozycave.feature_task.ui.tasks.TasksScreen
+import com.braiso_22.cozycave.feature_task.presentation.tasks.TasksScreen
 
 /**
  * A composable function that sets up the navigation in the app