CHANGE folder structure change for easier usage

Q42 · Aug 12, 2024 · 417ee4c · 417ee4c
1 parent 98bdacf
commit 417ee4c
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 28 deletions.
diff --git a/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt b/app/src/main/kotlin/nl/q42/template/navigation/NavGraphs.kt
@@ -2,9 +2,9 @@ package nl.q42.template.navigation
 
 import com.ramcosta.composedestinations.spec.DestinationSpec
 import com.ramcosta.composedestinations.spec.NavGraphSpec
-import nl.q42.template.ui.home.destinations.HomeScreenDestination
-import nl.q42.template.ui.home.destinations.HomeSecondScreenDestination
-import nl.q42.template.ui.onboarding.start.destinations.OnboardingStartScreenDestination
+import nl.q42.template.home.destinations.HomeScreenDestination
+import nl.q42.template.home.destinations.HomeSecondScreenDestination
+import nl.q42.template.onboarding.ui.start.destinations.OnboardingStartScreenDestination
 
 /**
  *
@@ -16,7 +16,7 @@ object NavGraphs {
 
     val home = object : NavGraphSpec {
         override val route = AppGraphRoutes.home
-        
+
         override val startRoute = HomeScreenDestination
 
         override val destinationsByRoute = listOf<DestinationSpec<*>>(
@@ -45,4 +45,4 @@ object NavGraphs {
             home, onboarding
         )
     }
-}
+}
diff --git a/...mplate/presentation/home/HomeViewModel.kt → ...e/home/main/presentation/HomeViewModel.kt b/...mplate/presentation/home/HomeViewModel.kt → ...e/home/main/presentation/HomeViewModel.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.presentation.home
+package nl.q42.template.home.main.presentation
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -16,9 +16,9 @@ import nl.q42.template.actionresult.data.handleAction
 import nl.q42.template.domain.user.usecase.FetchUserUseCase
 import nl.q42.template.domain.user.usecase.GetUserFlowUseCase
 import nl.q42.template.feature.home.R
+import nl.q42.template.home.destinations.HomeSecondScreenDestination
 import nl.q42.template.navigation.AppGraphRoutes
 import nl.q42.template.navigation.viewmodel.RouteNavigator
-import nl.q42.template.ui.home.destinations.HomeSecondScreenDestination
 import nl.q42.template.ui.presentation.ViewStateString
 import javax.inject.Inject
 

diff --git a/...mplate/presentation/home/HomeViewState.kt → ...e/home/main/presentation/HomeViewState.kt b/...mplate/presentation/home/HomeViewState.kt → ...e/home/main/presentation/HomeViewState.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.presentation.home
+package nl.q42.template.home.main.presentation
 
 import nl.q42.template.ui.presentation.ViewStateString
 

diff --git a/...in/nl/q42/template/ui/home/HomeContent.kt → .../q42/template/home/main/ui/HomeContent.kt b/...in/nl/q42/template/ui/home/HomeContent.kt → .../q42/template/home/main/ui/HomeContent.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.ui.home
+package nl.q42.template.home.main.ui
 
 import androidx.compose.foundation.layout.Arrangement.Center
 import androidx.compose.foundation.layout.Column
@@ -9,7 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
-import nl.q42.template.presentation.home.HomeViewState
+import nl.q42.template.home.main.presentation.HomeViewState
 import nl.q42.template.ui.compose.get
 import nl.q42.template.ui.presentation.toViewStateString
 import nl.q42.template.ui.theme.PreviewAppTheme

diff --git a/...lin/nl/q42/template/ui/home/HomeScreen.kt → ...l/q42/template/home/main/ui/HomeScreen.kt b/...lin/nl/q42/template/ui/home/HomeScreen.kt → ...l/q42/template/home/main/ui/HomeScreen.kt
@@ -1,14 +1,13 @@
-package nl.q42.template.ui.home
+package nl.q42.template.home.main.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import nl.q42.template.home.main.presentation.HomeViewModel
 import nl.q42.template.navigation.viewmodel.InitNavigator
-import nl.q42.template.presentation.home.HomeViewModel
-import nl.q42.template.presentation.home.HomeViewState
 import nl.q42.template.ui.compose.OnLifecycleResume
 
 @Destination

diff --git a/...tation/home/second/HomeSecondViewModel.kt → ...econd/presentation/HomeSecondViewModel.kt b/...tation/home/second/HomeSecondViewModel.kt → ...econd/presentation/HomeSecondViewModel.kt
@@ -1,9 +1,8 @@
-package nl.q42.template.presentation.home.second
+package nl.q42.template.home.second.presentation
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow

diff --git a/feature/home/src/main/kotlin/nl/q42/template/home/second/presentation/HomeSecondViewState.kt b/feature/home/src/main/kotlin/nl/q42/template/home/second/presentation/HomeSecondViewState.kt
@@ -0,0 +1,3 @@
+package nl.q42.template.home.second.presentation
+
+class HomeSecondViewState(val title: String)
diff --git a/...mplate/ui/home/second/HomeSecondScreen.kt → ...mplate/home/second/ui/HomeSecondScreen.kt b/...mplate/ui/home/second/HomeSecondScreen.kt → ...mplate/home/second/ui/HomeSecondScreen.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.ui.home.second
+package nl.q42.template.home.second.ui
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -14,8 +14,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import nl.q42.template.home.second.presentation.HomeSecondViewModel
 import nl.q42.template.navigation.viewmodel.InitNavigator
-import nl.q42.template.presentation.home.second.HomeSecondViewModel
 
 @Destination
 @Composable

diff --git a/feature/home/src/main/kotlin/nl/q42/template/presentation/home/second/HomeSecondViewState.kt b/feature/home/src/main/kotlin/nl/q42/template/presentation/home/second/HomeSecondViewState.kt
diff --git a/...te/presentation/home/HomeViewModelTest.kt → ...me/main/presentation/HomeViewModelTest.kt b/...te/presentation/home/HomeViewModelTest.kt → ...me/main/presentation/HomeViewModelTest.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.presentation.home
+package nl.q42.template.home.main.presentation
 
 import app.cash.turbine.test
 import io.mockk.coEvery
@@ -10,10 +10,15 @@ import kotlinx.coroutines.test.runTest
 import nl.q42.template.actionresult.domain.ActionResult
 import nl.q42.template.domain.user.usecase.FetchUserUseCase
 import nl.q42.template.domain.user.usecase.GetUserFlowUseCase
+import nl.q42.template.presentation.home.MainDispatcherRule
 import org.junit.Rule
 import org.junit.Test
 import kotlin.time.Duration.Companion.seconds
 
+/**
+ * An example ViewModel test. Weather you want to test ViewModels is up to you. On most projects,
+ * you probably want to focus on unit testing the Domain layer first.
+ */
 class HomeViewModelTest {
 
     @get:Rule

diff --git a/...oarding/start/OnboardingStartViewModel.kt → ...ntation/start/OnboardingStartViewModel.kt b/...oarding/start/OnboardingStartViewModel.kt → ...ntation/start/OnboardingStartViewModel.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.presentation.onboarding.start
+package nl.q42.template.onboarding.presentation.start
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel

diff --git a/...src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt b/...src/main/kotlin/nl/q42/template/onboarding/presentation/start/OnboardingStartViewState.kt
@@ -0,0 +1,3 @@
+package nl.q42.template.onboarding.presentation.start
+
+class OnboardingStartViewState(val title: String)
diff --git a/...onboarding/start/OnboardingStartScreen.kt → ...oarding/ui/start/OnboardingStartScreen.kt b/...onboarding/start/OnboardingStartScreen.kt → ...oarding/ui/start/OnboardingStartScreen.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.ui.onboarding.start
+package nl.q42.template.onboarding.ui.start
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -15,8 +15,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import nl.q42.template.navigation.viewmodel.InitNavigator
-import nl.q42.template.presentation.onboarding.start.OnboardingStartViewModel
-import nl.q42.template.presentation.onboarding.start.OnboardingStartViewState
+import nl.q42.template.onboarding.presentation.start.OnboardingStartViewModel
 
 @Destination
 @Composable

diff --git a/...src/main/kotlin/nl/q42/template/presentation/onboarding/start/OnboardingStartViewState.kt b/...src/main/kotlin/nl/q42/template/presentation/onboarding/start/OnboardingStartViewState.kt