From 32467448a47d8fc1946554cde78627e172290cc6 Mon Sep 17 00:00:00 2001 From: algosketch Date: Sun, 26 Jan 2025 19:28:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor=20:=20=EB=B0=96=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=9B=B0=EC=B3=90=EB=82=98=EC=98=A8=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20=EB=8B=A4=EC=8B=9C=20=EC=95=88=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=A7=91=EC=96=B4=20=EB=84=A3=EC=97=88=EC=96=B4?= =?UTF-8?q?=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nexters/boolti/presentation/screen/Main.kt | 2 +- .../{ => screen}/reservationdetail/ResendGiftButton.kt | 2 +- .../reservationdetail/ReservationDetailNavigation.kt | 2 +- .../{ => screen}/reservationdetail/ReservationDetailScreen.kt | 2 +- .../{ => screen}/reservationdetail/ReservationDetailUiState.kt | 2 +- .../reservationdetail/ReservationDetailViewModel.kt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename presentation/src/main/java/com/nexters/boolti/presentation/{ => screen}/reservationdetail/ResendGiftButton.kt (97%) rename presentation/src/main/java/com/nexters/boolti/presentation/{ => screen}/reservationdetail/ReservationDetailNavigation.kt (90%) rename presentation/src/main/java/com/nexters/boolti/presentation/{ => screen}/reservationdetail/ReservationDetailScreen.kt (99%) rename presentation/src/main/java/com/nexters/boolti/presentation/{ => screen}/reservationdetail/ReservationDetailUiState.kt (84%) rename presentation/src/main/java/com/nexters/boolti/presentation/{ => screen}/reservationdetail/ReservationDetailViewModel.kt (97%) 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 index 0f49f124b..ee8a79c2f 100644 --- 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/reservationdetail/ResendGiftButton.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ResendGiftButton.kt similarity index 97% rename from presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ResendGiftButton.kt rename to presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ResendGiftButton.kt index aeb2a023e..009c3a6a9 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ResendGiftButton.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/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/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailNavigation.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailNavigation.kt similarity index 90% rename from presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailNavigation.kt rename to presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailNavigation.kt index 68cbba651..bc5194b05 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailNavigation.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/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/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailScreen.kt similarity index 99% rename from presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailScreen.kt rename to presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailScreen.kt index 6a9116474..ed6921a46 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailScreen.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/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/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailUiState.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailUiState.kt similarity index 84% rename from presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailUiState.kt rename to presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailUiState.kt index 32d640c43..9afee6749 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailUiState.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/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/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailViewModel.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailViewModel.kt similarity index 97% rename from presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailViewModel.kt rename to presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailViewModel.kt index 3530dc34a..9e0069162 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailViewModel.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/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 From 17775d6893b04fbcca47a56af5d7dedc5872eaed Mon Sep 17 00:00:00 2001 From: algosketch Date: Sun, 26 Jan 2025 19:47:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20QR=20=EC=8A=A4=EC=BA=94=20?= =?UTF-8?q?=EB=A7=88=EC=A7=84=20=EA=B0=92=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F?= =?UTF-8?q?=20=EB=82=B4=EB=B9=84=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nexters/boolti/presentation/QrScanActivity.kt | 9 ++++----- .../boolti/presentation/screen/qr/QrScanScreen.kt | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/QrScanActivity.kt b/presentation/src/main/java/com/nexters/boolti/presentation/QrScanActivity.kt index 74e0fe15d..66dd29b40 100644 --- 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/qr/QrScanScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt index d1faec25f..453e6c470 100644 --- 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 @@ -235,7 +235,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, ) { From 472cec60571aed2c7825e8146d93ecc3e8f78efc Mon Sep 17 00:00:00 2001 From: algosketch Date: Sun, 26 Jan 2025 19:50:07 +0900 Subject: [PATCH 3/4] chore : version up --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b11f66945..c819e0a74 100644 --- 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" From fa3b75884d333f10218e57c3f5167bed41fe98f1 Mon Sep 17 00:00:00 2001 From: algosketch Date: Sun, 26 Jan 2025 19:58:48 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20edge=20to=20edge=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=ED=9B=84=20=EC=8A=A4=EB=82=B5=EB=B0=94=EA=B0=80=20?= =?UTF-8?q?=EC=B2=9C=EC=9E=A5=20=EB=9A=AB=EA=B3=A0=20=EB=82=98=EA=B0=80?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EB=A5=BC=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=96=88=EC=96=B4=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt | 2 ++ 1 file changed, 2 insertions(+) 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 index 453e6c470..6fc7d4f8d 100644 --- 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,