Merge branch 'develop' into feat-visit-completed-view

# Conflicts: # app/src/main/java/org/sopt/tabling/presentation/common/ViewModelFactory.kt # app/src/main/res/drawable/shape_gray_100_line_99_rect.xml # app/src/main/res/values/strings.xml
DOSOPT-CDS-TABLING · Nov 28, 2023 · 9791e1b · 9791e1b
2 parents e4c81da + 3039fa3
commit 9791e1b
Show file tree

Hide file tree

Showing 51 changed files with 2,157 additions and 45 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,14 +15,9 @@
         android:theme="@style/Theme.TablingAndroid"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
-            android:name=".presentation.store.PopularStoreActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity" />
 
         <activity
-            android:name=".presentation.queue.QueueDetailsActivity"
+            android:name=".presentation.store.PopularStoreActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
@@ -33,6 +28,18 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".presentation.shopDetail.ShopDetailActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".presentation.queue.QueueDetailsActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
         <activity
             android:name=".presentation.waiting.WaitingDetailActivity"
             android:exported="false"

diff --git a/app/src/main/java/org/sopt/tabling/domain/model/Menu.kt b/app/src/main/java/org/sopt/tabling/domain/model/Menu.kt
@@ -0,0 +1,6 @@
+package org.sopt.tabling.domain.model
+
+data class Menu(
+    val menuCategory: String,
+    val menuInfoList: List<MenuInfo>
+)
diff --git a/app/src/main/java/org/sopt/tabling/domain/model/MenuInfo.kt b/app/src/main/java/org/sopt/tabling/domain/model/MenuInfo.kt
@@ -0,0 +1,8 @@
+package org.sopt.tabling.domain.model
+
+data class MenuInfo(
+    val menuId: Long,
+    val menuPhotoUrl: String,
+    val menuName: String,
+    val price: Int
+)
diff --git a/app/src/main/java/org/sopt/tabling/domain/model/Review.kt b/app/src/main/java/org/sopt/tabling/domain/model/Review.kt
@@ -0,0 +1,9 @@
+package org.sopt.tabling.domain.model
+
+data class Review(
+    val reviewId: Long,
+    val star: Float,
+    val reviewerName: String,
+    val dayBefore: Int,
+    val reviewContent: String
+)
diff --git a/app/src/main/java/org/sopt/tabling/domain/model/ShopDetail.kt b/app/src/main/java/org/sopt/tabling/domain/model/ShopDetail.kt
@@ -0,0 +1,21 @@
+package org.sopt.tabling.domain.model
+
+data class ShopDetail(
+    val shopId: Long,
+    val detailPhotoList: List<String>,
+    val name: String,
+    val longAddress: String,
+    val currentWaiting: Int,
+    val salesTime: String,
+    val waitingTime: String,
+    val restTime: String,
+    val restDay: String,
+    val phoneNumber: String,
+    val hashTagList: List<String>,
+    val introduceContent: String,
+    val menuList: List<Menu>,
+    val averageStar: Float,
+    val reviewCount: Int,
+    val detailStarList: List<Float>,
+    val reviewList: List<Review>
+)
diff --git a/app/src/main/java/org/sopt/tabling/presentation/common/ViewModelFactory.kt b/app/src/main/java/org/sopt/tabling/presentation/common/ViewModelFactory.kt
@@ -2,15 +2,13 @@ package org.sopt.tabling.presentation.common
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.sopt.tabling.data.datasource.remote.DummyDataSource
-import org.sopt.tabling.data.repository.DummyRepositoryImpl
-import org.sopt.tabling.presentation.dummy.DummyViewModel
 import org.sopt.tabling.presentation.reportCompleted.ReportCompletedViewModel
+import org.sopt.tabling.presentation.shopDetail.ShopDetailViewModel
 
 class ViewModelFactory : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (modelClass.isAssignableFrom(DummyViewModel::class.java)) {
-            return DummyViewModel(DummyRepositoryImpl(DummyDataSource())) as T
+        if (modelClass.isAssignableFrom(ShopDetailViewModel::class.java)) {
+            return ShopDetailViewModel() as T
         } else if (modelClass.isAssignableFrom(ReportCompletedViewModel::class.java)) {
             return ReportCompletedViewModel() as T
         }

diff --git a/app/src/main/java/org/sopt/tabling/presentation/dummy/DummyViewModel.kt b/app/src/main/java/org/sopt/tabling/presentation/dummy/DummyViewModel.kt
@@ -1,10 +0,0 @@
-package org.sopt.tabling.presentation.dummy
-
-import androidx.lifecycle.ViewModel
-import org.sopt.tabling.data.repository.DummyRepositoryImpl
-
-class DummyViewModel(
-    private val dummyRepositoryImpl: DummyRepositoryImpl,
-) : ViewModel() {
-    // TODO 서버통신 관련 로직 작성
-}