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.

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

[UI/#98] OurTodo, MyTodo / 최종 GUI 구현 #101

Merged
merged 9 commits into from
Jan 14, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class MyTodoFragment() : BaseFragment<FragmentMyTodoBinding>(R.layout.fragment_m

private fun setMyTripInfo() {
// TODO: tripId
val tripId : Long = 1
val tripId: Long = 1
viewModel.getMyTripInfoFromServer(tripId)
}

Expand Down Expand Up @@ -108,15 +108,15 @@ class MyTodoFragment() : BaseFragment<FragmentMyTodoBinding>(R.layout.fragment_m
ContextCompat.getColor(
requireContext(), R.color.red_500
)
), 3, length - 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
), length - 3, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
}
}
}

companion object {
const val TAB_UNCOMPLETE = "미완료 todo"
const val TAB_COMPLETE = "완료 todo"
const val TAB_UNCOMPLETE = "해야 해요"
const val TAB_COMPLETE = "완료했어요"
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
}

companion object {
const val TAB_UNCOMPLETE = "미완료 todo"
const val TAB_COMPLETE = "완료 todo"
const val TAB_UNCOMPLETE = "해야 해요"
const val TAB_COMPLETE = "완료했어요"
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}

}
}

Expand Down
17 changes: 17 additions & 0 deletions presentation/src/main/res/drawable/ic_mytodo_disabled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5,2L20,2A2,2 0,0 1,22 4L22,19A2,2 0,0 1,20 21L5,21A2,2 0,0 1,3 19L3,4A2,2 0,0 1,5 2z"
android:fillColor="#C3C4CE"/>
<path
android:pathData="M16.753,8.521C16.96,8.752 16.941,9.107 16.711,9.314L11.379,14.107C11.264,14.21 11.113,14.261 10.959,14.249C10.806,14.237 10.664,14.162 10.567,14.042L8.195,11.112C8,10.871 8.038,10.517 8.279,10.322C8.52,10.127 8.873,10.164 9.068,10.406L11.068,12.876L15.96,8.479C16.191,8.272 16.546,8.29 16.753,8.521Z"
android:strokeLineJoin="round"
android:strokeWidth="0.7"
android:fillColor="#ffffff"
android:fillType="evenOdd"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</vector>
17 changes: 17 additions & 0 deletions presentation/src/main/res/drawable/ic_mytodo_enabled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M5,2L20,2A2,2 0,0 1,22 4L22,19A2,2 0,0 1,20 21L5,21A2,2 0,0 1,3 19L3,4A2,2 0,0 1,5 2z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M16.753,8.521C16.96,8.752 16.941,9.107 16.711,9.314L11.379,14.107C11.264,14.21 11.113,14.261 10.959,14.249C10.806,14.237 10.664,14.162 10.567,14.042L8.195,11.112C8,10.871 8.038,10.517 8.279,10.322C8.52,10.127 8.873,10.164 9.068,10.406L11.068,12.876L15.96,8.479C16.191,8.272 16.546,8.29 16.753,8.521Z"
android:strokeLineJoin="round"
android:strokeWidth="0.7"
android:fillColor="#ffffff"
android:fillType="evenOdd"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</vector>
9 changes: 0 additions & 9 deletions presentation/src/main/res/drawable/ic_mytodo_selected.xml

This file was deleted.

9 changes: 0 additions & 9 deletions presentation/src/main/res/drawable/ic_mytodo_unselected.xml

This file was deleted.

