From 25f3567574186b61ef28352d1204f98760adae87 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 16:49:54 +0900
Subject: [PATCH 01/23] =?UTF-8?q?[feat]=20#26=20=EB=A7=A4=EC=9E=A5=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89,=20=EB=A7=A4=EC=9E=A5=20=EC=83=81=EC=84=B8?=
 =?UTF-8?q?=20=EB=B7=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopDetail/ShopDetailActivity.kt          | 18 ++++++++++++------
 .../shopDetail/ShopDetailViewModel.kt         |  6 +-----
 .../store/PopularStoreActivity.kt             | 15 ++++++++++++++-
 .../presentation/store/PopularStoreAdapter.kt | 19 +++++++++----------
 .../store/PopularStoreViewHolder.kt           | 18 ++++++++++++++++++
 5 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt

diff --git a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
index dc50285..8b5a468 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
@@ -18,9 +18,10 @@ import org.sopt.tabling.R
 import org.sopt.tabling.databinding.ActivityShopDetailBinding
 import org.sopt.tabling.domain.model.Reserve
 import org.sopt.tabling.domain.model.ShopDetail
+import org.sopt.tabling.presentation.common.ViewModelFactory
 import org.sopt.tabling.presentation.reserve.ReserveBottomSheetDialogFragment
 import org.sopt.tabling.presentation.reserve.ReserveDialog
-import org.sopt.tabling.presentation.common.ViewModelFactory
+import org.sopt.tabling.presentation.store.PopularStoreActivity.Companion.SHOP_ID
 import org.sopt.tabling.presentation.type.StarType
 import org.sopt.tabling.util.UiState
 import org.sopt.tabling.util.binding.BindingActivity
@@ -34,11 +35,14 @@ class ShopDetailActivity :
     private lateinit var shopDetailShopImgAdapter: ShopDetailShopImgAdapter
     private lateinit var shopDetailMenuListAdapter: ShopDetailMenuListAdapter
     private lateinit var shopDetailRecentReviewAdapter: ShopDetailRecentReviewAdapter
+    private var shopId: Long = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding.shopDetailViewModel = shopDetailViewModel
 
+        shopId = intent.getLongExtra(SHOP_ID, -1)
+
         initLayout()
         collectData()
     }
@@ -54,6 +58,8 @@ class ShopDetailActivity :
     }
 
     private fun initLayout() {
+        shopDetailViewModel.getShopDetail(shopId)
+
         initAppBar()
         initTabLayout()
         initNestedScrollView()
@@ -181,12 +187,12 @@ class ShopDetailActivity :
         setTvShopDetailShopImgPageText(FIRST_POSITION)
 
         binding.vpShopDetailShopImg.registerOnPageChangeCallback(object :
-                ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-                    setTvShopDetailShopImgPageText(position)
-                }
+            ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                setTvShopDetailShopImgPageText(position)
             }
+        }
         )
     }
 
