Merge branch 'main' into dev

Author: ZZANZU

app/src/main/java/com/woozoo/menumonya/MainActivity.kt

@@ -4,7 +4,7 @@ import android.Manifest
 import android.content.Intent
 import android.content.Intent.ACTION_VIEW
 import android.content.pm.PackageManager
-import android.net.Uri
+import android.net.Ur
 import android.os.Bundle
 import android.provider.Settings
 import android.view.View
@@ -180,6 +180,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                 viewPager.invalidate()
                 viewPager.adapter = null
                 viewModel.showLocationInfo("강남")
+                
                 binding.locationGnBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
                 binding.locationYsBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
                 binding.locationGnBtn.setTextColor(applicationContext.getColor(R.color.white))
@@ -189,6 +190,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                 viewPager.invalidate()
                 viewPager.adapter = null
                 viewModel.showLocationInfo("역삼")
+                
                 binding.locationYsBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
                 binding.locationGnBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
                 binding.locationYsBtn.setTextColor(applicationContext.getColor(R.color.white))

app/src/main/java/com/woozoo/menumonya/MainViewModel.kt

@@ -26,6 +26,7 @@ import com.woozoo.menumonya.model.Restaurant
 import com.woozoo.menumonya.util.DateUtils.Companion.getTodayDate
 import com.woozoo.menumonya.util.LocationUtils.Companion.requestLocationUpdateOnce
 import com.woozoo.menumonya.util.PermissionUtils.Companion.isGpsPermissionAllowed
+
 import com.woozoo.menumonya.util.PermissionUtils.Companion.isLocationPermissionAllowed
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
@@ -133,6 +134,7 @@ class MainViewModel(application: Application): AndroidViewModel(Application()) {
 
             for (document in documents) {
                 val restaurant = document.toObject<Restaurant>()
+                
                 if (restaurant != null) {
                     // 메뉴 정보 조회
                     val menu = getMenuAsync(document.id)?.await()

app/src/main/java/com/woozoo/menumonya/RestaurantAdapter.kt

@@ -13,6 +13,7 @@ import com.woozoo.menumonya.databinding.ItemRestaurantBinding
 import com.woozoo.menumonya.model.Restaurant
 
 class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>, private val context: Context) :
+
     RecyclerView.Adapter<RestaurantAdapter.ItemViewHolder>() {
 
     private lateinit var binding: ItemRestaurantBinding

app/src/main/res/drawable/restaurant_item_background.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape>
+            <solid android:color="@color/white"/>
+            <corners
+                android:bottomLeftRadius="10dp"
+                android:bottomRightRadius="10dp"
+                android:topLeftRadius="10dp"
+                android:topRightRadius="10dp"
+                />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/selector_location_button.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape>
+            <solid android:color="@color/white"/>
+            <stroke android:width="1dp" android:color="@color/lightGray"/>
+            <corners
+                android:bottomLeftRadius="32dp"
+                android:bottomRightRadius="32dp"
+                android:topLeftRadius="32dp"
+                android:topRightRadius="32dp"
+                />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/selector_location_button_selected.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary"/>
+            <corners
+                android:bottomLeftRadius="32dp"
+                android:bottomRightRadius="32dp"
+                android:topLeftRadius="32dp"
+                android:topRightRadius="32dp"
+                />
+        </shape>
+    </item>
+</selector>

app/src/main/res/layout/item_restaurant.xml

@@ -368,4 +368,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>