Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/boolti 348 인앱 공연 등록 임시 롤백 #349

Merged
merged 2 commits into from
Nov 28, 2024
+11 −2
Merged

Feature/boolti 348 인앱 공연 등록 임시 롤백 #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e36c0
Boolti-348 feat: 공연 등록 외부 브라우저로 연결
mangbaam Nov 27, 2024
78fa74e
Boolti-348 feat: 공연 등록 외부 브라우저 연결 시 토스트 노출
mangbaam Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion presentation/src/main/java/com/nexters/boolti/presentation/screen/my/MyScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -60,7 +62,11 @@ fun MyScreen(
onClickQrScan: () -> Unit,
) {
val user by viewModel.user.collectAsStateWithLifecycle()

val domain = BuildConfig.DOMAIN
val url = "https://${domain}/show/add"
val uriHandler = LocalUriHandler.current
val context = LocalContext.current

LaunchedEffect(Unit) {
viewModel.fetchMyInfo()
Expand All @@ -72,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 = navigateToShowRegistration,
onClickRegisterShow = {
uriHandler.openUri(url)
Toast.makeText(context, "공연 등록을 위해 웹으로 이동합니다", Toast.LENGTH_LONG).show()
},// navigateToShowRegistration, // TODO 추후 인앱 공연 등록 반영 시 주석 해제
onClickQrScan = if (user != null) onClickQrScan else requireLogin,
)
}
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down