Merge pull request #124 from YAPP-Github/release/2.0.0

[Release/2.0.0] (main)

Author: l5x5l

app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Theme.Bitnagil">
             <intent-filter>

app/src/main/java/com/threegap/bitnagil/MainActivity.kt

@@ -9,6 +9,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -53,7 +54,8 @@ class MainActivity : ComponentActivity() {
                     state = globalToast,
                     modifier = Modifier
                         .align(Alignment.BottomCenter)
-                        .padding(bottom = 100.dp),
+                        .navigationBarsPadding()
+                        .padding(bottom = if (mainNavigator.hasBottomNavigationBarRoute()) 80.dp else 16.dp),
                 )
             }
         }

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -8,15 +8,17 @@ import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import com.threegap.bitnagil.navigation.home.HomeNavHost
 import com.threegap.bitnagil.presentation.emotion.EmotionScreenContainer
-import com.threegap.bitnagil.presentation.intro.IntroScreenContainer
+import com.threegap.bitnagil.presentation.guide.GuideScreenContainer
 import com.threegap.bitnagil.presentation.login.LoginScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
 import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
+import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
 import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
 import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
+import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer
 import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineScreenContainer
 import com.threegap.bitnagil.presentation.writeroutine.WriteRoutineViewModel
 import com.threegap.bitnagil.presentation.writeroutine.model.navarg.WriteRoutineScreenArg
@@ -33,8 +35,8 @@ fun MainNavHost(
     ) {
         composable<Route.Splash> {
             SplashScreenContainer(
-                navigateToIntro = {
-                    navigator.navController.navigate(Route.Intro) {
+                navigateToLogin = {
+                    navigator.navController.navigate(Route.Login) {
                         popUpTo<Route.Splash> { inclusive = true }
                     }
                 },
@@ -52,12 +54,6 @@ fun MainNavHost(
             )
         }
 
-        composable<Route.Intro> {
-            IntroScreenContainer(
-                navigateToLogin = { navigator.navController.navigate(Route.Login) },
-            )
-        }
-
         composable<Route.Login> {
             LoginScreenContainer(
                 navigateToHome = navigator::navigateToHomeAndClearStack,
@@ -84,7 +80,9 @@ fun MainNavHost(
                     )
                 },
                 navigateToOnBoarding = {
-                    navigator.navController.navigate(Route.OnBoarding())
+                    navigator.navController.navigate(Route.OnBoarding()) {
+                        popUpTo(0) { inclusive = true }
+                    }
                 },
                 navigateToBack = {
                     if (navigator.navController.previousBackStackEntry != null) {
@@ -118,15 +116,24 @@ fun MainNavHost(
                         ),
                     )
                 },
+                navigateToGuide = {
+                    navigator.navController.navigate(Route.Guide) {
+                        launchSingleTop = true
+                    }
+                },
                 navigateToRegisterRoutine = { routineId ->
                     navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))
                 },
-                navigateToEditRoutine = { routineId ->
-                    navigator.navController.navigate(Route.WriteRoutine(routineId = routineId, isRegister = false))
-                },
                 navigateToEmotion = {
                     navigator.navController.navigate(Route.Emotion)
                 },
+                navigateToRoutineList = { selectedDate ->
+                    navigator.navController.navigate(
+                        Route.RoutineList(selectedDate = selectedDate),
+                    ) {
+                        launchSingleTop = true
+                    }
+                },
             )
         }
 
@@ -166,13 +173,16 @@ fun MainNavHost(
                         ),
                     )
                 },
-                navigateToIntro = {
-                    navigator.navController.navigate(Route.Intro) {
+                navigateToLogin = {
+                    navigator.navController.navigate(Route.Login) {
                         popUpTo(0) {
                             inclusive = true
                         }
                     }
                 },
+                navigateToWithdrawal = {
+                    navigator.navController.navigate(Route.Withdrawal)
+                },
             )
         }
 
@@ -204,7 +214,7 @@ fun MainNavHost(
             val writeScreenNavArg = if (arg.isRegister) {
                 WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
             } else {
-                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!)
+                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
             }
 
             val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->
@@ -230,5 +240,54 @@ fun MainNavHost(
                 },
             )
         }
+
+        composable<Route.Withdrawal> {
+            WithdrawalScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+                navigateToLogin = {
+                    navigator.navController.navigate(Route.Login) {
+                        popUpTo(0) {
+                            inclusive = true
+                        }
+                    }
+                },
+            )
+        }
+
+        composable<Route.RoutineList> {
+            RoutineListScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+                navigateToAddRoutine = {
+                    navigator.navController.navigate(Route.WriteRoutine())
+                },
+                navigateToEditRoutine = { routineId, updateRoutineFromNowDate ->
+                    navigator.navController.navigate(
+                        Route.WriteRoutine(
+                            routineId = routineId,
+                            isRegister = false,
+                            isUpdateRoutineFromNowDate = updateRoutineFromNowDate,
+                        ),
+                    )
+                },
+            )
+        }
+
+        composable<Route.Guide> {
+            GuideScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+            )
+        }
     }
 }

app/src/main/java/com/threegap/bitnagil/MainNavigator.kt

