diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e2de3f2..0d2e38b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,10 +33,12 @@
android:theme="@style/Theme.YELLO"
android:usesCleartextTraffic="true"
tools:targetApi="31">
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
(R.layout.activity_
private fun observeDeviceTokenError() {
viewModel.getDeviceTokenError.flowWithLifecycle(lifecycle).onEach { error ->
- if (error) yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ if (error) {
+ yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ }
}.launchIn(lifecycleScope)
}
@@ -64,13 +66,17 @@ class SignInActivity : BindingActivity(R.layout.activity_
private fun observeChangeTokenResult() {
viewModel.postChangeTokenResult.flowWithLifecycle(lifecycle).onEach { result ->
- if (!result) yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ if (!result) {
+ yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ }
}.launchIn(lifecycleScope)
}
private fun observeKakaoUserInfoResult() {
viewModel.getKakaoInfoResult.flowWithLifecycle(lifecycle).onEach { result ->
- if (!result) yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ if (!result) {
+ yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ }
}.launchIn(lifecycleScope)
}
@@ -87,7 +93,9 @@ class SignInActivity : BindingActivity(R.layout.activity_
}
}
- is UiState.Failure -> yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ is UiState.Failure -> {
+ yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ }
is UiState.Empty -> return@onEach
@@ -112,7 +120,9 @@ class SignInActivity : BindingActivity(R.layout.activity_
}
}
- is UiState.Failure -> yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ is UiState.Failure -> {
+ yelloSnackbar(binding.root, getString(R.string.internet_connection_error_msg))
+ }
is UiState.Empty -> return@onEach
@@ -141,19 +151,21 @@ class SignInActivity : BindingActivity(R.layout.activity_
private fun startCheckNameDialog() {
val bundle = Bundle().apply { addPutExtra() }
if (viewModel.isUserNameBlank()) {
- Intent(SignInActivity(), EditNameActivity::class.java).apply {
+ Intent(this, EditNameActivity::class.java).apply {
putExtras(bundle)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(this)
}
finish()
} else {
+ with(binding) {
+ btnSignIn.visibility = View.GONE
+ ivSignIn.visibility = View.GONE
+ ivSignInKakao.visibility = View.GONE
+ tvSignInTitle.visibility = View.GONE
+ tvSignInSubtitle.visibility = View.GONE
+ }
checkNameDialog = CheckNameDialog()
- binding.btnSignIn.visibility = View.GONE
- binding.ivSignIn.visibility = View.GONE
- binding.ivSignInKakao.visibility = View.GONE
- binding.tvSignInTitle.visibility = View.GONE
- binding.tvSignInSubtitle.visibility = View.GONE
checkNameDialog?.arguments = bundle
checkNameDialog?.show(supportFragmentManager, CHECK_NAME_DIALOG)
}
diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt
index df0bd56f..3034fbef 100644
--- a/build-logic/convention/src/main/kotlin/Constants.kt
+++ b/build-logic/convention/src/main/kotlin/Constants.kt
@@ -3,7 +3,7 @@ object Constants {
const val compileSdk = 33
const val minSdk = 28
const val targetSdk = 33
- const val versionCode = 40
+ const val versionCode = 41
const val versionName = "2.0"
const val jvmVersion = "17"
}
\ No newline at end of file