feat: 마이페이지 - 포인트 내역 추가
This commit is contained in:
		| @@ -113,9 +113,11 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat | |||||||
|             } |             } | ||||||
|  |  | ||||||
|             if (SharedPreferenceManager.userId == 17958L) { |             if (SharedPreferenceManager.userId == 17958L) { | ||||||
|                 binding.llCan.visibility = View.GONE |                 binding.rlCan.visibility = View.GONE | ||||||
|  |                 binding.rlPoint.visibility = View.GONE | ||||||
|             } else { |             } else { | ||||||
|                 binding.llCan.visibility = View.VISIBLE |                 binding.rlCan.visibility = View.VISIBLE | ||||||
|  |                 binding.rlPoint.visibility = View.VISIBLE | ||||||
|                 binding.llTotalCan.setOnClickListener { |                 binding.llTotalCan.setOnClickListener { | ||||||
|                     startActivity( |                     startActivity( | ||||||
|                         Intent( |                         Intent( | ||||||
| @@ -233,6 +235,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat | |||||||
|             binding.llFollowingMemberListContainer.visibility = View.GONE |             binding.llFollowingMemberListContainer.visibility = View.GONE | ||||||
|  |  | ||||||
|             binding.rlAlarm.visibility = View.GONE |             binding.rlAlarm.visibility = View.GONE | ||||||
|  |             binding.rlPoint.visibility = View.GONE | ||||||
|             binding.rlCoupon.visibility = View.GONE |             binding.rlCoupon.visibility = View.GONE | ||||||
|             binding.llLockerContainer.visibility = View.GONE |             binding.llLockerContainer.visibility = View.GONE | ||||||
|             binding.llReservationStatusContainer.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.tvTotalCan.text = (it.chargeCan + it.rewardCan).moneyFormat() | ||||||
|  |             binding.tvTotalPoint.text = it.point.moneyFormat() | ||||||
|             binding.tvReservationLive.text = "${it.liveReservationCount}" |             binding.tvReservationLive.text = "${it.liveReservationCount}" | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.mypage | |||||||
|  |  | ||||||
| import androidx.annotation.Keep | import androidx.annotation.Keep | ||||||
| import com.google.gson.annotations.SerializedName | import com.google.gson.annotations.SerializedName | ||||||
| import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListResponse |  | ||||||
|  |  | ||||||
| @Keep | @Keep | ||||||
| data class MyPageResponse( | data class MyPageResponse( | ||||||
| @@ -10,6 +9,7 @@ data class MyPageResponse( | |||||||
|     @SerializedName("profileUrl") val profileUrl: String, |     @SerializedName("profileUrl") val profileUrl: String, | ||||||
|     @SerializedName("chargeCan") val chargeCan: Int, |     @SerializedName("chargeCan") val chargeCan: Int, | ||||||
|     @SerializedName("rewardCan") val rewardCan: Int, |     @SerializedName("rewardCan") val rewardCan: Int, | ||||||
|  |     @SerializedName("point") val point: Int, | ||||||
|     @SerializedName("youtubeUrl") val youtubeUrl: String?, |     @SerializedName("youtubeUrl") val youtubeUrl: String?, | ||||||
|     @SerializedName("instagramUrl") val instagramUrl: String?, |     @SerializedName("instagramUrl") val instagramUrl: String?, | ||||||
|     @SerializedName("websiteUrl") val websiteUrl: String?, |     @SerializedName("websiteUrl") val websiteUrl: String?, | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxhdpi/ic_point.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxhdpi/ic_point.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 2.9 KiB | 
| @@ -222,7 +222,7 @@ | |||||||
|             </LinearLayout> |             </LinearLayout> | ||||||
|  |  | ||||||
|             <RelativeLayout |             <RelativeLayout | ||||||
|                 android:id="@+id/ll_can" |                 android:id="@+id/rl_can" | ||||||
|                 android:layout_width="match_parent" |                 android:layout_width="match_parent" | ||||||
|                 android:layout_height="wrap_content" |                 android:layout_height="wrap_content" | ||||||
|                 android:layout_marginTop="26.7dp" |                 android:layout_marginTop="26.7dp" | ||||||
| @@ -283,6 +283,45 @@ | |||||||
|                     app:drawableStartCompat="@drawable/ic_coin_w" /> |                     app:drawableStartCompat="@drawable/ic_coin_w" /> | ||||||
|             </RelativeLayout> |             </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 |             <RelativeLayout | ||||||
|                 android:id="@+id/rl_alarm" |                 android:id="@+id/rl_alarm" | ||||||
|                 android:layout_width="match_parent" |                 android:layout_width="match_parent" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user