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

RTL适配：全局替换布局属性（layout_marginLeft->layout_marginStar、layout_marginRight->layout_marginEnd、paddingLeft->paddingStart、paddingRight->paddingEnd、drawableLeft->drawableStar、drawableRight->drawableEnd、gravityLeft->gravityStart、gravityRight->gravityEnd）

Browse Source
This commit is contained in:
max
2024-04-12 09:55:20 +08:00
parent a39a11343c
commit ecdeee3e76
264 changed files with 984 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/activity_add_team_member.xml
View File

@@ -36,8 +36,8 @@
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_family_member_search_edit"
android:gravity="center_vertical"
@@ -46,13 +46,13 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/ic_main_search" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@null"
android:gravity="center_vertical"
android:hint="@string/family_group_search_hint"
@@ -73,8 +73,8 @@
android:backgroundTint="@color/color_F5F5F5"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
@@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:gravity="end"
android:text="@string/family_member_label2"
android:visibility="gone"
android:textColor="@color/color_999999"

12
app/src/main/res/layout/activity_add_team_member_search_list.xml
View File

@@ -35,7 +35,7 @@
android:layout_width="0dp"
android:layout_height="29dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_search_edit"
android:gravity="center_vertical"
@@ -45,14 +45,14 @@
android:id="@+id/search_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/icon_little_search" />
<EditText
android:id="@+id/search_edit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_weight="1"
android:background="@null"
android:hint="@string/family_group_search_hint"
@@ -71,8 +71,8 @@
android:id="@+id/iv_clear_text"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:layout_marginLeft="4dp"
android:layout_marginRight="8dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:onClick="@{click}"
android:src="@mipmap/ic_text_clear" />
@@ -86,7 +86,7 @@
android:layout_gravity="center_vertical"
android:gravity="center"
android:onClick="@{click}"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:text="@string/search"
android:textColor="@color/text_primary"
android:textSize="16sp" />

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

@@ -77,8 +77,8 @@
android:layout_width="88dp"
android:layout_height="88dp"
android:layout_centerHorizontal="true"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp">
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp">
<ImageView
android:id="@+id/iv_record"

6
app/src/main/res/layout/activity_bill_gift_income_group.xml
View File

@@ -36,10 +36,10 @@
android:layout_height="49dp"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:drawableLeft="@drawable/icon_gold_num"
android:drawableStart="@drawable/icon_gold_num"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:text="52256225"
android:textColor="@color/color_333333"
android:textSize="14sp"
@@ -52,7 +52,7 @@
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="50dp"
android:src="@mipmap/ic_goto_top"/>

12
app/src/main/res/layout/activity_bills.xml
View File

@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_bills_01"
android:textColor="@color/color_999999"
android:textSize="18sp" />
@@ -42,8 +42,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_selector_date"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:src="@mipmap/ic_day_today_yellow"
android:visibility="visible" />
@@ -53,8 +53,8 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:paddingLeft="8dp"
android:layout_marginEnd="15dp"
android:paddingStart="8dp"
android:src="@drawable/icon_date_yellow" />
</RelativeLayout>
@@ -88,7 +88,7 @@
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="50dp"
android:src="@mipmap/ic_goto_top" />

6
app/src/main/res/layout/activity_bills_gift.xml
View File

@@ -34,10 +34,10 @@
android:layout_height="49dp"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:drawableLeft="@drawable/icon_gold_num"
android:drawableStart="@drawable/icon_gold_num"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:text="52256225"
android:textColor="@color/color_333333"
android:textSize="14sp"
@@ -50,7 +50,7 @@
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="50dp"
android:src="@mipmap/ic_goto_top"/>

8
app/src/main/res/layout/activity_cd_key_charge.xml
View File

@@ -12,8 +12,8 @@
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginTop="25dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/icon_cd_key_bg"
>
<RelativeLayout
@@ -52,8 +52,8 @@
android:layout_width="match_parent"
android:layout_height="40dp"
style="?android:attr/borderlessButtonStyle"
android:layout_marginLeft="@dimen/common_item_view_margin_left_right"
android:layout_marginRight="@dimen/common_item_view_margin_left_right"
android:layout_marginStart="@dimen/common_item_view_margin_left_right"
android:layout_marginEnd="@dimen/common_item_view_margin_left_right"
android:layout_marginTop="5dp"
android:layout_centerInParent="true"
android:background="@drawable/shape_semi_round_gray_solid"

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

@@ -16,9 +16,9 @@
android:id="@+id/cp_card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/layout/activity_cp_task.xml
View File

@@ -20,9 +20,9 @@
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_15"
android:fillViewport="true"
android:paddingLeft="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_8"
android:paddingRight="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:paddingBottom="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@id/layout_task_bottom"
app:layout_constraintTop_toBottomOf="@id/title_bar">
@@ -72,7 +72,7 @@
android:layout_height="@dimen/dp_40"
android:background="@drawable/bg_cp_task_label_selected"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:text="@string/layout_activity_cp_task_01"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
@@ -117,7 +117,7 @@
android:id="@+id/iv_invite"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/dp_33"
android:layout_marginEnd="@dimen/dp_33"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="@id/iv_accept"
app:layout_constraintTop_toTopOf="parent" />
@@ -126,7 +126,7 @@
android:id="@+id/tv_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_4"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toTopOf="@id/progress_bar"
@@ -139,9 +139,9 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="12dp"
android:layout_marginLeft="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginRight="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:max="100"
android:progress="20"
android:progressDrawable="@drawable/bg_cp_task_progress_bar"
@@ -154,7 +154,7 @@
android:id="@+id/iv_drop_down"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:src="@drawable/ic_cp_task_down"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/progress_bar"
@@ -166,8 +166,8 @@
android:id="@+id/tv_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_4"
android:paddingRight="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingEnd="@dimen/dp_4"
android:textColor="@color/white"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="@id/progress_bar"

