[Redesign/#200] review보기 리디자인 적용 (#202)

* resign: 액션바 색상 변경 * add: 리사이클러뷰 메뉴 아이템 생성 * chore: 프로그래스 바 간격 맞추기 * chore: 맛&양 -> 굿&배드 * feat: 카드뷰로 사진 테두리 구현 * feat: 카드뷰로 사진 둥근테두리 구현 * feat: 간격 값 조정 * chore: gitignore 수정 * fix: 사진 있을 때만 imageView&CardView 보이게 * delete: ds_store * fix: missing files * chore: 바 추가 * chore: 리뷰 없을 때 간격 조정 * chore: 시간 대 조정
EAT-SSU · Sep 2, 2024 · fd63a47 · fd63a47
1 parent 6535874
commit fd63a47
Show file tree

Hide file tree

Showing 26 changed files with 236 additions and 347 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ captures/
 # IntelliJ
 *.iml
 .idea/
+.idea/*
 .idea/compiler.xml
 .idea/misc.xml
 .idea/workspace.xml
@@ -91,4 +92,7 @@ lint/outputs/
 lint/tmp/
 # lint/reports/
 
-.DS_Store
+.DS_Store
+._.DS_Store
+**/.DS_Store
+**/._.DS_Store
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/release/.DS_Store b/app/release/.DS_Store
diff --git a/app/src/.DS_Store b/app/src/.DS_Store
diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store
diff --git a/app/src/main/java/.DS_Store b/app/src/main/java/.DS_Store
diff --git a/app/src/main/java/com/.DS_Store b/app/src/main/java/com/.DS_Store
diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt
@@ -1,5 +1,7 @@
 package com.eatssu.android.ui.main
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -33,15 +35,16 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) :
     }
 
     // 4. 디폴트로 노출할 Fragment의 위치를 설정
+    @RequiresApi(Build.VERSION_CODES.O)
     fun getDefaultFragmentPosition(): Int {
         // 여기에서 디폴트로 노출할 Fragment의 위치를 반환해줍니다.
         // 예를 들어, 첫 번째 Fragment를 디폴트로 설정하려면 0을 반환합니다.
 
         val time = LocalTime.now()
 
         val selectedIndex: Int = when (time.hour) {
-            in 0..10 -> 0 //아침
-            in 10..16 -> 1 //점심
+            in 0..9 -> 0 //아침
+            in 10..15 -> 1 //점심
             in 16..24 -> 2 //저녁
             else -> 1
         }

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt
@@ -25,9 +25,7 @@ class MyReviewAdapter(private val dataList: List<Review>) :
             binding.tvReviewItemComment.text = dataList[position].content
             binding.tvReviewItemDate.text = dataList[position].writeDate
             binding.tvMenuName.text = dataList[position].menu
-            binding.tvTotalRating.text = dataList[position].mainGrade.toString()
-            binding.tvTasteRating.text = dataList[position].tasteGrade.toString()
-            binding.tvAmountRating.text = dataList[position].amountGrade.toString()
+            binding.rbRate.rating = dataList[position].mainGrade.toFloat()
             binding.tvWriterNickname.text = MySharedPreferences.getUserName(binding.root.context)
 
             val imageView: ImageView = binding.ivReviewPhoto

diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt
@@ -160,8 +160,7 @@ class ReviewActivity :
                             binding.tvReviewNumCount.text = reviewCnt.toString()
 
                             binding.tvRate.text = String.format("%.1f", mainRating)
-                            binding.tvGradeTaste.text = String.format("%.1f", tasteRating)
-                            binding.tvGradeAmount.text = String.format("%.1f", amountRating)
+
 
                             val totalReviewCount = reviewCnt
                             binding.progressBar1.max = totalReviewCount

diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt
@@ -28,29 +28,29 @@ class ReviewAdapter(private val dataList: List<Review>) :
                 binding.tvReviewItemDate.text = writeDate
                 binding.tvMenuName.text = menu
 
-                binding.tvTotalRating.text = mainGrade.toString()
-                binding.tvTasteRating.text = tasteGrade.toString()
-                binding.tvAmountRating.text = amountGrade.toString()
+                binding.rbRate.rating = mainGrade.toFloat()
             }
 
