moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]收入统计和房间页面修改

Browse Source
This commit is contained in:
wushaocheng
2023-01-04 12:17:55 +08:00
parent 12ffb6f1af
commit 59b06395fd
11 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/include_mic_charm_layout.xml
View File

@@ -61,7 +61,7 @@
android:gravity="center"
tools:text="0"
android:textColor="@color/white"
android:textSize="10dp" />
android:textSize="@dimen/sp_10" />
</LinearLayout>
</LinearLayout>

5
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -156,6 +156,7 @@
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
android:paddingBottom="@dimen/dp_6"
app:layout_constraintStart_toEndOf="@+id/iv_tag"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -190,8 +191,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="@dimen/sp_9" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

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

@@ -242,8 +242,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="10dp" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

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

@@ -280,8 +280,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="9dp" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

2
app/src/main/res/layout/item_micro_game.xml
View File

@@ -238,7 +238,7 @@
android:layout_marginStart="3dp"
android:layout_marginEnd="3dp"
android:gravity="center"
android:textColor="@color/white"
android:textColor="@color/color_EB82AB"
android:textSize="10dp"
tools:text="126" />
</LinearLayout>

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

@@ -225,8 +225,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="10dp" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

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

@@ -199,8 +199,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="10dp" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

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

@@ -181,8 +181,8 @@
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="9dp" />
android:textColor="@color/color_EB82AB"
android:textSize="@dimen/sp_10" />
</LinearLayout>

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

@@ -639,5 +639,7 @@
<color name="color_ACB8D9">#ACB8D9</color>
<color name="color_DD9E0B">#DD9E0B</color>
<color name="color_DE9F0C">#DE9F0C</color>
<color name="color_EFEFEF">#EFEFEF</color>
<color name="color_EB82AB">#EB82AB</color>
</resources>

20
app/src/module_labour_union/res/layout/fragment_day_income.xml
View File

@@ -6,8 +6,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="33dp"
android:layout_marginTop="25dp"
android:layout_height="48dp"
android:background="@color/color_F0F5F6"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -16,25 +17,24 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/layout_activity_clan_income_04"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" />
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/layout_activity_clan_income_05"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" />
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:gravity="center"
android:text="@string/layout_activity_clan_income_06"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" />
android:text="@string/diamond_income"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
</LinearLayout>

73
app/src/module_labour_union/res/layout/item_clan_income.xml
View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@color/color_white">
<LinearLayout
@@ -30,8 +31,8 @@
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_hall_avatar"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_38"
android:layout_gravity="center_horizontal"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
@@ -45,17 +46,11 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="@string/layout_item_clan_income_01" />
</LinearLayout>
<View
android:layout_width="1px"
android:layout_height="36dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="10dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -78,8 +73,8 @@
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
@@ -87,8 +82,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_02"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
@@ -102,16 +97,16 @@
android:id="@+id/tv_normal_gift_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_03"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
@@ -125,16 +120,16 @@
android:id="@+id/tv_bag_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_04"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
@@ -160,8 +155,8 @@
android:id="@+id/tv_room_open_time_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
@@ -169,8 +164,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_05"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
@@ -185,16 +180,16 @@
android:id="@+id/tv_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_06"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
@@ -209,16 +204,16 @@
android:id="@+id/tv_new_user_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_07"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
@@ -229,8 +224,10 @@
</LinearLayout>
<View
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
android:layout_height="0.5dp"
android:background="@color/color_EFEFEF" />
</FrameLayout>
</LinearLayout>