Merge branch 'develop' into feature/356

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 minSdk = "26"
 targetSdk = "34"
-versionCode = "34"
-versionName = "1.10.1"
+versionCode = "36"
+versionName = "1.10.0"
 packageName = "com.nexters.boolti"
 compileSdk = "34"
 targetJvm = "17"

presentation/src/main/java/com/nexters/boolti/presentation/QrScanActivity.kt

@@ -1,5 +1,6 @@
 package com.nexters.boolti.presentation
 
+import android.Manifest
 import android.graphics.Color
 import android.hardware.Camera
 import android.os.Bundle
@@ -19,6 +20,7 @@ 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
@@ -65,6 +67,8 @@ class QrScanActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        requestPermission(Manifest.permission.CAMERA, 100)
+
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
             navigationBarStyle = SystemBarStyle.dark(0xFF090A0B.toInt())

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/GiftScreen.kt

@@ -242,7 +242,7 @@ fun GiftScreen(
                     modifier = Modifier
                         .fillMaxWidth()
                         .background(MaterialTheme.colorScheme.background)
-                        .padding(start = 20.dp, end = 20.dp, top = 8.dp, bottom = 24.dp),
+                        .padding(start = 20.dp, end = 20.dp, top = 8.dp, bottom = 20.dp),
                     enabled = uiState.isComplete,
                     label = stringResource(
                         R.string.ticketing_payment_button_label,

presentation/src/main/java/com/nexters/boolti/presentation/screen/giftcomplete/GiftCompleteScreen.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -26,6 +27,9 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -52,6 +56,7 @@ import com.nexters.boolti.presentation.R
 import com.nexters.boolti.presentation.component.BtCircularProgressIndicator
 import com.nexters.boolti.presentation.component.SecondaryButton
 import com.nexters.boolti.presentation.component.ShowItem
+import com.nexters.boolti.presentation.component.TopGradientBackground
 import com.nexters.boolti.presentation.component.dummyReservationDetail
 import com.nexters.boolti.presentation.extension.cardCodeToCompanyName
 import com.nexters.boolti.presentation.screen.payment.PaymentToolbar
@@ -102,6 +107,7 @@ fun GiftCompleteScreen(
     reservation: ReservationDetail,
 ) {
     val context = LocalContext.current
+    var bottomButtonHeight by remember { mutableStateOf(0.dp) }
 
     BackHandler(onBack = onClickClose)
 
@@ -188,15 +194,21 @@ fun GiftCompleteScreen(
                 ShowInformation(
                     reservation = reservation
                 )
+                Spacer(modifier = Modifier.height(bottomButtonHeight))
             }
-            SecondaryButton(
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .fillMaxWidth()
-                    .padding(top = 16.dp, bottom = 20.dp),
-                label = stringResource(R.string.show_reservation),
+            TopGradientBackground(
+                modifier = Modifier.align(Alignment.BottomCenter),
+                onHeightChanged = { bottomButtonHeight = it },
             ) {
-                navigateToReservation(reservation)
+                SecondaryButton(
+                    modifier = Modifier
+                        .align(Alignment.BottomCenter)
+                        .fillMaxWidth()
+                        .padding(bottom = 20.dp),
+                    label = stringResource(R.string.show_reservation),
+                ) {
+                    navigateToReservation(reservation)
+                }
             }
         }
     }
@@ -392,6 +404,7 @@ private fun ShowInformation(
 }
 
 @Composable
+@Preview(device = "spec:width=1080px,height=1340px,dpi=440")
 @Preview
 fun GiftCompleteScreenPreview(
 ) {

presentation/src/main/java/com/nexters/boolti/presentation/screen/login/LoginScreen.kt

@@ -172,9 +172,7 @@ private fun SignUpBottomSheet(
         MainButton(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 18.dp)
-                .padding(vertical = 8.dp)
-                .padding(bottom = 20.dp),
+                .padding(top = 18.dp, bottom = 20.dp),
             label = stringResource(id = R.string.signup_with_agreement),
             onClick = signUp,
         )

presentation/src/main/java/com/nexters/boolti/presentation/screen/payment/PaymentCompleteScreen.kt

@@ -7,8 +7,10 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
@@ -20,6 +22,9 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -37,6 +42,7 @@ import com.nexters.boolti.presentation.component.BtAppBarDefaults
 import com.nexters.boolti.presentation.component.MainButton
 import com.nexters.boolti.presentation.component.SecondaryButton
 import com.nexters.boolti.presentation.component.ShowItem
+import com.nexters.boolti.presentation.component.TopGradientBackground
 import com.nexters.boolti.presentation.extension.cardCodeToCompanyName
 import com.nexters.boolti.presentation.theme.BooltiTheme
 import com.nexters.boolti.presentation.theme.Grey15
@@ -80,6 +86,7 @@ private fun PaymentCompleteScreen(
 ) {
     val context = LocalContext.current
     val scrollState = rememberScrollState()
+    var bottomButtonHeight by remember { mutableStateOf(0.dp) }
 
     Box(
         modifier = modifier.fillMaxSize(),
@@ -161,27 +168,35 @@ private fun PaymentCompleteScreen(
                 showName = reservation.showName,
                 showDate = reservation.showDate,
             )
+
+            Spacer(modifier = Modifier.height(bottomButtonHeight))
         }
 
-        Row(
+        TopGradientBackground(
             modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomCenter)
-                .padding(horizontal = marginHorizontal)
-                .padding(bottom = 20.dp),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
+                .align(Alignment.BottomCenter),
+            onHeightChanged = { bottomButtonHeight = it },
         ) {
-            SecondaryButton(
-                modifier = Modifier.weight(1f),
-                label = stringResource(R.string.show_reservation),
-            ) {
-                navigateToReservation(reservation)
-            }
-            MainButton(
-                modifier = Modifier.weight(1f),
-                label = stringResource(R.string.show_ticket),
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.BottomCenter)
+                    .padding(horizontal = marginHorizontal)
+                    .padding(bottom = 20.dp),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                navigateToTicketDetail(reservation)
+                SecondaryButton(
+                    modifier = Modifier.weight(1f),
+                    label = stringResource(R.string.show_reservation),
+                ) {
+                    navigateToReservation(reservation)
+                }
+                MainButton(
+                    modifier = Modifier.weight(1f),
+                    label = stringResource(R.string.show_ticket),
+                ) {
+                    navigateToTicketDetail(reservation)
+                }
             }
         }
     }

presentation/src/main/java/com/nexters/boolti/presentation/screen/profile/ProfileScreen.kt

@@ -246,6 +246,8 @@ fun ProfileScreen(
                     }
                 }
             }