17 changes: 17 additions & 0 deletions presentation/src/main/res/drawable/ic_ourtodo_disabled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="28dp"
android:height="20dp"
android:viewportWidth="28"
android:viewportHeight="20">
<group>
<clip-path
android:pathData="M0,0h28v20h-28z"/>
<path
android:pathData="M28,3.216C28,1.438 26.62,0 24.913,0C24.173,0 23.493,0.271 22.96,0.726L22.929,0.689L16.448,5.333C16.104,5.579 15.642,5.582 15.295,5.341L8.442,0.581C8.132,0.365 7.728,0.343 7.396,0.522L5.061,1.784C4.437,2.121 4.352,2.982 4.899,3.434L10.021,7.671C10.527,8.09 10.499,8.875 9.964,9.256L7.39,11.091C7.055,11.33 6.608,11.34 6.263,11.115L3.842,9.538C3.516,9.326 3.096,9.322 2.766,9.528L1.149,10.539C0.578,10.896 0.516,11.703 1.025,12.144L3.969,14.69C4.151,14.847 4.383,14.933 4.623,14.933H14.22C14.435,14.933 14.644,14.864 14.817,14.736L26.898,5.744L26.867,5.707C27.559,5.119 28,4.223 28,3.216Z"
android:fillColor="#C3C4CE"/>
<path
android:pathData="M1.297,19.2C1.297,18.758 1.645,18.4 2.075,18.4L18.667,18.4C19.097,18.4 19.445,18.758 19.445,19.2C19.445,19.642 19.097,20 18.667,20L2.075,20C1.645,20 1.297,19.642 1.297,19.2Z"
android:fillColor="#C3C4CE"
android:fillType="evenOdd"/>
</group>
</vector>
17 changes: 17 additions & 0 deletions presentation/src/main/res/drawable/ic_ourtodo_enabled.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="28dp"
android:height="20dp"
android:viewportWidth="28"
android:viewportHeight="20">
<group>
<clip-path
android:pathData="M0,0h28v20h-28z"/>
<path
android:pathData="M28,3.216C28,1.438 26.62,0 24.913,0C24.173,0 23.493,0.271 22.96,0.726L22.929,0.689L16.448,5.333C16.104,5.579 15.642,5.582 15.295,5.341L8.442,0.581C8.132,0.365 7.728,0.343 7.396,0.522L5.061,1.784C4.437,2.121 4.352,2.982 4.899,3.434L10.021,7.671C10.527,8.09 10.499,8.875 9.964,9.256L7.39,11.091C7.055,11.33 6.608,11.34 6.263,11.115L3.842,9.538C3.516,9.326 3.096,9.322 2.766,9.528L1.149,10.539C0.578,10.896 0.516,11.703 1.025,12.144L3.969,14.69C4.151,14.847 4.383,14.933 4.623,14.933H14.22C14.435,14.933 14.644,14.864 14.817,14.736L26.898,5.744L26.867,5.707C27.559,5.119 28,4.223 28,3.216Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M1.297,19.2C1.297,18.758 1.645,18.4 2.075,18.4L18.667,18.4C19.097,18.4 19.445,18.758 19.445,19.2C19.445,19.642 19.097,20 18.667,20L2.075,20C1.645,20 1.297,19.642 1.297,19.2Z"
android:fillColor="#FF4F17"
android:fillType="evenOdd"/>
</group>
</vector>
12 changes: 0 additions & 12 deletions presentation/src/main/res/drawable/ic_ourtodo_selected.xml

This file was deleted.

12 changes: 0 additions & 12 deletions presentation/src/main/res/drawable/ic_ourtodo_unselected.xml

This file was deleted.

