diff --git a/app/src/main/java/org/sopt/and/feature/component/AuthTextField.kt b/app/src/main/java/org/sopt/and/core/component/AuthTextField.kt similarity index 98% rename from app/src/main/java/org/sopt/and/feature/component/AuthTextField.kt rename to app/src/main/java/org/sopt/and/core/component/AuthTextField.kt index bb78032..ab52fc0 100644 --- a/app/src/main/java/org/sopt/and/feature/component/AuthTextField.kt +++ b/app/src/main/java/org/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/app/src/main/java/org/sopt/and/feature/component/ExpandedButton.kt b/app/src/main/java/org/sopt/and/core/component/ExpandedButton.kt similarity index 97% rename from app/src/main/java/org/sopt/and/feature/component/ExpandedButton.kt rename to app/src/main/java/org/sopt/and/core/component/ExpandedButton.kt index db06796..88f8f8f 100644 --- a/app/src/main/java/org/sopt/and/feature/component/ExpandedButton.kt +++ b/app/src/main/java/org/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/app/src/main/java/org/sopt/and/feature/component/RoundedButton.kt b/app/src/main/java/org/sopt/and/core/component/RoundedButton.kt similarity index 97% rename from app/src/main/java/org/sopt/and/feature/component/RoundedButton.kt rename to app/src/main/java/org/sopt/and/core/component/RoundedButton.kt index aa37335..516a840 100644 --- a/app/src/main/java/org/sopt/and/feature/component/RoundedButton.kt +++ b/app/src/main/java/org/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/app/src/main/java/org/sopt/and/feature/component/TopBar.kt b/app/src/main/java/org/sopt/and/core/component/TopBar.kt similarity index 97% rename from app/src/main/java/org/sopt/and/feature/component/TopBar.kt rename to app/src/main/java/org/sopt/and/core/component/TopBar.kt index 1d10474..003d626 100644 --- a/app/src/main/java/org/sopt/and/feature/component/TopBar.kt +++ b/app/src/main/java/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 b/app/src/main/java/org/sopt/and/core/extension/ContextExtension.kt similarity index 85% rename from app/src/main/java/org/sopt/and/Extension.kt rename to app/src/main/java/org/sopt/and/core/extension/ContextExtension.kt index 3b765c4..9fe2a89 100644 --- a/app/src/main/java/org/sopt/and/Extension.kt +++ b/app/src/main/java/org/sopt/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/app/src/main/java/org/sopt/and/feature/main/MainRoute.kt b/app/src/main/java/org/sopt/and/core/navigation/MainRoute.kt similarity index 60% rename from app/src/main/java/org/sopt/and/feature/main/MainRoute.kt rename to app/src/main/java/org/sopt/and/core/navigation/MainRoute.kt index 65c9692..b0fcfc1 100644 --- a/app/src/main/java/org/sopt/and/feature/main/MainRoute.kt +++ b/app/src/main/java/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 index d7cab1a..f3aa396 100644 --- 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 index d2a0cab..bea864f 100644 --- 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 index bf219b2..ac3b9ad 100644 --- 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 index ccdaf6e..c53206e 100644 --- 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 index 15739a3..797ecd7 100644 --- 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 index 594b14d..1a4f53a 100644 --- 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 index d827541..c9bb2a5 100644 --- 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 index 45b023a..949a70d 100644 --- 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 index a97bcca..b473226 100644 --- 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 index ae4c4d0..21eefe1 100644 --- 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