[MERGE] #420 -> develop

[HOTFIX/#420] EditNameActivity 이슈 대응
team-yello · Mar 1, 2024 · ec80a51 · ec80a51
2 parents 1d48a33 + cf9cf82
commit ec80a51
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 19 deletions.
diff --git 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">
+
         <activity
             android:name=".presentation.event.EventActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.splash.SplashActivity"
             android:exported="true"
@@ -59,14 +61,23 @@
                     android:scheme="kakao${NATIVE_APP_KEY}" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".presentation.auth.SignInActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.auth.SocialSyncActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".presentation.onboarding.activity.EditNameActivity"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true"
@@ -82,20 +93,18 @@
                     android:scheme="kakao${NATIVE_APP_KEY}" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".presentation.onboarding.activity.EditNameActivity"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize"
-            android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.onboarding.activity.OnBoardingActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.onboarding.activity.GetAlarmActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.tutorial.TutorialAActivity"
             android:exported="false"
@@ -120,51 +129,63 @@
             android:name=".presentation.tutorial.TutorialEndPlusActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.main.MainActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.main.yello.vote.VoteActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.setting.SettingActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.setting.ProfileQuitTwoActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.setting.ProfileQuitOneActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.main.profile.detail.ProfileDetailActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.main.profile.schoolmod.SchoolProfileModActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.main.profile.univmod.UnivProfileModActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.setting.ProfileQuitReasonActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name=".presentation.main.myyello.read.MyYelloReadActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.pay.PayActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.search.SearchActivity"
             android:exported="false"

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
@@ -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<ActivitySignInBinding>(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<ActivitySignInBinding>(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<ActivitySignInBinding>(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<ActivitySignInBinding>(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<ActivitySignInBinding>(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
@@ -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"
 }