klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

룰렛 변경

Browse Source 
- 확률 수동 설정
- 여러개의 룰렛이 켜져있을 때 선택하여 돌리기
- 후원 히스토리에 룰렛 히스토리 추가
This commit is contained in:
klaus
2024-05-10 17:43:26 +09:00
parent 9df08cdf24
commit 85ccc18485
29 changed files with 519 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xxhdpi/btn_minus_round_rect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/btn_plus_round_rect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_donation_message_list.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 996 B

BIN
app/src/main/res/drawable-xxhdpi/ic_select_check_black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 418 B

8
app/src/main/res/drawable/bg_round_corner_10_ff14d9.xml Normal file
View 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_ff14d9" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/color_ff14d9" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_10_ffcb14.xml Normal file
View 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_ffcb14" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/color_ffcb14" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_10_transparent_ff14d9.xml Normal file
View 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="@android:color/transparent" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/color_ff14d9" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_10_transparent_ffcb14.xml Normal file
View 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="@android:color/transparent" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/color_ffcb14" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_5_3_ccc25264.xml Normal file
View 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_ccc25264" />
<corners android:radius="5.3dp" />
<stroke
android:width="1dp"
android:color="@color/color_ccc25264" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_6_7_ff14d9.xml Normal file
View 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_ff14d9" />
<corners android:radius="6.7dp" />
<stroke
android:width="1dp"
android:color="@color/color_ff14d9" />
</shape>

8
app/src/main/res/drawable/bg_round_corner_6_7_ffcb14.xml Normal file
View 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_ffcb14" />
<corners android:radius="6.7dp" />
<stroke
android:width="1dp"
android:color="@color/color_ffcb14" />
</shape>

4
app/src/main/res/layout/dialog_live_room_donation_message.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:fontFamily="@font/gmarket_sans_bold"
android:text="후원메시지"
android:text="후원 히스토리"
android:textColor="@color/color_eeeeee"
android:textSize="14.7sp"
app:layout_constraintStart_toStartOf="parent"
@@ -55,7 +55,7 @@
android:layout_marginTop="30dp"
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center"
android:text="후원메시지가 없습니다."
android:text="후원 히스토리가 없습니다."
android:textColor="@color/color_eeeeee"
android:textSize="14.7sp"
android:visibility="gone" />

95
app/src/main/res/layout/dialog_roulette_preview.xml
View File

@@ -9,6 +9,101 @@
android:orientation="vertical"
android:padding="13.3dp">
<LinearLayout
android:id="@+id/ll_select_roulette"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="26.7dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_select_roulette_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_6_7_13181b"
android:gravity="center"
android:paddingVertical="14.3dp">
<ImageView
android:id="@+id/iv_select_roulette_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_select_check"
android:visibility="gone" />
<TextView
android:id="@+id/tv_select_roulette_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="룰렛 1"
android:textColor="@color/color_3bb9f1"
android:textSize="14.7sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_select_roulette_2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="13.3dp"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_6_7_13181b"
android:gravity="center"
android:paddingVertical="14.3dp">
<ImageView
android:id="@+id/iv_select_roulette_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_select_check_black"
android:visibility="gone" />
<TextView
android:id="@+id/tv_select_roulette_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="룰렛 2"
android:textColor="@color/color_ffcb14"
android:textSize="14.7sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_select_roulette_3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="13.3dp"
android:layout_weight="1"
android:background="@drawable/bg_round_corner_6_7_13181b"
android:gravity="center"
android:paddingVertical="14.3dp"
android:visibility="gone">
<ImageView
android:id="@+id/iv_select_roulette_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.7dp"
android:contentDescription="@null"
android:src="@drawable/ic_select_check"
android:visibility="gone" />
<TextView
android:id="@+id/tv_select_roulette_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="룰렛 3"
android:textColor="@color/color_ff14d9"
android:textSize="14.7sp" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"

48
app/src/main/res/layout/layout_roulette_option.xml
View File

@@ -60,33 +60,39 @@
android:theme="@style/EditTextStyle"
tools:ignore="LabelFor" />
<TextView
android:id="@+id/tv_option_percentage"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/bg_round_corner_6_7_222222"
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center"
android:minWidth="60dp"
android:orientation="horizontal"
android:paddingHorizontal="13.3dp"
android:paddingVertical="16.7dp"
android:textColor="@color/color_eeeeee"
android:textSize="14.7sp"
tools:text="50%" />
android:paddingVertical="16.7dp">
<ImageView
android:id="@+id/iv_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:contentDescription="@null"
android:src="@drawable/btn_minus_round_rect" />
<EditText
android:id="@+id/et_option_percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:fontFamily="@font/gmarket_sans_medium"
android:hint="0.00"
android:importantForAutofill="no"
android:lines="1"
android:maxLength="5"
android:inputType="numberDecimal|numberSigned"
android:text=""
android:textColor="@color/color_eeeeee"
android:textColorHint="@color/color_eeeeee"
android:textSize="14.7sp" />
<ImageView
android:id="@+id/iv_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/btn_plus_round_rect" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_medium"
android:text="%"
android:textColor="@color/color_eeeeee"
android:textSize="14.7sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values/colors.xml
View File

@@ -79,6 +79,7 @@
<color name="color_d85e37">#D85E37</color>
<color name="color_d38c38">#D38C38</color>
<color name="color_59548f">#59548F</color>
<color name="color_ffcb14">#FFCB14</color>
<color name="color_4d6aa4">#4D6AA4</color>
<color name="color_2d7390">#2D7390</color>
<color name="color_548f7d">#548F7D</color>
@@ -118,4 +119,5 @@
<color name="color_002abd">#002ABD</color>
<color name="color_312827">#312827</color>
<color name="color_f1291c">#F1291C</color>
<color name="color_ff14d9">#FF14D9</color>
</resources>