feat: 패키지 정리 #2

bibbi-team · Jan 26, 2024 · 1597f5e · 1597f5e
1 parent e8ec5d6
commit 1597f5e
Show file tree

Hide file tree

Showing 101 changed files with 239 additions and 240 deletions.
diff --git a/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt b/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
@@ -36,11 +36,11 @@ import com.no5ing.bbibbi.data.datasource.network.request.member.AddFcmTokenReque
 import com.no5ing.bbibbi.di.NetworkModule
 import com.no5ing.bbibbi.di.SessionModule
 import com.no5ing.bbibbi.presentation.feature.MainPage
-import com.no5ing.bbibbi.presentation.ui.navigation.NavDestinationListener
+import com.no5ing.bbibbi.presentation.navigation.NavDestinationListener
 import com.no5ing.bbibbi.presentation.feature.view_controller.LandingAlreadyFamilyExistsDestination
 import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
-import com.no5ing.bbibbi.presentation.ui.theme.BbibbiTheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.BbibbiTheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.LocalDeepLinkState
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalNavigateControllerState

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/AddReactionBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/AddReactionBar.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.member.MemberRealEmoji
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.asyncImagePainter
 import com.no5ing.bbibbi.util.emojiList
 import com.no5ing.bbibbi.util.getDisabledEmojiResource

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/BBiBBiSurface.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/BBiBBiSurface.kt
@@ -5,7 +5,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 
 @Composable
 fun BBiBBiSurface(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/ClosableTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ClosableTopBar.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun ClosableTopBar(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/DisposableTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/DisposableTopBar.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun DisposableTopBar(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/Meatball.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/Meatball.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 
 @Composable
 fun MeatBall(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/ProfileImage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/ProfileImage.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import com.no5ing.bbibbi.data.model.member.Member
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.asyncImagePainter
 
 @Composable

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/SnackBarHost.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/SnackBarHost.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/TextBubbleBox.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/TextBubbleBox.kt
@@ -28,8 +28,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.util.toCodePointList
 import kotlin.streams.toList
 

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CTAButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/CTAButton.kt
@@ -14,8 +14,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun CTAButton(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/ToggleButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/component/button/ToggleButton.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 
 @Composable
 fun ToggleButton(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/MainPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/MainPage.kt
@@ -14,15 +14,15 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeIn
-import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeOut
+import com.no5ing.bbibbi.presentation.navigation.animation.defaultFadeIn
+import com.no5ing.bbibbi.presentation.navigation.animation.defaultFadeOut
 import com.no5ing.bbibbi.presentation.feature.view_controller.CameraViewDestination
 import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination
 import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
 import com.no5ing.bbibbi.presentation.component.CustomSnackBarHost
-import com.no5ing.bbibbi.presentation.ui.navigation.graph.landingGraph
-import com.no5ing.bbibbi.presentation.ui.navigation.graph.mainGraph
-import com.no5ing.bbibbi.presentation.ui.navigation.graph.registerGraph
+import com.no5ing.bbibbi.presentation.navigation.graph.landingGraph
+import com.no5ing.bbibbi.presentation.navigation.graph.mainGraph
+import com.no5ing.bbibbi.presentation.navigation.graph.registerGraph
 
 @Composable
 fun MainPage(

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/CameraView.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/common/CameraView.kt
@@ -52,7 +52,7 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.component.ClosableTopBar
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.getCameraProvider
 import com.no5ing.bbibbi.util.takePhotoWithImage
 import kotlinx.coroutines.launch

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/CustomAlertDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/CustomAlertDialog.kt
@@ -37,8 +37,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.DialogProperties
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import kotlin.math.max
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/PostCommentDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/PostCommentDialog.kt
@@ -68,12 +68,12 @@ import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestina
 import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
 import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
 import com.no5ing.bbibbi.presentation.component.snackBarWarning
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CreatePostCommentViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DeletePostCommentViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.CreatePostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.DeletePostCommentViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.PostCommentViewModel
 import com.no5ing.bbibbi.util.LocalNavigateControllerState
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/ReactionListDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/dialog/ReactionListDialog.kt
@@ -62,8 +62,8 @@ import com.no5ing.bbibbi.presentation.component.button.CTAButton
 import com.no5ing.bbibbi.presentation.component.CircleProfileImage
 import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestination
 import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState
 import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState
 import com.no5ing.bbibbi.util.CustomDialogPosition

diff --git a/...bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt b/...bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.presentation.component.button.CTAButton
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun AlreadyFamilyExistsView(

diff --git a/...in/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt b/...in/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt
@@ -35,10 +35,10 @@ import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog
 import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
 import com.no5ing.bbibbi.presentation.component.snackBarWarning
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.family.CreateFamilyAndJoinViewModel
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.feature.view_model.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.family.CreateFamilyAndJoinViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.dashedBorder

diff --git a/.../com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt b/.../com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 
 @Composable

diff --git a/.../bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt b/.../bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt
@@ -46,9 +46,9 @@ import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.component.DisposableTopBar
 import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
 import com.no5ing.bbibbi.presentation.component.snackBarWarning
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.feature.viewmodel.family.JoinFamilyWithLinkViewModel
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.feature.view_model.family.JoinFamilyWithLinkViewModel
 import com.no5ing.bbibbi.util.LocalDeepLinkState
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSnackbarHostState

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/login/LoginPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/login/LoginPage.kt
@@ -43,9 +43,9 @@ import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginStatus
 import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginSucceedResult
 import com.no5ing.bbibbi.presentation.feature.state.landing.login.rememberLoginPageState
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.presentation.component.BackToExitHandler
-import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.LoginWithCredentialsViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.auth.LoginWithCredentialsViewModel
 import com.no5ing.bbibbi.util.googleSignInIntent
 import com.no5ing.bbibbi.util.kakaoSignIn
 import timber.log.Timber

diff --git a/...ava/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt b/...ava/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun OnBoardingFirstPage() {

diff --git a/...ain/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt b/...ain/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt
@@ -30,7 +30,7 @@ import com.no5ing.bbibbi.presentation.feature.state.landing.onboarding.rememberO
 import com.no5ing.bbibbi.presentation.component.button.CTAButton
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.component.MeatBall
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.emptyPermissionState

diff --git a/...va/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt b/...va/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun OnBoardingSecondPage() {

diff --git a/...ava/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt b/...ava/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.no5ing.bbibbi.R
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 
 @Composable
 fun OnBoardingThirdPage() {

diff --git a/...rc/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt b/...rc/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.model.post.CalendarElement
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.util.asyncImagePainter
 import io.github.boguszpawlowski.composecalendar.day.DayState
 import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState

diff --git a/...c/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt b/...c/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt
@@ -39,10 +39,10 @@ import com.no5ing.bbibbi.data.model.post.CalendarBanner
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CalendarMonthViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MonthlyStatisticsViewModel
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.feature.view_model.post.CalendarMonthViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.MonthlyStatisticsViewModel
 import com.no5ing.bbibbi.util.getScreenSize
 import com.skydoves.balloon.ArrowPositionRules
 import com.skydoves.balloon.BalloonAnimation

diff --git a/...va/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt b/...va/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt
@@ -50,14 +50,14 @@ import com.no5ing.bbibbi.presentation.feature.view.main.calendar.MainCalendarDay
 import com.no5ing.bbibbi.presentation.feature.view.post.view.PostViewContent
 import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
 import com.no5ing.bbibbi.presentation.component.snackBarFire
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
 import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CalendarWeekViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilySwipePostsViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.AddPostReactionViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.CalendarWeekViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.FamilySwipePostsViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.PostReactionBarViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.post.RemovePostReactionViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 import com.no5ing.bbibbi.util.LocalSnackbarHostState
 import com.no5ing.bbibbi.util.asyncImagePainter

diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPage.kt
@@ -42,10 +42,10 @@ import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
 import com.no5ing.bbibbi.presentation.component.CircleProfileImage
 import com.no5ing.bbibbi.presentation.component.DisposableTopBar
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
-import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel
-import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMembersViewModel
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
+import com.no5ing.bbibbi.presentation.feature.view_model.auth.RetrieveMeViewModel
+import com.no5ing.bbibbi.presentation.feature.view_model.members.FamilyMembersViewModel
 import com.no5ing.bbibbi.util.LocalSessionState
 
 @OptIn(ExperimentalMaterialApi::class)

diff --git a/...in/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt b/...in/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt
@@ -32,8 +32,8 @@ import com.no5ing.bbibbi.R
 import com.no5ing.bbibbi.data.repository.Arguments
 import com.no5ing.bbibbi.presentation.feature.state.main.family.FamilyPageInvitationState
 import com.no5ing.bbibbi.presentation.feature.state.main.family.rememberFamilyPageInvitationState
-import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
-import com.no5ing.bbibbi.presentation.feature.viewmodel.family.FamilyInviteLinkViewModel
+import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
+import com.no5ing.bbibbi.presentation.feature.view_model.family.FamilyInviteLinkViewModel
 import com.no5ing.bbibbi.util.LocalMixpanelProvider
 import com.no5ing.bbibbi.util.LocalSessionState