Skip to content

Update v4.1.0 #492

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

Merged
skdud0629 merged 2 commits into from
Dec 2, 2024
Merged

Update v4.1.0 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3a8a9b
fix: 중복코드 제거
hsgo2430 Dec 2, 2024
dad96de
fix: 검색 버그
skdud0629 Dec 2, 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
6 changes: 3 additions & 3 deletions koin/src/main/java/in/koreatech/koin/ui/store/activity/StoreActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
viewModel.setCategory(it + 1)
binding.searchEditText.text.clear()
val current = viewModel.category.value?.name
viewModel.setCategory(it)

if (current != null && previous != null) {
EventLogger.logClickEvent(
EventAction.BUSINESS,
Expand Down Expand Up @@ -313,6 +313,7 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
@SuppressLint("RestrictedApi")
object : TextWatcherAdapter() {
override fun afterTextChanged(p0: Editable) {
if(p0.isNotEmpty()) viewModel.updateSearchQuery(binding.searchEditText.text.toString())
viewModel.getRelatedStore()
binding.suggestionsLayout.visibility =
if (p0.isEmpty()) View.GONE else View.VISIBLE
Expand Down Expand Up @@ -503,7 +504,6 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
if (binding.searchEditText.text.isNullOrEmpty()) {
return true
}
viewModel.updateSearchQuery(binding.searchEditText.text.toString())
binding.searchResultTextView.text =
"\"${binding.searchEditText.text}\" 관련 가게가 총 ${storeAdapter.itemCount}개 있어요."
hideSoftKeyboard()
Expand Down Expand Up @@ -562,7 +562,7 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {

observeLiveData(viewModel.searchRelated) {
searchRelatedAdapter.submitList(it.keywords)
if (it.keywords.isNullOrEmpty() && binding.searchEditText.text.isNotEmpty()) {
if (it.keywords.isEmpty() && binding.searchEditText.text.isNotEmpty()) {
binding.noResultTextView.visibility = View.VISIBLE
binding.suggestionsRecyclerView.visibility = View.GONE
} else {
Expand Down
3 changes: 2 additions & 1 deletion koin/src/main/java/in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class StoreViewModel @Inject constructor(
getStoreCategories()
getStoreEvents()
//changeCategory()
// searchStore()
searchStore()
getRelatedStore()

}

Expand Down