From f6e36c05a0becffd5e729cbbba0a9bd224d4b2d1 Mon Sep 17 00:00:00 2001 From: mangbaam Date: Thu, 28 Nov 2024 02:13:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Boolti-348=20feat:=20=EA=B3=B5=EC=97=B0=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=99=B8=EB=B6=80=20=EB=B8=8C=EB=9D=BC?= =?UTF-8?q?=EC=9A=B0=EC=A0=80=EB=A1=9C=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nexters/boolti/presentation/screen/my/MyScreen.kt | 5 ++++- .../screen/showregistration/ShowRegistrationScreen.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 index 8eba0706..09bb9a53 100644 --- 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 @@ -60,6 +60,9 @@ fun MyScreen( onClickQrScan: () -> Unit, ) { val user by viewModel.user.collectAsStateWithLifecycle() + + val domain = BuildConfig.DOMAIN + val url = "https://${domain}/show/add" val uriHandler = LocalUriHandler.current LaunchedEffect(Unit) { @@ -72,7 +75,7 @@ fun MyScreen( onClickHeaderButton = if (user != null) navigateToProfile else requireLogin, onClickAccountSetting = if (user != null) onClickAccountSetting else requireLogin, onClickReservations = if (user != null) navigateToReservations else requireLogin, - onClickRegisterShow = navigateToShowRegistration, + onClickRegisterShow = { uriHandler.openUri(url) },// navigateToShowRegistration, // TODO 추후 인앱 공연 등록 반영 시 주석 해제 onClickQrScan = if (user != null) onClickQrScan else requireLogin, ) } diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationScreen.kt index 5606de53..ceb1e361 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationScreen.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationScreen.kt @@ -61,7 +61,7 @@ fun ShowRegistrationScreen( val domain = BuildConfig.DOMAIN val url = "https://${domain}/show/add" - var showExitDialog by mutableStateOf(false) + var showExitDialog by remember { mutableStateOf(false) } val scope = rememberCoroutineScope() var webView: WebView? by remember { mutableStateOf(null) } From 78fa74e370b4f1e5fa641cba8418f7449249a665 Mon Sep 17 00:00:00 2001 From: mangbaam Date: Thu, 28 Nov 2024 02:17:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Boolti-348=20feat:=20=EA=B3=B5=EC=97=B0=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=99=B8=EB=B6=80=20=EB=B8=8C=EB=9D=BC?= =?UTF-8?q?=EC=9A=B0=EC=A0=80=20=EC=97=B0=EA=B2=B0=20=EC=8B=9C=20=ED=86=A0?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=85=B8=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nexters/boolti/presentation/screen/my/MyScreen.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 index 09bb9a53..c3ba4ba9 100644 --- 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 @@ -1,5 +1,6 @@ package com.nexters.boolti.presentation.screen.my +import android.widget.Toast import androidx.annotation.DrawableRes import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -26,6 +27,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource @@ -64,6 +66,7 @@ fun MyScreen( val domain = BuildConfig.DOMAIN val url = "https://${domain}/show/add" val uriHandler = LocalUriHandler.current + val context = LocalContext.current LaunchedEffect(Unit) { viewModel.fetchMyInfo() @@ -75,7 +78,10 @@ fun MyScreen( onClickHeaderButton = if (user != null) navigateToProfile else requireLogin, onClickAccountSetting = if (user != null) onClickAccountSetting else requireLogin, onClickReservations = if (user != null) navigateToReservations else requireLogin, - onClickRegisterShow = { uriHandler.openUri(url) },// navigateToShowRegistration, // TODO 추후 인앱 공연 등록 반영 시 주석 해제 + onClickRegisterShow = { + uriHandler.openUri(url) + Toast.makeText(context, "공연 등록을 위해 웹으로 이동합니다", Toast.LENGTH_LONG).show() + },// navigateToShowRegistration, // TODO 추후 인앱 공연 등록 반영 시 주석 해제 onClickQrScan = if (user != null) onClickQrScan else requireLogin, ) }