From 6c11b883102443f661f15d1b261aec5fd6f04686 Mon Sep 17 00:00:00 2001
From: Thirfir <sangbbang31@gmail.com>
Date: Sun, 5 Nov 2023 16:10:12 +0900
Subject: [PATCH] #111 [add] shop information data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

상점 정보 텍스트들
---
 .idea/compiler.xml                            | 12 ++++-----
 .idea/gradle.xml                              |  2 +-
 .../jjbaksa/jjbaksa/ui/shop/ShopActivity.kt   | 26 +++++++++++++++----
 app/src/main/res/layout/activity_shop.xml     | 13 ++++++----
 app/src/main/res/values/strings.xml           |  3 ++-
 .../com/jjbaksa/data/mapper/RespMapper.kt     |  2 ++
 .../jjbaksa/data/model/pin/ShopDetailResp.kt  |  4 +++
 .../jjbaksa/domain/model/shop/ShopDetail.kt   |  2 ++
 gradle/wrapper/gradle-wrapper.properties      |  6 ++---
 9 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 2500e213..923be03b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,12 +2,12 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.8">
-      <module name="JJBAKSA.app" target="11" />
-      <module name="JJBAKSA.buildSrc" target="11" />
-      <module name="JJBAKSA.buildSrc.main" target="11" />
-      <module name="JJBAKSA.buildSrc.test" target="11" />
-      <module name="JJBAKSA.data" target="11" />
-      <module name="JJBAKSA.image_selector" target="11" />
+      <module name="JJBAKSA.app" target="17" />
+      <module name="JJBAKSA.buildSrc" target="17" />
+      <module name="JJBAKSA.buildSrc.main" target="17" />
+      <module name="JJBAKSA.buildSrc.test" target="17" />
+      <module name="JJBAKSA.data" target="17" />
+      <module name="JJBAKSA.image_selector" target="17" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e8bdd8c9..f3adca57 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/ui/shop/ShopActivity.kt b/app/src/main/java/com/jjbaksa/jjbaksa/ui/shop/ShopActivity.kt
index b63643ba..096785ba 100644
--- a/app/src/main/java/com/jjbaksa/jjbaksa/ui/shop/ShopActivity.kt
+++ b/app/src/main/java/com/jjbaksa/jjbaksa/ui/shop/ShopActivity.kt
@@ -1,10 +1,12 @@
 package com.jjbaksa.jjbaksa.ui.shop
 
 import android.content.Intent
+import android.util.Log
 import android.view.View
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import com.google.android.material.tabs.TabLayoutMediator
+import com.jjbaksa.domain.model.review.ReviewShopLastDate
 import com.jjbaksa.jjbaksa.R
 import com.jjbaksa.jjbaksa.base.BaseActivity
 import com.jjbaksa.jjbaksa.databinding.ActivityShopBinding
@@ -12,7 +14,9 @@ import com.jjbaksa.jjbaksa.dialog.DoubleConfirmDialog
 import com.jjbaksa.jjbaksa.ui.pin.PinActivity
 import com.jjbaksa.jjbaksa.ui.pin.adapter.ImageFrameAdapter
 import com.jjbaksa.jjbaksa.ui.shop.viewmodel.ShopViewModel
+import com.naver.maps.geometry.LatLng
 import com.naver.maps.map.CameraPosition
+import com.naver.maps.map.CameraUpdate
 import com.naver.maps.map.MapFragment
 import com.naver.maps.map.NaverMap
 import com.naver.maps.map.OnMapReadyCallback
