diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt index 1f77b19..de9c52d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt @@ -113,9 +113,11 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat } if (SharedPreferenceManager.userId == 17958L) { - binding.llCan.visibility = View.GONE + binding.rlCan.visibility = View.GONE + binding.rlPoint.visibility = View.GONE } else { - binding.llCan.visibility = View.VISIBLE + binding.rlCan.visibility = View.VISIBLE + binding.rlPoint.visibility = View.VISIBLE binding.llTotalCan.setOnClickListener { startActivity( Intent( @@ -233,6 +235,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat binding.llFollowingMemberListContainer.visibility = View.GONE binding.rlAlarm.visibility = View.GONE + binding.rlPoint.visibility = View.GONE binding.rlCoupon.visibility = View.GONE binding.llLockerContainer.visibility = View.GONE binding.llReservationStatusContainer.visibility = View.GONE @@ -318,6 +321,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat } binding.tvTotalCan.text = (it.chargeCan + it.rewardCan).moneyFormat() + binding.tvTotalPoint.text = it.point.moneyFormat() binding.tvReservationLive.text = "${it.liveReservationCount}" } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt index d48a5af..18778fb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt @@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.mypage import androidx.annotation.Keep import com.google.gson.annotations.SerializedName -import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListResponse @Keep data class MyPageResponse( @@ -10,6 +9,7 @@ data class MyPageResponse( @SerializedName("profileUrl") val profileUrl: String, @SerializedName("chargeCan") val chargeCan: Int, @SerializedName("rewardCan") val rewardCan: Int, + @SerializedName("point") val point: Int, @SerializedName("youtubeUrl") val youtubeUrl: String?, @SerializedName("instagramUrl") val instagramUrl: String?, @SerializedName("websiteUrl") val websiteUrl: String?, diff --git a/app/src/main/res/drawable-xxhdpi/ic_point.png b/app/src/main/res/drawable-xxhdpi/ic_point.png new file mode 100644 index 0000000..d41e9a9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_point.png differ diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index 1bdca28..7456228 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -222,7 +222,7 @@ </LinearLayout> <RelativeLayout - android:id="@+id/ll_can" + android:id="@+id/rl_can" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="26.7dp" @@ -283,6 +283,45 @@ app:drawableStartCompat="@drawable/ic_coin_w" /> </RelativeLayout> + <RelativeLayout + android:id="@+id/rl_point" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="13.3dp" + android:background="@drawable/bg_round_corner_6_7_13181b" + android:paddingHorizontal="13.3dp" + android:paddingVertical="16.7dp"> + + <LinearLayout + android:id="@+id/ll_total_point" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="RelativeOverlap"> + + <TextView + android:id="@+id/tv_total_point" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:textColor="@color/color_eeeeee" + android:textSize="16sp" + tools:text="23,000" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="5.3dp" + android:layout_marginEnd="2.7dp" + android:contentDescription="@null" + android:gravity="center" + android:src="@drawable/ic_point" /> + </LinearLayout> + </RelativeLayout> + <RelativeLayout android:id="@+id/rl_alarm" android:layout_width="match_parent"