move files around (#41)

* move files around * fix wrong imports * move test to another pkg
Nodrex · May 8, 2022 · 518a30c · 518a30c
1 parent e335e72
commit 518a30c
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 17 deletions.
diff --git a/testomania/src/main/java/com/earth/testomania/MainActivity.kt b/testomania/src/main/java/com/earth/testomania/MainActivity.kt
@@ -7,15 +7,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.earth.testomania.technical.presentation.QuizViewModel
-import com.earth.testomania.ui.theme.TestomaniaTheme
 import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.earth.testomania.presentation.NavGraphs
 import com.earth.testomania.presentation.TopBar
+import com.earth.testomania.technical.presentation.QuizViewModel
 import com.earth.testomania.ui.theme.TestomaniaTheme
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.rememberNavHostEngine

diff --git a/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt b/testomania/src/main/java/com/earth/testomania/presentation/home/HomeScreen.kt
@@ -6,11 +6,11 @@ import androidx.compose.material.Button
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.earth.testomania.R
-import com.earth.testomania.presentation.destinations.SkillzTestScreenDestination
+import com.earth.testomania.destinations.SkillzTestScreenDestination
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 

diff --git a/...a/skills/GeneralSkillsMathematicalRepo.kt → ...lls/data/GeneralSkillsMathematicalRepo.kt b/...a/skills/GeneralSkillsMathematicalRepo.kt → ...lls/data/GeneralSkillsMathematicalRepo.kt
@@ -1,8 +1,8 @@
-package com.earth.testomania.skills
+package com.earth.testomania.skills.data
 
 import android.content.Context
 import com.earth.testomania.R
-import com.earth.testomania.skills.dto.GeneralTestItemDTO
+import com.earth.testomania.skills.data.dto.GeneralTestItemDTO
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter

diff --git a/...stomania/skills/dto/GeneralTestItemDTO.kt → ...nia/skills/data/dto/GeneralTestItemDTO.kt b/...stomania/skills/dto/GeneralTestItemDTO.kt → ...nia/skills/data/dto/GeneralTestItemDTO.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills.dto
+package com.earth.testomania.skills.data.dto
 
 import com.squareup.moshi.JsonClass
 

diff --git a/.../earth/testomania/skills/dto/OptionDTO.kt → ...h/testomania/skills/data/dto/OptionDTO.kt b/.../earth/testomania/skills/dto/OptionDTO.kt → ...h/testomania/skills/data/dto/OptionDTO.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills.dto
+package com.earth.testomania.skills.data.dto
 
 import com.squareup.moshi.JsonClass
 

diff --git a/...omania/domain/GetAllSkillsTestsUseCase.kt → ...skills/domain/GetAllSkillsTestsUseCase.kt b/...omania/domain/GetAllSkillsTestsUseCase.kt → ...skills/domain/GetAllSkillsTestsUseCase.kt
@@ -1,8 +1,8 @@
-package com.earth.testomania.domain
+package com.earth.testomania.skills.domain
 
 import com.earth.testomania.domain.models.GeneralMathematicalSkillsTest
 import com.earth.testomania.domain.models.PossibleAnswer
-import com.earth.testomania.skills.GeneralSkillsMathematicalRepo
+import com.earth.testomania.skills.data.GeneralSkillsMathematicalRepo
 import javax.inject.Inject
 
 class GetAllSkillsTestsUseCase @Inject constructor(

diff --git a/.../presentation/skillz/SkillzTestsScreen.kt → .../presentation/skillz/SkillzTestsScreen.kt b/.../presentation/skillz/SkillzTestsScreen.kt → .../presentation/skillz/SkillzTestsScreen.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.presentation.skillz
+package com.earth.testomania.skills.presentation.skillz
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Column

diff --git a/...esentation/skillz/SkillzTestsViewModel.kt → ...esentation/skillz/SkillzTestsViewModel.kt b/...esentation/skillz/SkillzTestsViewModel.kt → ...esentation/skillz/SkillzTestsViewModel.kt
@@ -1,9 +1,9 @@
-package com.earth.testomania.presentation.skillz
+package com.earth.testomania.skills.presentation.skillz
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.earth.testomania.domain.GetAllSkillsTestsUseCase
 import com.earth.testomania.domain.models.GeneralMathematicalSkillsTest
+import com.earth.testomania.skills.domain.GetAllSkillsTestsUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow

diff --git a/...ills/GeneralSkillsMathematicalRepoTest.kt → ...data/GeneralSkillsMathematicalRepoTest.kt b/...ills/GeneralSkillsMathematicalRepoTest.kt → ...data/GeneralSkillsMathematicalRepoTest.kt
@@ -1,4 +1,4 @@
-package com.earth.testomania.skills
+package com.earth.testomania.skills.data
 
 import com.google.common.truth.Truth
 import dagger.hilt.android.testing.HiltAndroidRule