+
+            Spacer(Modifier.size(32.dp))
         }
 
         backDialogMessage?.let { msg ->

presentation/src/main/java/com/nexters/boolti/presentation/screen/profileedit/link/LinkEditScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -34,6 +35,7 @@ import com.nexters.boolti.presentation.component.BTTextFieldDefaults
 import com.nexters.boolti.presentation.component.BtAppBar
 import com.nexters.boolti.presentation.component.BtAppBarDefaults
 import com.nexters.boolti.presentation.component.MainButton
+import com.nexters.boolti.presentation.theme.BooltiTheme
 import com.nexters.boolti.presentation.theme.Grey30
 import com.nexters.boolti.presentation.theme.Grey90
 import com.nexters.boolti.presentation.theme.marginHorizontal
@@ -113,9 +115,10 @@ fun LinkEditScreen(
                 .padding(innerPadding),
         ) {
             Column(
-                modifier = Modifier.padding(20.dp),
+                modifier = Modifier.padding(horizontal = 20.dp),
             ) {
                 Row(
+                    modifier = Modifier.padding(top = 20.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
@@ -141,7 +144,7 @@ fun LinkEditScreen(
                     )
                 }
                 Row(
-                    modifier = Modifier.padding(top = 16.dp),
+                    modifier = Modifier.padding(top = 16.dp, bottom = 20.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
@@ -172,7 +175,7 @@ fun LinkEditScreen(
                 MainButton(
                     modifier = Modifier
                         .align(Alignment.BottomCenter)
-                        .padding(marginHorizontal)
+                        .padding(horizontal = marginHorizontal)
                         .padding(bottom = 20.dp)
                         .fillMaxWidth(),
                     label = stringResource(R.string.link_remove),
@@ -201,3 +204,20 @@ fun LinkEditScreen(
         }
     }
 }
+
+@Preview
+@Composable
+private fun LinkEditScreenPreview() {
+    BooltiTheme {
+        LinkEditScreen(
+            isEditMode = true,
+            linkName = "링크 이름",
+            linkUrl = "링크 URL",
+            onClickBack = {},
+            onClickComplete = {},
+            onChangeLinkName = {},
+            onChangeLinkUrl = {},
+            requireRemove = {},
+        )
+    }
+}

presentation/src/main/java/com/nexters/boolti/presentation/screen/profileedit/sns/SnsEditScreen.kt

@@ -123,11 +123,12 @@ private fun SnsEditScreen(
                 .fillMaxSize(),
         ) {
             Column(
-                modifier = Modifier.padding(marginHorizontal),
+                modifier = Modifier.padding(horizontal = marginHorizontal),
                 verticalArrangement = Arrangement.spacedBy(20.dp),
             ) {
                 // SNS
                 Row(
+                    modifier = Modifier.padding(top = 20.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Label(stringResource(R.string.sns))
@@ -147,7 +148,9 @@ private fun SnsEditScreen(
                 }
 
                 // Username
-                Row {
+                Row(
+                    modifier = Modifier.padding(bottom = 20.dp),
+                ) {
                     Label(
                         label = stringResource(R.string.username),
                         modifier = Modifier.centerToTop(top = 24.dp),

presentation/src/main/java/com/nexters/boolti/presentation/screen/qr/QrScanScreen.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
@@ -236,8 +237,10 @@ private fun QrScanBottombar(onClick: () -> Unit) {
         )
         Row(
             modifier = Modifier
-                .clickable(onClick = onClick)
-                .padding(top = 20.dp, bottom = 32.dp),
+                .padding(bottom = 12.dp)
+                .clip(MaterialTheme.shapes.medium)
+                .clickable(onClick = onClick, role = Role.Button)
+                .padding(vertical = 20.dp, horizontal = 10.dp),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Center,
         ) {

presentation/src/main/java/com/nexters/boolti/presentation/screen/refund/RefundInfoPage.kt

@@ -136,7 +136,7 @@ fun RefundInfoPage(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = marginHorizontal)
-                .padding(top = 16.dp, bottom = 20.dp),
+                .padding(top = 16.dp, bottom = 32.dp),
             onClick = onRequest,
             enabled = uiState.isAbleToRequest,
             label = stringResource(id = R.string.refund_button)

presentation/src/main/java/com/nexters/boolti/presentation/screen/reservationdetail/ReservationDetailScreen.kt

@@ -146,7 +146,7 @@ fun ReservationDetailScreen(
                 MainButton(
                     modifier = modifier
                         .padding(horizontal = marginHorizontal)
-                        .padding(top = 8.dp, bottom = 20.dp)
+                        .padding(top = 8.dp, bottom = 32.dp)
                         .fillMaxWidth(),
                     colors = MainButtonDefaults.buttonColors(
                         containerColor = Grey15,
@@ -161,9 +161,9 @@ fun ReservationDetailScreen(
                         }
                     }
                 )
+            } else {
+                Spacer(Modifier.size(32.dp))
             }
-
-            Spacer(Modifier.size(32.dp))
         }
 
         if (showRefundDialog) {