add #13: add core package

AND-SOPT-ANDROID · Dec 4, 2024 · f512b35 · f512b35
1 parent 0ebb8fc
commit f512b35
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 20 deletions.
diff --git a/...pt/and/feature/component/AuthTextField.kt → .../sopt/and/core/component/AuthTextField.kt b/...pt/and/feature/component/AuthTextField.kt → .../sopt/and/core/component/AuthTextField.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.feature.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

diff --git a/...t/and/feature/component/ExpandedButton.kt → ...sopt/and/core/component/ExpandedButton.kt b/...t/and/feature/component/ExpandedButton.kt → ...sopt/and/core/component/ExpandedButton.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.feature.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

diff --git a/...pt/and/feature/component/RoundedButton.kt → .../sopt/and/core/component/RoundedButton.kt b/...pt/and/feature/component/RoundedButton.kt → .../sopt/and/core/component/RoundedButton.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.feature.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

diff --git a/.../org/sopt/and/feature/component/TopBar.kt → ...ava/org/sopt/and/core/component/TopBar.kt b/.../org/sopt/and/feature/component/TopBar.kt → ...ava/org/sopt/and/core/component/TopBar.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.feature.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize

diff --git a/app/src/main/java/org/sopt/and/Extension.kt → ...pt/and/core/extension/ContextExtension.kt b/app/src/main/java/org/sopt/and/Extension.kt → ...pt/and/core/extension/ContextExtension.kt
@@ -1,4 +1,4 @@
-package org.sopt.and
+package org.sopt.and.core.extension
 
 import android.content.Context
 import android.widget.Toast

diff --git a/...va/org/sopt/and/feature/main/MainRoute.kt → ...org/sopt/and/core/navigation/MainRoute.kt b/...va/org/sopt/and/feature/main/MainRoute.kt → ...org/sopt/and/core/navigation/MainRoute.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.feature.main
+package org.sopt.and.core.navigation
 
 interface MainRoute
 

diff --git a/app/src/main/java/org/sopt/and/feature/home/HomeNavigation.kt b/app/src/main/java/org/sopt/and/feature/home/HomeNavigation.kt
@@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
-import org.sopt.and.feature.main.MainTabRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 fun NavController.navigateHome(
     navOptions: NavOptions

diff --git a/app/src/main/java/org/sopt/and/feature/home/HomeRoute.kt b/app/src/main/java/org/sopt/and/feature/home/HomeRoute.kt
@@ -34,7 +34,7 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import org.sopt.and.R
 import org.sopt.and.feature.component.HomeContent
-import org.sopt.and.feature.component.TopBar
+import org.sopt.and.core.component.TopBar
 import org.sopt.and.feature.home.model.ContentModel
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 import org.sopt.and.ui.theme.Black

diff --git a/app/src/main/java/org/sopt/and/feature/main/MainBottomTab.kt b/app/src/main/java/org/sopt/and/feature/main/MainBottomTab.kt
@@ -6,6 +6,8 @@ import androidx.compose.material.icons.outlined.Home
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
+import org.sopt.and.core.navigation.MainRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 enum class MainBottomTab(
     val icon: ImageVector,

diff --git a/app/src/main/java/org/sopt/and/feature/main/MainNavigation.kt b/app/src/main/java/org/sopt/and/feature/main/MainNavigation.kt
@@ -8,6 +8,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
+import org.sopt.and.core.navigation.MainTabRoute
 import org.sopt.and.feature.home.Home
 import org.sopt.and.feature.home.navigateHome
 import org.sopt.and.feature.my.navigateMy

diff --git a/app/src/main/java/org/sopt/and/feature/my/MyNavigation.kt b/app/src/main/java/org/sopt/and/feature/my/MyNavigation.kt
@@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
-import org.sopt.and.feature.main.MainTabRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 fun NavController.navigateMy(
     navOptions: NavOptions

diff --git a/app/src/main/java/org/sopt/and/feature/search/SearchNavigation.kt b/app/src/main/java/org/sopt/and/feature/search/SearchNavigation.kt
@@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
-import org.sopt.and.feature.main.MainTabRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 fun NavController.navigateSearch(
     navOptions: NavOptions

diff --git a/app/src/main/java/org/sopt/and/feature/signin/SignInNavigation.kt b/app/src/main/java/org/sopt/and/feature/signin/SignInNavigation.kt
@@ -4,7 +4,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
-import org.sopt.and.feature.main.MainTabRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 fun NavController.navigateSignIn() {
     navigate(SignIn)

diff --git a/app/src/main/java/org/sopt/and/feature/signin/SignInRoute.kt b/app/src/main/java/org/sopt/and/feature/signin/SignInRoute.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -37,9 +36,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
 import org.sopt.and.R
-import org.sopt.and.feature.component.RoundedButton
-import org.sopt.and.feature.component.AuthTextField
-import org.sopt.and.feature.component.TopBar
+import org.sopt.and.core.component.RoundedButton
+import org.sopt.and.core.component.AuthTextField
+import org.sopt.and.core.component.TopBar
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 import org.sopt.and.ui.theme.Black
 import org.sopt.and.ui.theme.LightGray

diff --git a/app/src/main/java/org/sopt/and/feature/signup/SignUpNavigation.kt b/app/src/main/java/org/sopt/and/feature/signup/SignUpNavigation.kt
@@ -4,7 +4,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
-import org.sopt.and.feature.main.MainTabRoute
+import org.sopt.and.core.navigation.MainTabRoute
 
 fun NavController.navigateSignUp() {
     navigate(SignUp)

diff --git a/app/src/main/java/org/sopt/and/feature/signup/SignUpRoute.kt b/app/src/main/java/org/sopt/and/feature/signup/SignUpRoute.kt
@@ -31,10 +31,10 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
 import org.sopt.and.R
-import org.sopt.and.feature.component.ExpandedButton
-import org.sopt.and.feature.component.AuthTextField
-import org.sopt.and.feature.component.TopBar
-import org.sopt.and.showToast
+import org.sopt.and.core.component.ExpandedButton
+import org.sopt.and.core.component.AuthTextField
+import org.sopt.and.core.component.TopBar
+import org.sopt.and.core.extension.showToast
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 import org.sopt.and.ui.theme.Black
 import org.sopt.and.ui.theme.LightGray