@@ -27,6 +31,8 @@ class ShopActivity : BaseActivity<ActivityShopBinding>(), OnMapReadyCallback {
     private lateinit var imageFrameAdapter: ImageFrameAdapter
 
     override fun initView() {
+        binding.shop = viewModel
+        binding.lifecycleOwner = this
         intent.getStringExtra("place_id")?.let {
             viewModel.placeId.value = it
             viewModel.getShopDetail(it)
@@ -39,6 +45,12 @@ class ShopActivity : BaseActivity<ActivityShopBinding>(), OnMapReadyCallback {
             placeId = viewModel.placeId.value.toString(),
             size = 2
         )
+        viewModel.getFollowersShopReviewCount(
+            placeId = viewModel.placeId.value.toString()
+        )
+        viewModel.getMyLastReviewDate(
+            placeId = viewModel.placeId.value.toString()
+        )
         initShopImageViewPagerWithTabLayout()
         initMap()
     }
@@ -72,7 +84,10 @@ class ShopActivity : BaseActivity<ActivityShopBinding>(), OnMapReadyCallback {
         viewModel.shopInfo.observe(this) {
             binding.shopTitleTextView.text = it.name
             binding.shopTypeTextView.text = it.category
-            binding.reviewStarCountTextView.text =
+            binding.addressTextView.text = it.formattedAddress
+            binding.phoneTextView.text = it.formattedPhoneNumber
+
+            binding.reviewStarCountTextView.text = if(it.ratingCount == 0) "0.0" else
                 round((it.totalRating / it.ratingCount.toDouble()) * 10).div(10).toString()
             binding.bookmarkImageView.isSelected = it.scrap != 0
 
@@ -80,9 +95,6 @@ class ShopActivity : BaseActivity<ActivityShopBinding>(), OnMapReadyCallback {
                 binding.shopImagesTabLayout.addTab(binding.shopImagesTabLayout.newTab())
             }
             imageFrameAdapter.submitList(it.photos)
-
-            binding.addressTextView.text = it.formattedAddress
-            binding.phoneTextView.text = it.formattedPhoneNumber
         }
         viewModel.addScrapInfo.observe(this) {
             if (it.id != 0) {
@@ -136,7 +148,11 @@ class ShopActivity : BaseActivity<ActivityShopBinding>(), OnMapReadyCallback {
     }
 
     override fun onMapReady(naverMap: NaverMap) {
-
+        val cameraUpdate = CameraUpdate.scrollTo(LatLng(
+            viewModel.shopInfo.value?.lat ?: 0.0,
+            viewModel.shopInfo.value?.lng ?: 0.0
+        ))
+        naverMap.moveCamera(cameraUpdate)
     }
 
     companion object {
diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml
index edc03beb..19cf04a1 100644
--- a/app/src/main/res/layout/activity_shop.xml
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -102,6 +102,7 @@
                     android:ellipsize="end"
                     app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintHorizontal_bias="0"
+                    android:text="@{shop.shopInfo.name}"
                     tools:text="비빔밥" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -117,6 +118,7 @@
                     app:layout_constraintEnd_toStartOf="@id/bookmark_image_view"
                     app:layout_constraintBottom_toBottomOf="@id/shop_title_text_view"
                     app:layout_constraintStart_toEndOf="@id/shop_title_text_view"
+                    android:text="@{shop.shopInfo.category}"
                     tools:text="일식집" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -207,6 +209,7 @@
                     app:layout_constraintBottom_toBottomOf="@+id/location_image_view"
                     app:layout_constraintStart_toEndOf="@id/location_image_view"
                     app:layout_constraintTop_toTopOf="@id/location_image_view"
+                    android:text="@{shop.shopInfo.formattedAddress}"
                     tools:text="서울특별시 강남구 역삼동 123-45" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -226,6 +229,7 @@
                     app:layout_constraintStart_toStartOf="@id/address_text_view"
                     app:layout_constraintTop_toTopOf="@id/phone_image_view"
                     app:layout_constraintBottom_toBottomOf="@id/phone_image_view"
+                    android:text="@{shop.shopInfo.formattedPhoneNumber}"
                     tools:text="010-0000-0000"/>
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -237,7 +241,7 @@
                     app:layout_constraintTop_toBottomOf="@id/phone_image_view"
                     app:layout_constraintStart_toStartOf="@id/phone_image_view" />
 
-                <androidx.appcompat.widget.AppCompatTextView
+                <TextView
                     android:id="@+id/schedule_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -245,8 +249,7 @@
                     app:layout_constraintStart_toStartOf="@id/phone_text_view"
                     app:layout_constraintTop_toTopOf="@id/schedule_image_view"
                     app:layout_constraintBottom_toBottomOf="@id/schedule_image_view"
-                    android:text="@{@string/schedule(String.valueOf(shop.shopInfo.period[0].open.time),
-                        String.valueOf(shop.shopInfo.period[0].close.time))}"
+                    android:text="@{@string/schedule(String.valueOf(shop.shopInfo.period[0].open.time),String.valueOf(shop.shopInfo.period[0].close.time))}"
                     tools:text="00:00 - 23:59"/>
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -396,6 +399,7 @@
                     android:layout_marginTop="2dp"
                     app:layout_constraintStart_toStartOf="@id/my_review_text_view"
                     app:layout_constraintTop_toBottomOf="@id/my_review_text_view"
+                    android:text="@{@string/last_review_date(shop.myLastReviewDate.lastDate)}"
                     tools:text="마지막 방문 21.04.02" />
 
                 <TextView
@@ -477,11 +481,10 @@
                     android:layout_height="240dp"
                     android:name="com.naver.maps.map.MapFragment"
                     app:layout_constraintTop_toBottomOf="@id/map_text_view" />
-
-
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>
 
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/progress_bar_container"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55520120..c1d4fd3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,7 +161,7 @@
     <string name="no_review_content">다녀온 음식점의 리뷰를 작성해 보세요!</string>
     <string name="no_review_yet">아직 등록된 리뷰가 없습니다.\n친구에게 추천해볼까요?</string>
     <string name="no_bookmark_title">등록된 북마크가 없어요.</string>
-    <string name="no_bookmark_content">새로운 음식점을 저장해 보세요!</string>
+    <string name="no_bookmark_content" formatted="false">새로운 음식점을 저장해 보세요!</string>
     <string name="search">검색</string>
     <string name="search_main_title">오늘은 어떤음식이 땡기나요?</string>
     <string name="sharp">#</string>
@@ -192,5 +192,6 @@
     <string name="change_profile_content">%s님,\n프로필을 변경하시겠어요?</string>
     <string name="last_register_date">마지막 일자 %s</string>
     <string name="total_review">총 %s개의 리뷰</string>
+    <string name="last_review_date">마지막 리뷰 %s</string>
     <string name="schedule">%s ~ %s</string>
 </resources>
\ No newline at end of file
diff --git a/data/src/main/java/com/jjbaksa/data/mapper/RespMapper.kt b/data/src/main/java/com/jjbaksa/data/mapper/RespMapper.kt
index 8a7bc513..31865ab9 100644
--- a/data/src/main/java/com/jjbaksa/data/mapper/RespMapper.kt
+++ b/data/src/main/java/com/jjbaksa/data/mapper/RespMapper.kt
@@ -94,4 +94,6 @@ fun ShopDetailResp.toShopDetail() = ShopDetail(
     formattedPhoneNumber = formattedPhoneNumber ?: "",
     openNow = openNow ?: false,
     period = period?.map { it.toPeriod() } ?: listOf(Period()),
+    lat = lat ?: 0.0,
+    lng = lng ?: 0.0
 )
diff --git a/data/src/main/java/com/jjbaksa/data/model/pin/ShopDetailResp.kt b/data/src/main/java/com/jjbaksa/data/model/pin/ShopDetailResp.kt
index a9b6dd32..924a2122 100644
--- a/data/src/main/java/com/jjbaksa/data/model/pin/ShopDetailResp.kt
+++ b/data/src/main/java/com/jjbaksa/data/model/pin/ShopDetailResp.kt
@@ -27,4 +27,8 @@ data class ShopDetailResp(
     val openNow: Boolean? = false,
     @SerializedName("period")
     val period: List<PeriodResp>? = emptyList(),
+    @SerializedName("lat")
+    val lat: Double? = 0.0,
+    @SerializedName("lng")
+    val lng: Double? = 0.0
 )
\ No newline at end of file
diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt
index 29b1d8af..e8050c32 100644
--- a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt
+++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt
@@ -13,4 +13,6 @@ data class ShopDetail(
     val formattedPhoneNumber: String = "",
     val openNow: Boolean = false,
     val period: List<Period> = emptyList(),
+    val lat: Double = 0.0,
+    val lng: Double = 0.0
 )
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29b1919e..dc0d5bc7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jul 29 14:27:53 KST 2022
+#Sat Nov 04 21:29:19 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists