Merge pull request #258 from BCSDLab/fix/dining-detail

[Fix] 식단 상세 QA 반영

Author: ThirFir

build.gradle

@@ -12,8 +12,8 @@ buildscript {
         compileSdkVersion = 34
         minSdkVersion = 21
         targetSdkVersion = 34
-        versionName = "3.3.1"
-        minVersionCode = 30301
+        versionName = "3.4.1"
+        minVersionCode = 30401
     }
 
     dependencies {

koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt

@@ -214,10 +214,11 @@ class DiningAdapter : ListAdapter<Dining, RecyclerView.ViewHolder>(diffCallback)
                         val rect = Rect()
                         window!!.decorView.getWindowVisibleDisplayFrame(rect)
                         val statusBarHeight = rect.top
-
-                        if (!photoView.displayRect.contains(event.rawX, event.rawY - statusBarHeight)) {
-                            dismiss()
-                        }
+                        
+                        if(photoView.displayRect != null)
+                            if (!photoView.displayRect.contains(event.rawX, event.rawY - statusBarHeight)) {
+                                dismiss()
+                            }
                     }
                     isUserImageInteraction = false
                 }

koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningDateAdapter.kt

@@ -25,13 +25,23 @@ class DiningDateAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return DiningDateViewHolder(
+        val holder = DiningDateViewHolder(
             ItemDiningDateBinding.inflate(
                 LayoutInflater.from(parent.context),
                 parent,
                 false
             )
         )
+
+        val displayMetrics = parent.context.resources.displayMetrics
+        val screenWidth = displayMetrics.widthPixels
+        val itemWidth = screenWidth / 7
+
+        val layoutParams = holder.itemView.layoutParams
+        layoutParams.width = itemWidth
+        holder.itemView.layoutParams = layoutParams
+
+        return holder
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {

koin/src/main/java/in/koreatech/koin/ui/main/activity/MainActivity.kt

@@ -184,6 +184,7 @@ class MainActivity : KoinNavigationDrawerActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        binding.busViewPager.unregisterOnPageChangeCallback(busViewPagerScrollCallback)
+        if (this@MainActivity::busViewPagerScrollCallback.isInitialized)
+            binding.busViewPager.unregisterOnPageChangeCallback(busViewPagerScrollCallback)
     }
 }

koin/src/main/res/layout/activity_dining.xml

@@ -33,6 +33,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="92dp"
                 android:orientation="horizontal"
+                android:overScrollMode="never"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintTop_toBottomOf="@id/koin_base_app_bar_dark"
                 tools:itemCount="14"

koin/src/main/res/layout/fragment_dining_items.xml

@@ -13,9 +13,21 @@
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             android:background="@color/white"
-            tools:itemCount="4"
+            tools:itemCount="2"
             tools:listitem="@layout/item_dining"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
+        <TextView
+            android:id="@+id/text_view_caution_dining_changable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="24dp"
+            android:textSize="13sp"
+            android:textColor="@color/gray15"
+            android:text="@string/caution_dining_changable"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/recycler_view_dining_type" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

koin/src/main/res/layout/item_dining.xml

@@ -113,7 +113,7 @@
                 android:layout_marginEnd="12dp"
                 app:cardElevation="0dp"
                 app:rippleColor="@android:color/transparent"
-                app:strokeColor="#CACACA"
+                app:strokeColor="@color/gray15"
                 app:strokeWidth="1dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout

koin/src/main/res/values/strings.xml

@@ -407,6 +407,7 @@
     <string name="bus">버스</string>
     <string name="see_all">전체보기</string>
     <string name="complete_sign_up">회원가입 완료</string>
+    <string name="caution_dining_changable">식단 정보는 운영 상황에 따라 변동될 수 있습니다.</string>
     <string name="set_menu">세트 메뉴</string>
     <string name="side_menu">사이드 메뉴</string>
     <string name="best_menu">대표 메뉴</string>