80
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -50,8 +50,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -79,8 +79,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -109,8 +109,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -140,8 +140,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -154,8 +154,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_pk_vs" />
<androidx.gridlayout.widget.GridLayout
@@ -188,8 +188,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -217,8 +217,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -247,8 +247,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -277,8 +277,8 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/wait_for_mic"
android:textColor="@color/color_FFFFFF"
android:textSize="10dp" />
@@ -296,8 +296,8 @@
android:layout_height="55dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:weightSum="10">
<TextView
@@ -321,8 +321,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_353548" />
<LinearLayout
@@ -330,8 +330,8 @@
android:layout_height="55dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:weightSum="10">
<TextView
@@ -353,7 +353,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp"
android:paddingStart="5dp"
android:text="@string/vote_type_gift_value"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
@@ -362,9 +362,9 @@
android:id="@+id/rb_vote_type_gift_member"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp"
android:paddingStart="5dp"
android:text="@string/vote_type_gift_member"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
@@ -376,8 +376,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_353548" />
@@ -387,8 +387,8 @@
android:layout_height="55dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:weightSum="10">
<TextView
@@ -404,7 +404,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="7.5"
android:gravity="right"
android:gravity="end"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp"
tools:text="@string/layout_activity_create_pk_01" />
@@ -420,8 +420,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_353548" />
@@ -434,8 +434,8 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="20dp"
android:background="@drawable/base_selector_theme_30dp"
android:gravity="center"
@@ -455,8 +455,8 @@
android:id="@+id/tv_recreate_btn"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/base_selector_theme_30dp"
android:gravity="center"
android:text="@string/recreate_pk"
@@ -467,9 +467,9 @@
android:id="@+id/tv_close_pk_mode"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="15dp"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/base_shape_negative_30dp"
android:gravity="center"
android:text="@string/close_pk_mode"

12
app/src/main/res/layout/activity_create_team_message.xml
View File

@@ -161,7 +161,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:textColor="@color/text_color_secondary"
android:textSize="@dimen/dp_12"
android:visibility="gone"
@@ -196,7 +196,7 @@
android:id="@+id/iv_select_member_2"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:scaleType="centerCrop"
@@ -206,7 +206,7 @@
android:id="@+id/iv_select_member_3"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:scaleType="centerCrop"
@@ -216,7 +216,7 @@
android:id="@+id/iv_select_member_4"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:scaleType="centerCrop"
@@ -226,7 +226,7 @@
android:id="@+id/iv_select_member_5"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:scaleType="centerCrop"
@@ -236,7 +236,7 @@
android:id="@+id/iv_select_member_6"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:scaleType="centerCrop"

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

@@ -23,9 +23,9 @@
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_search_edit"
android:gravity="center_vertical"
android:orientation="horizontal"

6
app/src/main/res/layout/activity_feedback.xml
View File

@@ -21,10 +21,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="44dp"
android:drawableLeft="@drawable/feedback_point"
android:drawableStart="@drawable/feedback_point"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:text="@string/layout_activity_feedback_01"
android:textColor="@color/text_title_color"
android:textSize="15sp" />
@@ -36,7 +36,7 @@
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_secondary_radius_15"
android:gravity="left"
android:gravity="start"
android:hint="@string/layout_activity_feedback_02"
android:padding="10dp"
android:textColor="@color/text_normal_c6c6e9"

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

@@ -57,7 +57,7 @@
android:background="@color/color_grey_999999"
/>
<TextView
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="jumpToSystemSetting"
@@ -67,7 +67,7 @@
<View
android:layout_width="@dimen/dp_40"
android:layout_height="0.5dp"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:layout_gravity="center_vertical"
android:background="@color/color_grey_999999"
/>

18
app/src/main/res/layout/activity_jewel.xml
View File

@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/iv_diamond_color"
android:text="@string/layout_activity_jewel_01"
android:textColor="@color/color_333333"
@@ -83,7 +83,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_marginStart="7dp"
android:layout_weight="1"
android:text="@string/layout_activity_jewel_03"
android:textColor="@color/text_primary"
@@ -112,7 +112,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_marginStart="7dp"
android:layout_weight="1"
android:text="@string/layout_activity_jewel_04"
android:textColor="@color/text_primary"
@@ -134,8 +134,8 @@
android:layout_height="42dp"
android:layout_above="@+id/tv_jewel_exchange"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="54dp"
android:layout_marginRight="54dp"
android:layout_marginStart="54dp"
android:layout_marginEnd="54dp"
android:background="@mipmap/ic_gold_gift_bg"
android:visibility="gone">
@@ -156,9 +156,9 @@
android:layout_height="39dp"
android:layout_above="@+id/tv_jewel_tixian"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="23dp"
android:layout_marginStart="23dp"
android:layout_marginTop="10dp"
android:layout_marginRight="23dp"
android:layout_marginEnd="23dp"
android:background="@drawable/shape_semi_round_gray_solid"
android:gravity="center"
android:text="@string/layout_activity_jewel_06"
@@ -171,9 +171,9 @@
android:layout_height="39dp"
android:layout_above="@+id/tv_bottom_tips"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="23dp"
android:layout_marginStart="23dp"
android:layout_marginTop="20dp"
android:layout_marginRight="23dp"
android:layout_marginEnd="23dp"
android:background="@drawable/shape_semi_round_gray_solid"
android:gravity="center"
android:text="@string/layout_activity_jewel_07"

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

@@ -129,8 +129,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginTop="12dp"
android:gravity="center_vertical|start"
android:orientation="horizontal">

12
app/src/main/res/layout/activity_modify_info.xml
View File

@@ -21,8 +21,8 @@
android:id="@+id/rl_content_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:padding="11dp"
@@ -53,12 +53,12 @@
android:layout_width="match_parent"
android:background="@drawable/bg_secondary_radius_15"
android:orientation="horizontal"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:visibility="gone">

8
app/src/main/res/layout/activity_my_voice.xml
View File

@@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="150dp"
android:background="@drawable/bg_my_voice_vie_stub"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:paddingTop="26dp"
android:paddingRight="15dp"
android:paddingEnd="15dp"
android:paddingBottom="26dp"
android:visibility="gone"
tools:visibility="visible" />-->
@@ -34,9 +34,9 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:paddingTop="26dp"
android:paddingRight="15dp"
android:paddingEnd="15dp"
android:paddingBottom="26dp" />
</com.chwl.app.common.widget.StatusLayout>

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

@@ -25,9 +25,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:paddingTop="12dp"
android:paddingRight="15dp"
android:paddingEnd="15dp"
android:paddingBottom="12dp" />

6
app/src/main/res/layout/activity_nim_add_black_list.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
tools:background="@drawable/default_avatar" />
<TextView
@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_toRightOf="@id/iv_avatar"
android:textColor="@color/text_title_color"
android:textSize="15dp"
@@ -42,7 +42,7 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:gravity="center"
android:text="@string/layout_activity_nim_add_black_list_02"
android:textColor="@color/text_secondary_4f516a"

8
app/src/main/res/layout/activity_patriarch_mode.xml
View File

@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:drawableStart="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:paddingRight="28dp"
android:paddingEnd="28dp"
android:text="@string/layout_activity_patriarch_mode_02"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/shape_pm_point"
android:drawableStart="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="@string/layout_activity_patriarch_mode_03"
android:textColor="@color/text_normal_c6c6e9"
@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/shape_pm_point"
android:drawableStart="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="@string/layout_activity_patriarch_mode_04"
android:textColor="@color/text_normal_c6c6e9"
@@ -83,7 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/shape_pm_point"
android:drawableStart="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="@string/layout_activity_patriarch_mode_05"
android:textColor="@color/text_normal_c6c6e9"

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

@@ -23,8 +23,8 @@
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginRight="5dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="15dp"
android:background="@color/color_FAFAFA"
android:refreshing="@{viewmodel.loading}">

26
app/src/main/res/layout/activity_room_setting.xml
View File

@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_01"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -82,7 +82,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_03"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -102,7 +102,7 @@
android:id="@+id/pwd_edit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_toRightOf="@id/pwd_text"
android:background="@null"
android:hint="@string/layout_activity_room_setting_04"
@@ -161,7 +161,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_05"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -202,7 +202,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_07"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -240,7 +240,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_09"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -250,7 +250,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -271,7 +271,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_010"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -281,7 +281,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -302,7 +302,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/room_bg_text"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />
@@ -312,7 +312,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -336,7 +336,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -388,7 +388,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_room_setting_013"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_15" />

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

@@ -177,8 +177,8 @@
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="5dp"
android:paddingRight="5dp" />
android:paddingStart="5dp"
android:paddingEnd="5dp" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"

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

@@ -89,8 +89,8 @@
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:visibility="gone" />
<androidx.viewpager.widget.ViewPager

12
app/src/main/res/layout/activity_setting.xml
View File

@@ -138,8 +138,8 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/text_setting_black_management"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_14"
@@ -157,8 +157,8 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/language"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_14"
@@ -241,8 +241,8 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/text_setting_community_norms"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_14"

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

@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_margin="@dimen/dp_15"
android:background="@drawable/shape_white_alpha_10"
app:layout_constraintTop_toBottomOf="@id/title_bar" />

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

@@ -34,8 +34,8 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/title_bar" />

14
app/src/main/res/layout/activity_team_member_list.xml
View File

@@ -37,8 +37,8 @@
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_family_member_search_edit"
android:gravity="center_vertical"
@@ -47,13 +47,13 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/ic_main_search" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@null"
android:gravity="center_vertical"
android:hint="@string/family_group_search_hint"
@@ -74,8 +74,8 @@
android:backgroundTint="@color/color_F5F5F5"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
@@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:gravity="end"
android:text="@string/family_member_label2"
android:textColor="@color/color_999999"
android:textSize="12sp" />

12
app/src/main/res/layout/activity_team_member_search_list.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="0dp"
android:layout_height="29dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_search_edit"
android:gravity="center_vertical"
@@ -46,14 +46,14 @@
android:id="@+id/search_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/icon_little_search" />
<EditText
android:id="@+id/search_edit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_weight="1"
android:background="@null"
android:hint="@string/family_group_search_hint"
@@ -73,8 +73,8 @@
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:onClick="@{click}"
android:layout_marginLeft="4dp"
android:layout_marginRight="8dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/ic_text_clear" />
@@ -87,7 +87,7 @@
android:layout_gravity="center_vertical"
android:gravity="center"
android:onClick="@{click}"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:text="@string/search"
android:textColor="@color/text_primary"
android:textSize="16sp" />

12
app/src/main/res/layout/activity_team_weekly_bill_search.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="0dp"
android:layout_height="29dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_search_edit"
android:gravity="center_vertical"
@@ -46,14 +46,14 @@
android:id="@+id/search_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/icon_little_search" />
<EditText
android:id="@+id/search_edit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_weight="1"
android:background="@null"
android:hint="@string/team_statistics_search_member_hint"
@@ -73,8 +73,8 @@
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:onClick="@{click}"
android:layout_marginLeft="4dp"
android:layout_marginRight="8dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/ic_text_clear" />
@@ -87,7 +87,7 @@
android:layout_gravity="center_vertical"
android:gravity="center"
android:onClick="@{click}"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:text="@string/search"
android:textColor="@color/text_primary"
android:textSize="16sp" />

28
app/src/main/res/layout/activity_user_info_modify.xml
View File

@@ -84,15 +84,15 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:paddingStart="15dp"
android:paddingEnd="15dp">
<TextView
android:layout_width="wrap_content"
@@ -118,8 +118,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<LinearLayout
@@ -154,8 +154,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<LinearLayout
@@ -204,8 +204,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<LinearLayout
@@ -246,8 +246,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<LinearLayout
@@ -307,8 +307,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
</LinearLayout>

12
app/src/main/res/layout/activity_withdraw_bills.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_activity_withdraw_bills_01"
android:textColor="@color/color_999999"
android:textSize="18sp" />
@@ -41,8 +41,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_selector_date"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:src="@mipmap/ic_day_today_yellow"
android:visibility="visible" />
@@ -52,8 +52,8 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:paddingLeft="8dp"
android:layout_marginEnd="15dp"
android:paddingStart="8dp"
android:src="@drawable/icon_date_yellow" />
</RelativeLayout>
@@ -73,7 +73,7 @@
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="50dp"
android:src="@mipmap/ic_goto_top" />

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

@@ -10,7 +10,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/common_toolbar_height"
android:layout_marginRight="10dp">
android:layout_marginEnd="10dp">
<ImageView
android:src="@drawable/arrow_right"

14
app/src/main/res/layout/dialog_bottom_auction.xml
View File

@@ -52,7 +52,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:text="@string/layout_dialog_bottom_auction_02"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_larger" />
@@ -62,20 +62,20 @@
android:id="@+id/iv_minus"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/icon_minus" />
<TextView
android:id="@+id/tv_price_num"
android:layout_width="130dp"
android:layout_height="29dp"
android:layout_marginLeft="@dimen/space_normal"
android:layout_marginRight="10dp"
android:layout_marginStart="@dimen/space_normal"
android:layout_marginEnd="10dp"
android:background="@drawable/shape_semi_round_white_solid_black_stroke"
android:drawableRight="@drawable/icon_gold"
android:drawableEnd="@drawable/icon_gold"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="0"
android:textColor="@color/text_primary"
android:textSize="18dp" />