5 changes: 4 additions & 1 deletion presentation/src/main/res/drawable/ic_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M17.85,29.1C18.7,28.45 19.65,27.938 20.7,27.563C21.75,27.188 22.85,27 24,27C25.15,27 26.25,27.188 27.3,27.563C28.35,27.938 29.3,28.45 30.15,29.1C30.733,28.417 31.188,27.642 31.513,26.775C31.837,25.908 32,24.983 32,24C32,21.783 31.221,19.896 29.663,18.337C28.104,16.779 26.217,16 24,16C21.783,16 19.896,16.779 18.337,18.337C16.779,19.896 16,21.783 16,24C16,24.983 16.163,25.908 16.487,26.775C16.813,27.642 17.267,28.417 17.85,29.1ZM24,25C23.017,25 22.188,24.663 21.513,23.987C20.837,23.313 20.5,22.483 20.5,21.5C20.5,20.517 20.837,19.688 21.513,19.013C22.188,18.337 23.017,18 24,18C24.983,18 25.813,18.337 26.487,19.013C27.163,19.688 27.5,20.517 27.5,21.5C27.5,22.483 27.163,23.313 26.487,23.987C25.813,24.663 24.983,25 24,25ZM24,34C22.617,34 21.317,33.737 20.1,33.213C18.883,32.688 17.825,31.975 16.925,31.075C16.025,30.175 15.313,29.117 14.788,27.9C14.262,26.683 14,25.383 14,24C14,22.617 14.262,21.317 14.788,20.1C15.313,18.883 16.025,17.825 16.925,16.925C17.825,16.025 18.883,15.313 20.1,14.788C21.317,14.262 22.617,14 24,14C25.383,14 26.683,14.262 27.9,14.788C29.117,15.313 30.175,16.025 31.075,16.925C31.975,17.825 32.688,18.883 33.213,20.1C33.737,21.317 34,22.617 34,24C34,25.383 33.737,26.683 33.213,27.9C32.688,29.117 31.975,30.175 31.075,31.075C30.175,31.975 29.117,32.688 27.9,33.213C26.683,33.737 25.383,34 24,34Z"
android:pathData="M29.995,25.765C29.995,25.705 29.978,25.645 29.947,25.593L25.723,18.506C25.59,18.283 25.751,18 26.011,18H27.41C27.53,18 27.64,18.064 27.7,18.168L30.854,23.666C30.875,23.703 30.914,23.725 30.956,23.725C30.998,23.725 31.037,23.703 31.058,23.666L34.212,18.168C34.272,18.064 34.382,18 34.502,18H35.901C36.161,18 36.322,18.283 36.189,18.506L31.965,25.593C31.934,25.645 31.917,25.705 31.917,25.765V30.287C31.917,30.472 31.768,30.621 31.583,30.621H30.329C30.144,30.621 29.995,30.472 29.995,30.287V25.765Z"
android:fillColor="#4A4D63"/>
<path
android:pathData="M11.335,30.621C11.15,30.621 11,30.472 11,30.287V18.335C11,18.15 11.15,18 11.335,18H13.111C13.247,18 13.369,18.082 13.421,18.208L17.313,27.712C17.33,27.753 17.371,27.78 17.415,27.78C17.46,27.78 17.5,27.753 17.517,27.712L21.404,18.208C21.455,18.082 21.578,18 21.714,18H23.49C23.675,18 23.825,18.15 23.825,18.335V30.287C23.825,30.472 23.675,30.621 23.49,30.621H22.329C22.144,30.621 21.994,30.472 21.994,30.287V21.583C21.994,21.544 21.963,21.513 21.924,21.513C21.896,21.513 21.87,21.53 21.86,21.556L18.252,30.395C18.201,30.521 18.078,30.603 17.942,30.603H16.876C16.74,30.603 16.618,30.52 16.566,30.394L12.957,21.533C12.948,21.51 12.925,21.494 12.899,21.494C12.865,21.494 12.837,21.522 12.837,21.557V30.287C12.837,30.472 12.687,30.621 12.502,30.621H11.335Z"
android:fillColor="#4A4D63"/>
</vector>
Binary file not shown.
105 changes: 105 additions & 0 deletions presentation/src/main/res/drawable/img_mytodo_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="124dp"
android:height="90dp"
android:viewportWidth="124"
android:viewportHeight="90">
<group>
<clip-path
android:pathData="M0,90l124,-0l0,-90l-124,-0z"/>
<path
android:pathData="M15.53,52.09C16.8,23.29 41.6,0.95 70.93,2.2C100.25,3.45 122.99,27.81 121.72,56.62C120.44,85.42 95.64,107.76 66.32,106.51C37,105.26 14.26,80.9 15.53,52.09Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M70.84,4.2C42.64,3 18.78,24.48 17.56,52.18C16.34,79.88 38.21,103.31 66.41,104.51C94.61,105.72 118.46,84.23 119.69,56.53C120.91,28.83 99.04,5.4 70.84,4.2ZM70.93,2.2C41.6,0.95 16.8,23.29 15.53,52.09C14.26,80.9 37,105.26 66.32,106.51C95.64,107.76 120.44,85.42 121.72,56.62C122.99,27.81 100.25,3.45 70.93,2.2Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M52.48,33.79C53.94,34.44 54.4,36.56 53.49,38.54C52.59,40.51 50.67,41.59 49.21,40.94C47.75,40.3 47.3,38.17 48.2,36.2C49.1,34.23 51.02,33.15 52.48,33.79Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M40.43,33.18C41.89,33.83 42.34,35.95 41.44,37.93C40.53,39.9 38.61,40.98 37.15,40.33C35.69,39.68 35.24,37.56 36.14,35.59C37.05,33.61 38.97,32.54 40.43,33.18Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M7.91,62.61C7.34,60.78 8.74,58.93 10.69,58.93H38.1C39.38,58.93 40.51,59.76 40.88,60.96L50.07,90.86C50.63,92.69 49.23,94.54 47.29,94.54H19.87C18.59,94.54 17.46,93.71 17.09,92.51L7.91,62.61Z"
android:fillColor="#4A4D63"/>
<path
android:pathData="M38.1,60.93H10.69C10.1,60.93 9.68,61.48 9.85,62.03L19.04,91.93C19.15,92.29 19.49,92.54 19.87,92.54H47.29C47.87,92.54 48.29,91.99 48.12,91.44L38.94,61.54C38.83,61.17 38.49,60.93 38.1,60.93ZM10.69,58.93C8.74,58.93 7.34,60.78 7.91,62.61L17.09,92.51C17.46,93.71 18.59,94.54 19.87,94.54H47.29C49.23,94.54 50.63,92.69 50.07,90.86L40.88,60.96C40.51,59.76 39.38,58.93 38.1,58.93H10.69Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M24.06,93.26C19.36,97.48 12.06,97.15 7.77,92.53C3.48,87.91 3.81,80.74 8.52,76.53C13.22,72.31 20.52,72.64 24.81,77.26C29.1,81.88 28.77,89.05 24.06,93.26Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M9.16,91.28C12.75,95.15 18.86,95.43 22.79,91.9C26.73,88.37 27.01,82.38 23.42,78.51C19.83,74.64 13.73,74.37 9.79,77.89C5.85,81.42 5.57,87.41 9.16,91.28ZM7.77,92.53C12.06,97.15 19.36,97.48 24.06,93.26C28.77,89.05 29.1,81.88 24.81,77.26C20.52,72.64 13.22,72.31 8.52,76.53C3.81,80.74 3.48,87.91 7.77,92.53Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M14.05,66.4C14.05,65.85 14.5,65.4 15.06,65.4H36.6C37.16,65.4 37.62,65.85 37.62,66.4C37.62,66.95 37.16,67.4 36.6,67.4H15.06C14.5,67.4 14.05,66.95 14.05,66.4Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M15.21,70.85C15.21,70.3 15.67,69.85 16.23,69.85H37.76C38.33,69.85 38.78,70.3 38.78,70.85C38.78,71.4 38.33,71.85 37.76,71.85H16.23C15.67,71.85 15.21,71.4 15.21,70.85Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M87.92,59.37L113.69,60.54L113.48,64.86L87.72,63.69L87.92,59.37Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M61.97,81.97L57.64,77.67L86.98,49.19L91.31,53.49L61.97,81.97Z"
android:fillColor="#78D6FF"/>
<path
android:pathData="M55.22,86.62C53.66,87.7 51.75,85.81 52.86,84.28L57.67,77.65L62,81.95L55.22,86.62Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M54.41,85.08L59.3,81.33L58.29,80.32L54.41,85.08ZM54.2,87.61L60.95,82.96L60.95,82.97L91.32,53.49L91.33,53.49L94.84,50.09C95.51,49.44 95.51,48.38 94.85,47.72L92.92,45.79C92.26,45.14 91.18,45.13 90.51,45.78L88.41,47.82L88.41,47.81L56.64,78.64L56.64,78.64L56.64,78.64L56.62,78.66L56.63,78.67L51.84,85.27C50.73,86.8 52.63,88.69 54.2,87.61ZM91.35,50.73L89.81,49.2L91.7,47.36L93.24,48.89L91.35,50.73ZM59.55,78.57L61.09,80.1L89.81,52.21L88.27,50.68L59.55,78.57Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M78.84,64.77C78.32,64.13 77.72,63.54 77.03,63.01C72.23,59.3 65.27,60.13 61.48,64.86C57.69,69.59 58.51,76.43 63.31,80.14C68.01,83.78 74.8,83.06 78.63,78.57C88.32,78.22 105.8,74.55 111.48,61.68L87.07,60.97C85.52,62.22 82.09,64.37 78.84,64.77Z"
android:fillColor="#FF4F17"
android:fillType="evenOdd"/>
<path
android:pathData="M77.27,66.04L77.98,66.92L79.12,66.78C82.51,66.36 85.88,64.39 87.76,63.01L87.11,60.96L87.1,60.96C85.55,62.22 82.12,64.37 78.87,64.77C78.35,64.13 77.75,63.54 77.06,63.01C72.26,59.3 65.3,60.13 61.51,64.86C57.72,69.59 58.54,76.43 63.34,80.14C68.04,83.78 74.83,83.06 78.66,78.57C87.82,78.24 103.93,74.94 110.47,63.72L108.1,63.66C105.27,67.92 100.8,70.91 95.81,72.96C89.79,75.41 83.26,76.39 78.59,76.56L77.68,76.59L77.09,77.28C73.97,80.93 68.44,81.51 64.61,78.55C60.7,75.53 60.04,69.96 63.12,66.1C66.21,62.25 71.88,61.57 75.79,64.6C76.35,65.03 76.84,65.51 77.27,66.04Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M88.07,62.83C88.47,62.67 88.74,62.29 88.74,61.85C88.74,61.26 88.26,60.79 87.67,60.79C87.07,60.79 86.59,61.26 86.59,61.85C86.59,62.42 87.05,62.89 87.63,62.9L87.72,63.02L88.07,62.83Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M108.43,63.01C108.54,62.62 108.87,62.31 109.3,62.25C109.89,62.16 110.44,62.55 110.53,63.13C110.63,63.71 110.23,64.25 109.64,64.34C109.12,64.42 108.64,64.13 108.46,63.67L108.08,63.67L108.43,63.01Z"
android:fillColor="#1D1F29"
android:fillType="evenOdd"/>
<path
android:pathData="M6.61,52.04L1.5,49.5"
android:strokeWidth="2.09865"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M8.79,46.68L5.72,41.94"
android:strokeWidth="2.09865"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M52.12,55.55C47.64,56.91 42.92,54.56 41.34,50.32L58,45.26C59.14,49.63 56.6,54.19 52.12,55.55Z"
android:strokeWidth="2.56451"
android:fillColor="#1D1F29"
android:strokeColor="#1D1F29"/>
<group>
<clip-path
android:pathData="M52.12,55.55C47.64,56.91 42.92,54.56 41.34,50.32L58,45.26C59.14,49.63 56.6,54.19 52.12,55.55Z"/>
<path
android:pathData="M51.26,49.24C57.08,47.68 62.53,50.33 63.99,54.67L43.07,60.25C42.1,55.78 45.44,50.79 51.26,49.24Z"
android:strokeWidth="2.56451"
android:fillColor="#FCAD95"
android:strokeColor="#1D1F29"/>
</group>
<path
android:pathData="M52.17,55.72C47.54,57.14 42.65,54.65 41.1,50.2L58.13,45.03C59.41,49.55 56.81,54.31 52.17,55.72Z"
android:strokeWidth="2.19815"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
</group>
</vector>
Loading