Skip to content

Commit

Permalink
Merge pull request #349 from Nexters/feature/Boolti-348
Browse files Browse the repository at this point in the history
Feature/boolti 348 인앱 공연 등록 임시 롤백
  • Loading branch information
mangbaam authored Nov 28, 2024
2 parents ff5f6ed + 78fa74e commit 7fe20cb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
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
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

0 comments on commit 7fe20cb

Please sign in to comment.