-
Notifications
You must be signed in to change notification settings - Fork 0
Refactor: SAA 마이그레이션 #13
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.
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
Open
m6z1
wants to merge
6
commits into
develop
Choose a base branch
from
refactor/apply-single-activity-architecture
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 0 additions & 101 deletions
101
feature/src/main/java/com/sopt/now/feature/auth/LoginActivity.kt
This file was deleted.
Oops, something went wrong.
70 changes: 70 additions & 0 deletions
70
feature/src/main/java/com/sopt/now/feature/auth/LoginFragment.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package com.sopt.now.feature.auth | ||
|
|
||
| import androidx.fragment.app.viewModels | ||
| import androidx.lifecycle.flowWithLifecycle | ||
| import androidx.lifecycle.lifecycleScope | ||
| import androidx.navigation.fragment.findNavController | ||
| import com.sopt.now.core.base.BindingFragment | ||
| import com.sopt.now.core.util.fragment.snackBar | ||
| import com.sopt.now.core.util.fragment.toast | ||
| import com.sopt.now.core.view.UiState | ||
| import com.sopt.now.feature.R | ||
| import com.sopt.now.feature.databinding.FragmentLoginBinding | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import kotlinx.coroutines.flow.launchIn | ||
| import kotlinx.coroutines.flow.onEach | ||
|
|
||
| @AndroidEntryPoint | ||
| class LoginFragment : BindingFragment<FragmentLoginBinding>(R.layout.fragment_login) { | ||
| private val viewModel by viewModels<LoginViewModel>() | ||
|
|
||
| override fun initView() { | ||
| initAutoLoginStateObserve() | ||
| initBtnClickListener() | ||
| initSignUpStateObserve() | ||
| } | ||
|
|
||
| private fun initAutoLoginStateObserve() { | ||
| viewModel.autoLoginState.flowWithLifecycle(lifecycle).onEach { isAutoLogin -> | ||
| when (isAutoLogin) { | ||
| true -> findNavController().navigate(R.id.fragment_home) | ||
| false -> return@onEach | ||
| } | ||
| }.launchIn(lifecycleScope) | ||
| } | ||
|
|
||
| private fun initBtnClickListener() { | ||
| initLoginBtnClickListener() | ||
| initSignUpBtnClickListener() | ||
| } | ||
|
|
||
| private fun initLoginBtnClickListener() = with(binding) { | ||
| btnLogin.setOnClickListener { | ||
| viewModel.setLogin( | ||
| id = etLoginId.text.toString(), | ||
| pwd = etLoginPwd.text.toString() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun initSignUpBtnClickListener() { | ||
| binding.tvLoginSignUp.setOnClickListener { | ||
| findNavController().navigate(R.id.fragment_sign_up) | ||
| } | ||
| } | ||
|
|
||
| private fun initSignUpStateObserve() { | ||
| viewModel.loginState.flowWithLifecycle(lifecycle).onEach { state -> | ||
| when (state) { | ||
| is UiState.Success -> { | ||
| toast(getString(R.string.login_completed, getString(R.string.login))) | ||
| viewModel.saveCheckLoginSharedPreference(true) | ||
| findNavController().navigate(R.id.fragment_home) | ||
| } | ||
|
|
||
| is UiState.Failure -> snackBar(binding.root, state.errorMessage) | ||
| else -> Unit | ||
| } | ||
| }.launchIn(lifecycleScope) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MainActivity에서 자동로그인 여부를 판단하고 로그인 화면으로 넘기는게 나을 것 같습니다!
지금은 무조건 로그인으로 넘어가고 로그인에서 자동로그인 여부를 판단하는데 불필요한 작업인것 같아서요!
로그인에서 옵저빙 하는 코드를 그대로 메인액티비티로 옮기시면 될것 같습니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
스택 관리에 조금 더 효율적일 것 같아서요!