Merge branch 'develop' into feature/356

Nexters · Jan 26, 2025 · 3361378 · 3361378
2 parents d18a2fc + 6c9f1d9
commit 3361378
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 minSdk = "26"
 targetSdk = "34"
-versionCode = "32"
-versionName = "1.9.2"
+versionCode = "34"
+versionName = "1.10.1"
 packageName = "com.nexters.boolti"
 compileSdk = "34"
 targetJvm = "17"

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/QrScanActivity.kt b/presentation/src/main/java/com/nexters/boolti/presentation/QrScanActivity.kt
@@ -1,6 +1,5 @@
 package com.nexters.boolti.presentation
 
-import android.Manifest
 import android.graphics.Color
 import android.hardware.Camera
 import android.os.Bundle
@@ -20,7 +19,6 @@ import com.journeyapps.barcodescanner.BarcodeCallback
 import com.journeyapps.barcodescanner.BarcodeResult
 import com.journeyapps.barcodescanner.DecoratedBarcodeView
 import com.journeyapps.barcodescanner.DefaultDecoderFactory
-import com.nexters.boolti.presentation.extension.requestPermission
 import com.nexters.boolti.presentation.extension.vibrator
 import com.nexters.boolti.presentation.screen.qr.QrScanScreen
 import com.nexters.boolti.presentation.theme.BooltiTheme
@@ -67,9 +65,10 @@ class QrScanActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        requestPermission(Manifest.permission.CAMERA, 100)
-
-        enableEdgeToEdge(statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT))
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.dark(0xFF090A0B.toInt())
+        )
 
         setContent {
             BooltiTheme {

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt
@@ -23,7 +23,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.navigation
 import androidx.navigation.navDeepLink
 import com.nexters.boolti.presentation.component.ToastSnackbarHost
-import com.nexters.boolti.presentation.reservationdetail.reservationDetailScreen
+import com.nexters.boolti.presentation.screen.reservationdetail.reservationDetailScreen
 import com.nexters.boolti.presentation.screen.accountsetting.accountSettingScreen
 import com.nexters.boolti.presentation.screen.business.businessScreen
 import com.nexters.boolti.presentation.screen.gift.giftScreen

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -169,6 +170,7 @@ fun QrScanScreen(
             ) {
                 ToastSnackbarHost(
                     modifier = Modifier
+                        .statusBarsPadding()
                         .offset { // Scaffold의 inner padding 만큼 상단을 뚫고 나가는 문제가 있음. 해당 값 보정.
                             IntOffset(
                                 0,
@@ -235,7 +237,7 @@ private fun QrScanBottombar(onClick: () -> Unit) {
         Row(
             modifier = Modifier
                 .clickable(onClick = onClick)
-                .padding(20.dp),
+                .padding(top = 20.dp, bottom = 32.dp),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Center,
         ) {

diff --git a/...ion/reservationdetail/ResendGiftButton.kt → ...een/reservationdetail/ResendGiftButton.kt b/...ion/reservationdetail/ResendGiftButton.kt → ...een/reservationdetail/ResendGiftButton.kt
@@ -1,4 +1,4 @@
-package com.nexters.boolti.presentation.reservationdetail
+package com.nexters.boolti.presentation.screen.reservationdetail
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues

diff --git a/...tiondetail/ReservationDetailNavigation.kt → ...tiondetail/ReservationDetailNavigation.kt b/...tiondetail/ReservationDetailNavigation.kt → ...tiondetail/ReservationDetailNavigation.kt
@@ -1,4 +1,4 @@
-package com.nexters.boolti.presentation.reservationdetail
+package com.nexters.boolti.presentation.screen.reservationdetail
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable

diff --git a/...ervationdetail/ReservationDetailScreen.kt → ...ervationdetail/ReservationDetailScreen.kt b/...ervationdetail/ReservationDetailScreen.kt → ...ervationdetail/ReservationDetailScreen.kt
@@ -1,4 +1,4 @@
-package com.nexters.boolti.presentation.reservationdetail
+package com.nexters.boolti.presentation.screen.reservationdetail
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState

diff --git a/...rvationdetail/ReservationDetailUiState.kt → ...rvationdetail/ReservationDetailUiState.kt b/...rvationdetail/ReservationDetailUiState.kt → ...rvationdetail/ReservationDetailUiState.kt
@@ -1,4 +1,4 @@
-package com.nexters.boolti.presentation.reservationdetail
+package com.nexters.boolti.presentation.screen.reservationdetail
 
 import com.nexters.boolti.domain.model.ReservationDetail
 

diff --git a/...ationdetail/ReservationDetailViewModel.kt → ...ationdetail/ReservationDetailViewModel.kt b/...ationdetail/ReservationDetailViewModel.kt → ...ationdetail/ReservationDetailViewModel.kt
@@ -1,4 +1,4 @@
-package com.nexters.boolti.presentation.reservationdetail
+package com.nexters.boolti.presentation.screen.reservationdetail
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope