From fd63a4705fe846e000917b789b0c773fbc13cb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=84?= Date: Fri, 23 Aug 2024 16:04:55 +0900 Subject: [PATCH] =?UTF-8?q?[Redesign/#200]=20review=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=A6=AC=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9=20(#2?= =?UTF-8?q?02)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * resign: 액션바 색상 변경 * add: 리사이클러뷰 메뉴 아이템 생성 * chore: 프로그래스 바 간격 맞추기 * chore: 맛&양 -> 굿&배드 * feat: 카드뷰로 사진 테두리 구현 * feat: 카드뷰로 사진 둥근테두리 구현 * feat: 간격 값 조정 * chore: gitignore 수정 * fix: 사진 있을 때만 imageView&CardView 보이게 * delete: ds_store * fix: missing files * chore: 바 추가 * chore: 리뷰 없을 때 간격 조정 * chore: 시간 대 조정 --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 6 +- .idea/compiler.xml | 6 - .idea/misc.xml | 9 - app/.DS_Store | Bin 10244 -> 0 bytes app/release/.DS_Store | Bin 6148 -> 0 bytes app/src/.DS_Store | Bin 6148 -> 0 bytes app/src/main/.DS_Store | Bin 6148 -> 0 bytes app/src/main/java/.DS_Store | Bin 6148 -> 0 bytes app/src/main/java/com/.DS_Store | Bin 6148 -> 0 bytes .../android/ui/main/ViewPager2Adapter.kt | 7 +- .../ui/mypage/myreview/MyReviewAdapter.kt | 4 +- .../android/ui/review/list/ReviewActivity.kt | 3 +- .../android/ui/review/list/ReviewAdapter.kt | 20 +- app/src/main/res/drawable/ic_bad_28.png | Bin 0 -> 1397 bytes app/src/main/res/drawable/ic_good_28.png | Bin 0 -> 1355 bytes app/src/main/res/drawable/shape_button.xml | 9 - .../res/drawable/shape_button_duplicate.xml | 3 - app/src/main/res/drawable/shape_menu_name.xml | 15 ++ app/src/main/res/layout/activity_base.xml | 4 +- app/src/main/res/layout/activity_review.xml | 201 ++++++++++-------- app/src/main/res/layout/activity_sign_out.xml | 2 +- .../res/layout/activity_user_name_change.xml | 2 +- app/src/main/res/layout/item_menu_name.xml | 15 ++ .../main/res/layout/item_others_review.xml | 167 ++++----------- app/src/main/res/layout/item_review.xml | 110 ++-------- 26 files changed, 236 insertions(+), 347 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/misc.xml delete mode 100644 app/.DS_Store delete mode 100644 app/release/.DS_Store delete mode 100644 app/src/.DS_Store delete mode 100644 app/src/main/.DS_Store delete mode 100644 app/src/main/java/.DS_Store delete mode 100644 app/src/main/java/com/.DS_Store create mode 100644 app/src/main/res/drawable/ic_bad_28.png create mode 100644 app/src/main/res/drawable/ic_good_28.png delete mode 100644 app/src/main/res/drawable/shape_button.xml create mode 100644 app/src/main/res/drawable/shape_menu_name.xml create mode 100644 app/src/main/res/layout/item_menu_name.xml diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 124ac2bcf771f6fc8d34d3e9054c625b74dfae44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&5qMB5FT&KHl;!Y2_!fmMdDhOhRcGubo+By2{>#J8~~N3iI!-yan+>sP*v(3 zo`F~3%!9zYaDs1aBPCgo_Jk1Yk?hYip7C_P)NxEiVz`QYBA199G{)vtbiWav=XOr^ zjO7|o@EUR+rZR-a%UQ7uSO)%e26*o_XhsWK9Ho{0dx)9d4<)Jy;}x#+h1um_!bO_o zMZf<|>@}KK_FGQN={RqKcXAyRvtpGGXUkWtJ(n^Ke~oA1izHr8-J2ts6|*FZmntBM zVz|71nPib%59KP0aupls38(F}r|zB2#y{}8p5K48?Rp#Ef6(uG2mOcJZQHqZ@BZWC z>1leF$q$-!ftQjJF0w2ip_p=_e4d8*dF*OT?}KHQ%IpLdwz?G3iV{jGq8^>l5^P1# zVrZvSP+sHhGh)iT?U!S!zT$4p_eR+l>o1T^qK|d@%tSTE6FQ<1P3Rc~G^u%it$DlPO41zbrWdKGF{;J4=@^*~X-rRnJvyVP znh|qEpGyDK>y(43LNS)1!W>bh=T?j6=T(k|dP&4=52tfU>a}HB1}p;?XMo=i9vb7o z;7+4@b)ZvM0ALelB^axZf1t+(;K1NcBPP=gvyL{ zOlDzjD8gJlgs0p|3^dx_GGG~~GSJYf%jf^(&-edokku>$mVy6@0nr=>;~`2iXY0A* x_^kEN-lDOv-%g_nL1&I*HQ=N8HkuO5c{~6P4DK|-0 - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8978d23d..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index dc92dc9d134ea926776cc9ad2ba1af204c1400a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 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 diff --git a/app/src/main/java/com/.DS_Store b/app/src/main/java/com/.DS_Store deleted file mode 100644 index 8d4f572f4c48fd43c3df31635221448273e576a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5Z!HSn^1%v6!f;>wP@m{ikDdH!K)EHsMN$14aRI~QhO+c-1Ue25r0Q# zb~j?F-bAF#l-W0(ok_B9!%l`V#=GOlWvs;*vp^9mHVoeg&Z90!#dxZKTwNn$k(_kp zIE^xu>+1>2w(Ndub2@c9ZdxALP(KA?R zR7VF4ss#Y7fm;dK_}Pd#!k}lc&}B8fYK}{*-|a$DCM@ 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 index e74b602f..32b390b6 100644 --- 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,6 +35,7 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) : } // 4. 디폴트로 노출할 Fragment의 위치를 설정 + @RequiresApi(Build.VERSION_CODES.O) fun getDefaultFragmentPosition(): Int { // 여기에서 디폴트로 노출할 Fragment의 위치를 반환해줍니다. // 예를 들어, 첫 번째 Fragment를 디폴트로 설정하려면 0을 반환합니다. @@ -40,8 +43,8 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) : 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 index 3a50ad87..1c1a87d1 100644 --- 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) : 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 index eee79367..a473efc7 100644 --- 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 index 37b3b54a..8b6e5c6a 100644 --- 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) : 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) : 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) : .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 new file mode 100644 index 0000000000000000000000000000000000000000..a661c95b56a35f22beabc98a80e69d997f493cf2 GIT binary patch literal 1397 zcmZ`(X;2af6h@R)B=A79j9l|9axu*s4fDV|RLmr)#3j+x4v)YKOAI%Uku6Izv^++0 z%Ue6tQVZ`@OwEflBV08+@<<_1VCnbHzL|G?-#72QnfK$Rd3m}(m9>=t007j@)zMp) zBYwKlFS6Ll7h+`z9N~J70sxrEY7?wn$;s?e87W8ccEJFu`Vez6pb%{DVGjV*-i7R3 z1OWgbWj9BApIEuYi5Blq&U+MB!h_5m98?k%BCkdoMSOE7uk5qHsZ!W&LPi{eWvt|P zzRRjTj`0LX;=UZxrz%gTZYzk~wPUp7MNwQk4hifb+s>#XL z{-4>EDFk_mSD#oSB+bUGdh4PnQGv;z9@s|HU~9gaPOCc`mf2yh$@hrp_4_?GHE!ju>rf8`!K{eVT4d>Zx4N@D0^+Zdx0Sbx zwOSJS6Z;(ftxC$u@dO8$X&35aO3HLqN$xUQykZ9?2821YGa>adW)K`r%CfN!=;XGu7oX@9W@zZtG%BQ(=RVRP~iy_QEHW4EKo>e<)o>#1kJwD9POjwlmd>blPHxFuzJkkwt64! zAzIK}W@so9zw)aNHgsTK3sVEV_V{%P8vz=k;O+={@~1F2&Bk%q8A5rZXu6eEBK4t< zUP0Jz_wEqzcZ&pI@~1&2=-I=U%l=g48BCLAi{1~^fo}6ATk_Y{J6}hV2afN(L`7^Q zP|~^}W4R9kL*JsfWtw>TW&L)?QW!uZc!3(tej>BJNtt?$6_P#kWr= zHJyFsKaxXp-Q6>tlyC{WTwYK=Wfs>U$AL>`1X?WsnHOw|lOdJykDxtr+d$@N zn>7o+)Bt>9WKS?J8FIQpIfA!pwHFnOXm~qjBU5}6DOvqZFs&j2oIjG^YKOb7iYkcH zK{?jah#}(V@P?Tz!6Zhb{I9{wg83h6+i0`l-M7(-91bUmo*bTkBqgl3Y!Z`Cdpz`U z1n3a6B+8@W%}rCnzw8_{Z1RK3=4$dAYZKbPf72wzA!K8b?Cv7cF^vsEYTSMqtb!LO zZN^Mrvt-nX+SJ1OaHBb8Fpkz?UZ+4^=fB^G9UxX5rW@~0drDELIAGL9O(c600d`2O+f$vv5yPZh0tCgPXKv>!lgsPA>;|tJ^^5w$q{$J z%@OAb>Y1kQA(poL5t~_UoY_5CH%H000000000000000 z00000j0)2P*}gh2HJfj@SgEoiDqlCUsw(3B*_rsay}6YJd1hh)+jsNcXjf}LK&elns0+`@<`zW+_<$(-^kNc$N<-CFYj@p_RO|+czTq%Qa9T-FV4zj^gh`S zgBXWo#K|gtVYero+_%FMij{TF;}h~op#uEGbm7tA-IZ#$V{Rt&ZLIh?d8AMQcAYLL z_4w)h(q6ay+vW3Se<_~_3*VoRM+y^Qx9NfoWdG^H^6tlu@x6SCLIij{UC@_0&9?S* z;ggec-^-`)KEQsb3$`MZPvLcdgG?7}MJS)b+W-fhF4&4tK82S7W|=OejxR|06kY~6 z=ybtWl=3OO3oy%c!B&*=DZIKHv0kgJvZ7~Zn|*ho7b%|!t7GH%x;}o6JT*lg(c$f+ zw)>ba*zEGDh$G#rRnOyy8oFG``L)X7^!~U!df`nE?AH6_hHO70PLmEx?)^nHB>jgw z(m_6U9i%tsz#yR?%x(Dt4jP_4`W%Mtk*hKimJu;I9`Td@+-rXo zP-@^3a=cFi`f&6)w8(Xc&Pu3N${KnKaHq%qsq>WHKiA*B`T97bBrGeXcI3Qiey4xP z$&>k|6>`9335|@;B^q;5t`F`m9m$AQhnVX9GA)sFG&wL4j}?yE;llE^^g6RGP~_xk zHUyXvhw+-ZExmC2>NxjGf&ep;l4|$D=6_+Ca)tnhpc3^awXFy}5C($)hrj`UWp0NF z*C}TRa0q(flDfDM1g+d32u6Sz{akw~;hE>W#;<+cOdd4^m{BW^BXgVI->JwQ0?dj( zShDsfIe-8&V&ZSjZGC;TP7WZzj1+TZZU>4{LVY2NLha{rZryGnKwsRNnzGM-Raa{Y z5nu)_wx5clH{=Kc%z%}O%x!%Q)Jgdi2rz?y(<4v{83FplzJxZV;yO8k00%TKm(V&8 z;DE;E5?TiW9MqUxLhC?)0~(i0XdV6p$W%8s+fP~NPO)_lP%%nqKR8LBYZ6Mzl(TM+ z=DS`P>P>(#(`l-Kc`NTn+7njx(zf5pF>eBFy^D|ZKj!tuQeNv4$UUsTLlwZvzldb$<@Ql%Cq+TY@{~NUqwG&R<@h}{&TJ`m#v!L zU9XNBgLU=J7PoBHDy#1oicm=<{OItTrK5h1TfaEnV_iPUp?+UwlFx7P(8k5-u099u zkOSisp73%WC@(Y!nAZ9!y`!TV@+OQgXOqQo2~T+015Hwj6Is2>a*KyYd>&K{J#nw< zQhz#gJK6K`|CIm$000000000000000000000000000000004jy`yUr?6XG&+I{p9v N002ovPDHLkV1k9BddUC) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/shape_button.xml b/app/src/main/res/drawable/shape_button.xml deleted file mode 100644 index 68986fdf..00000000 --- a/app/src/main/res/drawable/shape_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_button_duplicate.xml b/app/src/main/res/drawable/shape_button_duplicate.xml index 0f76aaed..c95732de 100644 --- a/app/src/main/res/drawable/shape_button_duplicate.xml +++ b/app/src/main/res/drawable/shape_button_duplicate.xml @@ -4,7 +4,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_menu_name.xml b/app/src/main/res/drawable/shape_menu_name.xml new file mode 100644 index 00000000..ae5ef7b7 --- /dev/null +++ b/app/src/main/res/drawable/shape_menu_name.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index 3ec988e9..11e1ed9d 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -41,12 +41,12 @@ + android:textColor="@color/gray700" /> diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml index 4ccebd28..52a3e88b 100644 --- a/app/src/main/res/layout/activity_review.xml +++ b/app/src/main/res/layout/activity_review.xml @@ -4,22 +4,23 @@ xmlns:tools="http://schemas.android.com/tools"> - - + + @@ -84,10 +89,10 @@ android:isIndicator="true" android:max="1" android:numStars="1" - android:progressBackgroundTint="@color/primary" - android:progressTint="@color/primary" + android:progressBackgroundTint="@color/star" + android:progressTint="@color/star" android:rating="2" - android:secondaryProgressTint="@color/primary" + android:secondaryProgressTint="@color/star" android:stepSize="1" /> + + - + android:src="@drawable/ic_bad_28" /> - - - + + - + + + + + @@ -242,18 +235,21 @@ android:includeFontPadding="false" android:text="@string/rate_4" android:textAlignment="center" - android:textColor="@color/black" app:layout_constraintStart_toStartOf="@id/rate5" app:layout_constraintTop_toBottomOf="@id/rate5" /> + + @@ -270,17 +266,19 @@ android:includeFontPadding="false" android:text="@string/rate_3" android:textAlignment="center" - android:textColor="@color/black" /> + + @@ -297,17 +295,19 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="@string/rate_2" - android:textAlignment="center" android:textColor="@color/black" /> + @@ -327,13 +327,17 @@ android:textAlignment="center" android:textColor="@color/black" /> + + @@ -341,35 +345,21 @@ - - -