22
app/src/main/res/layout/dialog_bottom_auction_plus.xml
View File

@@ -20,7 +20,7 @@
android:layout_gravity="center"
android:layout_marginBottom="15dp"
android:layout_marginTop="18dp"
android:drawableLeft="@drawable/icon_trophy_first"
android:drawableStart="@drawable/icon_trophy_first"
android:drawablePadding="5dp"
android:text="@string/layout_dialog_bottom_auction_plus_01"
android:textColor="@color/text_primary"
@@ -105,7 +105,7 @@
android:id="@+id/rb_one"
android:layout_width="68dp"
android:layout_height="29dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/selector_auction_price"
android:button="@null"
android:gravity="center"
@@ -117,7 +117,7 @@
android:id="@+id/rb_two"
android:layout_width="68dp"
android:layout_height="29dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/selector_auction_price"
android:button="@null"
android:gravity="center"
@@ -140,7 +140,7 @@
android:id="@+id/rb_four"
android:layout_width="68dp"
android:layout_height="29dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@drawable/selector_auction_price"
android:button="@null"
android:gravity="center"
@@ -191,7 +191,7 @@
android:id="@+id/iv_minus"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:scaleType="center"
android:src="@drawable/icon_minus" />
@@ -200,10 +200,10 @@
android:layout_width="130dp"
android:layout_height="29dp"
android:background="@drawable/shape_semi_round_white_solid_black_stroke"
android:drawableRight="@drawable/icon_gold"
android:drawableEnd="@drawable/icon_gold"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="0"
android:textColor="@color/text_primary"
android:textSize="18dp" />
@@ -221,16 +221,16 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/common_item_view_margin_left_right"
android:layout_marginEnd="@dimen/common_item_view_margin_left_right"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/common_item_view_margin_left_right">
android:paddingStart="@dimen/common_item_view_margin_left_right">
<Button
android:id="@+id/btn_charge"
android:layout_width="68dp"
android:layout_height="29dp"
android:layout_marginRight="@dimen/common_item_view_margin_left_right"
android:layout_marginEnd="@dimen/common_item_view_margin_left_right"
android:background="@drawable/shape_semi_round_white_solid_yellow_stroke"
android:text="@string/layout_dialog_bottom_auction_plus_09"
android:textColor="@color/text_primary"

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

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:text="@string/layout_dialog_bottom_face_01"
android:textColor="@color/bg_gift_tab_color_selector"
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="25dp"
android:layout_marginStart="25dp"
android:gravity="center_vertical"
android:visibility="gone"
android:text="@string/layout_dialog_bottom_face_02"

28
app/src/main/res/layout/dialog_bottom_type_select.xml
View File

@@ -7,8 +7,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginLeft="13dp"
android:layout_marginRight="13dp"
android:layout_marginStart="13dp"
android:layout_marginEnd="13dp"
android:background="@drawable/shape_white_solid_round"
android:orientation="vertical">
@@ -25,22 +25,22 @@
android:id="@+id/open_home_party_layout"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_room_select_dialog"
android:gravity="center_vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_home_party_open" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="14dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="14dp">
<TextView
@@ -67,8 +67,8 @@
android:id="@+id/open_chat_light_layout"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_room_select_dialog"
android:gravity="center_vertical">
@@ -76,14 +76,14 @@
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_chat_light" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="14dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="14dp">
<TextView
@@ -111,8 +111,8 @@
android:id="@+id/open_auction_layout"
android:layout_width="match_parent"
android:layout_height="63dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_room_select_dialog"
android:gravity="center_vertical"
@@ -121,14 +121,14 @@
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_auction_open" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="14dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="14dp">
<TextView

16
app/src/main/res/layout/dialog_cp_global.xml
View File

@@ -5,8 +5,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="80dp"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -18,7 +18,7 @@
android:id="@+id/iv_avatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/space"
@@ -28,7 +28,7 @@
android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
app:layout_constraintLeft_toRightOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent" />
@@ -55,7 +55,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/layout_dialog_cp_global_02"
@@ -72,7 +72,7 @@
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginRight="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:src="@drawable/ic_cp_close_dialog"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -89,7 +89,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginRight="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_13"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintRight_toLeftOf="@id/iv_close"
@@ -101,7 +101,7 @@
android:layout_width="80dp"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_12"
android:background="@drawable/bg_cp_btn_visit_dialog"
app:layout_constraintBottom_toBottomOf="parent"

10
app/src/main/res/layout/dialog_cp_invite.xml
View File

@@ -14,7 +14,7 @@
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="right"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:src="@drawable/ic_invite_dialog_close" />
<androidx.core.widget.NestedScrollView
@@ -36,9 +36,9 @@
android:id="@+id/tv_tip"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="55dp"
android:layout_marginStart="55dp"
android:layout_marginTop="80dp"
android:layout_marginRight="40dp"
android:layout_marginEnd="40dp"
android:gravity="center"
android:lineSpacingMultiplier="1.2"
android:text="@string/layout_dialog_cp_invite_01"
@@ -86,9 +86,9 @@
android:id="@+id/edit_declaration"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_17"
android:layout_marginRight="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/bg_cp_invite_dilog_edit"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/dp_9"

14
app/src/main/res/layout/dialog_cp_invite_reply.xml
View File

@@ -36,9 +36,9 @@
android:id="@+id/tv_dialog_title"
android:layout_width="0dp"
android:layout_height="@dimen/dp_36"
android:layout_marginLeft="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_22"
android:layout_marginRight="@dimen/dp_45"
android:layout_marginEnd="@dimen/dp_45"
android:gravity="center"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13"
@@ -51,9 +51,9 @@
android:id="@+id/tv_declaration"
android:layout_width="0dp"
android:layout_height="@dimen/dp_36"
android:layout_marginLeft="@dimen/dp_7"
android:layout_marginStart="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_7"
android:layout_marginEnd="@dimen/dp_7"
android:gravity="center"
android:textColor="#4C5AF1"
android:textSize="@dimen/sp_13"
@@ -93,7 +93,7 @@
android:id="@+id/tv_refuse"
android:layout_width="101dp"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/bg_invite_reply_refuse"
android:gravity="center"
@@ -109,9 +109,9 @@
android:id="@+id/tv_agree"
android:layout_width="101dp"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:background="@drawable/bg_invite_reply_agree"
android:gravity="center"
android:text="@string/layout_dialog_cp_invite_reply_05"

