From ff598548bf2e6f65987a7369eb3105363130c5a2 Mon Sep 17 00:00:00 2001
From: hsgo2430 <hsgo2430@naver.com>
Date: Mon, 2 Dec 2024 22:55:32 +0900
Subject: [PATCH 1/2] fix: null_event_bug

---
 .../in/koreatech/koin/ui/store/activity/StoreActivity.kt   | 6 +++---
 .../in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt | 7 ++++---
 koin/src/main/res/layout/store_activity_main.xml           | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/koin/src/main/java/in/koreatech/koin/ui/store/activity/StoreActivity.kt b/koin/src/main/java/in/koreatech/koin/ui/store/activity/StoreActivity.kt
index 1432eabb19..6a3d102c29 100644
--- a/koin/src/main/java/in/koreatech/koin/ui/store/activity/StoreActivity.kt
+++ b/koin/src/main/java/in/koreatech/koin/ui/store/activity/StoreActivity.kt
@@ -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
@@ -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)
-
     }
 
 
@@ -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) {
diff --git a/koin/src/main/java/in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt b/koin/src/main/java/in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt
index 84acd24604..48c9fca0f3 100644
--- a/koin/src/main/java/in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt
+++ b/koin/src/main/java/in/koreatech/koin/ui/store/viewmodel/StoreViewModel.kt
@@ -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)
         }
     }
 
diff --git a/koin/src/main/res/layout/store_activity_main.xml b/koin/src/main/res/layout/store_activity_main.xml
index a4a3712fc2..a15efd3b05 100644
--- a/koin/src/main/res/layout/store_activity_main.xml
+++ b/koin/src/main/res/layout/store_activity_main.xml
@@ -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"

From e9fc90b8b92face75d61cc13107df82994e03161 Mon Sep 17 00:00:00 2001
From: hsgo2430 <hsgo2430@naver.com>
Date: Mon, 2 Dec 2024 23:00:06 +0900
Subject: [PATCH 2/2] update: 4.1.2

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1d2423b3fb..ef726fef14 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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")