Fix Folder structure

cs-24-sw-8-04 · May 10, 2024 · 70e7873 · 70e7873
1 parent ec71a74
commit 70e7873
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 35 deletions.
diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt
@@ -19,15 +19,22 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import dk.scheduling.schedulingfrontend.pages.AccountPage
-import dk.scheduling.schedulingfrontend.pages.CreateDevicePage
-import dk.scheduling.schedulingfrontend.pages.CreateTaskPage
-import dk.scheduling.schedulingfrontend.pages.HomePage
-import dk.scheduling.schedulingfrontend.pages.LoginPage
-import dk.scheduling.schedulingfrontend.pages.Page
-import dk.scheduling.schedulingfrontend.pages.SignUpPage
-import dk.scheduling.schedulingfrontend.pages.TaskOverviewPage
-import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.datasources.AccountDataSource
+import dk.scheduling.schedulingfrontend.datasources.api.getApiClient
+import dk.scheduling.schedulingfrontend.gui.pages.AccountPage
+import dk.scheduling.schedulingfrontend.gui.pages.CreateDevicePage
+import dk.scheduling.schedulingfrontend.gui.pages.CreateTaskPage
+import dk.scheduling.schedulingfrontend.gui.pages.HomePage
+import dk.scheduling.schedulingfrontend.gui.pages.LoginPage
+import dk.scheduling.schedulingfrontend.gui.pages.Page
+import dk.scheduling.schedulingfrontend.gui.pages.SignUpPage
+import dk.scheduling.schedulingfrontend.gui.pages.TaskOverviewPage
+import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
+import dk.scheduling.schedulingfrontend.repositories.account.AccountRepository
+import dk.scheduling.schedulingfrontend.repositories.device.DeviceRepository
+import dk.scheduling.schedulingfrontend.repositories.event.EventRepository
+import dk.scheduling.schedulingfrontend.repositories.overviews.OverviewRepository
+import dk.scheduling.schedulingfrontend.repositories.task.TaskRepository
 import kotlinx.coroutines.runBlocking
 
 class MainActivity : ComponentActivity() {
@@ -96,7 +103,11 @@ class MainActivity : ComponentActivity() {
                             CreateDevicePage(
                                 deviceRepository = App.appModule.deviceRepo,
                                 navigateOnValidCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
-                                navigateOnCancelCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
+                                navigateOnCancelCreation = {
+                                    appState.navHostController.navigate(
+                                        Page.DeviceOverview.route,
+                                    )
+                                },
                             )
                         }
                         composable(
@@ -107,7 +118,11 @@ class MainActivity : ComponentActivity() {
                                 deviceRepository = App.appModule.deviceRepo,
                                 taskRepository = App.appModule.taskRepo,
                                 navigateOnValidCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
-                                navigateOnCancelCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
+                                navigateOnCancelCreation = {
+                                    appState.navHostController.navigate(
+                                        Page.TaskOverview.route,
+                                    )
+                                },
                             )
                         }
                         composable(Page.Account.route) {

diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainLayout.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainLayout.kt
@@ -11,7 +11,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
-import dk.scheduling.schedulingfrontend.pages.Page
+import dk.scheduling.schedulingfrontend.gui.pages.Page
 
 @Composable
 fun BottomNavigationBar(

diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/model/DeviceState.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/model/DeviceState.kt
@@ -1,6 +1,6 @@
 package dk.scheduling.schedulingfrontend.model
 
-import dk.scheduling.schedulingfrontend.api.protocol.Event
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Event
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
 

diff --git a/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/model/TaskForm.kt b/frontend/app/src/main/java/dk/scheduling/schedulingfrontend/model/TaskForm.kt
@@ -2,7 +2,7 @@ package dk.scheduling.schedulingfrontend.model
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TimePickerState
-import dk.scheduling.schedulingfrontend.components.DateRange
+import dk.scheduling.schedulingfrontend.gui.components.DateRange
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
 

diff --git a/...pp/src/main/java/dk/scheduling/schedulingfrontend/repositories/device/DeviceRepository.kt b/...pp/src/main/java/dk/scheduling/schedulingfrontend/repositories/device/DeviceRepository.kt
@@ -1,8 +1,8 @@
 package dk.scheduling.schedulingfrontend.repositories.device
 
-import dk.scheduling.schedulingfrontend.api.ApiService
-import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceRequest
-import dk.scheduling.schedulingfrontend.api.protocol.Device
+import dk.scheduling.schedulingfrontend.datasources.api.ApiService
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
 import dk.scheduling.schedulingfrontend.exceptions.CreationFailedException
 import dk.scheduling.schedulingfrontend.exceptions.DeletionFailedException
 import dk.scheduling.schedulingfrontend.exceptions.NoBodyWasProvidedException

diff --git a/.../app/src/main/java/dk/scheduling/schedulingfrontend/repositories/event/EventRepository.kt b/.../app/src/main/java/dk/scheduling/schedulingfrontend/repositories/event/EventRepository.kt
@@ -2,9 +2,9 @@ package dk.scheduling.schedulingfrontend.repositories.event
 
 import android.content.Context
 import androidx.work.WorkManager
-import dk.scheduling.schedulingfrontend.api.ApiService
-import dk.scheduling.schedulingfrontend.api.protocol.Event
 import dk.scheduling.schedulingfrontend.background.EventAlarmSetterWorker
+import dk.scheduling.schedulingfrontend.datasources.api.ApiService
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Event
 import dk.scheduling.schedulingfrontend.exceptions.NoBodyWasProvidedException
 import dk.scheduling.schedulingfrontend.exceptions.UnauthorizedException
 import dk.scheduling.schedulingfrontend.exceptions.UnsuccessfulRequestException

diff --git a/...d/app/src/main/java/dk/scheduling/schedulingfrontend/repositories/task/ITaskRepository.kt b/...d/app/src/main/java/dk/scheduling/schedulingfrontend/repositories/task/ITaskRepository.kt
@@ -1,7 +1,7 @@
 package dk.scheduling.schedulingfrontend.repositories.task
 
-import dk.scheduling.schedulingfrontend.api.protocol.Task
-import dk.scheduling.schedulingfrontend.api.protocol.Timespan
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Task
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Timespan
 
 interface ITaskRepository {
     suspend fun getAllTasks(): List<Task>

diff --git a/...nd/app/src/main/java/dk/scheduling/schedulingfrontend/repositories/task/TaskRepository.kt b/...nd/app/src/main/java/dk/scheduling/schedulingfrontend/repositories/task/TaskRepository.kt
@@ -1,9 +1,9 @@
 package dk.scheduling.schedulingfrontend.repositories.task
 
-import dk.scheduling.schedulingfrontend.api.ApiService
-import dk.scheduling.schedulingfrontend.api.protocol.CreateTaskRequest
-import dk.scheduling.schedulingfrontend.api.protocol.Task
-import dk.scheduling.schedulingfrontend.api.protocol.Timespan
+import dk.scheduling.schedulingfrontend.datasources.api.ApiService
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateTaskRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Task
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Timespan
 import dk.scheduling.schedulingfrontend.exceptions.CreationFailedException
 import dk.scheduling.schedulingfrontend.exceptions.DeletionFailedException
 import dk.scheduling.schedulingfrontend.exceptions.NoBodyWasProvidedException

diff --git a/frontend/app/src/main/java/testdata/DummyDeviceRepository.kt b/frontend/app/src/main/java/testdata/DummyDeviceRepository.kt
@@ -1,6 +1,6 @@
 package testdata
 
-import dk.scheduling.schedulingfrontend.api.protocol.Device
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
 import dk.scheduling.schedulingfrontend.repositories.device.IDeviceRepository
 import kotlinx.coroutines.delay
 

diff --git a/frontend/app/src/test/java/dk/scheduling/schedulingfrontend/ApiServiceTest.kt b/frontend/app/src/test/java/dk/scheduling/schedulingfrontend/ApiServiceTest.kt
@@ -1,13 +1,13 @@
 package dk.scheduling.schedulingfrontend
 
-import dk.scheduling.schedulingfrontend.api.ApiService
-import dk.scheduling.schedulingfrontend.api.getApiClient
-import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceRequest
-import dk.scheduling.schedulingfrontend.api.protocol.CreateTaskRequest
-import dk.scheduling.schedulingfrontend.api.protocol.Device
-import dk.scheduling.schedulingfrontend.api.protocol.RegisterOrLoginRequest
-import dk.scheduling.schedulingfrontend.api.protocol.Task
-import dk.scheduling.schedulingfrontend.api.protocol.Timespan
+import dk.scheduling.schedulingfrontend.datasources.api.ApiService
+import dk.scheduling.schedulingfrontend.datasources.api.getApiClient
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateTaskRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Device
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.RegisterOrLoginRequest
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Task
+import dk.scheduling.schedulingfrontend.datasources.api.protocol.Timespan
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before

diff --git a/frontend/app/src/test/java/dk/scheduling/schedulingfrontend/DateRangeTest.kt b/frontend/app/src/test/java/dk/scheduling/schedulingfrontend/DateRangeTest.kt
@@ -1,6 +1,6 @@
 package dk.scheduling.schedulingfrontend
 
-import dk.scheduling.schedulingfrontend.components.DateRange
+import dk.scheduling.schedulingfrontend.gui.components.DateRange
 import org.junit.Test
 
 class DateRangeTest {