feat(profile): 채널 후원 영역과 전체보기 흐름을 추가한다
This commit is contained in:
8
app/src/main/res/drawable/bg_round_corner_16_525252.xml
Normal file
8
app/src/main/res/drawable/bg_round_corner_16_525252.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/color_525252" />
|
||||
<corners android:radius="16dp" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="@color/color_525252" />
|
||||
</shape>
|
||||
@@ -277,6 +277,15 @@
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<include
|
||||
android:id="@+id/layout_user_profile_channel_donation"
|
||||
layout="@layout/layout_user_profile_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="24dp"
|
||||
android:layout_marginTop="48dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<include
|
||||
android:id="@+id/layout_user_profile_live"
|
||||
layout="@layout/layout_user_profile_live"
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar"
|
||||
layout="@layout/detail_toolbar" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="13.3dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/medium"
|
||||
android:text="@string/screen_user_profile_donation_total_label"
|
||||
android:textColor="@color/color_eeeeee"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_total_count"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="6.7dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="@color/color_80d8ff"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/medium"
|
||||
android:text="@string/screen_user_profile_donation_total_unit"
|
||||
android:textColor="@color/color_777777"
|
||||
android:textSize="14sp" />
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginHorizontal="13.3dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="@color/color_595959" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_no_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="13.3dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:fontFamily="@font/light"
|
||||
android:gravity="center"
|
||||
android:text="@string/screen_user_profile_channel_donation_empty"
|
||||
android:textColor="@color/color_bbbbbb"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rv_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:padding="13.3dp" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="280dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_round_corner_10_232323"
|
||||
android:orientation="vertical"
|
||||
android:padding="14dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_profile"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:contentDescription="@null" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_nickname"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/bold"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="#78909C"
|
||||
android:textSize="13sp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="@color/color_cfd8dc"
|
||||
android:textSize="16sp" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_round_corner_10_232323"
|
||||
android:orientation="vertical"
|
||||
android:padding="14dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_profile"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:contentDescription="@null" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_nickname"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/bold"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="#78909C"
|
||||
android:textSize="13sp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:fontFamily="@font/medium"
|
||||
android:textColor="@color/color_cfd8dc"
|
||||
android:textSize="16sp" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,74 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/bold"
|
||||
android:text="@string/screen_user_profile_channel_donation_title"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="26sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_all"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:fontFamily="@font/light"
|
||||
android:gravity="center"
|
||||
android:text="@string/view_all"
|
||||
android:textColor="#78909C"
|
||||
android:textSize="14sp" />
|
||||
</RelativeLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rv_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="14dp"
|
||||
android:clipToPadding="false" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_no_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:fontFamily="@font/light"
|
||||
android:gravity="center"
|
||||
android:text="@string/screen_user_profile_channel_donation_empty"
|
||||
android:textColor="@color/color_bbbbbb"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_channel_donation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:background="@drawable/bg_round_corner_16_525252"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:drawablePadding="4dp"
|
||||
android:fontFamily="@font/bold"
|
||||
android:gravity="center"
|
||||
android:text="@string/screen_user_profile_channel_donation_button"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp"
|
||||
app:drawableStartCompat="@drawable/ic_donation_white" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -477,6 +477,8 @@
|
||||
<string name="screen_live_room_listener_label">Listener</string>
|
||||
<string name="screen_live_room_secret_mission_hint">Enter a secret mission (up to 1000 chars)</string>
|
||||
<string name="screen_live_room_donation_message_hint">Enter a message to send (up to 1000 chars)</string>
|
||||
<string name="screen_live_room_secret_mission_hint_format">Enter a secret mission (up to %1$d chars)</string>
|
||||
<string name="screen_live_room_donation_message_hint_format">Enter a message to send (up to %1$d chars)</string>
|
||||
<string name="screen_live_room_secret_mission_input_min">Enter 10 or more cans</string>
|
||||
<string name="screen_live_room_donation_input_min">Enter at least 1 can</string>
|
||||
<string name="screen_live_room_free">Free</string>
|
||||
@@ -794,6 +796,10 @@
|
||||
<string name="screen_user_profile_audio_ratio_detail">%1$s / %2$s items</string>
|
||||
<string name="screen_user_profile_fan_talk_title">Fan Talk</string>
|
||||
<string name="screen_user_profile_fantalk_all_title">View all Fan Talk</string>
|
||||
<string name="screen_user_profile_channel_donation_title">Channel Donation</string>
|
||||
<string name="screen_user_profile_channel_donation_button">Donate to Channel</string>
|
||||
<string name="screen_user_profile_channel_donation_all_title">View all Channel Donations</string>
|
||||
<string name="screen_user_profile_channel_donation_empty">No channel donations yet.</string>
|
||||
<string name="screen_user_profile_cheer_label">Cheer</string>
|
||||
<string name="screen_user_profile_cheer_hint">Leave a cheer comment!</string>
|
||||
<string name="screen_user_profile_cheer_reply_hint">Leave a reply to this cheer!</string>
|
||||
|
||||
@@ -476,6 +476,8 @@
|
||||
<string name="screen_live_room_listener_label">リスナー</string>
|
||||
<string name="screen_live_room_secret_mission_hint">シークレットミッションを入力(最大1000文字)</string>
|
||||
<string name="screen_live_room_donation_message_hint">一緒に送るメッセージを入力(最大1000文字)</string>
|
||||
<string name="screen_live_room_secret_mission_hint_format">シークレットミッションを入力(最大%1$d文字)</string>
|
||||
<string name="screen_live_room_donation_message_hint_format">一緒に送るメッセージを入力(最大%1$d文字)</string>
|
||||
<string name="screen_live_room_secret_mission_input_min">10CAN以上入力してください</string>
|
||||
<string name="screen_live_room_donation_input_min">1CAN以上入力してください</string>
|
||||
<string name="screen_live_room_free">無料</string>
|
||||
@@ -794,6 +796,10 @@
|
||||
<string name="screen_user_profile_audio_ratio_detail">%1$s / %2$s個</string>
|
||||
<string name="screen_user_profile_fan_talk_title">ファンTalk</string>
|
||||
<string name="screen_user_profile_fantalk_all_title">ファンTalkをすべて見る</string>
|
||||
<string name="screen_user_profile_channel_donation_title">チャンネルギフト</string>
|
||||
<string name="screen_user_profile_channel_donation_button">チャンネルにギフトする</string>
|
||||
<string name="screen_user_profile_channel_donation_all_title">チャンネルギフトをすべて見る</string>
|
||||
<string name="screen_user_profile_channel_donation_empty">チャンネルギフトがありません。</string>
|
||||
<string name="screen_user_profile_cheer_label">応援</string>
|
||||
<string name="screen_user_profile_cheer_hint">応援コメントを残してみましょう!</string>
|
||||
<string name="screen_user_profile_cheer_reply_hint">応援コメントに返信してみましょう!</string>
|
||||
|
||||
@@ -137,4 +137,5 @@
|
||||
<color name="color_b0bec5">#B0BEC5</color>
|
||||
<color name="color_7c7c80">#7C7C80</color>
|
||||
<color name="color_37474f">#37474F</color>
|
||||
<color name="color_cfd8dc">#CFD8DC</color>
|
||||
</resources>
|
||||
|
||||
@@ -476,6 +476,8 @@
|
||||
<string name="screen_live_room_listener_label">리스너</string>
|
||||
<string name="screen_live_room_secret_mission_hint">비밀 미션을 입력하세요(최대 1000자)</string>
|
||||
<string name="screen_live_room_donation_message_hint">함께 보낼 메시지 입력(최대 1000자)</string>
|
||||
<string name="screen_live_room_secret_mission_hint_format">비밀 미션을 입력하세요(최대 %1$d자)</string>
|
||||
<string name="screen_live_room_donation_message_hint_format">함께 보낼 메시지 입력(최대 %1$d자)</string>
|
||||
<string name="screen_live_room_secret_mission_input_min">10캔 이상 입력하세요</string>
|
||||
<string name="screen_live_room_donation_input_min">1캔 이상 입력하세요</string>
|
||||
<string name="screen_live_room_free">무료</string>
|
||||
@@ -793,6 +795,10 @@
|
||||
<string name="screen_user_profile_audio_ratio_detail">%1$s / %2$s개</string>
|
||||
<string name="screen_user_profile_fan_talk_title">팬 Talk</string>
|
||||
<string name="screen_user_profile_fantalk_all_title">팬 Talk 전체보기</string>
|
||||
<string name="screen_user_profile_channel_donation_title">채널 후원</string>
|
||||
<string name="screen_user_profile_channel_donation_button">채널 후원하기</string>
|
||||
<string name="screen_user_profile_channel_donation_all_title">채널 후원 전체보기</string>
|
||||
<string name="screen_user_profile_channel_donation_empty">채널 후원이 없습니다.</string>
|
||||
<string name="screen_user_profile_cheer_label">응원</string>
|
||||
<string name="screen_user_profile_cheer_hint">응원댓글을 남겨보세요!</string>
|
||||
<string name="screen_user_profile_cheer_reply_hint">응원댓글에 답글을 남겨보세요!</string>
|
||||
|
||||
Reference in New Issue
Block a user