-
-
             if (data.imgUrl?.size != 0) {
                 Log.d("ReviewAdapter", data.content + data.imgUrl?.size.toString())
                 Glide.with(itemView)
                     .load(data.imgUrl?.get(0))
                     .into(binding.ivReviewPhoto)
                 binding.ivReviewPhoto.visibility = View.VISIBLE
+                binding.ivReviewPhoto.visibility = View.VISIBLE
 
                 if (data.imgUrl?.get(0) == "") {
                     binding.ivReviewPhoto.visibility = View.GONE
+//                    binding.cvPhotoReview.visibility = View.GONE
 
                 }
                 if (data.imgUrl?.get(0) == null) {
                     binding.ivReviewPhoto.visibility = View.GONE
+//                    binding.cvPhotoReview.visibility = View.GONE
                 }
             } else {
                 binding.ivReviewPhoto.visibility = View.GONE
+//                binding.cvPhotoReview.visibility = View.GONE
             }
 
 
@@ -84,11 +84,8 @@ class ReviewAdapter(private val dataList: List<Review>) :
                 binding.tvWriterNickname.text = writerNickname
                 binding.tvReviewItemComment.text = content
                 binding.tvReviewItemDate.text = writeDate
-                binding.tvMenuName.text = menu
 
-                binding.tvTotalRating.text = mainGrade.toString()
-                binding.tvTasteRating.text = tasteGrade.toString()
-                binding.tvAmountRating.text = amountGrade.toString()
+                binding.rbRate.rating = mainGrade.toFloat()
             }
 
 
@@ -97,16 +94,19 @@ class ReviewAdapter(private val dataList: List<Review>) :
                     .load(data.imgUrl?.get(0))
                     .into(binding.ivReviewPhoto)
                 binding.ivReviewPhoto.visibility = View.VISIBLE
+                binding.cvPhotoReview.visibility = View.VISIBLE
 
                 if (data.imgUrl?.get(0) == "") {
                     binding.ivReviewPhoto.visibility = View.GONE
-
+                    binding.cvPhotoReview.visibility = View.GONE
                 }
                 if (data.imgUrl?.get(0) == null) {
                     binding.ivReviewPhoto.visibility = View.GONE
+                    binding.cvPhotoReview.visibility = View.GONE
                 }
             } else {
                 binding.ivReviewPhoto.visibility = View.GONE
+                binding.cvPhotoReview.visibility = View.GONE
             }
 
 

diff --git a/app/src/main/res/drawable/ic_bad_28.png b/app/src/main/res/drawable/ic_bad_28.png
diff --git a/app/src/main/res/drawable/ic_good_28.png b/app/src/main/res/drawable/ic_good_28.png
diff --git a/app/src/main/res/drawable/shape_button.xml b/app/src/main/res/drawable/shape_button.xml
diff --git a/app/src/main/res/drawable/shape_button_duplicate.xml b/app/src/main/res/drawable/shape_button_duplicate.xml
@@ -4,7 +4,4 @@
     <solid android:color="@color/primary" />
     <corners
         android:radius="10dp"/>
-    <padding
-        android:left="9dp"
-        android:right="9dp" />
 </shape>
diff --git a/app/src/main/res/drawable/shape_menu_name.xml b/app/src/main/res/drawable/shape_menu_name.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/secondary" />
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/primary" />
+    <corners android:radius="10dp" />
+    <padding
+        android:bottom="5dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="5dp" />
+
+</shape>
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
@@ -41,12 +41,12 @@
 
         <TextView
             android:id="@+id/toolbar_title"
-            style="@style/H2"
+            style="@style/Subtitle1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text=""
-            android:textColor="@color/primary" />
+            android:textColor="@color/gray700" />
     </androidx.appcompat.widget.Toolbar>