From 8665dbb62e5e86b3e49bf80f73dab5c177c0ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=84?= Date: Mon, 16 Sep 2024 22:17:19 +0900 Subject: [PATCH] Production to develop (#213) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * release 1.1.15 * Release/2.0.0 (#209) * [Refactor/#165] 문의하기 리팩토링 (#189) * refactor: inquire * add: todo * [Chore] migrate build.gradle.kts & lib.version.toml (#194) * chore: migrate build.gradle.kts & lib.version.toml * chore: toml use kebab-case * [Fix/#141] remote config ENUM값 있는걸로 교체 (#193) * fix: as Restaurant 타입 캐스팅 안되는 중 * fix: conflict * ds * chore: add gitignore ".DS_Store" * [Fix/#139] 리뷰 수정시 정보가 안넘어가던 현상 고치기 (#192) * release 1.1.15 * fix: 리뷰 수정하기 정보 안넘어가던거 성공 * fix: 맛 별점이 양 별점으로 잘못 들어가는거 수정 * fix: endpoint "s" * [chore/#195] change new color scheme (#196) * chore: change new color scheme * chore: naming * chore: naming lower * chore: missing "1" * chore: change missing color * [Redesign] change home design (#198) * redesign: calendar * redesign: item_cafeteria_section.xml * fix: top 여백을 fragment에서 item으로 변경 * feat: 장소 바인딩 * chore: indicator width min * add: ic good, bad * Revert "add: ic good, bad" This reverts commit f115b5feb91ab756a059780298cf0cbcc847492d. * Revert "chore: indicator width min" This reverts commit afc2f16d13c85d0d2aa666f6ec5c258a9c7a311e. * [Feat] 현재 시간에 따른 아침/점심/저녁 구분 (#201) * feat: TabLayout 시간대 설정 * feat: TabLayout 시간대 설정 * [Redesign/#203] my page 리디자인 적용 (#204) * redesign: 마이페이지 UI 변경 * redesign: 닉네임 변경 디자인 변경 * redesign: 닉네임 변경 디자인 변경 * delete: 안쓰는 drawable 삭제 * add: 정말 탈퇴하시겠습니까? 뷰 * feat: 닉네임 설정 로직 3개 완료 * feat: 정말 탈퇴하시겠습니까? * feat: 만든 사람들 * [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: 시간 대 조정 * [Redesign/#199] Info 리디자인 적용 + bottomSheet로 변경 (#205) * redesign: info bottomsheet로 변경 * feat: 식당 운영정보 실제 정보로 바인딩 * [Redesign] menus (#208) * refactor: material menus로 신고/수정/삭제 분리 * fix: 삭제 안되는거 수정 dialog import 수정, context를 this로 수정 * fix: 리뷰 삭제 후 리스트 재로딩 * [Redesign/#206] report 리디자인 적용 +문의하기 웹뷰처리 (#207) * add: shape, selector 파일 * delete: 문의하기 카카오채널로 변경 * refactor: 신고하기 flow로 리팩토링 * chore: 로고 변경 * chore: 메뉴이름 임시 바인딩 * chore: 굿배드 주석처리 * chore: 리뷰 작성 임시 처리 * fix: 리뷰 사진 안보이는거 해결 * fix: 메뉴이름 Text style * fix: 식당 사진 똑같게 들어가던거 수정 * chore: 체크박스 색상 변경 * fix: 텍스트 비정상적으로 작은거 해결 * chore: tablayout indicator 수정 * fix: NPE 뜨는 부분 주석처리 * fix: 사진이 없는데 자리 차지 하던거 고침 * fix: 아이콘 없대서 다시 되돌림 --- app/build.gradle.kts | 8 +- .../com/eatssu/android/base/BaseActivity.kt | 6 +- .../android/ui/common/VersionViewModel.kt | 7 +- .../eatssu/android/ui/info/InfoViewModel.kt | 8 +- .../ui/mypage/myreview/MyReviewAdapter.kt | 3 +- .../android/ui/review/list/ReviewAdapter.kt | 22 +- app/src/main/res/drawable/ic_check_24.png | Bin 8539 -> 1811 bytes app/src/main/res/drawable/ic_uncheck_24.png | Bin 0 -> 2022 bytes .../res/drawable/selector_check_state.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_review.xml | 77 ++-- .../res/layout/activity_review_write_rate.xml | 398 +++++++++--------- .../res/layout/fragment_bottomsheet_info.xml | 2 +- app/src/main/res/layout/item_review.xml | 20 +- app/src/main/res/values/themes.xml | 30 +- 15 files changed, 306 insertions(+), 279 deletions(-) create mode 100644 app/src/main/res/drawable/ic_uncheck_24.png diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 42a924a0..5562fa2e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,8 +19,8 @@ android { applicationId = "com.eatssu.android" minSdk = 23 targetSdk = 34 - versionCode = 17 - versionName = "1.1.14" + versionCode = 19 + versionName = "2.0.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -45,9 +45,13 @@ android { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + var shrinkResources = false + var minifyEnabled = false } debug { +// applicationIdSuffix = ".debug" + val p = Properties() p.load(project.rootProject.file("local.properties").reader()) diff --git a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt index 4d7284e3..687db424 100644 --- a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt +++ b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt @@ -69,9 +69,9 @@ abstract class BaseActivity( showForceUpdateDialog() } - if(versionViewModel.checkAndroidMessage().dialog) { - showAndroidMessageDialog(versionViewModel.checkAndroidMessage().message) - } +// if(versionViewModel.checkAndroidMessage().dialog) { +// showAndroidMessageDialog(versionViewModel.checkAndroidMessage().message) +// } _binding = bindingFactory(layoutInflater, findViewById(R.id.fl_content), true) } diff --git a/app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt b/app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt index 33dc9e1f..70cc73ef 100644 --- a/app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt @@ -2,7 +2,6 @@ package com.eatssu.android.ui.common import androidx.lifecycle.ViewModel import com.eatssu.android.BuildConfig.VERSION_CODE -import com.eatssu.android.data.model.AndroidMessage import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository import timber.log.Timber @@ -35,7 +34,7 @@ class VersionViewModel(private val repository: FirebaseRemoteConfigRepository) : return repository.getVersionCode() } - fun checkAndroidMessage(): AndroidMessage { - return repository.getAndroidMessage() - } +// fun checkAndroidMessage(): AndroidMessage { +// return repository.getAndroidMessage() +// } } \ No newline at end of file diff --git a/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt b/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt index f834df11..84598b55 100644 --- a/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt @@ -47,25 +47,25 @@ class InfoViewModel(firebaseRemoteConfigRepository: FirebaseRemoteConfigReposito dodamEtc.value = dodam?.etc ?: "" val food = infoList.value!!.find { it.enum == Restaurant.FOOD_COURT } - foodPhotoUrl.value = dodam?.photoUrl ?: "" + foodPhotoUrl.value = food?.photoUrl ?: "" foodTime.value = food?.time ?: "" foodLocation.value = food?.location ?: "" foodEtc.value = food?.etc ?: "" val dormitory = infoList.value!!.find { it.enum == Restaurant.DORMITORY } - dormitoryPhotoUrl.value = dodam?.photoUrl ?: "" + dormitoryPhotoUrl.value = dormitory?.photoUrl ?: "" dormitoryTime.value = dormitory?.time ?: "" dormitoryLocation.value = dormitory?.location ?: "" dormitoryEtc.value = dormitory?.etc ?: "" val snack = infoList.value!!.find { it.enum == Restaurant.SNACK_CORNER } - snackPhotoUrl.value = dodam?.photoUrl ?: "" + snackPhotoUrl.value = snack?.photoUrl ?: "" snackTime.value = snack?.time ?: "" snackLocation.value = snack?.location ?: "" snackEtc.value = snack?.etc ?: "" val haksik = infoList.value!!.find { it.enum == Restaurant.HAKSIK } - haksikPhotoUrl.value = dodam?.photoUrl ?: "" + haksikPhotoUrl.value = haksik?.photoUrl ?: "" haksikTime.value = haksik?.time ?: "" haksikLocation.value = haksik?.location ?: "" haksikEtc.value = haksik?.etc ?: "" 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 7ff0055c..ba10ef14 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 @@ -24,7 +24,8 @@ class MyReviewAdapter(private val dataList: List) : fun bind(position: Int) { binding.tvReviewItemComment.text = dataList[position].content binding.tvReviewItemDate.text = dataList[position].writeDate -// binding.tvMenuName.text = dataList[position].menu + binding.tvMenuName.text = dataList[position].menu + binding.rbRate.rating = dataList[position].mainGrade.toFloat() binding.tvWriterNickname.text = MySharedPreferences.getUserName(binding.root.context) 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 1fae366e..09548ac7 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 @@ -33,31 +33,27 @@ class ReviewAdapter( binding.tvWriterNickname.text = writerNickname binding.tvReviewItemComment.text = content binding.tvReviewItemDate.text = writeDate -// binding.tvMenuName.text = menu - + binding.tvMenuName.text = menu //TODO 리사이클러뷰로 변경 binding.rbRate.rating = mainGrade.toFloat() } - if (data.imgUrl?.size != 0) { + if (!data.imgUrl.isNullOrEmpty()) { Log.d("ReviewAdapter", data.content + data.imgUrl?.size.toString()) + data.imgUrl?.toString()?.let { Log.d("ReviewAdapter", it) } + Glide.with(itemView) - .load(data.imgUrl?.get(0)) + .load(data.imgUrl[0]) .into(binding.ivReviewPhoto) binding.ivReviewPhoto.visibility = View.VISIBLE - 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) { + if (data.imgUrl[0] == "") { binding.ivReviewPhoto.visibility = View.GONE -// binding.cvPhotoReview.visibility = View.GONE + binding.cvPhotoReview.visibility = View.GONE } } else { binding.ivReviewPhoto.visibility = View.GONE -// binding.cvPhotoReview.visibility = View.GONE + binding.cvPhotoReview.visibility = View.GONE } binding.btnDetail.setOnClickListener { v: View -> diff --git a/app/src/main/res/drawable/ic_check_24.png b/app/src/main/res/drawable/ic_check_24.png index 2acc5f0136b39e079297fa8b75f070f2818f6e24..15ff864185db2f6dd6bfd6c097ffa8393e16bd7c 100644 GIT binary patch delta 1802 zcmV+l2le>dLX!?QiBL{Q4GJ0x0000DNk~Le0001B0001B2nGNE0OFW;H~;_u32;bR za{vG=O8@{YO97=lmZ_08AAbg@Nklr7w7}+q1PLV^ zsYG!8fQs-JkRAwdN>Kj*!e4-MsX}^a_zM8F*DA(H?Gd*jt=bC|M(M8iX*HFw)?Ebs1wXEU>BrLqqk-$oU3nidF)k!M8Uz$GMR& z^IuclMvj2X-)NOt@Thq7SXC!Mv=HFN>XR}BHp>W<`3ovR%<^g`Jf4za>CiXWGGnJ*WiCYj8u?T=6hktsl2mD$Zhde-7-Lm?x z#1WE|3$Sba<_hSWXv5-Kc41Pr2ucOWvGF@77eSc-Jz)F}N<~m2Ko1$egEA46l%cx` zw`YuxIF#-@n0vkwc_$xP0A4HK%}uov1V+ZUUfZ`JB9R2ZO%`Oo&X2-e)XiGx9Ds2j zceolg)Y78C^MAqlu=yag2hdjYt}(t(3Hw|Sl28I*SCjkB6c~K4&*j@B1fc|Ix0DTg zK%0cAiUJETv-U*ietw!bTbowkgd8Xd_uz&rD2?KvH&Pjyls@ziY>?&B0?hnS!>Y#tgNPE|W+S^;S^#3fWq&Y8!7L{21yV_P`sqrkzhM6b zIpo8ELHOjolTft#VENV0u-^O!6d;|9r97bDw#$%1(DY(^_(iMlzsHXA$5g=xmFg5o36P~*N@Up2_{dj(yZ}`&AW|2tPymeo zkfZA7Fn{BJ{pU+ih$GXQ5DGBRCl|}IK!V2i*?J?+ok9U9&@$wJq>b-G#gRjt16cOM zPb$U-zs5f&S|b#ISmY#Rn6!-F#t|(L3c#~@W>39RHa=F5j%bZU8QT6(T*gS-__Fj# ztcleFraw3Z7fSELuiLNT^OtK%S^*jv-w`c{{eSZThk-2sG(OTX+Hm0rL?J6zeuq>A z=w`Su5J`lr86QbifcoF-@NMJww;l^CLKcmWhy@_vLX6yh^-E+CG&a7Pc68iC5kc=O zpShwH;*A)K*8@6)5kdE`Lx4p007jX*9<6{NB4i}yyP^f+W}HRpkRUQ5WF_I^#1_#S zp??4tO(q2GD$w< zuht$g^Qjmqa3tEjv58M**2>=-3S!rCPCtcdH+YAboWZ9ObF=JMX?#1#lZ=p#vD zd$`ds2^m;}SYGIvqk5* z8zy>esRP{jb-v?`Jgh3R09X}SHh;a+OQk8kSHj;jC_v%Z$`yxs7O#wm139K`{K+VB z|Lx~fNZv(IZT#KmR7_q)h{O1Z@>>(}1>y_MQ)0%18;9|CpF2jbtv;@hfa6hbu)6LB4<9XgeysD27Jlrr?C=Ss|T(SNjQV{^bumsdD zr|S{v8NNem0_K5drHV-m#q4)xIBE2}{ro3WB4*aAFI;YH?#!U+EE^3%HS sfr48+=2dkvxWQmB7z_r3!C)}_3mRSwmfu&yc>n+a07*qoM6N<$g0?kF*#H0l literal 8539 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 U^+Cs)=9c;6rdCIaO(-}157$;PApigX diff --git a/app/src/main/res/drawable/ic_uncheck_24.png b/app/src/main/res/drawable/ic_uncheck_24.png new file mode 100644 index 0000000000000000000000000000000000000000..5e5c182429b91de800d2e062253b237fd83317ab GIT binary patch literal 2022 zcmV@~0drDELIAGL9O(c600d`2O+f$vv5yPl1_qz5HAhleV7%bvjeh%nXG{90N4SnAnahs3Z_}XFz*OF4+tSZH214u z&flp*)kWF3?6O@p^+}A!ou=tJf1OjOt|kfu0)apv5C{YUfk5CfF+?7-v9ZzO%hb)y z&D4`8Pk!TTYiMX_O8j$MdwY+6B3$`BtNh;o_;*(Mesz3&yhonmod9g~4qras-rnNc zAvdhDC|$n(WHGwr5nc!&YWfTt{X1Vq+k z7b+qv>QV;sRMmmFkI>U};{yz#$TgwF58++0&v`$ zQSaqg{$l~<)kkr&dV#e7i2WS%rq$OBd2-`1l({43KCG}7KyURC533&2uL6@7ux-AR zCDsCP?eD1fzK!eKf=T=B?d`Z>=tT6e%eI*zORNMC4Nd#*mpLbX^X3iJ6&N3e$E+Bp zCLx3khWYE3ZDVXD0K3>g?02zhp(>>D)m0KHm$2L+S8%BC=XJ;eE9)mnRDZ=;?LpthS0MbT1>m)#t#s|7Bu$O^Sl3D=$LtngjL3N;L;{!be z@vubd);zTU{GkKiwhrlM8O8^O%IMw$$gslAXUZ~uUTo5sd#l`Bu(Pw%U$KlhIx;fi zP(5g<};@`eh@@bGYM5vn%6X*D&a#EVoWj|e{0e8ax8h*DzH4;WYxY&&%O5Lra< zCF~dkaPI-!U>>OVS65f$8XFOOiuu?UtHPD_UrLEL9w130f^QA3!4?sv#AYmLK!Aj8 zp1Da90n>-RWjne6x~-D1X@mzpRPIbKiZ~H4Z|jrs@m&la;9dZ%02U{X+<~5Kk(fl# zsXEVxM`~Cdk7GM2zoOn38HOZDBKXkB!Vw56+*YoT1y%xZZ0oA`51qZ>3X=%F^l)_# zU>hxy1=h>c*VosvVd}2r*a?FjF=c>d;fS|bi{!(CFbpJOG*=;-n3xzR3#@y>>|%@R zy&(n`2393wlY}p;@$@ZAdK;MrYXR8B7SwyR17)-Yz7bRId9uV>08=&;bH+lWF_igd zmc7GS2jd2mer#SK*OIDmrCgv4WD)@Tp>!|M_f0h!Ls`33>=7IA0%Ru#2M5%25PI~1 zL7X>78ObaF6xTB%Z0mP5QR5>h8_KA{#$U>FZbYsL8P162NE!P^r_3}^)&ykPG$P87 z`KaU)Kx9M%?uS~^#P%R2^yEHaG53@te}QE^6rqRMq}0@OfD_8hWnZG4IGGa`p(s*c zOE`nAR-g=e+-D+D=G-_DK!l<%)G!g^j4zHRNIm47L@7s>#hkh0H8IBb_sB9yoCp{| zg9vpvv=2#yTr#QP|Dk=7aBO9IN{ql@7M7~ik@kPi&1 z$%!5V^*y>+f-Rd|tLEai@q2uD_aaiw@j4>s)NhyLZHy1RFHaP-D8WsD>Kh1+!SD z;bes#zwcY#!}!ut_5&OclIHk-|A>2!-2M-bz((-A4YuV297?J6Dpftgq|KKf`l(wc z;2H7+u?Y!T~LaYZdpIXc@F<2qd`naUsHL%*J$G)>h|nc*ds3LsHJ6Arp) zQ?c|!s97j8)WqS104neb9E&4P9ho9GVDe}M3(Kmk?IyevKt(yB1&=dqW4FH8Fy5y7 z4+DzuA3Vm8eoYc#jlTDfG7JO)fj}S-2m}IwK;UulKha>j#^pm4<^TWy07*qoM6N<$ Ef`^E|7XSbN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/selector_check_state.xml b/app/src/main/res/drawable/selector_check_state.xml index d595609d..2a2c87ab 100644 --- a/app/src/main/res/drawable/selector_check_state.xml +++ b/app/src/main/res/drawable/selector_check_state.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1d730873..24ae615b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -134,13 +134,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" + app:tabIndicatorFullWidth="false" android:background="@drawable/shape_corner_bottom" android:elevation="3dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/week_recycler" app:tabTextAppearance="@style/Subtitle2" tools:ignore="NotSibling" /> - diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml index 52a3e88b..ee38b3b2 100644 --- a/app/src/main/res/layout/activity_review.xml +++ b/app/src/main/res/layout/activity_review.xml @@ -108,45 +108,46 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/app/src/main/res/layout/activity_review_write_rate.xml b/app/src/main/res/layout/activity_review_write_rate.xml index 66701a7b..bf0800cc 100644 --- a/app/src/main/res/layout/activity_review_write_rate.xml +++ b/app/src/main/res/layout/activity_review_write_rate.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools"> - @@ -16,216 +15,235 @@ android:padding="16dp" tools:context=".ui.review.write.ReviewWriteRateActivity"> - - - - - - - - - - - + android:layout_height="match_parent"> - - - - - + android:layout_height="match_parent"> - - - + android:gravity="center" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + - - - - - + android:secondaryProgressTint="@color/star" + android:stepSize="1" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_review2_menu" /> - - - + android:layout_marginTop="15dp" + android:text="해당 메뉴에 대한 상세한 평가를 남겨주세요" + android:textColor="@color/gray700" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/rb_main" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + android:text="@string/max_300" + android:textAlignment="center" + app:layout_constraintEnd_toEndOf="@+id/et_review2_comment" + app:layout_constraintTop_toBottomOf="@+id/et_review2_comment" /> + + + + + + + + - - - - - - - - - - - - - - + + +