@@ -1,21 +1,40 @@
 package com.threegap.bitnagil
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 
 class MainNavigator(
     val navController: NavHostController,
 ) {
     val startDestination = Route.Splash
 
+    private val currentDestination: NavDestination?
+        @Composable get() {
+            val currentEntry by navController.currentBackStackEntryAsState()
+            return currentEntry?.destination
+        }
+
     internal fun navigateToHomeAndClearStack() =
         navController.navigate(Route.Home) {
             popUpTo(0) {
                 inclusive = true
             }
         }
+
+    @Composable
+    internal fun hasBottomNavigationBarRoute(): Boolean {
+        val destination = currentDestination
+        return when {
+            destination?.hasRoute<Route.Home>() == true -> true
+            else -> false
+        }
+    }
 }
 
 @Composable

app/src/main/java/com/threegap/bitnagil/MainScreen.kt

@@ -1,11 +1,11 @@
 package com.threegap.bitnagil
 
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -18,7 +18,7 @@ fun MainScreen(
 ) {
     Scaffold(
         modifier = modifier.fillMaxSize(),
-        contentWindowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Bottom),
+        contentWindowInsets = WindowInsets.navigationBars.exclude(WindowInsets.ime),
         containerColor = BitnagilTheme.colors.white,
     ) { innerPadding ->
         MainNavHost(

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -7,9 +7,6 @@ sealed interface Route {
     @Serializable
     data object Splash : Route
 
-    @Serializable
-    data object Intro : Route
-
     @Serializable
     data object TermsAgreement : Route
 
@@ -37,8 +34,18 @@ sealed interface Route {
     data class WriteRoutine(
         val routineId: String? = null,
         val isRegister: Boolean = true,
+        val isUpdateRoutineFromNowDate: Boolean = true,
     ) : Route
 
     @Serializable
     data object Emotion : Route
+
+    @Serializable
+    data object Withdrawal : Route
+
+    @Serializable
+    data class RoutineList(val selectedDate: String) : Route
+
+    @Serializable
+    data object Guide : Route
 }

app/src/main/java/com/threegap/bitnagil/di/data/DataSourceModule.kt

@@ -14,6 +14,8 @@ import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
 import com.threegap.bitnagil.data.routine.datasourceImpl.RoutineRemoteDataSourceImpl
 import com.threegap.bitnagil.data.user.datasource.UserDataSource
 import com.threegap.bitnagil.data.user.datasourceImpl.UserDataSourceImpl
+import com.threegap.bitnagil.data.version.datasource.VersionDataSource
+import com.threegap.bitnagil.data.version.datasourceImpl.VersionDataSourceImpl
 import com.threegap.bitnagil.data.writeroutine.datasource.WriteRoutineDataSource
 import com.threegap.bitnagil.data.writeroutine.datasourceImpl.WriteRoutineDataSourceImpl
 import dagger.Binds
@@ -57,4 +59,8 @@ abstract class DataSourceModule {
     @Binds
     @Singleton
     abstract fun bindRecommendRoutineDataSource(recommendRoutineDataSourceImpl: RecommendRoutineDataSourceImpl): RecommendRoutineDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindVersionDataSource(versionDataSourceImpl: VersionDataSourceImpl): VersionDataSource
 }

app/src/main/java/com/threegap/bitnagil/di/data/RepositoryModule.kt

@@ -6,13 +6,15 @@ import com.threegap.bitnagil.data.onboarding.repositoryImpl.OnBoardingRepository
 import com.threegap.bitnagil.data.recommendroutine.repositoryImpl.RecommendRoutineRepositoryImpl
 import com.threegap.bitnagil.data.routine.repositoryImpl.RoutineRepositoryImpl
 import com.threegap.bitnagil.data.user.repositoryImpl.UserRepositoryImpl
+import com.threegap.bitnagil.data.version.repositoryImpl.VersionRepositoryImpl
 import com.threegap.bitnagil.data.writeroutine.repositoryImpl.WriteRoutineRepositoryImpl
 import com.threegap.bitnagil.domain.auth.repository.AuthRepository
 import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
 import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
 import com.threegap.bitnagil.domain.recommendroutine.repository.RecommendRoutineRepository
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
 import com.threegap.bitnagil.domain.user.repository.UserRepository
+import com.threegap.bitnagil.domain.version.repository.VersionRepository
 import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
 import dagger.Binds
 import dagger.Module
@@ -51,4 +53,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindRecommendRoutineRepository(recommendRoutineRepositoryImpl: RecommendRoutineRepositoryImpl): RecommendRoutineRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindVersionRepository(versionRepositoryImpl: VersionRepositoryImpl): VersionRepository
 }

app/src/main/java/com/threegap/bitnagil/di/data/ServiceModule.kt

@@ -6,6 +6,7 @@ import com.threegap.bitnagil.data.onboarding.service.OnBoardingService
 import com.threegap.bitnagil.data.recommendroutine.service.RecommendRoutineService
 import com.threegap.bitnagil.data.routine.service.RoutineService
 import com.threegap.bitnagil.data.user.service.UserService
+import com.threegap.bitnagil.data.version.service.VersionService
 import com.threegap.bitnagil.data.writeroutine.service.WriteRoutineService
 import com.threegap.bitnagil.di.core.Auth
 import com.threegap.bitnagil.di.core.NoneAuth
@@ -60,4 +61,9 @@ object ServiceModule {
     @Singleton
     fun provideRecommendRoutineService(@Auth retrofit: Retrofit): RecommendRoutineService =
         retrofit.create(RecommendRoutineService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideVersionService(@NoneAuth retrofit: Retrofit): VersionService =
+        retrofit.create(VersionService::class.java)
 }