diff --git a/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt b/app/src/main/java/com/no5ing/bbibbi/MainActivity.kt index 1ea7c0b..d6bb89b 100644 --- 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 index 99f7dc7..5781243 100644 --- 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 index 0f3f0c2..f51074d 100644 --- 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 index 7fca32e..a07cd77 100644 --- 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 index 8a6a2d9..698a920 100644 --- 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 index 97fb5ab..e4a2138 100644 --- 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 index 9063291..b9fb9e0 100644 --- 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 index e405009..0e7886c 100644 --- 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 index de9ae55..09f3ef4 100644 --- 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 index e7ea30a..5014c02 100644 --- 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 index 0083ab9..a4cfa72 100644 --- 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 index 58c7581..8c2e417 100644 --- 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 index ff89189..5d2492a 100644 --- 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 index bbf927d..701effd 100644 --- 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 index 0d0bca2..b52c8b7 100644 --- 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 index 38c0c20..448609f 100644 --- 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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt index 3f6ca6c..606042e 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/already_family_exists/AlreadyFamilyExistsView.kt +++ b/app/src/main/java/com/no5ing/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt index 89066ff..601e1ab 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPage.kt +++ b/app/src/main/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt index 7499ebf..314b5a0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family/JoinFamilyPageLinkBar.kt +++ b/app/src/main/java/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt index 1bdb13a..e6f72b4 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/join_family_with_link/JoinFamilyWithLinkPage.kt +++ b/app/src/main/java/com/no5ing/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 index 55e65c6..2868166 100644 --- 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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt index b024ed5..c7f3391 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingFirstPage.kt +++ b/app/src/main/java/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt index 2a27f85..393d3d0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingPage.kt +++ b/app/src/main/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt index 6e3c3a9..06b5caf 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingSecondPage.kt +++ b/app/src/main/java/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt index 3f227e9..3ec3760 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/landing/onboarding/OnBoardingThirdPage.kt +++ b/app/src/main/java/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt index 72c43cd..3780519 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarDay.kt +++ b/app/src/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt index 6cd9587..8b1701d 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/MainCalendarPage.kt +++ b/app/src/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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt index 7cfad90..a1b2d38 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/calendar/detail/CalendarDetailPage.kt +++ b/app/src/main/java/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 index 14d0ee2..d715f4b 100644 --- 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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt index 82cbaa5..b603d79 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/family/FamilyPageInviteButton.kt +++ b/app/src/main/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 diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt index 1914d1c..41cc00c 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePage.kt @@ -29,14 +29,14 @@ import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageSt import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState import com.no5ing.bbibbi.presentation.component.BBiBBiSurface import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog -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.presentation.component.BackToExitHandler -import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveMeViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMembersViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DailyFamilyTopViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.IsMeUploadedTodayViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MainPostFeedViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.auth.RetrieveMeViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.members.FamilyMembersViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.DailyFamilyTopViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.IsMeUploadedTodayViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.MainPostFeedViewModel import com.no5ing.bbibbi.util.LocalSessionState @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt index 2975214..5c48e01 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageContent.kt @@ -52,12 +52,12 @@ import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageContentSta import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageStoryBarState import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageContentState import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState -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.feature.viewmodel.post.DailyFamilyTopViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MainPostFeedViewModel +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.presentation.feature.view_model.post.DailyFamilyTopViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.MainPostFeedViewModel import com.no5ing.bbibbi.util.asyncImagePainter import com.no5ing.bbibbi.util.gapBetweenNow import com.no5ing.bbibbi.util.todayAsString diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt index a8e8273..8b699c3 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageNoFamilyBar.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/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt index 2b71b96..18f9b1a 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageStoryBar.kt @@ -35,8 +35,8 @@ import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.presentation.feature.state.main.home.HomePageStoryBarState import com.no5ing.bbibbi.presentation.feature.state.main.home.rememberHomePageStoryBarState import com.no5ing.bbibbi.presentation.component.CircleProfileImage -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.LocalSessionState @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt index 96f6c06..393e682 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageTopBar.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Color 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 HomePageTopBar( diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt index fe5a176..29085f2 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/HomePageUploadButton.kt @@ -32,8 +32,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.no5ing.bbibbi.R import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton -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 BoxScope.HomePageUploadButton( diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt index 4a33b62..1db22a5 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/home/UploadCountDownBar.kt @@ -23,8 +23,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 kotlinx.coroutines.delay import java.time.LocalDateTime import java.time.temporal.ChronoUnit diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt index 35baf43..bf87027 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePage.kt @@ -28,9 +28,9 @@ import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.model.post.Post 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.feature.viewmodel.members.ChangeProfileImageViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMemberViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.feature.view_model.members.ChangeProfileImageViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.members.FamilyMemberViewModel import com.no5ing.bbibbi.util.LocalSessionState @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt index 8093b6b..52d01db 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageContent.kt @@ -41,9 +41,9 @@ import coil.compose.AsyncImage import com.no5ing.bbibbi.R import com.no5ing.bbibbi.data.model.post.Post import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme -import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.FamilyPostsViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.post.FamilyPostsViewModel import com.no5ing.bbibbi.util.asyncImagePainter import com.no5ing.bbibbi.util.toLocalizedDate diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt index 49b5618..bfeb036 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/main/profile/ProfilePageMemberBar.kt @@ -43,9 +43,9 @@ import com.no5ing.bbibbi.presentation.feature.view.dialog.AlbumCameraSelectDialo import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss import com.no5ing.bbibbi.presentation.component.snackBarInfo import com.no5ing.bbibbi.presentation.component.snackBarWarning -import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme -import com.no5ing.bbibbi.presentation.feature.viewmodel.members.ChangeProfileImageViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.members.FamilyMemberViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.feature.view_model.members.ChangeProfileImageViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.members.FamilyMemberViewModel import com.no5ing.bbibbi.util.LocalSessionState import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.getErrorMessage diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt index f9ce962..bcf250a 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/create_real_emoji/CreateRealEmojiPage.kt @@ -69,10 +69,10 @@ import com.no5ing.bbibbi.presentation.component.BBiBBiSurface import com.no5ing.bbibbi.presentation.component.ClosableTopBar 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.post.MemberRealEmojiListViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.UpdateMemberPostRealEmojiViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.post.MemberRealEmojiListViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.UpdateMemberPostRealEmojiViewModel import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.asyncImagePainter import com.no5ing.bbibbi.util.emojiList diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt index 9165f87..9643ae6 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/upload/PostUploadPage.kt @@ -67,9 +67,9 @@ import com.no5ing.bbibbi.presentation.component.TextBubbleBox import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss import com.no5ing.bbibbi.presentation.component.snackBarCamera 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.post.CreatePostViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.post.CreatePostViewModel import com.no5ing.bbibbi.util.LocalMixpanelProvider import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.codePointLength diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt index 0f70ae7..a5927a0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostCommentBoxIcon.kt @@ -17,8 +17,8 @@ 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.ui.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo @Composable fun PostCommentBoxIcon( diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt index af2b0d9..e332c9d 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewContent.kt @@ -30,11 +30,11 @@ import com.no5ing.bbibbi.data.model.post.Post import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.component.AddReactionBar import com.no5ing.bbibbi.presentation.component.MiniTextBubbleBox -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddRealEmojiViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.MemberRealEmojiListViewModel -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.AddRealEmojiViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.MemberRealEmojiListViewModel +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.asyncImagePainter diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt index 3a645c1..b008bd0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewEmojiElement.kt @@ -16,8 +16,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier 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.getEmojiResource @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt index 370a800..abd3fc8 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewPage.kt @@ -44,14 +44,14 @@ import com.no5ing.bbibbi.presentation.feature.state.post.view.PostViewPageState import com.no5ing.bbibbi.presentation.feature.state.post.view.rememberPostViewPageState import com.no5ing.bbibbi.presentation.component.BBiBBiSurface import com.no5ing.bbibbi.presentation.component.CircleProfileImage -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.FamilyPostViewModel -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.FamilyPostViewModel +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.asyncImagePainter import com.no5ing.bbibbi.util.toLocalizedDate diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt index 4d9afab..2fd0ad6 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewReactionBar.kt @@ -30,14 +30,14 @@ import com.no5ing.bbibbi.data.model.post.Post import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.feature.view.dialog.PostCommentDialog import com.no5ing.bbibbi.presentation.feature.view.dialog.ReactionListDialog -import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddPostReactionViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.AddRealEmojiViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostReactionBarViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemovePostReactionViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.post.RemoveRealEmojiViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.AddPostReactionViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.AddRealEmojiViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.PostReactionBarViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.RemovePostReactionViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.post.RemoveRealEmojiViewModel import com.no5ing.bbibbi.util.LocalSessionState @OptIn(ExperimentalLayoutApi::class) diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt index bdf7b15..cd58285 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/post/view/PostViewRealEmojiElement.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -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 com.no5ing.bbibbi.util.getRealEmojiResource diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt index 969e51d..3885b58 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/day_of_birth/RegisterDayOfBirthPage.kt @@ -41,8 +41,8 @@ import com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth.Regist import com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth.rememberRegisterDayOfBirthPageState 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 import java.time.YearMonth @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt index 62f7f79..2d9cccf 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/nickname/RegisterNickNamePage.kt @@ -40,8 +40,8 @@ import com.no5ing.bbibbi.presentation.feature.state.register.nickname.RegisterNi import com.no5ing.bbibbi.presentation.feature.state.register.nickname.rememberRegisterNickNamePageState 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 @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt index 82e49c7..8c6abdc 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/register/profile_image/RegisterProfileImagePage.kt @@ -49,9 +49,9 @@ import com.no5ing.bbibbi.presentation.component.BBiBBiSurface import com.no5ing.bbibbi.presentation.feature.view.dialog.AlbumCameraSelectDialog 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.RegisterMemberViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.auth.RegisterMemberViewModel import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.getErrorMessage import com.no5ing.bbibbi.util.localResources diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt index 6cc0e13..767ba6e 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/change_nickname/ChangeNicknamePage.kt @@ -46,9 +46,9 @@ import com.no5ing.bbibbi.presentation.component.DisposableTopBar import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss import com.no5ing.bbibbi.presentation.component.snackBarSuccess 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.members.ChangeNicknameViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.members.ChangeNicknameViewModel import com.no5ing.bbibbi.util.LocalSessionState import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.getErrorMessage diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt index 017ea0b..718181b 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/home/SettingHomePage.kt @@ -45,11 +45,11 @@ import com.no5ing.bbibbi.presentation.feature.view.dialog.CustomAlertDialog import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss import com.no5ing.bbibbi.presentation.component.snackBarInfo 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.LogoutViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.auth.RetrieveAppVersionViewModel -import com.no5ing.bbibbi.presentation.feature.viewmodel.family.QuitFamilyViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.auth.LogoutViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.auth.RetrieveAppVersionViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.family.QuitFamilyViewModel import com.no5ing.bbibbi.util.LocalMixpanelProvider import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.emptyPermissionState diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt index b604efc..a6d57d2 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/quit/QuitPage.kt @@ -36,9 +36,9 @@ import com.no5ing.bbibbi.presentation.component.DisposableTopBar 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.QuitViewModel +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiTypo +import com.no5ing.bbibbi.presentation.feature.view_model.auth.QuitViewModel import com.no5ing.bbibbi.util.LocalMixpanelProvider import com.no5ing.bbibbi.util.LocalSnackbarHostState import com.no5ing.bbibbi.util.getErrorMessage diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt index 4446250..8585c69 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view/setting/webview/WebViewDialog.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.viewinterop.AndroidView import com.no5ing.bbibbi.presentation.component.BBiBBiSurface -import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme +import com.no5ing.bbibbi.presentation.theme.bbibbiScheme import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/BaseViewModel.kt similarity index 97% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/BaseViewModel.kt index a9c9c03..2277989 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/BaseViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel +package com.no5ing.bbibbi.presentation.feature.view_model import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LoginWithCredentialsViewModel.kt similarity index 95% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LoginWithCredentialsViewModel.kt index b2679b6..dd982ca 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LoginWithCredentialsViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LoginWithCredentialsViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.auth.SocialLoginRequest import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule import com.no5ing.bbibbi.presentation.feature.state.landing.login.LoginStatus -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.retrofit.body import com.skydoves.sandwich.suspendOnFailure import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LogoutViewModel.kt similarity index 88% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LogoutViewModel.kt index b4641da..203bbbd 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/LogoutViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/LogoutViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import com.google.firebase.messaging.FirebaseMessaging import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.OperationStatus import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.tasks.await diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/QuitViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/QuitViewModel.kt index 89a7a2c..4bc1820 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/QuitViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/QuitViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import com.google.firebase.messaging.FirebaseMessaging import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.idle import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RegisterMemberViewModel.kt similarity index 95% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RegisterMemberViewModel.kt index 58f99c8..aeaf388 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RegisterMemberViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RegisterMemberViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import android.content.Context import android.net.Uri @@ -12,7 +12,7 @@ import com.no5ing.bbibbi.data.model.auth.RegisterRequest import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.uploadImage import com.skydoves.sandwich.onError import com.skydoves.sandwich.onSuccess @@ -26,7 +26,6 @@ import javax.inject.Inject @HiltViewModel class RegisterMemberViewModel @Inject constructor( private val restAPI: RestAPI, - private val context: Context, private val client: OkHttpClient, private val sessionModule: SessionModule, ) : BaseViewModel>() { diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveAppVersionViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveAppVersionViewModel.kt index 634f9dd..43cf730 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveAppVersionViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveAppVersionViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.auth.AppVersion import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveMeViewModel.kt similarity index 90% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveMeViewModel.kt index 6b99f52..f173369 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/auth/RetrieveMeViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/auth/RetrieveMeViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.auth +package com.no5ing.bbibbi.presentation.feature.view_model.auth import android.net.Uri import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/CreateFamilyAndJoinViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/CreateFamilyAndJoinViewModel.kt index 798a35a..b2246ec 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/CreateFamilyAndJoinViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/CreateFamilyAndJoinViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.family +package com.no5ing.bbibbi.presentation.feature.view_model.family import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.family.Family import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.ApiResponse import com.skydoves.sandwich.suspendOnFailure import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/FamilyInviteLinkViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/FamilyInviteLinkViewModel.kt index 979708a..8893581 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/FamilyInviteLinkViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/FamilyInviteLinkViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.family +package com.no5ing.bbibbi.presentation.feature.view_model.family import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.link.DeepLink import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/JoinFamilyWithLinkViewModel.kt similarity index 93% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/JoinFamilyWithLinkViewModel.kt index 0ee3710..1e966e4 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/JoinFamilyWithLinkViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/JoinFamilyWithLinkViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.family +package com.no5ing.bbibbi.presentation.feature.view_model.family import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.member.JoinFamilyRequest @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.family.Family import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.ApiResponse import com.skydoves.sandwich.suspendOnFailure import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/QuitFamilyViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/QuitFamilyViewModel.kt index 4d6aada..874b338 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/family/QuitFamilyViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/family/QuitFamilyViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.family +package com.no5ing.bbibbi.presentation.feature.view_model.family import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.response.DefaultResponse @@ -6,7 +6,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.ApiResponse import com.skydoves.sandwich.suspendOnFailure import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeNicknameViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeNicknameViewModel.kt index 83109cf..bd929d2 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeNicknameViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeNicknameViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.members +package com.no5ing.bbibbi.presentation.feature.view_model.members import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.member.ChangeNameRequest @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.loading import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeProfileImageViewModel.kt similarity index 94% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeProfileImageViewModel.kt index 8106fd2..0913a80 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/ChangeProfileImageViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/ChangeProfileImageViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.members +package com.no5ing.bbibbi.presentation.feature.view_model.members import android.net.Uri import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.loading import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.uploadImage import com.skydoves.sandwich.suspendOnError import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMemberViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMemberViewModel.kt index cd8528f..04ae494 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMemberViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMemberViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.members +package com.no5ing.bbibbi.presentation.feature.view_model.members import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMembersViewModel.kt similarity index 90% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMembersViewModel.kt index 8a86a99..b5926a7 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/members/FamilyMembersViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/members/FamilyMembersViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.members +package com.no5ing.bbibbi.presentation.feature.view_model.members import androidx.lifecycle.viewModelScope import androidx.paging.PagingData @@ -6,7 +6,7 @@ import androidx.paging.cachedIn import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.data.repository.member.GetMembersRepository -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddPostReactionViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddPostReactionViewModel.kt index 9dd2dc1..99eb475 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddPostReactionViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddPostReactionViewModel.kt @@ -1,9 +1,9 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostReactionRequest import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddRealEmojiViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddRealEmojiViewModel.kt index 3a04b9a..82f55b0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/AddRealEmojiViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/AddRealEmojiViewModel.kt @@ -1,9 +1,9 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.member.AddPostRealEmojiRequest import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarDetailContentViewModel.kt similarity index 95% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarDetailContentViewModel.kt index fc244e8..54dc2f7 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarDetailContentViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarDetailContentViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendMapSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarMonthViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarMonthViewModel.kt index b266574..d8185b4 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarMonthViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarMonthViewModel.kt @@ -1,9 +1,9 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.post.CalendarElement import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarWeekViewModel.kt similarity index 93% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarWeekViewModel.kt index 4959d90..4b0047a 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CalendarWeekViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CalendarWeekViewModel.kt @@ -1,9 +1,9 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.post.CalendarElement import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.toYearMonth import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostCommentViewModel.kt similarity index 90% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostCommentViewModel.kt index d6f0c24..191cee3 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostCommentViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostCommentViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.post.CreatePostCommentRequest @@ -6,7 +6,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.post.PostComment import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostViewModel.kt similarity index 95% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostViewModel.kt index 4fa4e87..b962749 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/CreatePostViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/CreatePostViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import android.net.Uri import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage @@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.post.Post import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.getZonedDateTimeString import com.no5ing.bbibbi.util.uploadImage import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DailyFamilyTopViewModel.kt similarity index 89% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DailyFamilyTopViewModel.kt index 2e3b542..893be95 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DailyFamilyTopViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DailyFamilyTopViewModel.kt @@ -1,8 +1,8 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.todayAsString import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DeletePostCommentViewModel.kt similarity index 89% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DeletePostCommentViewModel.kt index 53fc27e..d6f7bb3 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/DeletePostCommentViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/DeletePostCommentViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.response.DefaultResponse import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostViewModel.kt index 7c4b1de..709fb57 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -7,7 +7,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendMapSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostsViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostsViewModel.kt index d4a7946..5635acf 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilyPostsViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilyPostsViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import androidx.lifecycle.viewModelScope import androidx.paging.PagingData @@ -6,7 +6,7 @@ import androidx.paging.cachedIn import com.no5ing.bbibbi.data.model.post.Post import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.data.repository.post.GetPostsRepository -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilySwipePostsViewModel.kt similarity index 92% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilySwipePostsViewModel.kt index 8f62871..47a55f4 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/FamilySwipePostsViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/FamilySwipePostsViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider import com.no5ing.bbibbi.data.datasource.network.RestAPI @@ -6,7 +6,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendMapSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/IsMeUploadedTodayViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/IsMeUploadedTodayViewModel.kt index 32d4192..6a07fda 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/IsMeUploadedTodayViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/IsMeUploadedTodayViewModel.kt @@ -1,10 +1,10 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.todayAsString import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MainPostFeedViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MainPostFeedViewModel.kt index 8bb119a..ff0789a 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MainPostFeedViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MainPostFeedViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import androidx.lifecycle.viewModelScope import androidx.paging.PagingData @@ -6,7 +6,7 @@ import androidx.paging.cachedIn import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.data.repository.post.GetFeedsRepository import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MemberRealEmojiListViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MemberRealEmojiListViewModel.kt index ee75b9b..a8f3e70 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MemberRealEmojiListViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MemberRealEmojiListViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.member.MemberRealEmoji import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MonthlyStatisticsViewModel.kt similarity index 88% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MonthlyStatisticsViewModel.kt index 2188500..762b214 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/MonthlyStatisticsViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/MonthlyStatisticsViewModel.kt @@ -1,11 +1,11 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.post.CalendarBanner import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostCommentViewModel.kt similarity index 91% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostCommentViewModel.kt index 5d9ede7..7f68617 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostCommentViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostCommentViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import androidx.lifecycle.viewModelScope import androidx.paging.PagingData @@ -6,7 +6,7 @@ import androidx.paging.cachedIn import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.data.repository.post.GetCommentsRepository import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostReactionBarViewModel.kt similarity index 98% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostReactionBarViewModel.kt index 271dd49..2b3fce7 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/PostReactionBarViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/PostReactionBarViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import androidx.lifecycle.viewModelScope import com.no5ing.bbibbi.data.datasource.local.MemberCacheProvider @@ -8,7 +8,7 @@ import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.presentation.feature.uistate.post.NormalPostReactionUiState import com.no5ing.bbibbi.presentation.feature.uistate.post.PostReactionUiState import com.no5ing.bbibbi.presentation.feature.uistate.post.RealEmojiPostReactionUiState -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.parallelMap import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemovePostReactionViewModel.kt similarity index 87% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemovePostReactionViewModel.kt index 4deb4cc..634049b 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemovePostReactionViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemovePostReactionViewModel.kt @@ -1,9 +1,9 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.post.DeletePostReactionRequest import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemoveRealEmojiViewModel.kt similarity index 86% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemoveRealEmojiViewModel.kt index bd05701..d0654f9 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/RemoveRealEmojiViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/RemoveRealEmojiViewModel.kt @@ -1,8 +1,8 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/UpdateMemberPostRealEmojiViewModel.kt similarity index 96% rename from app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/UpdateMemberPostRealEmojiViewModel.kt index dc7bba3..d9e0659 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/feature/viewmodel/post/UpdateMemberPostRealEmojiViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/feature/view_model/post/UpdateMemberPostRealEmojiViewModel.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.feature.viewmodel.post +package com.no5ing.bbibbi.presentation.feature.view_model.post import android.net.Uri import androidx.annotation.OptIn @@ -12,7 +12,7 @@ import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.member.MemberRealEmoji import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.di.SessionModule -import com.no5ing.bbibbi.presentation.feature.viewmodel.BaseViewModel +import com.no5ing.bbibbi.presentation.feature.view_model.BaseViewModel import com.no5ing.bbibbi.util.uploadImage import com.skydoves.sandwich.suspendOnError import com.skydoves.sandwich.suspendOnSuccess diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/NavDestinationListener.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/NavDestinationListener.kt similarity index 95% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/NavDestinationListener.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/NavDestinationListener.kt index 782537d..8dfa080 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/NavDestinationListener.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/NavDestinationListener.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation +package com.no5ing.bbibbi.presentation.navigation import android.content.Context import android.os.Bundle diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/EnterAnimation.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/EnterAnimation.kt similarity index 90% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/EnterAnimation.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/EnterAnimation.kt index 23a5207..6193494 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/EnterAnimation.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/EnterAnimation.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation.animation +package com.no5ing.bbibbi.presentation.navigation.animation import androidx.compose.animation.fadeIn import androidx.compose.animation.slideInHorizontally diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/ExitAnimation.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/ExitAnimation.kt similarity index 94% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/ExitAnimation.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/ExitAnimation.kt index 9961797..4625035 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/animation/ExitAnimation.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/animation/ExitAnimation.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation.animation +package com.no5ing.bbibbi.presentation.navigation.animation import androidx.compose.animation.core.Spring import androidx.compose.animation.core.VisibilityThreshold diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/LandingNavGraph.kt similarity index 96% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/LandingNavGraph.kt index 7d67459..a5689a5 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/LandingNavGraph.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/LandingNavGraph.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation.graph +package com.no5ing.bbibbi.presentation.navigation.graph import androidx.compose.runtime.Stable import androidx.navigation.NavGraphBuilder diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/MainNavGraph.kt similarity index 90% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/MainNavGraph.kt index 3afdecd..2d31834 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/MainNavGraph.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/MainNavGraph.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation.graph +package com.no5ing.bbibbi.presentation.navigation.graph import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.fadeIn @@ -7,12 +7,12 @@ import androidx.compose.runtime.Stable import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.navigation -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlideInToLeft -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlideInToRight -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlideOutToLeft -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullHorizontalSlideOutToRight -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullSlideInVertically -import com.no5ing.bbibbi.presentation.ui.navigation.animation.fullSlideOutVertically +import com.no5ing.bbibbi.presentation.navigation.animation.fullHorizontalSlideInToLeft +import com.no5ing.bbibbi.presentation.navigation.animation.fullHorizontalSlideInToRight +import com.no5ing.bbibbi.presentation.navigation.animation.fullHorizontalSlideOutToLeft +import com.no5ing.bbibbi.presentation.navigation.animation.fullHorizontalSlideOutToRight +import com.no5ing.bbibbi.presentation.navigation.animation.fullSlideInVertically +import com.no5ing.bbibbi.presentation.navigation.animation.fullSlideOutVertically import com.no5ing.bbibbi.presentation.feature.view_controller.ChangeNicknameDestination import com.no5ing.bbibbi.presentation.feature.view_controller.CreateRealEmojiDestination import com.no5ing.bbibbi.presentation.feature.view_controller.MainCalendarDestination diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/RegisterNavGraph.kt similarity index 97% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/RegisterNavGraph.kt index 48e1f59..4e6759a 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/navigation/graph/RegisterNavGraph.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/navigation/graph/RegisterNavGraph.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.navigation.graph +package com.no5ing.bbibbi.presentation.navigation.graph import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideOutHorizontally diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Theme.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/Theme.kt similarity index 98% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Theme.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/theme/Theme.kt index 2565c6e..c22363e 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Theme.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.theme +package com.no5ing.bbibbi.presentation.theme import android.app.Activity import android.os.Build diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/ThemeMapper.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/ThemeMapper.kt similarity index 97% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/ThemeMapper.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/theme/ThemeMapper.kt index 2b5c0c7..4695494 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/ThemeMapper.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/ThemeMapper.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.theme +package com.no5ing.bbibbi.presentation.theme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Typography.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/Typography.kt similarity index 97% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Typography.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/theme/Typography.kt index 536c0c1..fa7b3e7 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/Typography.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/Typography.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.theme +package com.no5ing.bbibbi.presentation.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/TypographyMapper.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/TypographyMapper.kt similarity index 96% rename from app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/TypographyMapper.kt rename to app/src/main/java/com/no5ing/bbibbi/presentation/theme/TypographyMapper.kt index 9445e2c..0ab3cee 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/theme/TypographyMapper.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/theme/TypographyMapper.kt @@ -1,4 +1,4 @@ -package com.no5ing.bbibbi.presentation.ui.theme +package com.no5ing.bbibbi.presentation.theme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable