feat: 홈화면(공모목록) UI 추가 구현 및 상태 변경 대응 (#142)

* feat: 공모의 상태 변경이 반영되도록 기능 구현 * feat: 공모 목록 ui변경 * feat: 필터 ui추가 * feat: API변경에 따른 DTO수정 * style: lint적용 * feat: resource추가 * refactor: ui위치 수정 * chore: 불필요한 괄호 제거 * refactor: item 수직 정렬
woowacourse-teams · Aug 1, 2024 · adcc62b · adcc62b
1 parent a36190b
commit adcc62b
Show file tree

Hide file tree

Showing 18 changed files with 272 additions and 76 deletions.
diff --git a/android/app/src/main/java/com/zzang/chongdae/data/mapper/OfferingMapper.kt b/android/app/src/main/java/com/zzang/chongdae/data/mapper/OfferingMapper.kt
@@ -7,7 +7,7 @@ fun RemoteOffering.toDomain() =
     Offering(
         id = this.id,
         title = this.title,
-        meetingAddress = this.meetingAddress,
+        meetingAddress = this.meetingAddress ?: "",
         thumbnailUrl = this.thumbnailUrl,
         totalCount = this.totalCount,
         currentCount = this.currentCount,

diff --git a/android/app/src/main/java/com/zzang/chongdae/data/remote/dto/response/RemoteOffering.kt b/android/app/src/main/java/com/zzang/chongdae/data/remote/dto/response/RemoteOffering.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 data class RemoteOffering(
     @SerialName("id") val id: Long,
     @SerialName("title") val title: String,
-    @SerialName("meetingAddress") val meetingAddress: String,
+    @SerialName("meetingAddressDong") val meetingAddress: String?,
     @SerialName("currentCount") val currentCount: Int,
     @SerialName("totalCount") val totalCount: Int,
     @SerialName("thumbnailUrl") val thumbnailUrl: String?,

diff --git a/android/app/src/main/java/com/zzang/chongdae/presentation/util/BindingAdapters.kt b/android/app/src/main/java/com/zzang/chongdae/presentation/util/BindingAdapters.kt
@@ -2,6 +2,8 @@ package com.zzang.chongdae.presentation.util
 
 import android.animation.ValueAnimator
 import android.content.Context
+import android.text.Html
+import android.text.Spannable
 import android.text.util.Linkify
 import android.util.TypedValue
 import android.view.View
@@ -53,24 +55,63 @@ fun ImageView.setOfferingsProductImageResource(imageUrl: String?) {
 @BindingAdapter("imageResource")
 fun setImageResource(
     imageView: ImageView,
-    @DrawableRes resource: Int,
+    @DrawableRes resource: Int?,
 ) {
-    imageView.setImageResource(resource)
+    resource?.let { imageView.setImageResource(it) }
 }
 
-@BindingAdapter("offeringCondition")
+@BindingAdapter("offeringConditionForComment", "remaining")
+fun TextView.bindConditionComment(
+    offeringCondition: OfferingCondition?,
+    remaining: Int,
+) {
+    offeringCondition?.let {
+        this.text = it.toOfferingComment(context, remaining)
+    }
+}
+
+private fun OfferingCondition.toOfferingComment(
+    context: Context,
+    remaining: Int,
+) = when (this) {
+    OfferingCondition.FULL -> context.getString(R.string.main_offering_condition_full_comment)
+    OfferingCondition.TIME_OUT -> context.getString(R.string.main_offering_condition_closed_comment)
+    OfferingCondition.CONFIRMED -> context.getString(R.string.main_offering_condition_closed_comment)
+    OfferingCondition.AVAILABLE ->
+        Html.fromHtml(
+            context.getString(R.string.main_offering_condition_continue_comment)
+                .format(remaining),
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
+        )
+}
+
+@BindingAdapter("conditionText:offeringCondition") // 추후 condition추가(마감임박)에 따른 API변경있으면 수정 예정
 fun TextView.bindConditionText(offeringCondition: OfferingCondition?) {
     offeringCondition?.toStyle()?.let {
         this.setTextAppearance(it)
     }
 
     offeringCondition?.let {
-        this.text = it.toComment(context)
+        this.text = it.toOfferingConditionText(context)
         this.setTextAppearance(it.toStyle())
+        setBackGroundTintByCondition(it)
+    }
+}
+
+private fun TextView.setBackGroundTintByCondition(offeringCondition: OfferingCondition) {
+    when (offeringCondition) {
+        OfferingCondition.FULL -> this.setColor(R.color.offering_full)
+        OfferingCondition.TIME_OUT -> this.setColor(R.color.offering_closed)
+        OfferingCondition.CONFIRMED -> this.setColor(R.color.offering_closed)
+        OfferingCondition.AVAILABLE -> this.setColor(R.color.offering_continue)
     }
 }
 
-private fun OfferingCondition.toComment(context: Context) =
+private fun TextView.setColor(colorId: Int) {
+    this.background.setTint(this.context.resources.getColor(colorId, null))
+}
+
+private fun OfferingCondition.toOfferingConditionText(context: Context) =
     when (this) {
         OfferingCondition.FULL -> context.getString(R.string.main_offering_full) // 인원 만석
         OfferingCondition.TIME_OUT -> context.getString(R.string.main_offering_closed) // 공구마감
@@ -108,10 +149,10 @@ fun TextView.bindStatusComment(
         this.text = context.getString(R.string.participant_already)
         return
     }
-    this.text = condition?.toComment(this.context, currentCount, totalCount)
+    this.text = condition?.toOfferingConditionText(this.context, currentCount, totalCount)
 }
 
-private fun OfferingCondition.toComment(
+private fun OfferingCondition.toOfferingConditionText(
     context: Context,
     currentCount: Int,
     totalCount: Int,
@@ -150,7 +191,12 @@ fun setLayoutHeightWithAnimation(
 
 @BindingAdapter("formattedAmPmTime")
 fun TextView.setTime(localDateTime: LocalDateTime?) {
-    this.text = localDateTime?.format(DateTimeFormatter.ofPattern(context.getString(R.string.amPmTime), Locale.KOREAN)) ?: ""
+    this.text = localDateTime?.format(
+        DateTimeFormatter.ofPattern(
+            context.getString(R.string.amPmTime),
+            Locale.KOREAN,
+        ),
+    ) ?: ""
 }
 
 private fun Int.toPx(context: Context): Int {
@@ -174,7 +220,13 @@ fun setFormattedDeadline(
 
 @BindingAdapter("formattedCommentTime")
 fun TextView.setTime(localTime: LocalTime) {
-    this.text = localTime.format(DateTimeFormatter.ofPattern(context.getString(R.string.amPmTime), Locale.KOREAN))
+    this.text =
+        localTime.format(
+            DateTimeFormatter.ofPattern(
+                context.getString(R.string.amPmTime),
+                Locale.KOREAN,
+            ),
+        )
 }
 
 @BindingAdapter("setImageProposer")

diff --git a/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/HomeFragment.kt b/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/HomeFragment.kt
@@ -40,6 +40,17 @@ class HomeFragment : Fragment(), OnArticleClickListener {
         return binding.root
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        offeringAdapter.refresh()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     private fun initBinding(
         inflater: LayoutInflater,
         container: ViewGroup?,

diff --git a/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/OfferingViewModel.kt b/android/app/src/main/java/com/zzang/chongdae/presentation/view/home/OfferingViewModel.kt
@@ -17,12 +17,20 @@ import com.zzang.chongdae.domain.repository.OfferingsRepository
 class OfferingViewModel(
     private val offeringsRepository: OfferingsRepository,
 ) : ViewModel() {
-    val offerings: LiveData<PagingData<Offering>> =
-        Pager(
-            config = PagingConfig(pageSize = PAGE_SIZE, enablePlaceholders = false),
-            pagingSourceFactory = { OfferingPagingSource(fetchOfferings = offeringsRepository::fetchOfferings) },
-        ).liveData
-            .cachedIn(viewModelScope)
+    lateinit var offerings: LiveData<PagingData<Offering>>
+        private set
+
+    init {
+        getOfferings()
+    }
+
+    private fun getOfferings() {
+        offerings =
+            Pager(
+                config = PagingConfig(pageSize = PAGE_SIZE, enablePlaceholders = false),
+                pagingSourceFactory = { OfferingPagingSource(fetchOfferings = offeringsRepository::fetchOfferings) },
+            ).liveData.cachedIn(viewModelScope)
+    }
 
     companion object {
         private const val PAGE_SIZE = 10

diff --git a/android/app/src/main/res/drawable/bg_main_discount_rate.xml b/android/app/src/main/res/drawable/bg_main_discount_rate.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="10dp" />
+</shape>
diff --git a/android/app/src/main/res/drawable/bg_main_filter.xml b/android/app/src/main/res/drawable/bg_main_filter.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_main_main_color_10dp" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_main_gray_color_10dp" android:state_checked="false" />
+</selector>
diff --git a/android/app/src/main/res/drawable/bg_main_gray_color_10dp.xml b/android/app/src/main/res/drawable/bg_main_gray_color_10dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/listview_background_shape">
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/gray_300" />
+</shape>
diff --git a/android/app/src/main/res/drawable/bg_main_main_color_10dp.xml b/android/app/src/main/res/drawable/bg_main_main_color_10dp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/listview_background_shape">
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/main_color" />
+</shape>
diff --git a/android/app/src/main/res/drawable/btn_main_filter.xml b/android/app/src/main/res/drawable/btn_main_filter.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_main_checked_circle" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_main_unchecked_circle" android:state_checked="false" />
+</selector>
diff --git a/android/app/src/main/res/drawable/ic_main_checked_circle.xml b/android/app/src/main/res/drawable/ic_main_checked_circle.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M6,6m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+      android:fillColor="#F15642"/>
+  <path
+      android:pathData="M4.924,7.169L8.099,3.729C8.197,3.622 8.323,3.569 8.475,3.569C8.628,3.569 8.753,3.622 8.852,3.729C8.951,3.836 9,3.972 9,4.137C9,4.302 8.951,4.438 8.852,4.545L5.3,8.394C5.193,8.51 5.067,8.569 4.924,8.569C4.78,8.569 4.655,8.51 4.547,8.394L3.148,6.878C3.049,6.771 3,6.635 3,6.469C3,6.304 3.049,6.168 3.148,6.061C3.247,5.954 3.372,5.901 3.525,5.901C3.677,5.901 3.803,5.954 3.901,6.061L4.924,7.169Z"
+      android:fillColor="#FEFEFE"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_main_unchecked_circle.xml b/android/app/src/main/res/drawable/ic_main_unchecked_circle.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M4.924,7.169L8.099,3.729C8.197,3.622 8.323,3.569 8.475,3.569C8.628,3.569 8.753,3.622 8.852,3.729C8.951,3.836 9,3.972 9,4.137C9,4.302 8.951,4.438 8.852,4.545L5.3,8.394C5.193,8.51 5.067,8.569 4.924,8.569C4.78,8.569 4.655,8.51 4.547,8.394L3.148,6.878C3.049,6.771 3,6.635 3,6.469C3,6.304 3.049,6.168 3.148,6.061C3.247,5.954 3.372,5.901 3.525,5.901C3.677,5.901 3.803,5.954 3.901,6.061L4.924,7.169Z"
+      android:fillColor="#D9D9D9"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M11.5,6C11.5,9.038 9.038,11.5 6,11.5C2.962,11.5 0.5,9.038 0.5,6C0.5,2.962 2.962,0.5 6,0.5C9.038,0.5 11.5,2.962 11.5,6Z"
+      android:fillColor="#00000000"
+      android:strokeColor="#D9D9D9"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/img_main_product_default.xml b/android/app/src/main/res/drawable/img_main_product_default.xml
@@ -1,42 +1,39 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="121dp"
-    android:height="110dp"
-    android:viewportWidth="121"
-    android:viewportHeight="110">
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
   <path
-      android:pathData="M10.85,0L110.85,0A10,10 0,0 1,120.85 10L120.85,100A10,10 0,0 1,110.85 110L10.85,110A10,10 0,0 1,0.85 100L0.85,10A10,10 0,0 1,10.85 0z"
+      android:pathData="M10,0L110,0A10,10 0,0 1,120 10L120,110A10,10 0,0 1,110 120L10,120A10,10 0,0 1,0 110L0,10A10,10 0,0 1,10 0z"
       android:fillColor="#D9D9D9"/>
   <path
-      android:pathData="M38.55,77.82V88H37.14L31.96,80.53H31.87V88H30.33V77.82H31.75L36.93,85.3H37.03V77.82H38.55ZM43.89,88.15C43.17,88.15 42.55,87.99 42.01,87.66C41.48,87.33 41.07,86.87 40.77,86.28C40.48,85.69 40.33,85.01 40.33,84.22C40.33,83.42 40.48,82.73 40.77,82.14C41.07,81.55 41.48,81.08 42.01,80.76C42.55,80.43 43.17,80.26 43.89,80.26C44.6,80.26 45.23,80.43 45.76,80.76C46.3,81.08 46.71,81.55 47.01,82.14C47.3,82.73 47.45,83.42 47.45,84.22C47.45,85.01 47.3,85.69 47.01,86.28C46.71,86.87 46.3,87.33 45.76,87.66C45.23,87.99 44.6,88.15 43.89,88.15ZM43.89,86.91C44.36,86.91 44.74,86.78 45.05,86.54C45.35,86.29 45.58,85.97 45.72,85.56C45.87,85.15 45.95,84.7 45.95,84.21C45.95,83.72 45.87,83.28 45.72,82.87C45.58,82.46 45.35,82.13 45.05,81.88C44.74,81.63 44.36,81.51 43.89,81.51C43.43,81.51 43.04,81.63 42.73,81.88C42.42,82.13 42.2,82.46 42.05,82.87C41.9,83.28 41.83,83.72 41.83,84.21C41.83,84.7 41.9,85.15 42.05,85.56C42.2,85.97 42.42,86.29 42.73,86.54C43.04,86.78 43.43,86.91 43.89,86.91ZM54.47,77.82V88H52.93V77.82H54.47ZM56.59,88V80.36H58.01V81.61H58.11C58.27,81.19 58.53,80.86 58.89,80.62C59.25,80.38 59.68,80.26 60.18,80.26C60.7,80.26 61.12,80.38 61.47,80.62C61.82,80.86 62.07,81.19 62.24,81.61H62.32C62.5,81.2 62.79,80.87 63.19,80.63C63.59,80.39 64.06,80.26 64.61,80.26C65.3,80.26 65.87,80.48 66.3,80.92C66.75,81.35 66.97,82 66.97,82.88V88H65.48V83.02C65.48,82.5 65.34,82.13 65.06,81.89C64.78,81.66 64.44,81.55 64.05,81.55C63.56,81.55 63.19,81.7 62.92,81.99C62.65,82.29 62.52,82.67 62.52,83.13V88H61.03V82.92C61.03,82.51 60.91,82.18 60.65,81.92C60.39,81.67 60.05,81.55 59.64,81.55C59.36,81.55 59.1,81.62 58.86,81.77C58.62,81.92 58.43,82.12 58.29,82.38C58.14,82.64 58.07,82.95 58.07,83.29V88H56.59ZM71.18,88.17C70.7,88.17 70.26,88.08 69.87,87.9C69.48,87.72 69.17,87.45 68.94,87.11C68.71,86.77 68.6,86.34 68.6,85.84C68.6,85.41 68.68,85.06 68.85,84.78C69.01,84.5 69.24,84.28 69.52,84.12C69.8,83.95 70.12,83.83 70.46,83.75C70.81,83.67 71.17,83.6 71.53,83.56C71.99,83.51 72.36,83.46 72.64,83.43C72.93,83.39 73.13,83.34 73.26,83.26C73.39,83.18 73.46,83.05 73.46,82.87V82.83C73.46,82.4 73.33,82.06 73.09,81.83C72.85,81.59 72.49,81.47 72.01,81.47C71.51,81.47 71.11,81.58 70.82,81.8C70.54,82.02 70.34,82.26 70.23,82.53L68.83,82.21C69,81.75 69.24,81.37 69.56,81.09C69.88,80.8 70.25,80.59 70.67,80.46C71.09,80.33 71.53,80.26 71.99,80.26C72.29,80.26 72.61,80.3 72.96,80.37C73.3,80.44 73.62,80.57 73.92,80.76C74.22,80.95 74.47,81.22 74.66,81.57C74.85,81.92 74.95,82.37 74.95,82.93V88H73.5V86.96H73.44C73.34,87.15 73.2,87.34 73.01,87.52C72.81,87.71 72.57,87.86 72.26,87.99C71.96,88.11 71.6,88.17 71.18,88.17ZM71.5,86.98C71.91,86.98 72.27,86.89 72.56,86.73C72.85,86.57 73.08,86.36 73.23,86.1C73.38,85.83 73.46,85.55 73.46,85.25V84.26C73.41,84.31 73.31,84.36 73.15,84.41C73.01,84.45 72.83,84.49 72.64,84.52C72.45,84.55 72.26,84.58 72.08,84.61C71.9,84.63 71.75,84.65 71.62,84.67C71.33,84.71 71.07,84.77 70.83,84.85C70.6,84.94 70.41,85.06 70.27,85.23C70.13,85.38 70.06,85.6 70.06,85.86C70.06,86.23 70.19,86.51 70.46,86.7C70.74,86.88 71.08,86.98 71.5,86.98ZM80.13,91.02C79.52,91.02 79,90.94 78.56,90.78C78.13,90.63 77.78,90.41 77.5,90.15C77.23,89.89 77.02,89.6 76.88,89.29L78.16,88.77C78.25,88.91 78.37,89.07 78.52,89.23C78.67,89.39 78.88,89.53 79.14,89.65C79.4,89.77 79.73,89.82 80.15,89.82C80.71,89.82 81.17,89.69 81.54,89.41C81.91,89.14 82.09,88.71 82.09,88.11V86.61H82C81.91,86.77 81.78,86.95 81.61,87.15C81.45,87.35 81.22,87.52 80.93,87.67C80.63,87.81 80.25,87.89 79.79,87.89C79.18,87.89 78.64,87.74 78.16,87.46C77.68,87.18 77.3,86.76 77.01,86.21C76.74,85.65 76.6,84.96 76.6,84.15C76.6,83.34 76.73,82.64 77.01,82.06C77.29,81.48 77.67,81.04 78.15,80.73C78.64,80.42 79.18,80.26 79.8,80.26C80.27,80.26 80.65,80.34 80.95,80.5C81.24,80.66 81.46,80.84 81.63,81.05C81.79,81.26 81.92,81.44 82.01,81.6H82.12V80.36H83.58V88.17C83.58,88.83 83.42,89.36 83.12,89.78C82.81,90.21 82.4,90.52 81.88,90.72C81.36,90.92 80.78,91.02 80.13,91.02ZM80.12,86.65C80.54,86.65 80.9,86.55 81.2,86.35C81.5,86.15 81.72,85.86 81.88,85.49C82.03,85.11 82.11,84.66 82.11,84.13C82.11,83.62 82.03,83.17 81.88,82.77C81.73,82.38 81.5,82.08 81.21,81.86C80.91,81.64 80.55,81.53 80.12,81.53C79.67,81.53 79.3,81.64 79,81.88C78.7,82.1 78.47,82.42 78.32,82.81C78.17,83.2 78.1,83.64 78.1,84.13C78.1,84.63 78.17,85.07 78.33,85.45C78.48,85.83 78.7,86.12 79,86.33C79.3,86.55 79.68,86.65 80.12,86.65ZM88.86,88.15C88.11,88.15 87.46,87.99 86.92,87.67C86.38,87.35 85.96,86.89 85.66,86.3C85.37,85.71 85.23,85.02 85.23,84.23C85.23,83.45 85.37,82.76 85.66,82.16C85.96,81.57 86.37,81.1 86.9,80.77C87.43,80.43 88.05,80.26 88.76,80.26C89.19,80.26 89.6,80.34 90.01,80.48C90.41,80.62 90.78,80.84 91.1,81.15C91.42,81.45 91.67,81.85 91.86,82.34C92.04,82.82 92.14,83.41 92.14,84.1V84.63H86.07V83.52H90.68C90.68,83.12 90.6,82.78 90.44,82.48C90.28,82.17 90.06,81.93 89.77,81.76C89.49,81.58 89.15,81.49 88.77,81.49C88.35,81.49 87.98,81.59 87.67,81.8C87.36,82 87.13,82.27 86.96,82.6C86.79,82.92 86.71,83.27 86.71,83.65V84.52C86.71,85.04 86.8,85.47 86.98,85.83C87.16,86.19 87.41,86.46 87.74,86.65C88.06,86.83 88.44,86.93 88.88,86.93C89.16,86.93 89.41,86.89 89.65,86.81C89.88,86.72 90.08,86.6 90.25,86.44C90.42,86.28 90.55,86.08 90.64,85.84L92.04,86.09C91.93,86.51 91.73,86.87 91.44,87.18C91.15,87.49 90.78,87.73 90.35,87.9C89.91,88.07 89.42,88.15 88.86,88.15Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M64.67,37.06m-9,0a9,9 0,1 1,17.99 0a9,9 0,1 1,-17.99 0"
+      android:pathData="M63.83,56.06m-9,0a9,9 0,1 1,17.99 0a9,9 0,1 1,-17.99 0"
       android:strokeWidth="3"
       android:fillColor="#D9D9D9"
       android:strokeColor="#ffffff"/>
   <path
-      android:pathData="M35.48,26.15L41.19,48.98"
+      android:pathData="M34.63,45.15L40.34,67.98"
       android:strokeWidth="3"
       android:fillColor="#00000000"
       android:strokeColor="#ffffff"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M39.54,27.64L37.66,29.47C37.38,29.73 36.95,29.62 36.85,29.26L36.23,27C36.14,26.64 36.45,26.29 36.81,26.35L39.31,26.78C39.71,26.85 39.84,27.35 39.54,27.64Z"
+      android:pathData="M38.46,45.78C38.86,45.85 38.99,46.35 38.69,46.64L36.81,48.47C36.53,48.73 36.1,48.62 36,48.26L35.38,46C35.29,45.64 35.6,45.29 35.96,45.35L38.46,45.78Z"
       android:strokeWidth="3"
       android:fillColor="#ffffff"
       android:strokeColor="#ffffff"/>
   <path
-      android:pathData="M68.39,46.22C68.39,54.28 62.4,60.6 55.26,60.6C48.13,60.6 42.14,54.28 42.14,46.22C42.14,38.17 48.13,31.85 55.26,31.85C62.4,31.85 68.39,38.17 68.39,46.22Z"
+      android:pathData="M67.54,65.22C67.54,73.28 61.55,79.6 54.42,79.6C47.28,79.6 41.29,73.28 41.29,65.22C41.29,57.17 47.28,50.85 54.42,50.85C61.55,50.85 67.54,57.17 67.54,65.22Z"
       android:strokeWidth="3"
       android:fillColor="#D9D9D9"
       android:strokeColor="#ffffff"/>
   <path
-      android:pathData="M81.07,44.83C81.07,49.9 77.21,53.85 72.65,53.85C68.08,53.85 64.22,49.9 64.22,44.83C64.22,39.77 68.08,35.82 72.65,35.82C77.21,35.82 81.07,39.77 81.07,44.83Z"
+      android:pathData="M80.22,63.83C80.22,68.9 76.36,72.85 71.8,72.85C67.23,72.85 63.38,68.9 63.38,63.83C63.38,58.77 67.23,54.82 71.8,54.82C76.36,54.82 80.22,58.77 80.22,63.83Z"
       android:strokeWidth="3"
       android:fillColor="#D9D9D9"
       android:strokeColor="#ffffff"/>
   <path
-      android:pathData="M85.93,47.55C85.93,52.83 83.05,56.75 78.34,59.43C73.57,62.14 67.03,63.5 60.14,63.5C53.24,63.5 46.78,62.14 42.1,59.44C37.47,56.77 34.65,52.85 34.65,47.55C34.65,44.75 35.4,44.13 35.93,43.92C36.32,43.77 36.91,43.7 37.79,43.8C38.67,43.9 39.7,44.15 40.92,44.52C42.01,44.84 43.19,45.24 44.47,45.68C44.62,45.73 44.76,45.78 44.91,45.83C46.36,46.32 47.91,46.84 49.54,47.31C52.8,48.26 56.4,49.05 60.14,49.05C63.87,49.05 67.49,48.26 70.77,47.31C72.42,46.84 73.99,46.32 75.45,45.83C75.58,45.78 75.72,45.74 75.85,45.7C77.17,45.26 78.38,44.85 79.5,44.52C80.74,44.16 81.79,43.91 82.69,43.8C83.59,43.7 84.2,43.77 84.62,43.92C84.97,44.06 85.26,44.29 85.48,44.77C85.74,45.31 85.93,46.17 85.93,47.55Z"
+      android:pathData="M85.08,66.55C85.08,71.83 82.2,75.75 77.49,78.43C72.72,81.14 66.18,82.5 59.29,82.5C52.39,82.5 45.93,81.14 41.25,78.44C36.62,75.77 33.8,71.85 33.8,66.55C33.8,63.75 34.55,63.13 35.08,62.92C35.47,62.77 36.06,62.7 36.94,62.8C37.82,62.9 38.85,63.15 40.07,63.52C41.16,63.84 42.34,64.24 43.62,64.68C43.77,64.73 43.91,64.78 44.06,64.83C45.51,65.32 47.07,65.84 48.69,66.31C51.95,67.26 55.55,68.05 59.29,68.05C63.02,68.05 66.64,67.26 69.92,66.31C71.57,65.84 73.14,65.32 74.6,64.83C74.73,64.78 74.87,64.74 75,64.7C76.32,64.26 77.53,63.85 78.65,63.52C79.89,63.16 80.95,62.91 81.84,62.8C82.74,62.7 83.36,62.77 83.77,62.92C84.12,63.06 84.41,63.29 84.63,63.77C84.89,64.31 85.08,65.17 85.08,66.55Z"
       android:strokeWidth="3"
       android:fillColor="#D9D9D9"
       android:strokeColor="#ffffff"/>