6
app/src/main/res/layout/dialog_cp_invite_reply_confirm.xml
View File

@@ -33,7 +33,7 @@
android:id="@+id/tv_refuse"
android:layout_width="101dp"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_30"
android:background="@drawable/bg_invite_reply_refuse"
android:gravity="center"
android:text="@string/layout_dialog_cp_invite_reply_confirm_02"
@@ -48,8 +48,8 @@
android:id="@+id/tv_agree"
android:layout_width="101dp"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:background="@drawable/bg_invite_reply_agree"
android:gravity="center"
android:text="@string/layout_dialog_cp_invite_reply_confirm_03"

24
app/src/main/res/layout/dialog_cp_mp.xml
View File

@@ -14,8 +14,8 @@
android:id="@+id/layout_root"
android:layout_width="316dp"
android:layout_height="188dp"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_mp_current"
@@ -34,8 +34,8 @@
android:layout_height="0dp"
android:background="@drawable/bg_cp_level_label"
android:gravity="center"
android:paddingLeft="@dimen/dp_8"
android:paddingRight="@dimen/dp_8"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:textColor="#9372FF"
android:textSize="@dimen/dp_12"
app:layout_constraintDimensionRatio="h,54:16"
@@ -47,9 +47,9 @@
android:id="@+id/iv_cp_level_current"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_36"
android:layout_marginRight="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_23"
app:layout_constraintDimensionRatio="98:30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -73,8 +73,8 @@
android:layout_height="0dp"
android:background="@drawable/bg_cp_level_label"
android:gravity="center"
android:paddingLeft="@dimen/dp_8"
android:paddingRight="@dimen/dp_8"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:textColor="#9372FF"
android:textSize="@dimen/dp_12"
app:layout_constraintDimensionRatio="h,54:16"
@@ -86,9 +86,9 @@
android:id="@+id/iv_cp_level_next"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_36"
android:layout_marginRight="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_23"
app:layout_constraintDimensionRatio="98:30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -119,8 +119,8 @@
android:id="@+id/edit_cp_mp_customized"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
android:background="#AB96FF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="h,276:24"

12
app/src/main/res/layout/dialog_custom_voice_match_sync_history_voice.xml
View File

@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="36dp"
android:paddingRight="36dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:text="@string/voice_sync_history_voice_dialog_message"
android:textColor="@color/color_333333"
android:textSize="14sp" />
@@ -42,8 +42,8 @@
android:id="@+id/iv_voice_bar_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_marginRight="7dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:src="@drawable/ic_voice_bar_play"
tools:ignore="ContentDescription" />
@@ -59,8 +59,8 @@
android:id="@+id/tv_voice_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:textColor="#FFFFFF"
android:textSize="18sp"
tools:ignore="RelativeOverlap,RtlHardcoded"

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

@@ -35,8 +35,8 @@
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="38dp"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"
android:layout_weight="1"
android:background="@drawable/shape_f0f0f0_corner"
android:gravity="center"

20
app/src/main/res/layout/dialog_family_currency_contribution.xml
View File

@@ -37,7 +37,7 @@
android:id="@+id/tv_family_currency_balance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:gravity="center_horizontal"
android:text="@string/family_currency_count"
android:textColor="@color/appColor"
@@ -65,7 +65,7 @@
android:id="@+id/tv_member_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:gravity="center_horizontal"
android:textColor="@color/color_333333"
android:textSize="14sp"
@@ -76,14 +76,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="37dp"
android:layout_marginStart="37dp"
android:layout_marginTop="17dp"
android:layout_marginRight="37dp"
android:layout_marginEnd="37dp"
android:background="@drawable/bg_family_dialog_edit"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10">
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10">
<EditText
android:id="@+id/et_input"
@@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:gravity="left"
android:gravity="start"
android:hint="@string/family_currency_contribution_hint"
android:inputType="numberDecimal"
android:maxLength="15"
@@ -125,8 +125,8 @@
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"
android:layout_weight="1"
android:background="@drawable/shape_f0f0f0_corner"
android:gravity="center"
@@ -139,7 +139,7 @@
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"
android:layout_weight="1"
android:background="@drawable/shape_appcolor_corner"
android:gravity="center"

14
app/src/main/res/layout/dialog_family_currency_transfer.xml
View File

@@ -34,7 +34,7 @@
android:textSize="14sp" />
<TextView
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:id="@+id/tv_family_currency_balance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
android:textSize="14sp" />
<TextView
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:id="@+id/tv_member_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -77,12 +77,12 @@
android:layout_marginTop="17dp"
android:layout_width="match_parent"
android:layout_height="31dp"
android:layout_marginLeft="27dp"
android:layout_marginRight="27dp"
android:layout_marginStart="27dp"
android:layout_marginEnd="27dp"
android:background="@drawable/bg_family_dialog_edit"
android:orientation="horizontal"
android:paddingRight="@dimen/dp_10"
android:paddingLeft="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:paddingStart="@dimen/dp_10"
android:gravity="center_vertical">
<EditText
android:id="@+id/et_input"
@@ -90,7 +90,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="left"
android:gravity="start"
android:inputType="numberDecimal"
android:hint="@string/family_currency_transfer_hint"
android:maxLength="15"

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

@@ -16,8 +16,8 @@
android:textStyle="bold" />
<TextView
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

14
app/src/main/res/layout/dialog_family_invite_confirm.xml
View File

@@ -8,8 +8,8 @@
android:orientation="vertical">
<TextView
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
@@ -20,8 +20,8 @@
<LinearLayout
android:layout_marginTop="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
@@ -32,7 +32,7 @@
android:layout_height="50dp"
android:src="@mipmap/app_logo"/>
<TextView
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -45,8 +45,8 @@
</LinearLayout>
<TextView
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

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

@@ -16,8 +16,8 @@
android:textStyle="bold" />
<TextView
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="14dp"
android:id="@+id/tv_family_join_tip"
android:layout_width="wrap_content"

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

@@ -16,8 +16,8 @@
android:textStyle="bold" />
<TextView
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

8
app/src/main/res/layout/dialog_filtrate.xml
View File

@@ -32,9 +32,9 @@
<RadioGroup
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="55dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:orientation="horizontal">
<RadioButton
@@ -84,8 +84,8 @@
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/shape_white_20dp_round"
android:gravity="center"

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

