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/#237] OurTodo / 엠프티뷰 수정 & 성향 미설정 아이템 대응 #238

Merged
merged 4 commits into from
Mar 8, 2024
Merged

[FIX/#237] OurTodo / 엠프티뷰 수정 & 성향 미설정 아이템 대응 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40c6448
[FEAT/#237] 엠프티뷰일 때 앱바 표시
Marchbreeze Mar 8, 2024
6bdcae5
[FIX/#237] 아워투두 친구목록뷰 수정
Marchbreeze Mar 8, 2024
9aaff37
[FEAT/#237] 투두 empty뷰일 때 앱바 표시
Marchbreeze Mar 8, 2024
bfcb28b
Merge branch 'develop' of https://github.com/Team-Going/Going-Android…
Marchbreeze Mar 8, 2024
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
1 change: 1 addition & 0 deletions presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ class MyTodoFragment() : BaseFragment<FragmentMyTodoBinding>(R.layout.fragment_m

fun showEmptyView(show: Boolean) {
binding.layoutMyTodoEmpty.isVisible = show
if (show) binding.appbarMyTodo.setExpanded(true)
}

private fun observeMyTripInfoState() {
Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment

fun showEmptyView(show: Boolean) {
binding.layoutOurTodoEmpty.isVisible = show
if (show) binding.appbarOurTodo.setExpanded(true)
}

private fun observeOurTripInfoState() {
Expand Down
28 changes: 13 additions & 15 deletions ...n/src/main/java/com/going/presentation/todo/ourtodo/friendlist/OurTodoFriendViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.going.presentation.todo.ourtodo.friendlist

import androidx.recyclerview.widget.RecyclerView
import coil.load
import coil.transform.CircleCropTransformation
import com.going.domain.entity.response.TripParticipantModel
import com.going.presentation.R
import com.going.presentation.databinding.ItemTodoFriendsBinding
Expand All @@ -18,20 +17,19 @@ class OurTodoFriendViewHolder(
binding.run {
tvTodoFriend.text = item.name

val profileImage = when (item.result) {
0 -> R.drawable.img_profile_6
1 -> R.drawable.img_profile_1
2 -> R.drawable.img_profile_2
3 -> R.drawable.img_profile_4
4 -> R.drawable.img_profile_8
5 -> R.drawable.img_profile_5
6 -> R.drawable.img_profile_7
else -> R.drawable.img_profile_3
}

ivTodoFriend.load(profileImage) {
transformations(CircleCropTransformation())
}
ivTodoFriend.load(
when (item.result) {
0 -> R.drawable.img_profile_6
1 -> R.drawable.img_profile_1
2 -> R.drawable.img_profile_2
3 -> R.drawable.img_profile_4
4 -> R.drawable.img_profile_8
5 -> R.drawable.img_profile_5
6 -> R.drawable.img_profile_7
7 -> R.drawable.img_profile_3
else -> R.drawable.img_profile_guest
}
)

root.setOnSingleClickListener {
onClicked(item.participantId)
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/layout/item_todo_friends.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:paddingStart="1dp"
android:paddingEnd="10dp">

<ImageView
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/iv_todo_friend"
android:layout_width="45dp"
Comment on lines +11 to 13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋아요~!!!

android:layout_height="0dp"
Expand Down
Loading