Skip to content

[Hotfix] null event bug #495

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
hsgo2430 merged 2 commits into from
Dec 2, 2024
Merged

[Hotfix] null event bug #495

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
ff59854
fix: null_event_bug
hsgo2430 Dec 2, 2024
e9fc90b
update: 4.1.2
hsgo2430 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
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
}

extra.apply {
set("versionName", "4.1.1")
set("versionCode", 40101)
set("versionName", "4.1.2")
set("versionCode", 40102)
// 코인 버전 관리

set("versionBusinessName", "1.0.1")
Expand Down
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 @@ -68,7 +68,7 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
@Inject
lateinit var onboardingManager: OnboardingManager

private var eventListSize by Delegates.notNull<Int>()
var eventListSize = -1

fun interface StoreCategoryFactory {
fun getCurrentCategory(): String
Expand Down Expand Up @@ -202,9 +202,8 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
storeCategoriesAdapter.selectPosition =
intent.extras?.getInt(StoreActivityContract.STORE_CATEGORY)?.minus(2)

viewModel.setCategory(initStoreCategory!! + 1)
viewModel.setCategory(initStoreCategory)
storeCategoriesAdapter.initCategory(initStoreCategory)

}


Expand Down Expand Up @@ -553,6 +552,7 @@ class StoreActivity : KoinNavigationDrawerTimeActivity() {
binding.eventViewPager.setCurrentItem(1, false)
}
binding.eventViewPager.isGone = it.isNullOrEmpty()
binding.eventItemButton.isGone = it.isNullOrEmpty()
}

observeLiveData(viewModel.storeCategoryList) {
Expand Down
7 changes: 4 additions & 3 deletions 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 @@ -99,12 +99,13 @@ class StoreViewModel @Inject constructor(
}

fun setCategory(categoryPosition: Int?) {
if(_categoryPosition.value == categoryPosition) {
if(categoryPosition == null || _categoryPosition.value == categoryPosition){
_categoryPosition.value = 0
_category.value = _storeCategoryList.value?.get(0)
} else {
}
else{
_categoryPosition.value = categoryPosition
_category.value = categoryPosition?.let { _storeCategoryList.value?.get(it) }
_category.value =_storeCategoryList.value?.get(categoryPosition)
}
}

Expand Down
1 change: 1 addition & 0 deletions koin/src/main/res/layout/store_activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
tools:listitem="@layout/store_event_card" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/event_item_button"
android:layout_width="80dp"
android:layout_height="24dp"
android:layout_marginEnd="28dp"
Expand Down