@@ -49,7 +49,7 @@
android:id="@+id/tv_continue"
android:layout_width="120dp"
android:layout_height="38dp"
android:layout_marginLeft="17dp"
android:layout_marginStart="17dp"
android:background="@drawable/shape_05c7c7_to_57edc2"
android:gravity="center"
android:text="@string/layout_dialog_game_exit_04"

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

@@ -16,8 +16,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp" />
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp" />
<com.chwl.app.ui.gift.dialog.PageIndicatorView
android:id="@+id/indicator"

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

@@ -56,8 +56,8 @@
android:background="@{isExper? @drawable/level_up_line_left : @drawable/charm_level_up_line_left}"/>
<TextView
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:id="@+id/tv_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
app/src/main/res/layout/dialog_manual_quantity_gift.xml
View File

@@ -17,7 +17,7 @@
android:inputType="number"
android:maxLength="4"
android:maxLines="1"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:textColor="@color/black"
android:textColorHint="@color/color_BFBFBF"
@@ -27,8 +27,8 @@
android:id="@+id/tv_ok"
android:layout_width="50dp"
android:layout_height="30dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/selector_gift_quantity_confirm_btn"
android:gravity="center"
android:text="@string/ok"

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

@@ -12,8 +12,8 @@
android:background="@drawable/bg_new_user_task_dialog"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="38dp"
android:paddingRight="38dp"
android:paddingStart="38dp"
android:paddingEnd="38dp"
android:paddingBottom="26dp">
<TextView

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

@@ -91,8 +91,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:paddingStart="15dp"
android:paddingEnd="15dp">
<LinearLayout
android:id="@+id/ll_join_queue"

10
app/src/main/res/layout/dialog_pk_result.xml
View File

@@ -22,7 +22,7 @@
android:id="@+id/ll_pk_member"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginStart="35dp"
android:layout_marginTop="38dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -45,7 +45,7 @@
android:id="@+id/ll_score"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginStart="35dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -71,7 +71,7 @@
android:id="@+id/ll_guardian_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginStart="35dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -97,7 +97,7 @@
android:id="@+id/ll_guardian_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginStart="35dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -140,7 +140,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginStart="35dp"
android:gravity="center_vertical"
android:orientation="horizontal">

20
app/src/main/res/layout/dialog_pub_room_shutup.xml
View File

@@ -28,8 +28,8 @@
android:layout_marginTop="30dp"
android:text="@string/layout_dialog_pub_room_shutup_01"
android:singleLine="true"
android:layout_marginLeft="65dp"
android:layout_marginRight="65dp"
android:layout_marginStart="65dp"
android:layout_marginEnd="65dp"
android:textColor="#ff333333"
android:textSize="16sp" />
@@ -37,7 +37,7 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginStart="19dp"
android:layout_marginTop="80dp"
android:text="@string/layout_dialog_pub_room_shutup_02"
android:textColor="#ff666666"
@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text"
android:layout_marginLeft="25dp"
android:layout_marginStart="25dp"
android:text="@string/layout_dialog_pub_room_shutup_03"
android:textColor="@color/color_B3B3B3"
android:textSize="12sp" />
@@ -56,13 +56,13 @@
android:id="@+id/et_reason"
android:layout_width="190dp"
android:layout_height="39dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="76dp"
android:layout_toRightOf="@id/text"
android:background="@drawable/shape_gray_5dp"
android:gravity="center_vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text=""
android:hint="@string/layout_dialog_pub_room_shutup_04"
android:textColor="#ff333333"
@@ -71,7 +71,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_marginStart="19dp"
android:layout_marginTop="141dp"
android:text="@string/layout_dialog_pub_room_shutup_05"
android:textColor="#ff666666"
@@ -80,7 +80,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginStart="25dp"
android:layout_marginTop="159dp"
android:text="@string/layout_dialog_pub_room_shutup_06"
android:textColor="@color/color_B3B3B3"
@@ -97,7 +97,7 @@
android:gravity="center"
android:textSize="15dp"
android:textColor="@color/color_333333"
android:paddingRight="30dp"
android:paddingEnd="30dp"
android:background="@drawable/popup_down" />
<LinearLayout

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

@@ -78,8 +78,8 @@
android:id="@+id/btn_ok"
android:layout_width="0dp"
android:layout_height="@dimen/dp_38"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/base_shape_positive_30dp"
android:gravity="center"
android:onClick="@{click}"

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

@@ -341,9 +341,9 @@
android:id="@+id/recyclerview_skill_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="@dimen/dp_8" />
<LinearLayout

10
app/src/main/res/layout/dialog_vip_upgrade.xml
View File

@@ -44,8 +44,8 @@
android:textColor="#ffffe3af"
android:gravity="center_horizontal"
android:textSize="14sp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constrainedWidth="true"
android:lineSpacingMultiplier="1.2"
app:layout_constraintEnd_toEndOf="parent"
@@ -66,7 +66,7 @@
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintStart_toEndOf="@id/tv_vip_origin" />
<TextView
@@ -78,9 +78,9 @@
android:gravity="center"
android:text="@string/layout_dialog_vip_upgrade_04"
android:textColor="#FFE3AF"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:textSize="16sp"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_vip_uplevel"
app:layout_constraintStart_toStartOf="parent" />

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

@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:layout_marginLeft="15dp" />
android:layout_marginStart="15dp" />
<LinearLayout
@@ -107,7 +107,7 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_toRightOf="@+id/noble_avatar_view" />
</RelativeLayout>

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

@@ -105,7 +105,7 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_toRightOf="@+id/noble_avatar_view" />
</RelativeLayout>

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

@@ -20,8 +20,8 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:gravity="center"
android:orientation="vertical">

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

@@ -9,9 +9,9 @@
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_search_user"
android:gravity="center_vertical"
android:orientation="horizontal">

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

@@ -16,8 +16,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginEnd="20dp"
android:layout_marginStart="20dp"
android:gravity="center"
android:layout_centerHorizontal="true"
android:textSize="@dimen/sp_16"

32
app/src/main/res/layout/fragment_family.xml
View File

