Updated the presentation layer packaging

janewaitara · Mar 25, 2024 · a7880bc · a7880bc
1 parent 905e594
commit a7880bc
Show file tree

Hide file tree

Showing 60 changed files with 262 additions and 174 deletions.
diff --git a/app/src/main/java/com/mumbicodes/projectie/domain/use_case/tasks/TransformTasksUseCase.kt b/app/src/main/java/com/mumbicodes/projectie/domain/use_case/tasks/TransformTasksUseCase.kt
@@ -1,8 +1,8 @@
 package com.mumbicodes.projectie.domain.use_case.tasks
 
 import com.mumbicodes.projectie.domain.model.Task
-import com.mumbicodes.projectie.presentation.add_edit_milestone.TaskState
-import com.mumbicodes.projectie.presentation.add_edit_milestone.TaskTextFieldState
+import com.mumbicodes.projectie.presentation.screens.add_edit_milestone.TaskState
+import com.mumbicodes.projectie.presentation.screens.add_edit_milestone.TaskTextFieldState
 
 class TransformTasksUseCase {
     fun transformTasksToTaskStates(tasks: List<Task>): List<TaskState> {

diff --git a/app/src/main/java/com/mumbicodes/projectie/presentation/ProjectsScreen.kt b/app/src/main/java/com/mumbicodes/projectie/presentation/ProjectsScreen.kt
@@ -10,9 +10,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
-import com.mumbicodes.projectie.presentation.allProjects.AllProjectsScreenRoute
-import com.mumbicodes.projectie.presentation.projectDetails.ProjectDetailsScreen
-import com.mumbicodes.projectie.presentation.theme.Space20dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space20dp
+import com.mumbicodes.projectie.presentation.screens.allProjects.AllProjectsScreenRoute
+import com.mumbicodes.projectie.presentation.screens.projectDetails.ProjectDetailsScreen
 import com.mumbicodes.projectie.presentation.util.ContentType
 import com.mumbicodes.projectie.presentation.util.navigation.Screens
 

diff --git a/app/src/main/java/com/mumbicodes/projectie/presentation/activity/MainActivity.kt b/app/src/main/java/com/mumbicodes/projectie/presentation/activity/MainActivity.kt
@@ -13,9 +13,8 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
-import com.mumbicodes.projectie.presentation.splash.SplashScreenViewModel
-import com.mumbicodes.projectie.presentation.theme.*
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.screens.splash.SplashScreenViewModel
 import com.mumbicodes.projectie.presentation.util.DevicePosture
 import com.mumbicodes.projectie.presentation.util.isBookPosture
 import com.mumbicodes.projectie.presentation.util.isSeparating

diff --git a/...e/presentation/components/BottomNavBar.kt → ...n/designsystem/components/BottomNavBar.kt b/...e/presentation/components/BottomNavBar.kt → ...n/designsystem/components/BottomNavBar.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import android.content.res.Configuration
 import androidx.compose.animation.AnimatedVisibility
@@ -21,8 +21,8 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
-import com.mumbicodes.projectie.presentation.theme.Space20dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space20dp
 import com.mumbicodes.projectie.presentation.util.navigation.Screens
 import com.mumbicodes.projectie.presentation.util.navigation.bottomNavigationDestinations
 

diff --git a/...ntation/components/BottomNavigationBar.kt → ...nsystem/components/BottomNavigationBar.kt b/...ntation/components/BottomNavigationBar.kt → ...nsystem/components/BottomNavigationBar.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.background
 import androidx.compose.material3.*
@@ -10,7 +10,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
 import com.mumbicodes.projectie.presentation.util.navigation.Screens
 import com.mumbicodes.projectie.presentation.util.navigation.bottomNavigationDestinations
 

diff --git a/...jectie/presentation/components/Buttons.kt → ...tation/designsystem/components/Buttons.kt b/...jectie/presentation/components/Buttons.kt → ...tation/designsystem/components/Buttons.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
 import java.util.*
 
 @Composable

diff --git a/...projectie/presentation/components/Chip.kt → ...sentation/designsystem/components/Chip.kt b/...projectie/presentation/components/Chip.kt → ...sentation/designsystem/components/Chip.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -8,9 +8,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
-import com.mumbicodes.projectie.presentation.theme.Space12dp
-import com.mumbicodes.projectie.presentation.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space12dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...on/components/EmptyStateSlotComposable.kt → ...em/components/EmptyStateSlotComposable.kt b/...on/components/EmptyStateSlotComposable.kt → ...em/components/EmptyStateSlotComposable.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
@@ -17,7 +17,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space24dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space32dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space36dp
 import com.mumbicodes.projectie.presentation.util.ReferenceDevices
 
 @Composable

diff --git a/...on/components/ErrorStateSlotComposable.kt → ...em/components/ErrorStateSlotComposable.kt b/...on/components/ErrorStateSlotComposable.kt → ...em/components/ErrorStateSlotComposable.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
@@ -17,7 +17,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space24dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space32dp
 import com.mumbicodes.projectie.presentation.util.ReferenceDevices
 
 @Composable

diff --git a/...entation/components/LabelledInputField.kt → ...gnsystem/components/LabelledInputField.kt b/...entation/components/LabelledInputField.kt → ...gnsystem/components/LabelledInputField.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
@@ -19,9 +19,14 @@ import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.add_edit_milestone.TaskState
-import com.mumbicodes.projectie.presentation.add_edit_milestone.TaskTextFieldState
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.GreySubtle
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space48dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space4dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space8dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.White
+import com.mumbicodes.projectie.presentation.screens.add_edit_milestone.TaskState
+import com.mumbicodes.projectie.presentation.screens.add_edit_milestone.TaskTextFieldState
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...esentation/components/NavigationDrawer.kt → ...signsystem/components/NavigationDrawer.kt b/...esentation/components/NavigationDrawer.kt → ...signsystem/components/NavigationDrawer.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -21,7 +21,12 @@ import androidx.navigation.NavDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space12dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space24dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space32dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space8dp
 import com.mumbicodes.projectie.presentation.util.navigation.Screens
 import com.mumbicodes.projectie.presentation.util.navigation.navigationRailDestinations
 

diff --git a/...presentation/components/NavigationRail.kt → ...designsystem/components/NavigationRail.kt b/...presentation/components/NavigationRail.kt → ...designsystem/components/NavigationRail.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -21,10 +21,10 @@ import androidx.navigation.NavDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
-import com.mumbicodes.projectie.presentation.theme.Space16dp
-import com.mumbicodes.projectie.presentation.theme.Space32dp
-import com.mumbicodes.projectie.presentation.theme.Space36dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space32dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space36dp
 import com.mumbicodes.projectie.presentation.util.navigation.Screens
 import com.mumbicodes.projectie.presentation.util.navigation.navigationRailDestinations
 

diff --git a/...omponents/NotificationsAlertComposable.kt → ...omponents/NotificationsAlertComposable.kt b/...omponents/NotificationsAlertComposable.kt → ...omponents/NotificationsAlertComposable.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
@@ -18,9 +18,9 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
-import com.mumbicodes.projectie.presentation.theme.Space16dp
-import com.mumbicodes.projectie.presentation.theme.Space4dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space4dp
 
 @Composable
 fun NotificationsAlertComposable(modifier: Modifier = Modifier, onClick: () -> Unit) {

diff --git a/...ojectie/presentation/components/Shadow.kt → ...ntation/designsystem/components/Shadow.kt b/...ojectie/presentation/components/Shadow.kt → ...ntation/designsystem/components/Shadow.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable

diff --git a/...ion/components/ShimmerEffectComposable.kt → ...tem/components/ShimmerEffectComposable.kt b/...ion/components/ShimmerEffectComposable.kt → ...tem/components/ShimmerEffectComposable.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.animation.core.*
@@ -17,7 +17,14 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.GreyLight
+import com.mumbicodes.projectie.presentation.designsystem.theme.GreySubtle
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space12dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space16dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space24dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space48dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space8dp
 
 @Composable
 fun ShimmerEffectComposable() {

diff --git a/...ion/components/SwipeToDismissComponent.kt → ...tem/components/SwipeToDismissComponent.kt b/...ion/components/SwipeToDismissComponent.kt → ...tem/components/SwipeToDismissComponent.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
@@ -13,8 +13,8 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.Space20dp
-import com.mumbicodes.projectie.presentation.theme.Space4dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space20dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space4dp
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable

diff --git a/.../projectie/presentation/components/Tag.kt → ...esentation/designsystem/components/Tag.kt b/.../projectie/presentation/components/Tag.kt → ...esentation/designsystem/components/Tag.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.components
+package com.mumbicodes.projectie.presentation.designsystem.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.padding
@@ -10,7 +10,15 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.theme.LightSuccess
+import com.mumbicodes.projectie.presentation.designsystem.theme.LightWarning
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Red90
+import com.mumbicodes.projectie.presentation.designsystem.theme.RedMain
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space12dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space4dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Success
+import com.mumbicodes.projectie.presentation.designsystem.theme.Warning
 import kotlin.math.abs
 
 @Composable

diff --git a/...des/projectie/presentation/theme/Color.kt → .../presentation/designsystem/theme/Color.kt b/...des/projectie/presentation/theme/Color.kt → .../presentation/designsystem/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import androidx.compose.ui.graphics.Color
 

diff --git a/...rojectie/presentation/theme/Dimensions.kt → ...entation/designsystem/theme/Dimensions.kt b/...rojectie/presentation/theme/Dimensions.kt → ...entation/designsystem/theme/Dimensions.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import androidx.compose.ui.unit.dp
 

diff --git a/...odes/projectie/presentation/theme/Font.kt → ...e/presentation/designsystem/theme/Font.kt b/...odes/projectie/presentation/theme/Font.kt → ...e/presentation/designsystem/theme/Font.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily

diff --git a/...des/projectie/presentation/theme/Shape.kt → .../presentation/designsystem/theme/Shape.kt b/...des/projectie/presentation/theme/Shape.kt → .../presentation/designsystem/theme/Shape.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Shapes

diff --git a/...des/projectie/presentation/theme/Theme.kt → .../presentation/designsystem/theme/Theme.kt b/...des/projectie/presentation/theme/Theme.kt → .../presentation/designsystem/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import android.app.Activity
 import androidx.compose.foundation.isSystemInDarkTheme

diff --git a/...odes/projectie/presentation/theme/Type.kt → ...e/presentation/designsystem/theme/Type.kt b/...odes/projectie/presentation/theme/Type.kt → ...e/presentation/designsystem/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.theme
+package com.mumbicodes.projectie.presentation.designsystem.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle

diff --git a/...it_milestone/AddAndEditMilestoneScreen.kt → ...it_milestone/AddAndEditMilestoneScreen.kt b/...it_milestone/AddAndEditMilestoneScreen.kt → ...it_milestone/AddAndEditMilestoneScreen.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.add_edit_milestone
+package com.mumbicodes.projectie.presentation.screens.add_edit_milestone
 
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -17,8 +17,16 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.components.*
-import com.mumbicodes.projectie.presentation.theme.*
+import com.mumbicodes.projectie.presentation.designsystem.components.LabelledInputField
+import com.mumbicodes.projectie.presentation.designsystem.components.LabelledInputFieldWithIcon
+import com.mumbicodes.projectie.presentation.designsystem.components.PrimaryButton
+import com.mumbicodes.projectie.presentation.designsystem.components.SwipeToDismissComponent
+import com.mumbicodes.projectie.presentation.designsystem.components.TaskItemField
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space20dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space24dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space48dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space8dp
 import com.mumbicodes.projectie.presentation.util.fromMillisToLocalDate
 import kotlinx.coroutines.flow.collectLatest
 import java.time.LocalDate

diff --git a/..._edit_milestone/AddEditMilestoneEvents.kt → ..._edit_milestone/AddEditMilestoneEvents.kt b/..._edit_milestone/AddEditMilestoneEvents.kt → ..._edit_milestone/AddEditMilestoneEvents.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.add_edit_milestone
+package com.mumbicodes.projectie.presentation.screens.add_edit_milestone
 
 import androidx.compose.ui.focus.FocusState
 import java.time.LocalDate

diff --git a/...t_milestone/AddEditMilestonesViewModel.kt → ...t_milestone/AddEditMilestonesViewModel.kt b/...t_milestone/AddEditMilestonesViewModel.kt → ...t_milestone/AddEditMilestonesViewModel.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.add_edit_milestone
+package com.mumbicodes.projectie.presentation.screens.add_edit_milestone
 
 import android.app.Application
 import android.util.Log

diff --git a/...entation/add_edit_milestone/TaskStates.kt → .../screens/add_edit_milestone/TaskStates.kt b/...entation/add_edit_milestone/TaskStates.kt → .../screens/add_edit_milestone/TaskStates.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.add_edit_milestone
+package com.mumbicodes.projectie.presentation.screens.add_edit_milestone
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf

diff --git a/...tion/add_edit_project/AddAndEditScreen.kt → ...eens/add_edit_project/AddAndEditScreen.kt b/...tion/add_edit_project/AddAndEditScreen.kt → ...eens/add_edit_project/AddAndEditScreen.kt
@@ -1,4 +1,4 @@
-package com.mumbicodes.projectie.presentation.add_edit_project
+package com.mumbicodes.projectie.presentation.screens.add_edit_project
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -17,12 +17,12 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.mumbicodes.projectie.R
-import com.mumbicodes.projectie.presentation.components.LabelledInputField
-import com.mumbicodes.projectie.presentation.components.LabelledInputFieldWithIcon
-import com.mumbicodes.projectie.presentation.components.PrimaryButton
-import com.mumbicodes.projectie.presentation.theme.ProjectTrackingTheme
-import com.mumbicodes.projectie.presentation.theme.Space20dp
-import com.mumbicodes.projectie.presentation.theme.Space48dp
+import com.mumbicodes.projectie.presentation.designsystem.components.LabelledInputField
+import com.mumbicodes.projectie.presentation.designsystem.components.LabelledInputFieldWithIcon
+import com.mumbicodes.projectie.presentation.designsystem.components.PrimaryButton
+import com.mumbicodes.projectie.presentation.designsystem.theme.ProjectTrackingTheme
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space20dp
+import com.mumbicodes.projectie.presentation.designsystem.theme.Space48dp
 import com.mumbicodes.projectie.presentation.util.fromMillisToLocalDate
 import kotlinx.coroutines.flow.collectLatest
 import java.time.LocalDate