From bf495b322cb11d6418e995037c4a8457f26ff03c Mon Sep 17 00:00:00 2001 From: jhg3410 <80373033+jhg3410@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:25:18 +0900 Subject: [PATCH] =?UTF-8?q?release-1.0.0=20fix:=20moneymong-253=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/moneymong/moneymong/home/HomeScreen.kt | 3 +++ gradle/libs.versions.toml | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt index 647e382a..234759dc 100644 --- a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt +++ b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt @@ -2,9 +2,11 @@ package com.moneymong.moneymong.home import androidx.compose.animation.EnterTransition import androidx.compose.animation.ExitTransition +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost import androidx.navigation.navOptions import com.google.accompanist.systemuicontroller.rememberSystemUiController @@ -78,6 +80,7 @@ fun HomeScreen( } ) { padding -> NavHost( + modifier = Modifier.fillMaxSize(), navController = homeNavController, startDestination = splashRoute, enterTransition = { EnterTransition.None }, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cdf34314..a5becfeb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,11 +11,11 @@ androidxComposeBom = "2023.10.01" androidxComposeCompiler = "1.5.3" androidxComposeMaterial = "1.3.1" androidxComposeMaterial3 = "1.1.0-alpha07" -androidxComposeNavigation = "2.7.4" androidxJunit = "1.1.5" androidxDatastore = "1.0.0" androidxEspresso = "3.5.1" androidHiltNavigationCompose = "1.0.0" +navigation = "2.7.0" cameraX = "1.2.1" chucker-android = "4.0.0" desugaring = "1.2.2" @@ -38,8 +38,6 @@ appcompat = "1.6.1" material = "1.10.0" lifecycle-runtime-ktx = "2.6.2" constraintlayout = "2.1.4" -navigation-fragment-ktx = "2.7.5" -navigation-ui-ktx = "2.7.5" paging = "3.2.1" [libraries] accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } @@ -63,7 +61,7 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = androidx-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastore" } androidx-datastore-core = { group = "androidx.datastore", name = "datastore-preferences-core", version.ref = "androidxDatastore" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycle" } -androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" } chucker-debug = { group = "com.github.chuckerteam.chucker", name = "library", version.ref = "chucker-android" } chucker-release = { group = "com.github.chuckerteam.chucker", name = "library-no-op", version.ref = "chucker-android" } @@ -98,8 +96,8 @@ lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtim ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation-fragment-ktx" } -navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation-ui-ktx" } +navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" } +navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" } kakao-kakaolink = { group = "com.kakao.sdk", name = "kakaolink", version = "1.30.5" } kakao-v2-user = { group = "com.kakao.sdk", name = "v2-user", version = "2.5.0" }