Merge branch 'develop' into feature/Boolti-347

Nexters · Dec 30, 2024 · ea4246e · ea4246e
2 parents 7ff99ba + 49acd12
commit ea4246e
Show file tree

Hide file tree

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

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/my/MyScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/my/MyScreen.kt
@@ -63,7 +63,8 @@ fun MyScreen(
     val user by viewModel.user.collectAsStateWithLifecycle()
 
     val domain = BuildConfig.DOMAIN
-    val url = "https://${domain}/show/add"
+    val registrationUrl = "https://${domain}/show/add"
+    val homeUrl = "https://${domain}/home"
     val uriHandler = LocalUriHandler.current
     val context = LocalContext.current
 
@@ -78,6 +79,10 @@ fun MyScreen(
         onClickAccountSetting = if (user != null) onClickAccountSetting else requireLogin,
         onClickReservations = if (user != null) navigateToReservations else requireLogin,
         onClickRegisterShow = if (user != null) navigateToShowRegistration else requireLogin,
+        onClickManageShow = {
+            uriHandler.openUri(homeUrl)
+            Toast.makeText(context, "공연 관리를 위해 웹으로 이동합니다", Toast.LENGTH_LONG).show()
+        }, // TODO 추후 인앱 공연 관리 반영 시 처리
         onClickQrScan = if (user != null) onClickQrScan else requireLogin,
     )
 }
@@ -89,7 +94,8 @@ fun MyScreen(
     onClickHeaderButton: () -> Unit = {},
     onClickAccountSetting: () -> Unit = {},
     onClickReservations: () -> Unit = {},
-    onClickRegisterShow: () -> Unit = { },
+    onClickManageShow: () -> Unit = {},
+    onClickRegisterShow: () -> Unit = {},
     onClickQrScan: () -> Unit = {},
 ) {
     val scrollState = rememberScrollState()
@@ -146,6 +152,11 @@ fun MyScreen(
                         label = stringResource(R.string.my_register_show),
                         onClick = onClickRegisterShow,
                     )
+                    MyMenu(
+                        iconRes = R.drawable.ic_manage_show,
+                        label = stringResource(R.string.my_manage_show),
+                        onClick = onClickManageShow,
+                    )
                     MyMenu(
                         iconRes = R.drawable.ic_qr_simple,
                         label = stringResource(R.string.my_scan_qr),

diff --git a/...rc/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailContentScreen.kt b/...rc/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailContentScreen.kt
@@ -29,7 +29,7 @@ fun ShowDetailContentScreen(
     val uriHandler = LocalUriHandler.current
     val scrollState = rememberScrollState()
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    val notice = uiState.showDetail.notice
+    val notice = uiState.showDetail?.notice ?: return
     val urlParser = UrlParser(notice)
 
     Scaffold(