@@ -35,8 +35,8 @@
<com.chwl.app.ui.widget.RectLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="10dp"
app:hw_ratio="0.3462">
@@ -55,9 +55,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_find_item_round_rect"
android:orientation="vertical">
@@ -67,8 +67,8 @@
android:layout_height="75dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="28dp"
@@ -125,8 +125,8 @@
android:layout_height="75dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="28dp"
@@ -173,9 +173,9 @@
android:id="@+id/ll_my_family_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
@@ -266,9 +266,9 @@
android:id="@+id/ll_star_family_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
@@ -295,8 +295,8 @@
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingRight="20dp">
android:paddingStart="20dp"
android:paddingEnd="20dp">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="28dp"
@@ -354,8 +354,8 @@
android:layout_marginBottom="20dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingRight="20dp">
android:paddingStart="20dp"
android:paddingEnd="20dp">
<com.chwl.app.common.widget.CircleImageView
android:layout_width="28dp"

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

@@ -8,8 +8,8 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_game_room_tab_select"
android:orientation="horizontal">

10
app/src/main/res/layout/fragment_gift_income.xml
View File

@@ -15,7 +15,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_fragment_gift_income_01"
android:textColor="@color/color_999999"
android:textSize="18sp" />
@@ -26,8 +26,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_selector_date"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:src="@mipmap/ic_day_today_yellow"
android:visibility="visible" />
@@ -37,8 +37,8 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:paddingLeft="8dp"
android:layout_marginEnd="15dp"
android:paddingStart="8dp"
android:src="@drawable/icon_date_yellow" />
</RelativeLayout>

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

@@ -9,8 +9,8 @@
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:background="@color/color_FAFAFA" />
<androidx.viewpager.widget.ViewPager

10
app/src/main/res/layout/fragment_radish_record.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:text="@string/layout_fragment_radish_record_01"
android:textColor="@color/color_999999"
android:textSize="18sp" />
@@ -32,8 +32,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/tv_selector_date"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:src="@mipmap/ic_day_today_yellow"
android:visibility="visible" />
@@ -43,8 +43,8 @@
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:paddingLeft="8dp"
android:layout_marginEnd="15dp"
android:paddingStart="8dp"
android:src="@drawable/icon_date_yellow" />
</RelativeLayout>

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

@@ -9,8 +9,8 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15">
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svga_image_view_bg"

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

@@ -281,11 +281,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/layout_fragment_userinfo_info_012"
android:drawableRight="@drawable/arrow_right"
android:drawableEnd="@drawable/arrow_right"
android:textColor="@color/color_333333"
android:layout_marginEnd="@dimen/dp_15"
android:textSize="@dimen/sp_14"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_12"
/>
<androidx.recyclerview.widget.RecyclerView

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

@@ -25,9 +25,9 @@
android:id="@+id/tv_voice_card_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginStart="25dp"
android:layout_marginTop="38dp"
android:layout_marginRight="25dp"
android:layout_marginEnd="25dp"
android:ellipsize="end"
android:focusable="true"
android:focusableInTouchMode="true"

22
app/src/main/res/layout/header_famiy_currency_bill.xml
View File

@@ -11,9 +11,9 @@
android:layout_height="wrap_content"
android:background="@mipmap/bg_family_currency_card"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_20"
android:paddingStart="@dimen/dp_20"
android:paddingTop="25dp"
android:paddingRight="@dimen/dp_20">
android:paddingEnd="@dimen/dp_20">
<RelativeLayout
android:layout_width="match_parent"
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="left"
android:gravity="start"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="30sp"
@@ -82,7 +82,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:text="@string/family_currency_income"
android:textColor="@color/color_white"
android:textSize="14sp" />
@@ -91,7 +91,7 @@
android:id="@+id/tv_family_currency_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:maxLines="1"
android:textColor="@color/color_white"
android:textSize="14sp"
@@ -114,7 +114,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:text="@string/family_currency_expenditure"
android:textColor="@color/color_white"
android:textSize="14sp" />
@@ -123,7 +123,7 @@
android:id="@+id/tv_family_currency_expenditure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:maxLines="1"
android:textColor="@color/color_white"
android:textSize="14sp"
@@ -148,8 +148,8 @@
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_weight="1.0"
android:background="@drawable/bg_family_member_search_edit"
android:gravity="center_vertical">
@@ -157,13 +157,13 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:src="@mipmap/ic_main_search" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@null"
android:gravity="center_vertical"
android:hint="@string/family_search_member_hint"

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

@@ -23,7 +23,7 @@
app:layout_constraintTop_toBottomOf="@id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:overScrollMode="never" />
</merge>

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

@@ -12,7 +12,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
/>
<androidx.appcompat.widget.AppCompatTextView
@@ -21,7 +21,7 @@
android:id="@+id/tv_title"
app:layout_constraintLeft_toRightOf="@id/iv_icon"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_12"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_333333"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -58,8 +58,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginTop="12dp"
android:layout_weight="1"
android:orientation="vertical">

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

@@ -25,8 +25,8 @@
android:layout_marginTop="-9dp"
android:textColor="@color/base_color_theme_text"
android:background="@drawable/base_shape_theme_30dp"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:paddingStart="@dimen/dp_5"
android:paddingEnd="@dimen/dp_5"
android:text="@string/layout_item_attention_in_room_01"/>
<TextView

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

@@ -26,8 +26,8 @@
android:id="@+id/ll_panel_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">

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

@@ -42,7 +42,7 @@
android:id="@+id/tv_car_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:layout_toEndOf="@+id/ll_car_cover"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="10dp"

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

@@ -9,7 +9,7 @@
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_alignParentRight="true"
android:layout_marginRight="9dp"
android:layout_marginEnd="9dp"
android:layout_marginTop="9dp"
android:background="@drawable/bg_car_drive_selector" />

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

@@ -85,7 +85,7 @@
android:layout_width="40dp"
android:layout_height="15dp"
android:layout_gravity="right"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_pk_mic_queue_mark_red"
android:gravity="center"
android:textColor="@color/color_FFFFFF"

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

@@ -9,7 +9,7 @@
android:maxWidth="218dp"
android:gravity="center_vertical"
android:textSize="@dimen/sp_10"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:paddingStart="@dimen/dp_5"
android:paddingEnd="@dimen/dp_5"
tools:text="@string/layout_item_cp_declaration_recommend_01"
android:layout_height="20dp" />

12
app/src/main/res/layout/item_cp_invite_record.xml
View File

@@ -6,13 +6,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_white_cornor_4"
android:paddingLeft="@dimen/dp_8"
android:paddingStart="@dimen/dp_8"
android:paddingTop="6dp"
android:paddingRight="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_6"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:paddingBottom="6dp">
<com.chwl.app.common.widget.CircleImageView
@@ -27,7 +27,7 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:textColor="@color/color_333333"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/tv_desc"
@@ -40,7 +40,7 @@
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_4"
android:textColor="@color/color_999999"
android:textSize="12sp"

