diff --git a/Diary/Diary/DiaryApp.swift b/Diary/Diary/DiaryApp.swift index 3d677643..6f710127 100644 --- a/Diary/Diary/DiaryApp.swift +++ b/Diary/Diary/DiaryApp.swift @@ -9,7 +9,15 @@ struct DiaryApp: App { var body: some Scene { WindowGroup { - ContentView().ignoresSafeArea() + VStack { + if let info = Bundle.main.infoDictionary { + if let diaryApiUrl = info["Diary Api Url"] as? String { + Text(diaryApiUrl) + } + } + + ContentView().ignoresSafeArea() + } } } } diff --git a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinScreen.kt b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinScreen.kt index 4ac44ce7..c35f3599 100644 --- a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinScreen.kt +++ b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinScreen.kt @@ -240,7 +240,7 @@ private fun Message( uiState.isLoginFinish -> onLoginFinish() uiState.isExistEmail -> state.showMessage(existEmailMessage) uiState.isNetworkError -> state.showMessage(networkErrorMessage) - uiState.isUnknownError -> state.showMessage(unknownErrorMessage) + uiState.isUnknownError -> state.showMessage(uiState.message) } uiState.onMessageShow() diff --git a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinViewModel.kt b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinViewModel.kt index 3664738e..202de718 100644 --- a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinViewModel.kt +++ b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/JoinViewModel.kt @@ -43,7 +43,7 @@ internal class JoinViewModel( when (throwable) { is ExistEmailException -> _uiState.update { it.copy(isProgress = false, isExistEmail = true) } is NetworkException -> _uiState.update { it.copy(isProgress = false, isNetworkError = true) } - else -> _uiState.update { it.copy(isProgress = false, isUnknownError = true) } + else -> _uiState.update { it.copy(isProgress = false, isUnknownError = true, message = it.toString()) } } } diff --git a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/state/JoinUiState.kt b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/state/JoinUiState.kt index 9c316718..f5fc7f50 100644 --- a/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/state/JoinUiState.kt +++ b/app/feature/account/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/account/join/state/JoinUiState.kt @@ -6,6 +6,7 @@ internal data class JoinUiState( val isExistEmail: Boolean = false, val isNetworkError: Boolean = false, val isUnknownError: Boolean = false, + val message: String = "", val onMessageShow: () -> Unit = {}, ) { val hasMessage = isLoginFinish || isExistEmail || isNetworkError || isUnknownError