diff --git a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailViewModel.kt b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailViewModel.kt
index 8e24a38..df5b369 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailViewModel.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailViewModel.kt
@@ -15,11 +15,7 @@ class ShopDetailViewModel(
     private val _getShopDetailState = MutableStateFlow<UiState<ShopDetail?>>(UiState.Empty)
     val getShopDetailState = _getShopDetailState.asStateFlow()
 
-    init {
-        getShopDetail()
-    }
-
-    private fun getShopDetail(shopId: Long = 2) {
+    fun getShopDetail(shopId: Long) {
         viewModelScope.launch {
             _getShopDetailState.value = UiState.Loading
             shopDetailRepository.getShopDetail(shopId).onSuccess { shopDetail ->
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreActivity.kt
index 6833c85..1696aee 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreActivity.kt
@@ -1,9 +1,11 @@
 package org.sopt.tabling.presentation.store
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import org.sopt.tabling.R
 import org.sopt.tabling.databinding.ActivityPopularStoreBinding
+import org.sopt.tabling.presentation.shopDetail.ShopDetailActivity
 import org.sopt.tabling.util.binding.BindingActivity
 
 class PopularStoreActivity :
@@ -21,7 +23,7 @@ class PopularStoreActivity :
     }
 
     private fun initAdapter() {
-        popularStoreAdapter = PopularStoreAdapter(this)
+        popularStoreAdapter = PopularStoreAdapter(this, ::moveToShopDetail)
         binding.rvPopularStore.adapter = popularStoreAdapter
     }
 
@@ -30,4 +32,15 @@ class PopularStoreActivity :
             popularStoreAdapter.setStoreList(storeList)
         }
     }
+
+    private fun moveToShopDetail(shopId: Long) {
+        Intent(this@PopularStoreActivity, ShopDetailActivity::class.java).apply {
+            putExtra(SHOP_ID, shopId)
+            startActivity(this)
+        }
+    }
+
+    companion object {
+        const val SHOP_ID = "shopId"
+    }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
index ae3ac60..46f8722 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
@@ -7,20 +7,19 @@ import androidx.recyclerview.widget.RecyclerView
 import org.sopt.tabling.data.model.response.ResponsePopularStoreDto
 import org.sopt.tabling.databinding.ItemPopularStoreBinding
 
-class PopularStoreAdapter(context: Context) :
-    RecyclerView.Adapter<PopularStoreAdapter.PopularStoreViewHolder>() {
+class PopularStoreAdapter(
+    private val context: Context,
+    private val moveToShopDetail: (Long) -> Unit
+) :
+    RecyclerView.Adapter<PopularStoreViewHolder>() {
     private val inflater by lazy { LayoutInflater.from(context) }
     private var storeList = listOf<ResponsePopularStoreDto.StoreData>()
 
-    inner class PopularStoreViewHolder(val binding: ItemPopularStoreBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        fun onBind(storeData: ResponsePopularStoreDto.StoreData) {
-            binding.storeData = storeData
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PopularStoreViewHolder {
-        return PopularStoreViewHolder(ItemPopularStoreBinding.inflate(inflater, parent, false))
+        return PopularStoreViewHolder(
+            ItemPopularStoreBinding.inflate(inflater, parent, false),
+            moveToShopDetail
+        )
     }
 
     override fun getItemCount() = storeList.size
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt
new file mode 100644
index 0000000..ab10fa5
--- /dev/null
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt
@@ -0,0 +1,18 @@
+package org.sopt.tabling.presentation.store
+
+import androidx.recyclerview.widget.RecyclerView
+import org.sopt.tabling.data.model.response.ResponsePopularStoreDto
+import org.sopt.tabling.databinding.ItemPopularStoreBinding
+
+class PopularStoreViewHolder(
+    private val binding: ItemPopularStoreBinding,
+    private val moveToShopDetail: (Long) -> Unit
+) :
+    RecyclerView.ViewHolder(binding.root) {
+    fun onBind(storeData: ResponsePopularStoreDto.StoreData) {
+        binding.storeData = storeData
+        binding.root.setOnClickListener {
+            moveToShopDetail(storeData.shopId.toLong())
+        }
+    }
+}

From 1a9bddc6af300d93292a66631e523b3ceb7e0819 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 16:57:44 +0900
Subject: [PATCH 02/23] =?UTF-8?q?[chore]=20#26=20=EB=A7=A4=EC=9E=A5=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=A9=94=EB=89=B4=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=20=EB=A9=94=EB=89=B4=20=EC=9D=B4=EB=A6=84=201?=
 =?UTF-8?q?=EC=A4=84=20=EC=A0=9C=ED=95=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/item_shop_detail_menu.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/item_shop_detail_menu.xml b/app/src/main/res/layout/item_shop_detail_menu.xml
index 4a9d1f2..e09ed0b 100644
--- a/app/src/main/res/layout/item_shop_detail_menu.xml
+++ b/app/src/main/res/layout/item_shop_detail_menu.xml
@@ -22,6 +22,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Body2.Regular"
         android:textColor="@color/gray_800"
         app:layout_constraintEnd_toEndOf="@id/iv_item_shop_detail_menu_img"

From ac51e6d0bc08d26f0e34411776ca88b9882fd2f6 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:00:57 +0900
Subject: [PATCH 03/23] =?UTF-8?q?[feat]=20#26=20=EB=A7=A4=EC=9E=A5=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabling/presentation/shopDetail/ShopDetailActivity.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
index 8b5a468..1c8d9a1 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
@@ -44,6 +44,7 @@ class ShopDetailActivity :
         shopId = intent.getLongExtra(SHOP_ID, -1)
 
         initLayout()
+        addListeners()
         collectData()
     }
 
@@ -65,6 +66,12 @@ class ShopDetailActivity :
         initNestedScrollView()
     }
 
+    private fun addListeners() {
+        binding.ivShopDetailBack.setOnClickListener {
+            finish()
+        }
+    }
+
     private fun collectData() {
         shopDetailViewModel.getShopDetailState.flowWithLifecycle(lifecycle).onEach { uiState ->
             when (uiState) {

From 909f4a597f95492121988e3b607ba491118e0ed2 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:11:54 +0900
Subject: [PATCH 04/23] =?UTF-8?q?[chore]=20#26=20chip=20=ED=8C=A8=EB=94=A9?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/view_detail_btn.xml | 4 ++--
 app/src/main/res/values/themes.xml          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/view_detail_btn.xml b/app/src/main/res/layout/view_detail_btn.xml
index 09d29a9..756a8ae 100644
--- a/app/src/main/res/layout/view_detail_btn.xml
+++ b/app/src/main/res/layout/view_detail_btn.xml
@@ -10,7 +10,7 @@
         android:id="@+id/tv_detail_btn"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="7dp"
+        android:layout_marginVertical="10dp"
         android:layout_marginStart="@dimen/spacing12"
         android:textAppearance="@style/TextAppearance.Body2.SemiBold"
         android:textColor="@color/gray_400"
@@ -23,7 +23,7 @@
         android:id="@+id/iv_detail_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="10dp"
         android:src="@drawable/ic_chevron_gray_600_12"
         app:layout_constraintBottom_toBottomOf="@+id/tv_detail_btn"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 04aaf9c..731a47b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -97,7 +97,7 @@
     </style>
 
     <style name="Widget.Material3.Chip.Style.Radius99.Pick" parent="Widget.Material3.Chip.Style.Radius99">
-        <item name="android:paddingVertical">7dp</item>
+        <item name="android:paddingVertical">10dp</item>
         <item name="chipStrokeColor">@color/gray_100</item>
         <item name="textStartPadding">12dp</item>
         <item name="textEndPadding">12dp</item>
@@ -110,7 +110,7 @@
     </style>
 
     <style name="Widget.Material3.Chip.Style.Radius4.ShopDetailWaiting" parent="Widget.Material3.Chip.Style.Radius4">
-        <item name="android:paddingVertical">4dp</item>
+        <item name="android:paddingVertical">8dp</item>
         <item name="chipBackgroundColor">@color/primary</item>
         <item name="textStartPadding">10dp</item>
         <item name="textEndPadding">10dp</item>
@@ -135,7 +135,7 @@
         <item name="chipStrokeColor">@android:color/transparent</item>
         <item name="chipCornerRadius">4dp</item>
         <item name="android:checkable">false</item>
-        <item name="android:paddingVertical">2dp</item>
+        <item name="android:paddingVertical">4dp</item>
         <item name="chipMinTouchTargetSize">0dp</item>
         <item name="chipMinHeight">2dp</item>
         <item name="chipStartPadding">5dp</item>

From c5614ae2cdf2c2d66c0ddc4f3607278680710de1 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:21:32 +0900
Subject: [PATCH 05/23] =?UTF-8?q?[chore]=20#26=20=EB=8B=A4=EC=9D=B4?=
 =?UTF-8?q?=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EB=B2=84=ED=8A=BC=20style=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/dialog_reserve.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/dialog_reserve.xml b/app/src/main/res/layout/dialog_reserve.xml
index 4b48e04..9ba8f3c 100644
--- a/app/src/main/res/layout/dialog_reserve.xml
+++ b/app/src/main/res/layout/dialog_reserve.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
@@ -265,6 +264,7 @@
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_dialog_confirm"
+                style="@style/Widget.FullButton.Basic"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="56dp"

From 4e341368a84290b1adb78d0408a8a40f10df6a61 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:25:06 +0900
Subject: [PATCH 06/23] =?UTF-8?q?[feat]=20#26=20=EB=8B=A4=EC=9D=B4?=
 =?UTF-8?q?=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EB=B2=84=ED=8A=BC=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=20=EC=8B=9C=20=EC=9D=B4=EC=9A=A9=EC=98=88=EC=A0=95/?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EB=B7=B0=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/sopt/tabling/presentation/Reserve/ReserveDialog.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/Reserve/ReserveDialog.kt b/app/src/main/java/org/sopt/tabling/presentation/Reserve/ReserveDialog.kt
index d6bab49..609365a 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/Reserve/ReserveDialog.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/Reserve/ReserveDialog.kt
@@ -6,7 +6,7 @@ import android.view.View
 import org.sopt.tabling.R
 import org.sopt.tabling.databinding.DialogReserveBinding
 import org.sopt.tabling.domain.model.Reserve
-import org.sopt.tabling.presentation.store.PopularStoreActivity
+import org.sopt.tabling.presentation.queue.QueueDetailsActivity
 import org.sopt.tabling.util.binding.BindingDialogFragment
 
 class ReserveDialog(
@@ -31,7 +31,7 @@ class ReserveDialog(
 
     private fun addListeners() {
         binding.btnDialogConfirm.setOnClickListener {
-            startActivity(Intent(requireContext(), PopularStoreActivity::class.java))
+            startActivity(Intent(requireContext(), QueueDetailsActivity::class.java))
         }
 
         binding.ivIcExit24.setOnClickListener {

From 80c68c37b99bd16bd7b8fa6022406c7fb5905c49 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:39:35 +0900
Subject: [PATCH 07/23] =?UTF-8?q?[feat]=20#26=20=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=98=88=EC=A0=95/=EC=99=84=EB=A3=8C,=20=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=B7=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabling/data/service/WaitingDetailService.kt |  2 +-
 .../queue/QueueReservationFragment.kt            | 16 +++++++++++++++-
 .../presentation/queue/ReservationAdapter.kt     |  4 ++++
 .../queue/ReservationDoneViewHolder.kt           |  9 ++++++++-
 .../queue/ReservationNoneViewHolder.kt           |  9 ++++++++-
 .../presentation/queue/ReservationViewHolder.kt  |  5 +++++
 .../waiting/WaitingDetailActivity.kt             | 12 +++++++++---
 .../presentation/waiting/WaitingViewModel.kt     |  2 +-
 8 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/sopt/tabling/data/service/WaitingDetailService.kt b/app/src/main/java/org/sopt/tabling/data/service/WaitingDetailService.kt
index 1293927..d75bd06 100644
--- a/app/src/main/java/org/sopt/tabling/data/service/WaitingDetailService.kt
+++ b/app/src/main/java/org/sopt/tabling/data/service/WaitingDetailService.kt
@@ -6,5 +6,5 @@ import retrofit2.http.Path
 
 interface WaitingDetailService {
     @GET("/orders/{order_id}")
-    suspend fun getWaitingDetail(@Path("order_id") orderId: Int): ResponseWaitingDetailDto
+    suspend fun getWaitingDetail(@Path("order_id") orderId: Long): ResponseWaitingDetailDto
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
index d65b186..33e003d 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
@@ -1,5 +1,6 @@
 package org.sopt.tabling.presentation.queue
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -10,6 +11,7 @@ import org.sopt.tabling.data.model.request.RequestApplyCodeDto
 import org.sopt.tabling.data.model.response.ResponseApplyCodeDto
 import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.FragmentQueueReservationBinding
+import org.sopt.tabling.presentation.waiting.WaitingDetailActivity
 import org.sopt.tabling.util.extension.showToast
 import retrofit2.Call
 import retrofit2.Response
@@ -62,7 +64,8 @@ class QueueReservationFragment : Fragment() {
     }
 
     private fun setReservationAdapter(reserveList: List<ResponseReservationDto.Reservation>) {
-        val reservationAdapter = ReservationAdapter(requireContext(), ::patchApplyCode)
+        val reservationAdapter =
+            ReservationAdapter(requireContext(), ::patchApplyCode, ::moveToWaiting)
         reservationAdapter.setReservationList(reserveList)
         binding.rvReservationItems.adapter = reservationAdapter
     }
@@ -94,4 +97,15 @@ class QueueReservationFragment : Fragment() {
                 }
             })
     }
+
+    private fun moveToWaiting(orderId: Long) {
+        Intent(requireContext(), WaitingDetailActivity::class.java).apply {
+            putExtra(ORDER_ID, orderId)
+            startActivity(this)
+        }
+    }
+
+    companion object {
+        const val ORDER_ID = "orderId"
+    }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationAdapter.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationAdapter.kt
index 280509f..0937a32 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationAdapter.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationAdapter.kt
@@ -12,6 +12,7 @@ import org.sopt.tabling.databinding.ItemReservationBinding
 class ReservationAdapter(
     context: Context,
     private val patchOnClick: (Int) -> Unit,
+    private val moveToWaiting: (Long) -> Unit
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private val inflater by lazy { LayoutInflater.from(context) }
 
@@ -22,14 +23,17 @@ class ReservationAdapter(
             1 -> ReservationViewHolder(
                 ItemReservationBinding.inflate(inflater, parent, false),
                 patchOnClick,
+                moveToWaiting
             )
 
             2 -> ReservationDoneViewHolder(
                 ItemDoneReservationBinding.inflate(inflater, parent, false),
+                moveToWaiting
             )
 
             3 -> ReservationNoneViewHolder(
                 ItemNoneReservationBinding.inflate(inflater, parent, false),
+                moveToWaiting
             )
 
             else -> throw RuntimeException()
diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationDoneViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationDoneViewHolder.kt
index b85197e..9e64be9 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationDoneViewHolder.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationDoneViewHolder.kt
@@ -4,7 +4,10 @@ import androidx.recyclerview.widget.RecyclerView
 import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.ItemDoneReservationBinding
 
-class ReservationDoneViewHolder(private val binding: ItemDoneReservationBinding) :
+class ReservationDoneViewHolder(
+    private val binding: ItemDoneReservationBinding,
+    private val moveToWaiting: (Long) -> Unit
+) :
     RecyclerView.ViewHolder(binding.root) {
     fun onBind(item: ResponseReservationDto.Reservation) {
         binding.chipReservationWait.text = item.orderStatus
@@ -12,5 +15,9 @@ class ReservationDoneViewHolder(private val binding: ItemDoneReservationBinding)
         binding.tvReservationPeople.text = item.personCount.toString() + "명"
         binding.tvStoreName.text = item.shopName
         binding.tvRemainReviewNum.text = item.remainingReviewPeriod.toString() + "일"
+
+        binding.tvShowDetail.setOnClickListener {
+            moveToWaiting(item.orderId.toLong())
+        }
     }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationNoneViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationNoneViewHolder.kt
index 0ea5eac..18424a7 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationNoneViewHolder.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationNoneViewHolder.kt
@@ -4,12 +4,19 @@ import androidx.recyclerview.widget.RecyclerView
 import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.ItemNoneReservationBinding
 
-class ReservationNoneViewHolder(private val binding: ItemNoneReservationBinding) :
+class ReservationNoneViewHolder(
+    private val binding: ItemNoneReservationBinding,
+    private val moveToWaiting: (Long) -> Unit
+) :
     RecyclerView.ViewHolder(binding.root) {
     fun onBind(item: ResponseReservationDto.Reservation) {
         binding.chipReservationWait.text = item.orderStatus
         binding.tvReservationDate.text = item.orderDate
         binding.tvReservationPeople.text = item.personCount.toString() + "명"
         binding.tvStoreName.text = item.shopName
+
+        binding.tvShowDetail.setOnClickListener {
+            moveToWaiting(item.orderId.toLong())
+        }
     }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationViewHolder.kt
index b59c747..573faaa 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationViewHolder.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/ReservationViewHolder.kt
@@ -7,6 +7,7 @@ import org.sopt.tabling.databinding.ItemReservationBinding
 class ReservationViewHolder(
     private val binding: ItemReservationBinding,
     private val patchOnClick: (Int) -> Unit,
+    private val moveToWaiting: (Long) -> Unit
 ) :
     RecyclerView.ViewHolder(binding.root) {
     fun onBind(item: ResponseReservationDto.Reservation) {
@@ -20,5 +21,9 @@ class ReservationViewHolder(
         binding.btnCode.setOnClickListener {
             patchOnClick(item.orderId)
         }
+
+        binding.tvShowDetail.setOnClickListener {
+            moveToWaiting(item.orderId.toLong())
+        }
     }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
index cad0249..d9afe02 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
@@ -4,21 +4,27 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import org.sopt.tabling.R
 import org.sopt.tabling.databinding.ActivityWaitingDetailBinding
+import org.sopt.tabling.presentation.queue.QueueReservationFragment.Companion.ORDER_ID
 import org.sopt.tabling.util.binding.BindingActivity
 
 class WaitingDetailActivity :
     BindingActivity<ActivityWaitingDetailBinding>(R.layout.activity_waiting_detail) {
     private val waitingViewModel by viewModels<WaitingViewModel>()
+    private var orderId: Long = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // View 연결 전 임의로 설정한 orderId
-        val orderId = 2
-        waitingViewModel.getWaitingDetail(orderId)
+        orderId = intent.getLongExtra(ORDER_ID, -1)
+
+        initLayout()
         setWaitingDetailList()
     }
 
+    private fun initLayout() {
+        waitingViewModel.getWaitingDetail(orderId)
+    }
+
     private fun setWaitingDetailList() {
         waitingViewModel.waitingDetail.observe(this) { waitingDetailList ->
             binding.waitingData = waitingDetailList
diff --git a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingViewModel.kt b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingViewModel.kt
index ad04e22..d752a68 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingViewModel.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingViewModel.kt
@@ -14,7 +14,7 @@ class WaitingViewModel : ViewModel() {
         MutableLiveData<ResponseWaitingDetailDto.WaitingDetailData>()
     val waitingDetail: LiveData<ResponseWaitingDetailDto.WaitingDetailData> = _waitingDetail
 
-    fun getWaitingDetail(orderId: Int) {
+    fun getWaitingDetail(orderId: Long) {
         viewModelScope.launch {
             val response =
                 runCatching { ServicePool.waitingDetailService.getWaitingDetail(orderId) }

From 0cc4348f97cb5e4ba0843f088a6ee0ac49d1c936 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:43:20 +0900
Subject: [PATCH 08/23] =?UTF-8?q?[chore]=20#26=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EB=B3=B8=EB=AC=B8=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_waiting_detail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_waiting_detail.xml b/app/src/main/res/layout/activity_waiting_detail.xml
index e512fbc..dee654a 100644
--- a/app/src/main/res/layout/activity_waiting_detail.xml
+++ b/app/src/main/res/layout/activity_waiting_detail.xml
@@ -147,9 +147,9 @@
             style="@style/Style.Material3.Button.Outlined.Custom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
             android:layout_marginEnd="17dp"
             android:paddingEnd="15dp"
-            android:layout_marginStart="16dp"
             android:text="@string/store_detail"
             app:icon="@drawable/ic_store_gray_500_24"
             app:layout_constraintBottom_toBottomOf="@id/btn_waiting_detail_call"
@@ -351,7 +351,7 @@
             android:layout_marginTop="8dp"
             android:text="@{waitingData.requestContent}"
             android:textAppearance="@style/TextAppearance.Body2.SemiBold"
-            android:textColor="@color/gray_000"
+            android:textColor="@color/gray_100"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/view_waiting_horizontal_3dp_sec"
             tools:text="@string/waiting_request_default" />

From b5022067b206c4f1134633c4e45205e1e07c77e3 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 17:56:53 +0900
Subject: [PATCH 09/23] =?UTF-8?q?[chore]=20#26=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=8C=80=EA=B8=B0=20=EC=99=84=EB=A3=8C=20?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80=20=ED=8C=90=EB=8B=A8=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabling/presentation/waiting/WaitingDetailActivity.kt | 4 ++--
 app/src/main/res/layout/activity_waiting_detail.xml       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
index d9afe02..74a116a 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
@@ -26,8 +26,8 @@ class WaitingDetailActivity :
     }
 
     private fun setWaitingDetailList() {
-        waitingViewModel.waitingDetail.observe(this) { waitingDetailList ->
-            binding.waitingData = waitingDetailList
+        waitingViewModel.waitingDetail.observe(this) { waitingDetail ->
+            binding.waitingData = waitingDetail
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_waiting_detail.xml b/app/src/main/res/layout/activity_waiting_detail.xml
index dee654a..e451cf0 100644
--- a/app/src/main/res/layout/activity_waiting_detail.xml
+++ b/app/src/main/res/layout/activity_waiting_detail.xml
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="17dp"
             android:layout_marginTop="5dp"
-            android:text="@{waitingData.orderStatus == @string/waiting_status_ing ? @string/waiting_ing : @string/waiting_done}"
+            android:text="@{waitingData.orderStatus.equals(@string/waiting_status_ing) ? @string/waiting_ing : @string/waiting_done}"
             android:textAppearance="@style/TextAppearance.Caption2"
             android:textColor="@color/gray_300"
             app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
             android:layout_marginTop="3dp"
             android:text="@{@string/waiting_number_primary(waitingData.waitingNumber)}"
             android:textAppearance="@style/TextAppearance.H2"
-            android:textColor="@{waitingData.orderStatus == @string/waiting_status_ing ? @color/primary : @color/gray_100}"
+            android:textColor="@{waitingData.orderStatus.equals(@string/waiting_status_ing) ? @color/primary : @color/gray_100}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_waiting_detail_name"
             tools:text="@string/waiting_number_primary" />
@@ -94,9 +94,9 @@
                 android:id="@+id/tv_front_waiting_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@{waitingData.orderStatus == @string/waiting_status_ing ? @string/front_waiting_number(waitingData.beforeCount) : @string/waiting_0}"
+                android:text="@{waitingData.orderStatus.equals(@string/waiting_status_ing) ? @string/front_waiting_number(waitingData.beforeCount) : @string/waiting_0}"
                 android:textAppearance="@style/TextAppearance.H1"
-                android:textColor="@{waitingData.orderStatus == @string/waiting_status_ing ? @color/primary : @color/white}"
+                android:textColor="@{waitingData.orderStatus.equals(@string/waiting_status_ing) ? @color/primary : @color/white}"
                 app:layout_constraintEnd_toStartOf="@id/tv_front_waiting_team"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"

From 932c0c862d9083c34a5fe9311dbe0fd583a532c2 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 18:22:50 +0900
Subject: [PATCH 10/23] =?UTF-8?q?[chore]=20#26=20=EC=9D=B8=EA=B8=B0=20?=
 =?UTF-8?q?=EB=A7=A4=EC=9E=A5=20BEST=20=ED=83=80=EC=9D=B4=ED=8B=80?=
 =?UTF-8?q?=EB=8F=84=20=ED=95=A8=EA=BB=98=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?=
 =?UTF-8?q?=EB=90=98=EA=B2=8C=20=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20?=
 =?UTF-8?q?=EB=A9=80=ED=8B=B0=EB=B7=B0=ED=83=80=EC=9E=85=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/store/PopularStoreAdapter.kt |  38 ++-
 .../store/PopularStoreViewHolder.kt           |   5 +-
 .../store/PopularStoreWithTitleViewHolder.kt  |  17 ++
 .../res/layout/activity_popular_store.xml     |  50 +---
 .../main/res/layout/item_popular_store.xml    |   7 +-
 .../layout/item_popular_store_with_title.xml  | 253 ++++++++++++++++++
 6 files changed, 306 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreWithTitleViewHolder.kt
 create mode 100644 app/src/main/res/layout/item_popular_store_with_title.xml

diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
index 46f8722..17210f4 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
@@ -6,30 +6,50 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.sopt.tabling.data.model.response.ResponsePopularStoreDto
 import org.sopt.tabling.databinding.ItemPopularStoreBinding
+import org.sopt.tabling.databinding.ItemPopularStoreWithTitleBinding
 
 class PopularStoreAdapter(
     private val context: Context,
     private val moveToShopDetail: (Long) -> Unit
-) :
-    RecyclerView.Adapter<PopularStoreViewHolder>() {
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private val inflater by lazy { LayoutInflater.from(context) }
     private var storeList = listOf<ResponsePopularStoreDto.StoreData>()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PopularStoreViewHolder {
-        return PopularStoreViewHolder(
-            ItemPopularStoreBinding.inflate(inflater, parent, false),
-            moveToShopDetail
-        )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when(viewType) {
+            POPULAR_STORE_WITH_TITLE -> PopularStoreWithTitleViewHolder(
+                ItemPopularStoreWithTitleBinding.inflate(inflater, parent, false),
+                moveToShopDetail
+            )
+
+            else -> PopularStoreViewHolder(
+                ItemPopularStoreBinding.inflate(inflater, parent, false),
+                moveToShopDetail
+            )
+        }
     }
 
     override fun getItemCount() = storeList.size
 
-    override fun onBindViewHolder(holder: PopularStoreViewHolder, position: Int) {
-        holder.onBind(storeList[position])
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is PopularStoreWithTitleViewHolder -> holder.onBind(storeList[position])
+            is PopularStoreViewHolder -> holder.onBind(storeList[position])
+        }
     }
 
+    override fun getItemViewType(position: Int): Int = when(position) {
+        FIRST_POSITION -> POPULAR_STORE_WITH_TITLE
+        else -> POPULAR_STORE
+    }
     fun setStoreList(storeDataList: List<ResponsePopularStoreDto.StoreData>) {
         storeList = storeDataList
         notifyDataSetChanged()
     }
+
+    companion object {
+        const val FIRST_POSITION = 0
+        const val POPULAR_STORE_WITH_TITLE = 0
+        const val POPULAR_STORE = 1
+    }
 }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt
index ab10fa5..8544d51 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreViewHolder.kt
@@ -7,11 +7,10 @@ import org.sopt.tabling.databinding.ItemPopularStoreBinding
 class PopularStoreViewHolder(
     private val binding: ItemPopularStoreBinding,
     private val moveToShopDetail: (Long) -> Unit
-) :
-    RecyclerView.ViewHolder(binding.root) {
+) : RecyclerView.ViewHolder(binding.root) {
     fun onBind(storeData: ResponsePopularStoreDto.StoreData) {
         binding.storeData = storeData
-        binding.root.setOnClickListener {
+        binding.layoutPopularStore.setOnClickListener {
             moveToShopDetail(storeData.shopId.toLong())
         }
     }
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreWithTitleViewHolder.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreWithTitleViewHolder.kt
new file mode 100644
index 0000000..ab232f1
--- /dev/null
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreWithTitleViewHolder.kt
@@ -0,0 +1,17 @@
+package org.sopt.tabling.presentation.store
+
+import androidx.recyclerview.widget.RecyclerView
+import org.sopt.tabling.data.model.response.ResponsePopularStoreDto
+import org.sopt.tabling.databinding.ItemPopularStoreWithTitleBinding
+
+class PopularStoreWithTitleViewHolder(
+    private val binding: ItemPopularStoreWithTitleBinding,
+    private val moveToShopDetail: (Long) -> Unit
+) : RecyclerView.ViewHolder(binding.root) {
+    fun onBind(storeData: ResponsePopularStoreDto.StoreData) {
+        binding.storeData = storeData
+        binding.layoutPopularStore.setOnClickListener {
+            moveToShopDetail(storeData.shopId.toLong())
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_popular_store.xml b/app/src/main/res/layout/activity_popular_store.xml
index 7c994f3..f95b7db 100644
--- a/app/src/main/res/layout/activity_popular_store.xml
+++ b/app/src/main/res/layout/activity_popular_store.xml
@@ -122,64 +122,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/hsv_popular_store_chip" />
 
-        <TextView
-            android:id="@+id/tv_popular_store_avg_people_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/popular_store_avg_personnel"
-            android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
-            android:textColor="@color/gray_400"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_popular_store_horizontal_1dp" />
-
-        <TextView
-            android:id="@+id/tv_popular_store_text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/popular_store_standard"
-            android:textAppearance="@style/TextAppearance.Caption1.Regular"
-            android:textColor="@color/gray_400"
-            app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_avg_people_number"
-            app:layout_constraintStart_toEndOf="@id/tv_popular_store_avg_people_number"
-            app:layout_constraintTop_toTopOf="@id/tv_popular_store_avg_people_number" />
-
-        <TextView
-            android:id="@+id/tv_popular_store_area"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="2dp"
-            android:text="@string/area_seoul_south"
-            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
-            android:textColor="@color/secondary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_popular_store_avg_people_number" />
-
-        <TextView
-            android:id="@+id/tv_popular_store_best"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:text="@string/popular_store_BEST"
-            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
-            android:textColor="@color/gray_800"
-            app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_area"
-            app:layout_constraintStart_toEndOf="@id/tv_popular_store_area"
-            app:layout_constraintTop_toTopOf="@id/tv_popular_store_area" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_popular_store"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="15dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_popular_store_area"
+            app:layout_constraintTop_toBottomOf="@id/view_popular_store_horizontal_1dp"
             tools:listitem="@layout/item_popular_store" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_popular_store.xml b/app/src/main/res/layout/item_popular_store.xml
index 991645a..0c7b73c 100644
--- a/app/src/main/res/layout/item_popular_store.xml
+++ b/app/src/main/res/layout/item_popular_store.xml
@@ -11,8 +11,10 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_popular_store"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp">
 
         <TextView
             android:id="@+id/tv_popular_store_number"
@@ -32,9 +34,8 @@
             android:id="@+id/iv_popular_store"
             android:layout_width="0dp"
             android:layout_height="100dp"
+            android:layout_marginVertical="8dp"
             android:layout_marginStart="4dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
             android:background="@drawable/shape_gray_200_6"
             android:clipToOutline="true"
             android:foreground="@drawable/shape_gray_200_6"
diff --git a/app/src/main/res/layout/item_popular_store_with_title.xml b/app/src/main/res/layout/item_popular_store_with_title.xml
new file mode 100644
index 0000000..62bdae8
--- /dev/null
+++ b/app/src/main/res/layout/item_popular_store_with_title.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="storeData"
+            type="org.sopt.tabling.data.model.response.ResponsePopularStoreDto.StoreData" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_popular_store_avg_people_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing16"
+            android:text="@string/popular_store_avg_personnel"
+            android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
+            android:textColor="@color/gray_400"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_popular_store_text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/popular_store_standard"
+            android:textAppearance="@style/TextAppearance.Caption1.Regular"
+            android:textColor="@color/gray_400"
+            app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_avg_people_number"
+            app:layout_constraintStart_toEndOf="@id/tv_popular_store_avg_people_number"
+            app:layout_constraintTop_toTopOf="@id/tv_popular_store_avg_people_number" />
+
+        <TextView
+            android:id="@+id/tv_popular_store_area"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/area_seoul_south"
+            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+            android:textColor="@color/secondary"
+            app:layout_constraintStart_toEndOf="@+id/tv_popular_store_avg_people_number"
+            app:layout_constraintStart_toStartOf="@+id/tv_popular_store_avg_people_number"
+            app:layout_constraintTop_toBottomOf="@id/tv_popular_store_avg_people_number" />
+
+        <TextView
+            android:id="@+id/tv_popular_store_best"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:text="@string/popular_store_BEST"
+            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+            android:textColor="@color/gray_800"
+            app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_area"
+            app:layout_constraintStart_toEndOf="@id/tv_popular_store_area"
+            app:layout_constraintTop_toTopOf="@id/tv_popular_store_area" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_popular_store"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_popular_store_area">
+
+            <TextView
+                android:id="@+id/tv_popular_store_number"
+                android:layout_width="18dp"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@color/gray_800"
+                android:gravity="center"
+                android:text="@{String.valueOf(storeData.shopId)}"
+                android:textAppearance="@style/TextAppearance.Body2.SemiBold"
+                android:textColor="@{storeData.shopId > 3 ? @color/gray_200 : @color/gray_800}"
+                app:layout_constraintBottom_toBottomOf="@id/iv_popular_store"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/iv_popular_store"
+                tools:text="10" />
+
+            <ImageView
+                android:id="@+id/iv_popular_store"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                android:layout_marginVertical="8dp"
+                android:layout_marginStart="4dp"
+                android:background="@drawable/shape_gray_200_6"
+                android:clipToOutline="true"
+                android:foreground="@drawable/shape_gray_200_6"
+                android:scaleType="centerCrop"
+                app:image="@{storeData.profilePhotoUrl}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1"
+                app:layout_constraintStart_toEndOf="@id/tv_popular_store_number"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:srcCompat="@drawable/ic_launcher_background" />
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_popular_store_waiting_num"
+                style="@style/Style.Material3.Chip.Suggestion.Waiting.Item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="4dp"
+                android:text="@{storeData.currentWaiting == 0 ? @string/popular_store_no_waiting_team : @string/popular_store_waiting_team(storeData.currentWaiting)}"
+                android:textColor="@{storeData.currentWaiting == 0 ? @color/gray_200 : @color/white}"
+                app:chipBackgroundColor="@{storeData.currentWaiting == 0 ? @color/gray_600 : @color/primary}"
+                app:layout_constraintStart_toStartOf="@id/iv_popular_store"
+                app:layout_constraintTop_toTopOf="@id/iv_popular_store"
+                tools:text="대기 14팀" />
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/spacing12"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_popular_store"
+                app:layout_constraintStart_toEndOf="@+id/iv_popular_store"
+                app:layout_constraintTop_toTopOf="@+id/iv_popular_store">
+
+                <TextView
+                    android:id="@+id/tv_popular_store_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{storeData.name}"
+                    android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                    android:textColor="@color/gray_400"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="파이브가이즈 여의도" />
+
+                <ImageView
+                    android:id="@+id/ic_popular_store_star"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_review"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/tv_popular_store_review"
+                    app:srcCompat="@drawable/ic_star_yellow_14" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_review"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="1dp"
+                    android:text="@{String.valueOf(storeData.averageStar)}"
+                    android:textAppearance="@style/TextAppearance.Body2.Regular"
+                    android:textColor="@color/gray_800"
+                    app:layout_constraintStart_toEndOf="@id/ic_popular_store_star"
+                    app:layout_constraintTop_toBottomOf="@id/tv_popular_store_name"
+                    tools:text="3.9" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_review_cnt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:text="@{storeData.reviewCount > 300 ? @string/popular_store_review_count_over : @string/popular_store_review_count(storeData.reviewCount) }"
+                    android:textAppearance="@style/TextAppearance.Body2.Regular"
+                    android:textColor="@color/gray_800"
+                    app:layout_constraintStart_toEndOf="@id/tv_popular_store_review"
+                    app:layout_constraintTop_toBottomOf="@id/tv_popular_store_name"
+                    tools:text="(64)" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_food_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:text="@{storeData.shopCategory}"
+                    android:textAppearance="@style/TextAppearance.Body2.Regular"
+                    android:textColor="@color/gray_200"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_popular_store_review"
+                    tools:text="양식" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_."
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="1dp"
+                    android:text="·"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_food_type"
+                    app:layout_constraintStart_toEndOf="@id/tv_popular_store_food_type"
+                    app:layout_constraintTop_toTopOf="@id/tv_popular_store_food_type" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_location"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="1dp"
+                    android:text="@{storeData.shortAddress}"
+                    android:textAppearance="@style/TextAppearance.Body2.Regular"
+                    android:textColor="@color/gray_200"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_popular_store_food_type"
+                    app:layout_constraintStart_toEndOf="@id/tv_popular_store_."
+                    app:layout_constraintTop_toTopOf="@id/tv_popular_store_food_type"
+                    tools:text="여의도동" />
+
+                <ImageView
+                    android:id="@+id/ic_popular_store_people"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_popular_store_food_type"
+                    app:srcCompat="@drawable/ic_people_grey_100_24" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_avg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:text="@string/popular_store_avg"
+                    android:textAppearance="@style/TextAppearance.Caption1.Regular"
+                    android:textColor="@color/gray_300"
+                    app:layout_constraintBottom_toBottomOf="@id/ic_popular_store_people"
+                    app:layout_constraintStart_toEndOf="@id/ic_popular_store_people"
+                    app:layout_constraintTop_toTopOf="@id/ic_popular_store_people" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_waiting_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="@{String.valueOf(storeData.averageWaiting)}"
+                    android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
+                    android:textColor="@color/gray_600"
+                    app:layout_constraintBottom_toBottomOf="@id/ic_popular_store_people"
+                    app:layout_constraintStart_toEndOf="@id/tv_popular_store_avg"
+                    app:layout_constraintTop_toTopOf="@id/ic_popular_store_people"
+                    tools:text="4753" />
+
+                <TextView
+                    android:id="@+id/tv_popular_store_wait"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/popular_store_wait"
+                    android:textAppearance="@style/TextAppearance.Caption1.Regular"
+                    android:textColor="@color/gray_300"
+                    app:layout_constraintBottom_toBottomOf="@id/ic_popular_store_people"
+                    app:layout_constraintStart_toEndOf="@id/tv_popular_store_waiting_number"
+                    app:layout_constraintTop_toTopOf="@id/ic_popular_store_people" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 6c6a23c741ecb9fc1e3bdd32481c212a1ec2cac8 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:00:09 +0900
Subject: [PATCH 11/23] =?UTF-8?q?[chore]=20#26=20=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=98=88=EC=A0=95/=EC=99=84=EB=A3=8C=20=EB=B7=B0=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20(0dp)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/fragment_queue_reservation.xml |   6 +-
 .../main/res/layout/item_done_reservation.xml | 140 +++++++++++-------
 .../main/res/layout/item_none_reservation.xml |  61 +++++---
 app/src/main/res/layout/item_reservation.xml  |  12 +-
 4 files changed, 138 insertions(+), 81 deletions(-)

diff --git a/app/src/main/res/layout/fragment_queue_reservation.xml b/app/src/main/res/layout/fragment_queue_reservation.xml
index 612da36..e6a87dd 100644
--- a/app/src/main/res/layout/fragment_queue_reservation.xml
+++ b/app/src/main/res/layout/fragment_queue_reservation.xml
@@ -8,13 +8,17 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_reservation_items"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        android:layout_marginHorizontal="11dp"
+        android:layout_marginTop="@dimen/spacing16"
         android:orientation="vertical"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/item_reservation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_done_reservation.xml b/app/src/main/res/layout/item_done_reservation.xml
index b07cdd7..b6175c6 100644
--- a/app/src/main/res/layout/item_done_reservation.xml
+++ b/app/src/main/res/layout/item_done_reservation.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/block"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:clipToPadding="false"
@@ -10,9 +10,10 @@
     android:paddingVertical="@dimen/spacing4">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/spacing20"
         android:background="@drawable/shape_white_line_8_rect"
         android:elevation="@dimen/spacing4"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -24,7 +25,7 @@
             android:id="@+id/chip_reservation_wait"
             style="@style/Widget.Material3.Chip.Style.Radius48"
             android:layout_width="wrap_content"
-            android:layout_height="21dp"
+            android:layout_height="0dp"
             android:layout_marginStart="23dp"
             android:layout_marginTop="20dp"
             android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
@@ -55,23 +56,23 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="5dp"
-            tools:text="11월 13일 (월)"
             android:textAppearance="@style/TextAppearance.Body2.SemiBold"
             android:textColor="@color/gray_200"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait"/>
+            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait"
+            tools:text="11월 13일 (월)" />
 
         <TextView
             android:id="@+id/tv_reservation_bar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:text="@string/queue_tv_bar"
             android:layout_marginTop="5dp"
+            android:text="@string/queue_tv_bar"
             android:textAppearance="@style/TextAppearance.Body2.SemiBold"
             android:textColor="@color/gray_200"
-            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait"
-            app:layout_constraintStart_toEndOf="@id/tv_reservation_date" />
+            app:layout_constraintStart_toEndOf="@id/tv_reservation_date"
+            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait" />
 
         <TextView
             android:id="@+id/tv_reservation_people"
@@ -79,11 +80,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="5dp"
-            tools:text="2명"
             android:textAppearance="@style/TextAppearance.Body2.SemiBold"
             android:textColor="@color/gray_200"
             app:layout_constraintStart_toEndOf="@id/tv_reservation_bar"
-            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait" />
+            app:layout_constraintTop_toBottomOf="@id/chip_reservation_wait"
+            tools:text="2명" />
 
         <TextView
             android:id="@+id/tv_store_name"
@@ -91,11 +92,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="8dp"
-            tools:text="파이브가이즈 여의도"
             android:textAppearance="@style/TextAppearance.H0"
             android:textColor="@color/gray_700"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_reservation_date" />
+            app:layout_constraintTop_toBottomOf="@id/tv_reservation_date"
+            tools:text="파이브가이즈 여의도" />
 
         <ImageView
             android:id="@+id/iv_store_detail"
@@ -107,61 +108,88 @@
             app:layout_constraintStart_toEndOf="@id/tv_store_name"
             app:layout_constraintTop_toBottomOf="@id/tv_reservation_people" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_code"
-            android:layout_width="282dp"
-            android:layout_height="49dp"
-            android:layout_marginStart="23dp"
-            android:paddingStart="96dp"
-            android:paddingEnd="86dp"
-            android:drawableStart="@drawable/ic_review_23"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="23dp"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_done_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="23dp"
+            android:layout_marginTop="@dimen/spacing24"
             android:background="@drawable/shape_gray_100_line_8_rect"
-            android:text="@string/queue_btn_review"
-            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
-            android:textColor="@color/gray_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_store_detail" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_store_name">
 
+            <ImageView
+                android:id="@+id/iv_done_btn_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="13dp"
+                android:src="@drawable/ic_review_23"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_done_btn_text"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_remain_review"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="93dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="18dp"
-            android:text="@string/queue_tv_remain_review"
-            android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
-            android:textColor="@color/gray_300"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_code" />
+            <TextView
+                android:id="@+id/tv_done_btn_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:text="@string/queue_btn_review"
+                android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                android:textColor="@color/gray_600"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_done_btn_img"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_done_btn_img"
+                app:layout_constraintTop_toTopOf="@+id/iv_done_btn_img" />
 
-        <TextView
-            android:id="@+id/tv_remain_review_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="18dp"
-            tools:text="@string/queue_tv_remain_review_num"
-            android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
-            android:textColor="@color/primary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_remain_review" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/tv_remain_review2"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="18dp"
-            android:text="@string/queue_tv_remain_review2"
-            android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
-            android:textColor="@color/gray_300"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_remain_review_num" />
+            app:layout_constraintEnd_toEndOf="@id/layout_done_btn"
+            app:layout_constraintStart_toStartOf="@id/layout_done_btn"
+            app:layout_constraintTop_toBottomOf="@id/layout_done_btn">
+
+            <TextView
+                android:id="@+id/tv_remain_review"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/queue_tv_remain_review"
+                android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
+                android:textColor="@color/gray_300"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_remain_review_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
+                android:textColor="@color/primary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tv_remain_review"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="@string/queue_tv_remain_review_num" />
+
+            <TextView
+                android:id="@+id/tv_remain_review2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/queue_tv_remain_review2"
+                android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
+                android:textColor="@color/gray_300"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tv_remain_review_num"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_none_reservation.xml b/app/src/main/res/layout/item_none_reservation.xml
index af5707f..d858531 100644
--- a/app/src/main/res/layout/item_none_reservation.xml
+++ b/app/src/main/res/layout/item_none_reservation.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/block"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:clipToPadding="false"
@@ -10,9 +10,10 @@
     android:paddingVertical="@dimen/spacing4">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/spacing20"
         android:background="@drawable/shape_white_line_8_rect"
         android:elevation="@dimen/spacing4"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -24,7 +25,7 @@
             android:id="@+id/chip_reservation_wait"
             style="@style/Widget.Material3.Chip.Style.Radius48"
             android:layout_width="wrap_content"
-            android:layout_height="21dp"
+            android:layout_height="0dp"
             android:layout_marginStart="23dp"
             android:layout_marginTop="20dp"
             android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
@@ -107,35 +108,55 @@
             app:layout_constraintStart_toEndOf="@id/tv_store_name"
             app:layout_constraintTop_toBottomOf="@id/tv_reservation_people" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_code"
-            android:layout_width="282dp"
-            android:layout_height="49dp"
-            android:layout_marginStart="23dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="23dp"
-            android:background="@drawable/shape_gray_100_line_8_rect"
-            android:drawableStart="@drawable/ic_review_non_23"
-            android:paddingStart="96dp"
-            android:paddingEnd="86dp"
-            android:text="@string/queue_btn_review"
-            android:textAppearance="@style/TextAppearance.Body1.SemiBold"
-            android:textColor="@color/gray_100"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_code_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="23dp"
+            android:layout_marginTop="@dimen/spacing24"
+            android:background="@drawable/shape_gray_000_line_8_rect"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_store_detail" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_store_name">
+
+            <ImageView
+                android:id="@+id/iv_code_btn_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="13dp"
+                android:src="@drawable/ic_review_non_23"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_code_btn_text"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_code_btn_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:text="@string/queue_btn_review"
+                android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                android:textColor="@color/gray_100"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_code_btn_img"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_code_btn_img"
+                app:layout_constraintTop_toTopOf="@+id/iv_code_btn_img" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="18dp"
-            android:text="리뷰 작성 기간이 지났어요."
+            android:text="@string/queue_review_end"
             android:textAppearance="@style/TextAppearance.Caption1.SemiBold"
             android:textColor="@color/gray_200"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_code"/>
+            app:layout_constraintTop_toBottomOf="@id/layout_code_btn" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_reservation.xml b/app/src/main/res/layout/item_reservation.xml
index 6644e37..59feaa0 100644
--- a/app/src/main/res/layout/item_reservation.xml
+++ b/app/src/main/res/layout/item_reservation.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/block"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:clipToPadding="false"
@@ -11,9 +11,10 @@
     android:paddingVertical="@dimen/spacing4">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/spacing20"
         android:background="@drawable/shape_white_line_8_rect"
         android:elevation="@dimen/spacing4"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -148,6 +149,7 @@
             android:id="@+id/tv_waiting_info_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
             android:layout_marginTop="7dp"
             android:textAppearance="@style/TextAppearance.Body2.SemiBold"
             android:textColor="@color/primary"
@@ -157,7 +159,8 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_delay"
-            android:layout_width="wrap_content"
+            style="@style/Widget.OutlinedButton.State"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="24dp"
@@ -172,7 +175,8 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_code"
-            android:layout_width="wrap_content"
+            style="@style/Widget.OutlinedButton.State"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="8dp"

From 0f062b954bdb6f634fa13423f42eb4179cd5db4b Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:00:30 +0900
Subject: [PATCH 12/23] =?UTF-8?q?[add]=20#26=20=EC=9D=B4=EC=9A=A9=EC=98=88?=
 =?UTF-8?q?=EC=A0=95/=EC=99=84=EB=A3=8C=20=EB=B7=B0=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20drawable=20=EB=A6=AC?=
 =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/shape_gray_000_line_8_rect.xml | 9 +++++++++
 app/src/main/res/drawable/shape_gray_100_line_8_rect.xml | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_gray_000_line_8_rect.xml

diff --git a/app/src/main/res/drawable/shape_gray_000_line_8_rect.xml b/app/src/main/res/drawable/shape_gray_000_line_8_rect.xml
new file mode 100644
index 0000000..ad381d7
--- /dev/null
+++ b/app/src/main/res/drawable/shape_gray_000_line_8_rect.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray_000" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_gray_100_line_8_rect.xml b/app/src/main/res/drawable/shape_gray_100_line_8_rect.xml
index d53b8f6..88dc3f1 100644
--- a/app/src/main/res/drawable/shape_gray_100_line_8_rect.xml
+++ b/app/src/main/res/drawable/shape_gray_100_line_8_rect.xml
@@ -6,7 +6,4 @@
     <stroke
         android:width="1dp"
         android:color="@color/gray_100" />
-    <size
-        android:width="282dp"
-        android:height="49dp" />
 </shape>

From 12bc0731fa01fde2aeed50fdd2cc6e86814e808e Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:00:45 +0900
Subject: [PATCH 13/23] =?UTF-8?q?[add]=20#26=20=EC=9D=B4=EC=9A=A9=EC=98=88?=
 =?UTF-8?q?=EC=A0=95/=EC=99=84=EB=A3=8C=20=EB=B7=B0=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EB=A7=81=20=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a06d411..e42a559 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,6 +48,7 @@
     <string name="queue_tv_remain_review">"리뷰 작성 기간이 "</string>
     <string name="queue_tv_remain_review_num">2일</string>
     <string name="queue_tv_remain_review2">" 남았어요!"</string>
+    <string name="queue_review_end">리뷰 작성 기간이 지났어요.</string>
 
     <!-- popular store -->
     <string name="area_seoul_south">서울 남부</string>

From c4db345a8f092e2f47cb1ffaa99973b172e567fd Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:00:59 +0900
Subject: [PATCH 14/23] =?UTF-8?q?[chore]=20#26=20=EC=B9=A9=20=ED=85=8C?=
 =?UTF-8?q?=EB=A7=88=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/themes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 731a47b..ff9bdc1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -152,7 +152,7 @@
         <item name="textStartPadding">8dp</item>
         <item name="textEndPadding">8dp</item>
         <item name="chipMinHeight">0dp</item>
-        <item name="android:paddingVertical">2dp</item>
+        <item name="android:paddingVertical">5dp</item>
         <item name="chipMinTouchTargetSize">0dp</item>
         <item name="android:textAppearance">@style/TextAppearance.Caption1.SemiBold</item>
         <item name="android:textColor">@color/white</item>

From c168c1dfd813d97d50d7606c0900e6153cd57cf1 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:01:24 +0900
Subject: [PATCH 15/23] =?UTF-8?q?[chore]=20#26=20=EC=9D=B4=EC=9A=A9=20?=
 =?UTF-8?q?=EC=98=88=EC=A0=95/=EC=99=84=EB=A3=8C=20=EB=B7=B0=20=ED=83=AD?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=B0=B1=EA=B7=B8?=
 =?UTF-8?q?=EB=9D=BC=EC=9A=B4=EB=93=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_queue_details.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/activity_queue_details.xml b/app/src/main/res/layout/activity_queue_details.xml
index c32aa21..d79ac04 100644
--- a/app/src/main/res/layout/activity_queue_details.xml
+++ b/app/src/main/res/layout/activity_queue_details.xml
@@ -31,6 +31,7 @@
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="38dp"
+            android:background="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/top_app_bar"

From bc989249ec6ccbf2a1be41ebcd79de3d4aea3540 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:16:34 +0900
Subject: [PATCH 16/23] =?UTF-8?q?[chore]=20#26=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=B2=84=ED=8A=BC=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/activity_waiting_detail.xml    | 145 +++++++++++++-----
 1 file changed, 108 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/layout/activity_waiting_detail.xml b/app/src/main/res/layout/activity_waiting_detail.xml
index e451cf0..3bed863 100644
--- a/app/src/main/res/layout/activity_waiting_detail.xml
+++ b/app/src/main/res/layout/activity_waiting_detail.xml
@@ -68,6 +68,7 @@
             tools:text="@string/waiting_number_primary" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_waiting_detail_front_waiting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="9dp"
@@ -114,49 +115,119 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_front_waiting" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <Button
-            android:id="@+id/btn_waiting_detail_call"
-            style="@style/Style.Material3.Button.Outlined.Custom"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_waiting_detail_call"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/call"
-            app:icon="@drawable/ic_call_gray_500_24"
-            app:layout_constraintBottom_toTopOf="@id/view_waiting_horizontal_3dp"
-            app:layout_constraintEnd_toStartOf="@+id/btn_waiting_detail_location"
+            android:layout_marginTop="23dp"
+            android:background="@drawable/shape_gray_100_line_8_rect"
+            app:layout_constraintEnd_toStartOf="@id/layout_waiting_detail_location"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_waiting_detail_number" />
+            app:layout_constraintStart_toStartOf="@+id/tv_waiting_detail_name"
+            app:layout_constraintTop_toBottomOf="@+id/layout_waiting_detail_front_waiting">
 
-        <Button
-            android:id="@+id/btn_waiting_detail_location"
-            style="@style/Style.Material3.Button.Outlined.Custom"
+            <ImageView
+                android:id="@+id/iv_waiting_detail_call"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="7dp"
+                android:src="@drawable/ic_call_gray_500_24"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_waiting_detail_call"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_waiting_detail_call"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:text="@string/call"
+                android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                android:textColor="@color/gray_600"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_waiting_detail_call"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_waiting_detail_call"
+                app:layout_constraintTop_toTopOf="@+id/iv_waiting_detail_call" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_waiting_detail_location"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:text="@string/location"
-            app:icon="@drawable/ic_location_gray_500_24"
-            app:layout_constraintBottom_toBottomOf="@id/btn_waiting_detail_call"
-            app:layout_constraintEnd_toStartOf="@+id/btn_waiting_detail_store"
-            app:layout_constraintStart_toEndOf="@+id/btn_waiting_detail_call"
-            app:layout_constraintTop_toTopOf="@id/btn_waiting_detail_call" />
-
-        <Button
-            android:id="@+id/btn_waiting_detail_store"
-            style="@style/Style.Material3.Button.Outlined.Custom"
-            android:layout_width="wrap_content"
+            android:layout_marginStart="@dimen/spacing16"
+            android:background="@drawable/shape_gray_100_line_8_rect"
+            app:layout_constraintBottom_toBottomOf="@+id/layout_waiting_detail_call"
+            app:layout_constraintEnd_toStartOf="@id/layout_waiting_detail_store"
+            app:layout_constraintStart_toEndOf="@+id/layout_waiting_detail_call"
+            app:layout_constraintTop_toTopOf="@+id/layout_waiting_detail_call">
+
+            <ImageView
+                android:id="@+id/iv_waiting_detail_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="7dp"
+                android:src="@drawable/ic_location_gray_500_24"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_waiting_detail_location"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_waiting_detail_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:text="@string/location"
+                android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                android:textColor="@color/gray_600"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_waiting_detail_location"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_waiting_detail_location"
+                app:layout_constraintTop_toTopOf="@+id/iv_waiting_detail_location" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/layout_waiting_detail_store"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="17dp"
-            android:paddingEnd="15dp"
-            android:text="@string/store_detail"
-            app:icon="@drawable/ic_store_gray_500_24"
-            app:layout_constraintBottom_toBottomOf="@id/btn_waiting_detail_call"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_waiting_detail_location"
-            app:layout_constraintTop_toBottomOf="@id/tv_waiting_detail_number"
-            app:layout_constraintTop_toTopOf="@id/btn_waiting_detail_call" />
+            android:layout_marginStart="@dimen/spacing16"
+            android:background="@drawable/shape_gray_100_line_8_rect"
+            app:layout_constraintBottom_toBottomOf="@+id/layout_waiting_detail_location"
+            app:layout_constraintEnd_toEndOf="@+id/layout_waiting_detail_front_waiting"
+            app:layout_constraintStart_toEndOf="@+id/layout_waiting_detail_location"
+            app:layout_constraintTop_toTopOf="@+id/layout_waiting_detail_location">
+
+            <ImageView
+                android:id="@+id/iv_waiting_detail_store"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="7dp"
+                android:src="@drawable/ic_store_gray_500_24"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tv_waiting_detail_store"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_waiting_detail_store"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:text="@string/store_detail"
+                android:textAppearance="@style/TextAppearance.Body1.SemiBold"
+                android:textColor="@color/gray_600"
+                app:layout_constraintBottom_toBottomOf="@+id/iv_waiting_detail_store"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_waiting_detail_store"
+                app:layout_constraintTop_toTopOf="@+id/iv_waiting_detail_store" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
             android:id="@+id/view_waiting_horizontal_3dp"
@@ -168,7 +239,7 @@
             android:background="@color/gray_000"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_waiting_detail_call" />
+            app:layout_constraintTop_toBottomOf="@id/layout_waiting_detail_call" />
 
         <TextView
             android:id="@+id/tv_waiting_detail_info"

From c8c2d64f7c7168a2170dd980617fb7bd6e2f031d Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:27:12 +0900
Subject: [PATCH 17/23] =?UTF-8?q?[chore]=20#26=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=95=B1=EB=B0=94=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/activity_waiting_detail.xml    | 50 ++++++++++++++++---
 .../main/res/menu/menu_waiting_detail_tb.xml  | 12 -----
 2 files changed, 43 insertions(+), 19 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_waiting_detail_tb.xml

diff --git a/app/src/main/res/layout/activity_waiting_detail.xml b/app/src/main/res/layout/activity_waiting_detail.xml
index 3bed863..1f8e797 100644
--- a/app/src/main/res/layout/activity_waiting_detail.xml
+++ b/app/src/main/res/layout/activity_waiting_detail.xml
@@ -19,16 +19,52 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/tb_waiting_detail"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/button_height_56"
             android:background="@color/white"
+            app:contentInsetStart="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:menu="@menu/menu_waiting_detail_tb"
-            app:navigationIcon="@drawable/ic_back_button_gray_600_45"
-            app:title="@string/waiting_detail"
-            app:titleTextAppearance="@style/TextAppearance.H2"
-            app:titleTextColor="@color/gray_800" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/layout_waiting_detail_app_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/iv_waiting_detail_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_back_gray_800_45"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_waiting_detail_app_bar_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="@string/waiting_detail"
+                    android:textAppearance="@style/TextAppearance.H2"
+                    android:textColor="@color/gray_800"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_waiting_detail_back"
+                    app:layout_constraintStart_toEndOf="@+id/iv_waiting_detail_back"
+                    app:layout_constraintTop_toTopOf="@+id/iv_waiting_detail_back" />
+
+                <ImageView
+                    android:id="@+id/iv_waiting_detail_app_bar_refresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="2dp"
+                    android:src="@drawable/ic_refresh_gray_600_45"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <TextView
             android:id="@+id/tv_waiting_detail_ing"
diff --git a/app/src/main/res/menu/menu_waiting_detail_tb.xml b/app/src/main/res/menu/menu_waiting_detail_tb.xml
deleted file mode 100644
index a2811a4..0000000
--- a/app/src/main/res/menu/menu_waiting_detail_tb.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/item_waiting_detail_refresh"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:icon="@drawable/ic_refresh_gray_600_45"
-        android:title="refresh"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file

From 6a5067c80177e9b0f9664268711830c37e1acdde Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:27:22 +0900
Subject: [PATCH 18/23] =?UTF-8?q?[feat]=20#26=20=EB=8C=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabling/presentation/waiting/WaitingDetailActivity.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
index 74a116a..0595e33 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/waiting/WaitingDetailActivity.kt
@@ -18,6 +18,7 @@ class WaitingDetailActivity :
         orderId = intent.getLongExtra(ORDER_ID, -1)
 
         initLayout()
+        addListeners()
         setWaitingDetailList()
     }
 
@@ -25,6 +26,12 @@ class WaitingDetailActivity :
         waitingViewModel.getWaitingDetail(orderId)
     }
 
+    private fun addListeners() {
+        binding.ivWaitingDetailBack.setOnClickListener {
+            finish()
+        }
+    }
+
     private fun setWaitingDetailList() {
         waitingViewModel.waitingDetail.observe(this) { waitingDetail ->
             binding.waitingData = waitingDetail

From dcee842f875daf5a18c0beaa72f8daf93dd653d6 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:45:11 +0900
Subject: [PATCH 19/23] =?UTF-8?q?[feat]=20#26=20=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=98=88=EC=A0=95/=EC=99=84=EB=A3=8C=20=EB=B7=B0=20=EB=92=A4?=
 =?UTF-8?q?=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../queue/QueueDetailsActivity.kt             |  8 ++++
 .../res/layout/activity_queue_details.xml     | 40 +++++++++++++++----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueDetailsActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueDetailsActivity.kt
index a1dc8f4..64416ba 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueDetailsActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueDetailsActivity.kt
@@ -16,5 +16,13 @@ class QueueDetailsActivity :
                 .add(R.id.fcv_reservation, QueueReservationFragment())
                 .commit()
         }
+
+        addListeners()
+    }
+
+    private fun addListeners() {
+        binding.ivQueueDetailBack.setOnClickListener {
+            finish()
+        }
     }
 }
diff --git a/app/src/main/res/layout/activity_queue_details.xml b/app/src/main/res/layout/activity_queue_details.xml
index d79ac04..df6f609 100644
--- a/app/src/main/res/layout/activity_queue_details.xml
+++ b/app/src/main/res/layout/activity_queue_details.xml
@@ -17,15 +17,41 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/top_app_bar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
+            android:layout_height="@dimen/button_height_56"
+            app:contentInsetStart="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_back_45"
-            app:title="@string/queue_title"
-            app:titleTextAppearance="@style/TextAppearance.H2"
-            app:titleTextColor="@color/gray_800" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/layout_waiting_detail_app_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/iv_queue_detail_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_back_gray_800_45"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_waiting_detail_app_bar_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="@string/queue_title"
+                    android:textAppearance="@style/TextAppearance.H2"
+                    android:textColor="@color/gray_800"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_queue_detail_back"
+                    app:layout_constraintStart_toEndOf="@+id/iv_queue_detail_back"
+                    app:layout_constraintTop_toTopOf="@+id/iv_queue_detail_back" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"

From b0da4df0fb8c68ec9f017e336217ad0b9f46cd60 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:52:39 +0900
Subject: [PATCH 20/23] =?UTF-8?q?[feat]=20#26=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=B9=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_popular_store.xml | 6 ++++++
 app/src/main/res/values/strings.xml                | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/res/layout/activity_popular_store.xml b/app/src/main/res/layout/activity_popular_store.xml
index f95b7db..7eefa22 100644
--- a/app/src/main/res/layout/activity_popular_store.xml
+++ b/app/src/main/res/layout/activity_popular_store.xml
@@ -95,6 +95,12 @@
                     android:layout_height="match_parent"
                     android:text="@string/area_seoul_seocho" />
 
+                <com.google.android.material.chip.Chip
+                    style="@style/Style.Material3.Chip.Suggestion.Waiting"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="@string/area_seoul_yangjae" />
+
             </com.google.android.material.chip.ChipGroup>
         </HorizontalScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e42a559..9e23785 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="area_seoul_apgujeong">압구정/청담</string>
     <string name="area_seoul_samsung">선릉/삼성</string>
     <string name="area_seoul_seocho">서초/방배</string>
+    <string name="area_seoul_yangjae">양재/수서/도곡</string>
     <string name="popular_store_avg_personnel">일 평균 대기인원</string>
     <string name="popular_store_standard">을 기준으로 선정한</string>
     <string name="popular_store_BEST">인기 매장 BEST</string>

From 15924771a6f88be1d4e3765f08ddcbb1d48d3ed0 Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 19:53:33 +0900
Subject: [PATCH 21/23] =?UTF-8?q?[chore]=20#26=20=EC=84=9C=EB=B2=84?=
 =?UTF-8?q?=ED=86=B5=EC=8B=A0=20=EC=84=B1=EA=B3=B5=20=EC=8B=9C=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8A=94=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EC=A0=9C=EA=B1=B0(patch)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/tabling/presentation/queue/QueueReservationFragment.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
index 33e003d..c86e89a 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt
@@ -86,7 +86,6 @@ class QueueReservationFragment : Fragment() {
                         } else if (response.code() == 500) {
                             context!!.showToast("서버 에러 발생")
                         } else {
-                            context!!.showToast("변경이 완료되었습니다.")
                             setReservationList()
                         }
                     }

From f24273f83a36dec1dfee6c398dee626e6a4433cf Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 20:06:26 +0900
Subject: [PATCH 22/23] =?UTF-8?q?[chore]=20#26=20ktlint=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/shopDetail/ShopDetailActivity.kt      | 10 +++++-----
 .../tabling/presentation/store/PopularStoreAdapter.kt  |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
index 1c8d9a1..7e980b3 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/shopDetail/ShopDetailActivity.kt
@@ -194,12 +194,12 @@ class ShopDetailActivity :
         setTvShopDetailShopImgPageText(FIRST_POSITION)
 
         binding.vpShopDetailShopImg.registerOnPageChangeCallback(object :
-            ViewPager2.OnPageChangeCallback() {
-            override fun onPageSelected(position: Int) {
-                super.onPageSelected(position)
-                setTvShopDetailShopImgPageText(position)
+                ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    setTvShopDetailShopImgPageText(position)
+                }
             }
-        }
         )
     }
 
diff --git a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
index 17210f4..c44b376 100644
--- a/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
+++ b/app/src/main/java/org/sopt/tabling/presentation/store/PopularStoreAdapter.kt
@@ -16,7 +16,7 @@ class PopularStoreAdapter(
     private var storeList = listOf<ResponsePopularStoreDto.StoreData>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return when(viewType) {
+        return when (viewType) {
             POPULAR_STORE_WITH_TITLE -> PopularStoreWithTitleViewHolder(
                 ItemPopularStoreWithTitleBinding.inflate(inflater, parent, false),
                 moveToShopDetail
@@ -38,10 +38,11 @@ class PopularStoreAdapter(
         }
     }
 
-    override fun getItemViewType(position: Int): Int = when(position) {
+    override fun getItemViewType(position: Int): Int = when (position) {
         FIRST_POSITION -> POPULAR_STORE_WITH_TITLE
         else -> POPULAR_STORE
     }
+
     fun setStoreList(storeDataList: List<ResponsePopularStoreDto.StoreData>) {
         storeList = storeDataList
         notifyDataSetChanged()

From ec1c61840c164c0bf6d2089a6f6836e2453127cd Mon Sep 17 00:00:00 2001
From: jihyunniiii <jita1125@naver.com>
Date: Fri, 1 Dec 2023 21:07:56 +0900
Subject: [PATCH 23/23] [docs] #26 Update README.md

---
 README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ca89c12..06ac59b 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,54 @@
-# Tabling-AOS
\ No newline at end of file
+# 🍴 Tabling-Android 🍴
+> DO SOPT 33RD 합동 세미나 앱 9조 Android팀 <br>
+23.11.18 - 23.12.01
+
+![image](https://github.com/DOSOPT-CDS-TABLING/Tabling-Android/assets/103172971/81033c2b-f9d7-4fea-9b8e-a1e51e4ee9be)
+
+## 🍽️ *****Contributors*****
+| 배지현 <br> [@jihyunniiii](https://github.com/jihyunniiii) | 김민우 <br> [@DoReMinWoo](https://github.com/DoReMinWoo) | 하지은 <br>[@HAJIEUN02](https://github.com/HAJIEUN02) |
+|:---:| :---: | :---: |
+| <img width="250" src="https://avatars.githubusercontent.com/u/103172971?v=4"/> |<img width="250" src="https://avatars.githubusercontent.com/u/86788873?v=4"/>|<img width="250" src="https://avatars.githubusercontent.com/u/83916472?v=4"/>|
+| `매장 상세`, `방문 인원 모달` |`매장 검색_검색 결과`, `대기 상세`|`대기 신청 완료 팝업`, `이용예정/완료`|
+
+## 📗 *****Convention*****
+[📕 Git Convention & Branch Strategy](https://jihyunniiii.notion.site/Git-Convention-Branch-Strategy-ef6552f59ca5439d831eb3a9c306d6ae?pvs=4)
+<br>
+[📘 Android Coding Convention](https://jihyunniiii.notion.site/Android-Coding-Convention-5732cddbd1b04c62b36de8bdd8870a22?pvs=4)
+<br>
+[📒 Package Convention](https://jihyunniiii.notion.site/Package-Convention-4a4895944f484883a2d59b044f85890d?pvs=4)
+
+## 📷 *****ScreenShot*****
+### 🥄 매장 검색_검색 결과, 매장 상세, 방문인원 모달, 대기 신청 완료 팝업
+https://github.com/DOSOPT-CDS-TABLING/Tabling-Android/assets/103172971/de5a1669-4d4f-4f5b-8aff-6c6d1216a2e2
+
+### 🧂 이용예정/완료, 대기 상세
+https://github.com/DOSOPT-CDS-TABLING/Tabling-Android/assets/103172971/e080dd36-af61-4b53-b007-2d3d3ee88ced
+
+## 📁 *****Foldering*****
+
+```
+📂 org.sopt.tabling
+┣ 📂 data
+┃ ┣ 📂 datasource
+┃ ┃ ┣ 📂 remote
+┃ ┣ 📂 model
+┃ ┃ ┣ 📂 request
+┃ ┃ ┣ 📂 response
+┃ ┣ 📂 repository
+┃ ┣ 📂 service
+┣ 📂 di
+┣ 📂 domain
+┃ ┣ 📂 model
+┃ ┣ 📂 repository
+┣ 📂 presentation
+┃ ┣ 📂 common
+┃ ┣ 📂 queue
+┃ ┣ 📂 reserve
+┃ ┣ 📂 shopDetail
+┃ ┣ 📂 store
+┃ ┣ 📂 type
+┃ ┣ 📂 waiting
+┣ 📂 util
+┃ ┣ 📂 binding
+┃ ┣ 📂 extension
+```