Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 디자인 배포전 일괄 수정 #145

Merged
merged 1 commit into from
Aug 27, 2024
Merged

[FIX] 디자인 배포전 일괄 수정 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions presentation/src/main/java/com/dpm/presentation/scrap/adapter/ScrapDetailAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ class ScrapDetailViewHolder(
ivScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_active)
} else {
ivScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_inactive)
ivScrap.setColorFilter(
ContextCompat.getColor(
binding.root.context,
com.depromeet.designsystem.R.color.color_foreground_caption
)
)
}


Expand Down Expand Up @@ -163,12 +169,13 @@ class ScrapDetailViewHolder(
}

private fun initScrapImageAdapter(item: ResponseScrap.ResponseBaseReview) {
if(!::scrapImageAdapter.isInitialized){
if (!::scrapImageAdapter.isInitialized) {
scrapImageAdapter = ScrapImageAdapter()
binding.vpImage.adapter = scrapImageAdapter
scrapImageAdapter.submitList(item.images.map { it.url })
setupIndicators(scrapImageAdapter.itemCount)
binding.vpImage.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
binding.vpImage.registerOnPageChangeCallback(object :
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
updateIndicators(position)
if (position >= 0 && position < item.images.size) {
Expand Down
6 changes: 6 additions & 0 deletions presentation/src/main/java/com/dpm/presentation/seatrecord/adapter/DetailRecordAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ class ReviewDetailViewHolder(
)
if (item.isScrapped) {
ivRecordScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_active)
ivRecordScrap.setColorFilter(
ContextCompat.getColor(
binding.root.context,
com.depromeet.designsystem.R.color.color_action_enabled
)
)
} else {
ivRecordScrap.load(com.depromeet.designsystem.R.drawable.ic_scrap_inactive)
ivRecordScrap.setColorFilter(
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/dpm/presentation/seatreview/dialog/view/SeatShareDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SeatShareDialog : BindingBottomSheetDialog<FragmentSightShareBottomSheetBi
super.onViewCreated(view, savedInstanceState)
initEvent()
initView()
binding.csbvSelectImage.setTextPart("시야 사진이 ", 1, "인 경우 선택해주세요")
binding.csbvSelectImage.setTextPart("시야 사진이 ", "1장", "인 경우 선택해주세요")
}

private fun initEvent() {
Expand Down
3 changes: 1 addition & 2 deletions presentation/src/main/res/layout/fragment_sight_share_bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@
android:paddingVertical="10dp"
app:layout_constraintBottom_toTopOf="@+id/clButton"
app:layout_constraintEnd_toEndOf="parent"
app:textAppearance="@style/TextAppearance.Spot.Caption04"
app:textColor="@color/color_foreground_body_subtitle">
app:textAppearance="@style/TextAppearance.Spot.Caption04">

</com.dpm.presentation.home.customview.CustomSpeechBubbleView>

Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/item_stadium_small_selection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
android:layout_marginTop="12dp"
android:gravity="center"
android:textColor="@color/color_foreground_body_sebtext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@id/iv_stadium"
app:layout_constraintStart_toStartOf="@id/iv_stadium"
app:layout_constraintTop_toBottomOf="@id/iv_stadium"
tools:text="서울\n잠실야구장" />

Expand Down
Loading