chore: more larger touch area(cafetria info btn)

EAT-SSU · Sep 26, 2024 · 06886bd · 06886bd
1 parent 9284d2b
commit 06886bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt
@@ -27,8 +27,7 @@ class MenuAdapter(
             sectionModel: Section
         ) {
 
-
-            binding.btnInfo.setOnClickListener {
+            binding.llCafeteriaInfo.setOnClickListener {
 
                 val modalBottomSheet =
                     InfoBottomSheetFragment.newInstance(sectionModel.cafeteria.name)

diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt
@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
+import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -50,11 +50,9 @@ class MenuFragment : Fragment() {
 
     private val totalMenuList = ArrayList<Section>()
 
-    //    private lateinit var infoViewModel: InfoViewModel
     private lateinit var restaurantType: Restaurant
-//    private lateinit var firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository
 
-    private val infoViewModel: InfoViewModel by viewModels()
+    private val infoViewModel: InfoViewModel by activityViewModels()
 
 
     companion object {
@@ -76,13 +74,6 @@ class MenuFragment : Fragment() {
         savedInstanceState: Bundle?,
     ): View {
         _binding = FragmentMenuBinding.inflate(inflater, container, false)
-
-//        firebaseRemoteConfigRepository = FirebaseRemoteConfigRepository()
-//        infoViewModel = ViewModelProvider(
-//            this,
-//            InfoViewModelFactory(firebaseRemoteConfigRepository)
-//        )[InfoViewModel::class.java]
-
         return binding.root
     }
 
@@ -93,11 +84,6 @@ class MenuFragment : Fragment() {
         observeViewModel()
     }
 
-    override fun onResume() {
-        super.onResume()
-
-    }
-
     @RequiresApi(Build.VERSION_CODES.O)
     fun observeViewModel() {
         menuService = RetrofitImpl.retrofit.create(MenuService::class.java)

diff --git a/app/src/main/res/layout/item_cafeteria_section.xml b/app/src/main/res/layout/item_cafeteria_section.xml
@@ -31,6 +31,13 @@
             android:text="@string/student_cafeteria"
             android:textColor="@color/black" />
 
+        <LinearLayout
+            android:id="@+id/ll_cafeteria_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center">
+
+
         <TextView
             android:id="@+id/tv_cafeteria_location"
             style="@style/Caption3"
@@ -49,6 +56,8 @@
             android:gravity="start"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_info_12" />
+        </LinearLayout>
+
     </LinearLayout>