Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HOTFIX/#420] EditNameActivity 이슈 대응 #421

Merged
merged 3 commits into from
Mar 1, 2024
Merged

[HOTFIX/#420] EditNameActivity 이슈 대응 #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b97b634
[FIX/#420] SignInActivity 인텐트 수정
Marchbreeze Mar 1, 2024
ba273ec
[FIX/#420] manifest 선언 수정
Marchbreeze Mar 1, 2024
cf9cf82
[CHORE/#420] version code 41 업데이트
Marchbreeze Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
38 changes: 25 additions & 13 deletions app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}

Expand All @@ -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)
}

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion build-logic/convention/src/main/kotlin/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Loading