Skip to content

Commit

Permalink
Production to develop (#213)
Browse files Browse the repository at this point in the history 
* 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 f115b5f.

* Revert "chore: indicator width min"

This reverts commit afc2f16.

* [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: 아이콘 없대서 다시 되돌림
  • Loading branch information
@HI-JIN2
HI-JIN2 authored Sep 16, 2024
1 parent 40c675d commit 8665dbb
Show file tree
Hide file tree
Showing 15 changed files with 306 additions and 279 deletions.
8 changes: 6 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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())

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/eatssu/android/base/BaseActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ abstract class BaseActivity<B : ViewBinding>(
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)
}
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
// }
}
8 changes: 4 additions & 4 deletions app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?: ""
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ class MyReviewAdapter(private val dataList: List<Review>) :
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)

Expand Down
22 changes: 9 additions & 13 deletions app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
Binary file modified app/src/main/res/drawable/ic_check_24.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/ic_uncheck_24.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/selector_check_state.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item android:state_checked="false">
<layer-list>

<item android:drawable="@drawable/ic_unselected_24" />
<item android:drawable="@drawable/ic_uncheck_24" />


</layer-list>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

</FrameLayout>

<!-- ViewPager2 - fragment 3개 -->
Expand Down
77 changes: 39 additions & 38 deletions app/src/main/res/layout/activity_review.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,45 +108,46 @@
</LinearLayout>


<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">

<ImageView
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:src="@drawable/ic_good_28" />

<TextView
android:id="@+id/tv_good"
style="@style/Subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="20"
android:textColor="@color/black" />
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center">-->

<!-- <ImageView-->
<!-- android:layout_width="28dp"-->
<!-- android:layout_height="28dp"-->
<!-- android:layout_gravity="center"-->
<!-- android:src="@drawable/ic_good_28" />-->

<!-- <TextView-->
<!-- android:id="@+id/tv_good"-->
<!-- style="@style/Subtitle1"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center"-->
<!-- android:text="20"-->
<!-- android:textColor="@color/black" />-->

<!-- <ImageView-->
<!-- android:layout_width="28dp"-->
<!-- android:layout_height="28dp"-->
<!-- android:layout_gravity="center"-->
<!-- android:src="@drawable/ic_bad_28" />-->

<!-- <TextView-->
<!-- android:id="@+id/tv_bad"-->
<!-- style="@style/Subtitle1"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="17"-->
<!-- android:layout_gravity="center"-->
<!-- android:textColor="@color/black" />-->

<!-- &lt;!&ndash; android:text="@{String.valueOf(viewModel.uiState.reviewInfo.tasteRating)}"&ndash;&gt;-->


<!-- </LinearLayout>-->

<ImageView
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:src="@drawable/ic_bad_28" />

<TextView
android:id="@+id/tv_bad"
style="@style/Subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="17"
android:layout_gravity="center"
android:textColor="@color/black" />

<!-- android:text="@{String.valueOf(viewModel.uiState.reviewInfo.tasteRating)}"-->


</LinearLayout>
</LinearLayout>

<!-- 프로그래스 바 -->
Expand Down
Loading

0 comments on commit 8665dbb

Please sign in to comment.