Skip to content
This repository was archived by the owner on Mar 2, 2025. It is now read-only.

Commit 8ab55d6

Browse files
Puvikaran2001Puvikaran2001
authored
Change folder structure (#161)
Changed the folder structure to meet the implementation chapter in the report
1 parent d0398b6 commit 8ab55d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+213
-183
lines changed

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ import androidx.navigation.compose.NavHost
1919
import androidx.navigation.compose.composable
2020
import androidx.navigation.compose.currentBackStackEntryAsState
2121
import androidx.navigation.compose.rememberNavController
22-
import dk.scheduling.schedulingfrontend.pages.AccountPage
23-
import dk.scheduling.schedulingfrontend.pages.CreateDevicePage
24-
import dk.scheduling.schedulingfrontend.pages.CreateTaskPage
25-
import dk.scheduling.schedulingfrontend.pages.HomePage
26-
import dk.scheduling.schedulingfrontend.pages.LoginPage
27-
import dk.scheduling.schedulingfrontend.pages.Page
28-
import dk.scheduling.schedulingfrontend.pages.SignUpPage
29-
import dk.scheduling.schedulingfrontend.pages.TaskOverviewPage
30-
import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
22+
import dk.scheduling.schedulingfrontend.gui.pages.AccountPage
23+
import dk.scheduling.schedulingfrontend.gui.pages.CreateDevicePage
24+
import dk.scheduling.schedulingfrontend.gui.pages.CreateTaskPage
25+
import dk.scheduling.schedulingfrontend.gui.pages.HomePage
26+
import dk.scheduling.schedulingfrontend.gui.pages.LoginPage
27+
import dk.scheduling.schedulingfrontend.gui.pages.Page
28+
import dk.scheduling.schedulingfrontend.gui.pages.SignUpPage
29+
import dk.scheduling.schedulingfrontend.gui.pages.TaskOverviewPage
30+
import dk.scheduling.schedulingfrontend.gui.theme.SchedulingFrontendTheme
3131
import kotlinx.coroutines.runBlocking
3232

3333
class MainActivity : ComponentActivity() {
@@ -96,7 +96,11 @@ class MainActivity : ComponentActivity() {
9696
CreateDevicePage(
9797
deviceRepository = App.appModule.deviceRepo,
9898
navigateOnValidCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
99-
navigateOnCancelCreation = { appState.navHostController.navigate(Page.DeviceOverview.route) },
99+
navigateOnCancelCreation = {
100+
appState.navHostController.navigate(
101+
Page.DeviceOverview.route,
102+
)
103+
},
100104
)
101105
}
102106
composable(
@@ -107,7 +111,11 @@ class MainActivity : ComponentActivity() {
107111
deviceRepository = App.appModule.deviceRepo,
108112
taskRepository = App.appModule.taskRepo,
109113
navigateOnValidCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
110-
navigateOnCancelCreation = { appState.navHostController.navigate(Page.TaskOverview.route) },
114+
navigateOnCancelCreation = {
115+
appState.navHostController.navigate(
116+
Page.TaskOverview.route,
117+
)
118+
},
111119
)
112120
}
113121
composable(Page.Account.route) {

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/MainLayout.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.navigation.NavController
1111
import androidx.navigation.NavDestination.Companion.hierarchy
1212
import androidx.navigation.NavGraph.Companion.findStartDestination
1313
import androidx.navigation.compose.currentBackStackEntryAsState
14-
import dk.scheduling.schedulingfrontend.pages.Page
14+
import dk.scheduling.schedulingfrontend.gui.pages.Page
1515

1616
@Composable
1717
fun BottomNavigationBar(

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiClient.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/ApiClient.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package dk.scheduling.schedulingfrontend.api
1+
package dk.scheduling.schedulingfrontend.datasources.api
22

33
import com.google.gson.Gson
44
import com.google.gson.GsonBuilder
5-
import dk.scheduling.schedulingfrontend.api.typeadapters.LocalDateTimeTypeAdapter
5+
import dk.scheduling.schedulingfrontend.datasources.api.typeadapters.LocalDateTimeTypeAdapter
66
import okhttp3.OkHttpClient
77
import retrofit2.Retrofit
88
import retrofit2.converter.gson.GsonConverterFactory

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiService.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/ApiService.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package dk.scheduling.schedulingfrontend.api
2-
import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceRequest
3-
import dk.scheduling.schedulingfrontend.api.protocol.CreateDeviceResponse
4-
import dk.scheduling.schedulingfrontend.api.protocol.CreateTaskRequest
5-
import dk.scheduling.schedulingfrontend.api.protocol.GetDevicesResponse
6-
import dk.scheduling.schedulingfrontend.api.protocol.GetEventsResponse
7-
import dk.scheduling.schedulingfrontend.api.protocol.GetTasksResponse
8-
import dk.scheduling.schedulingfrontend.api.protocol.RegisterOrLoginRequest
9-
import dk.scheduling.schedulingfrontend.api.protocol.RegisterOrLoginResponse
10-
import dk.scheduling.schedulingfrontend.api.protocol.Task
1+
package dk.scheduling.schedulingfrontend.datasources.api
2+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceRequest
3+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateDeviceResponse
4+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.CreateTaskRequest
5+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetDevicesResponse
6+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetEventsResponse
7+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.GetTasksResponse
8+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.RegisterOrLoginRequest
9+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.RegisterOrLoginResponse
10+
import dk.scheduling.schedulingfrontend.datasources.api.protocol.Task
1111
import retrofit2.Response
1212
import retrofit2.http.Body
1313
import retrofit2.http.DELETE

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/protocol/Accounts.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/protocol/Accounts.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("PropertyName")
22

3-
package dk.scheduling.schedulingfrontend.api.protocol
3+
package dk.scheduling.schedulingfrontend.datasources.api.protocol
44

55
import java.util.UUID
66

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/protocol/Devices.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/protocol/Devices.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dk.scheduling.schedulingfrontend.api.protocol
1+
package dk.scheduling.schedulingfrontend.datasources.api.protocol
22

33
data class Device(
44
val id: Long,

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/protocol/Events.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/protocol/Events.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("PropertyName")
22

3-
package dk.scheduling.schedulingfrontend.api.protocol
3+
package dk.scheduling.schedulingfrontend.datasources.api.protocol
44

55
import java.time.LocalDateTime
66

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/protocol/Tasks.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/protocol/Tasks.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("PropertyName")
22

3-
package dk.scheduling.schedulingfrontend.api.protocol
3+
package dk.scheduling.schedulingfrontend.datasources.api.protocol
44

55
data class Task(
66
val id: Long,

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/protocol/Timespan.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/protocol/Timespan.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dk.scheduling.schedulingfrontend.api.protocol
1+
package dk.scheduling.schedulingfrontend.datasources.api.protocol
22

33
import java.time.LocalDateTime
44

‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/api/typeadapters/LocalDateTimeTypeAdapter.kt‎ renamed to ‎frontend/app/src/main/java/dk/scheduling/schedulingfrontend/datasources/api/typeadapters/LocalDateTimeTypeAdapter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dk.scheduling.schedulingfrontend.api.typeadapters
1+
package dk.scheduling.schedulingfrontend.datasources.api.typeadapters
22

33
import com.google.gson.JsonDeserializationContext
44
import com.google.gson.JsonDeserializer

0 commit comments

Comments
 (0)