14
app/src/main/res/layout/item_cp_task.xml
View File

@@ -5,16 +5,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_12"
android:paddingRight="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:paddingBottom="@dimen/dp_5">
<TextView
android:id="@+id/tv_task_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_15"
app:layout_constrainedWidth="true"
@@ -27,7 +27,7 @@
android:id="@+id/tv_task_desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_14"
@@ -43,8 +43,8 @@
android:background="@drawable/bg_cp_pink_selector"
android:enabled="false"
android:gravity="center"
android:paddingLeft="@dimen/dp_14"
android:paddingRight="@dimen/dp_14"
android:paddingStart="@dimen/dp_14"
android:paddingEnd="@dimen/dp_14"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintDimensionRatio="64:24"
@@ -56,7 +56,7 @@
android:id="@+id/tv_task_completed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_4"
android:gravity="center"
android:singleLine="true"

14
app/src/main/res/layout/item_erban_recommend.xml
View File

@@ -23,11 +23,11 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="7dp"
android:paddingRight="7dp"
android:paddingStart="7dp"
android:paddingEnd="7dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:layout_alignParentRight="true"
@@ -43,7 +43,7 @@
android:background="@color/transparent"/>
<TextView
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:id="@+id/tv_online_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -82,8 +82,8 @@
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:maxLines="2"

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

@@ -21,7 +21,7 @@
android:id="@+id/iv_msg1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5"/>
android:layout_marginEnd="@dimen/dp_5"/>
<TextView
android:id="@+id/tv_msg1"
android:layout_width="match_parent"
@@ -45,7 +45,7 @@
android:id="@+id/iv_msg2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5"/>
android:layout_marginEnd="@dimen/dp_5"/>
<TextView
android:id="@+id/tv_msg2"
android:layout_width="match_parent"

8
app/src/main/res/layout/item_family_currency_bill_date.xml
View File

@@ -6,15 +6,15 @@
android:background="@color/color_F5F5F5"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_10"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:paddingTop="@dimen/dp_10">
<TextView
android:id="@+id/tv_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/ic_family_currency_bill_date_arrow_down"
android:drawableEnd="@mipmap/ic_family_currency_bill_date_arrow_down"
android:gravity="left|center_vertical"
android:textColor="@color/color_333333"
android:textSize="13sp"
@@ -24,7 +24,7 @@
android:id="@+id/tv_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:text="@string/family_currency_bill_summary"
android:textColor="@color/color_999999"
android:textSize="13sp" />

10
app/src/main/res/layout/item_family_currency_transaction_record.xml
View File

@@ -12,8 +12,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/dp_15"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:paddingTop="@dimen/dp_15">
<com.chwl.app.common.widget.CircleImageView
@@ -26,7 +26,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_weight="1"
android:orientation="vertical">
@@ -51,7 +51,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:orientation="vertical">
<TextView
@@ -77,6 +77,6 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:background="@color/color_F1F1F1" />
</LinearLayout>

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

@@ -7,8 +7,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white"
android:gravity="center_horizontal"
android:paddingRight="@dimen/dp_10"
android:paddingLeft="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:paddingStart="@dimen/dp_10"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:orientation="vertical">

8
app/src/main/res/layout/item_family_list.xml
View File

@@ -6,8 +6,8 @@
android:background="@drawable/bg_common_touch_while"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:orientation="horizontal">
<com.chwl.app.ui.widget.SquareImageView
@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:layout_weight="1"
android:orientation="vertical">
@@ -48,7 +48,7 @@
android:textSize="12dp" />
<TextView
android:layout_marginLeft="17dp"
android:layout_marginStart="17dp"
android:id="@+id/tv_family_member_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

10
app/src/main/res/layout/item_family_manage_rv.xml
View File

@@ -3,9 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/shape_white_solid_round"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -14,16 +14,16 @@
android:id="@+id/iv_img"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:src="@drawable/default_cover" />
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:drawableEnd="@drawable/arrow_right"
android:paddingRight="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:textColor="@color/color_333333"
android:textSize="14sp"
tools:text="@string/layout_item_family_manage_rv_01" />

10
app/src/main/res/layout/item_family_member_list.xml
View File

@@ -9,8 +9,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -41,8 +41,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginTop="12dp"
android:layout_weight="1"
android:orientation="vertical">
@@ -124,7 +124,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:background="@color/color_F1F1F1" />
</LinearLayout>

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

@@ -65,8 +65,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"
android:gravity="end"
android:orientation="vertical">

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

@@ -32,7 +32,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
tools:background="@drawable/default_avatar" />
<TextView
@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_toRightOf="@id/iv_avatar"
android:textColor="@color/text_title_color"
android:textSize="15dp"

10
app/src/main/res/layout/item_game_rank.xml
View File

@@ -4,7 +4,7 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingRight="14dp"
android:paddingEnd="14dp"
android:background="@drawable/home_ranking">
<TextView
@@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="45dp"
android:layout_marginStart="45dp"
android:text="@string/layout_item_game_rank_01"
android:textColor="#ff999999"
android:textSize="19sp" />
@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_toRightOf="@id/tv_name"
android:src="@drawable/home_ranking_img" />
@@ -46,7 +46,7 @@
android:visibility="visible"
app:cborder_color="@color/white"
app:cborder_width="1.5dp"
android:layout_marginLeft="-6dp" />
android:layout_marginStart="-6dp" />
<com.chwl.app.common.widget.CircleImageView
android:id="@+id/iv_avatar2"
@@ -63,7 +63,7 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginRight="-6dp"
android:layout_marginEnd="-6dp"
android:layout_toLeftOf="@id/iv_avatar2"
android:src="@drawable/default_avatar"
android:visibility="visible"

10
app/src/main/res/layout/item_gift.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="20dp"
android:background="@drawable/bg_giftlayout">
@@ -33,7 +33,7 @@
android:id="@+id/nickNameTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:ellipsize="end"
@@ -68,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_marginEnd="5dp"
android:layout_toRightOf="@id/giftIv"
android:text="x1"
android:textColor="@color/white"
@@ -79,14 +79,14 @@
android:id="@+id/light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp" />
android:layout_marginStart="120dp" />
<com.chwl.app.ui.gift.widget.StrokeTextView
android:id="@+id/animation_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:layout_toRightOf="@id/infoRl"
android:text="x 1"

Some files were not shown because too many files have changed in this diff Show More