[feat] 필터뷰 api 연동 #51
Merged
Conversation
This file contains 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
jihyunniiii
requested review from
Dan2dani and
jooyyoo
and removed request for
Dan2dani
Dan2dani
reviewed
Jul 20, 2023
| @@ -39,4 +44,8 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main | |||
| replace<T>(R.id.fcv_home_container, T::class.java.canonicalName) | |||
| } | |||
| } | |||
|
|
|||
| companion object { | |||
| const val FRAGMENT = "fragment" | |||
There was a problem hiding this comment.
Suggested change
| const val FRAGMENT = "fragment" | |
| const val MYPAGE_FRAGMENT = "MyPageFragment" |
|
|
||
| companion object { | ||
| const val FILTER_INFO = "filterInfo" | ||
| const val FRAGMENT = "fragment" |
| @@ -44,12 +53,23 @@ class FilterActivity : BindingActivity<ActivityFilterBinding>(R.layout.activity_ | |||
| binding.btnFilterNext.setOnClickListener { | |||
| when (binding.vpFilterContainer.currentItem) { | |||
| 2 -> { | |||
| startActivity(Intent(this, WelcomeActivity::class.java)) | |||
| viewModel.setFilter() | |||
| val intent = Intent(this, MainActivity::class.java) | ||
| intent.putExtra(FRAGMENT, FRAGMENT) | ||
| startActivity(intent) | ||
| } | ||
| } | ||
|
|
||
| else -> { |
| private val _selectedFilterState = MutableStateFlow<UiState<SelectedFilter>>(UiState.Loading) | ||
| val selectedFilterState get() = _selectedFilterState.asStateFlow() | ||
|
|
||
| private val _previousState = MutableStateFlow<String?>(null) |
There was a problem hiding this comment.
Suggested change
| private val _previousState = MutableStateFlow<String?>(null) | |
| private val _previousActivityName = MutableStateFlow<String?>(null) |
| _previousState.value = filterInfoTypeName | ||
| } | ||
|
|
||
| fun setFilter() { |
There was a problem hiding this comment.
Suggested change
| fun setFilter() { | |
| fun setUserFilter() { |
Comment on lines
5
to
6
| val currentPageRes: Int, | ||
| val maxPageRes: Int, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Related issue 🛠
Work Description ✏️
Screenshot 📸
device-2023-07-20-221144.mp4
Screen_Recording_20230720_230710.1.mp4
Uncompleted Tasks 😅
To Reviewers 📢