From b97b6345c599125ad8e8f2bbfd98b3eaa74474d9 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Fri, 1 Mar 2024 15:49:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FIX/#420]=20SignInActivity=20=EC=9D=B8?= =?UTF-8?q?=ED=85=90=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yello/presentation/auth/SignInActivity.kt | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt b/app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt index b35697d1..dd03db83 100644 --- a/app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt +++ b/app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt @@ -14,11 +14,11 @@ import com.el.yello.presentation.onboarding.activity.EditNameActivity import com.el.yello.presentation.onboarding.activity.GetAlarmActivity import com.el.yello.presentation.onboarding.fragment.checkName.CheckNameDialog import com.el.yello.presentation.tutorial.TutorialAActivity -import com.el.yello.util.manager.AmplitudeManager import com.el.yello.util.extension.yelloSnackbar +import com.el.yello.util.manager.AmplitudeManager import com.example.ui.base.BindingActivity -import com.example.ui.state.UiState import com.example.ui.extension.setOnSingleClickListener +import com.example.ui.state.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -52,7 +52,9 @@ class SignInActivity : BindingActivity(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) } From ba273eca0832aae5c21d0a460eb7ea02a446a4d4 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Fri, 1 Mar 2024 15:53:25 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX/#420]=20manifest=20=EC=84=A0=EC=96=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) 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"> + + + + + + + - + + + + + + + + + + + + + + + Date: Fri, 1 Mar 2024 15:54:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[CHORE/#420]=20version=20code=2041=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-logic/convention/src/main/kotlin/Constants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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