diff --git a/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoFragment.kt index a5ee4b85..6b024529 100644 --- a/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/mytodo/MyTodoFragment.kt @@ -115,7 +115,7 @@ class MyTodoFragment() : BaseFragment(R.layout.fragment_m } companion object { - const val TAB_UNCOMPLETE = "해야해요" + const val TAB_UNCOMPLETE = "해야 해요" const val TAB_COMPLETE = "완료했어요" } diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt index 2cbfd603..a9f0041b 100644 --- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt @@ -172,7 +172,7 @@ class OurTodoFragment() : BaseFragment(R.layout.fragment } companion object { - const val TAB_UNCOMPLETE = "해야해요" + const val TAB_UNCOMPLETE = "해야 해요" const val TAB_COMPLETE = "완료했어요" } diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt index 94c71ed9..17461aba 100644 --- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt +++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt @@ -7,14 +7,27 @@ import com.going.domain.entity.response.TripParticipantModel import com.going.presentation.R import com.going.presentation.databinding.ItemTodoFriendsBinding -class OurTodoFriendViewHolder(val binding: ItemTodoFriendsBinding) : RecyclerView.ViewHolder(binding.root) { +class OurTodoFriendViewHolder(val binding: ItemTodoFriendsBinding) : + RecyclerView.ViewHolder(binding.root) { fun onBind(item: TripParticipantModel) { binding.run { tvTodoFriend.text = item.name - ivTodoFriend.load(R.drawable.ic_todo_friend) { + + val profileImage = when (item.result) { + 0 -> R.drawable.img_profile_1 + 1 -> R.drawable.img_profile_2 + 2 -> R.drawable.img_profile_3 + 3 -> R.drawable.img_profile_4 + 4 -> R.drawable.img_profile_5 + 5 -> R.drawable.img_profile_6 + 6 -> R.drawable.img_profile_7 + else -> R.drawable.img_profile_8 + } + ivTodoFriend.load(profileImage) { transformations(CircleCropTransformation()) } + } } diff --git a/presentation/src/main/res/drawable/ic_todo_friend.png b/presentation/src/main/res/drawable/ic_todo_friend.png deleted file mode 100644 index 668998c2..00000000 Binary files a/presentation/src/main/res/drawable/ic_todo_friend.png and /dev/null differ diff --git a/presentation/src/main/res/layout/fragment_my_todo.xml b/presentation/src/main/res/layout/fragment_my_todo.xml index 26816d10..32c4ea5b 100644 --- a/presentation/src/main/res/layout/fragment_my_todo.xml +++ b/presentation/src/main/res/layout/fragment_my_todo.xml @@ -80,6 +80,7 @@ style="@style/TextAppearance.Doorip.Head1" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="24dp" android:layout_marginEnd="-24dp" app:layout_constraintEnd_toStartOf="@id/iv_my_todo" app:layout_constraintStart_toStartOf="parent" @@ -104,8 +105,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:src="@drawable/img_mytodo_main" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> diff --git a/presentation/src/main/res/layout/item_todo_friends.xml b/presentation/src/main/res/layout/item_todo_friends.xml index 2edb93de..dfb821d8 100644 --- a/presentation/src/main/res/layout/item_todo_friends.xml +++ b/presentation/src/main/res/layout/item_todo_friends.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" android:background="@color/white_000" android:paddingStart="1dp" android:paddingEnd="10dp"> @@ -11,7 +12,7 @@ android:id="@+id/iv_todo_friend" android:layout_width="45dp" android:layout_height="0dp" - android:src="@drawable/ic_todo_friend" + tools:src="@drawable/img_profile_1" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"