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

[Modify]阿拉伯语适配

Browse Source
This commit is contained in:
wushaocheng
2023-05-24 18:06:30 +08:00
parent c6cef55b9a
commit 95f7c525ab
323 changed files with 1227 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_crop_lib/src/main/res/values/styles.xml
View File

@@ -24,7 +24,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingRight">20dp</item> <!-- Offsets left drawable -->
<item name="android:paddingEnd">20dp</item> <!-- Offsets left drawable -->
<item name="android:drawablePadding">8dp</item>
<item name="android:textColor">@color/crop__button_text</item>
<item name="android:textStyle">bold</item>

4
app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java
View File

@@ -21,6 +21,8 @@ import android.util.AttributeSet;
import android.util.Pair;
import android.widget.TextView;
import androidx.appcompat.widget.AppCompatTextView;
import com.yizhuan.erban.R;
import java.util.ArrayList;
@@ -38,7 +40,7 @@ import java.util.WeakHashMap;
* AuthorPhone：nothing
* Created by 2016/9/22.
*/
public class MagicTextView extends TextView {
public class MagicTextView extends AppCompatTextView {
private ArrayList<Shadow> outerShadows;
private ArrayList<Shadow> innerShadows;

10
app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java
View File

@@ -53,7 +53,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene
//hint透明度
private int alpha;
private int paddingLeft;
private int paddingStart;
private int paddingTop;
private int paddingRight;
private int paddingBottom;
@@ -113,7 +113,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene
delay = type.getInt(R.styleable.RollViewPager_rollviewpager_play_delay, 0);
color = type.getColor(R.styleable.RollViewPager_rollviewpager_hint_color, Color.BLACK);
alpha = type.getInt(R.styleable.RollViewPager_rollviewpager_hint_alpha, 0);
paddingLeft = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingLeft, 0);
paddingStart = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingStart, 0);
paddingRight = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingRight, 0);
paddingTop = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingTop, 0);
paddingBottom = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingBottom, Util.dip2px(getContext(), 4));
@@ -231,7 +231,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene
*/
private void loadHintView() {
addView(mHintView);
mHintView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
mHintView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom);
LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lp.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
((View) mHintView).setLayoutParams(lp);
@@ -319,11 +319,11 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene
* 设置提示view的位置
*/
public void setHintPadding(int left, int top, int right, int bottom) {
paddingLeft = left;
paddingStart = left;
paddingTop = top;
paddingRight = right;
paddingBottom = bottom;
mHintView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
mHintView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom);
}
/**

12
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"

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"

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

@@ -42,8 +42,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toStartOf="@+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" />

30
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -18,8 +18,8 @@
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<TextView
android:layout_width="wrap_content"
@@ -54,8 +54,8 @@
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<TextView
android:layout_width="wrap_content"
@@ -72,7 +72,7 @@
android:layout_weight="1"
android:background="@null"
android:hint="@string/layout_activity_binder_alipay_04"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
@@ -96,7 +96,7 @@
android:layout_height="40dp"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingStart="15dp"
android:text="@string/layout_activity_binder_alipay_05"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_14"
@@ -113,8 +113,8 @@
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
android:paddingStart="32dp"
android:paddingEnd="32dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -138,9 +138,9 @@
android:id="@+id/btn_get_code"
android:layout_width="wrap_content"
android:layout_height="29dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/space_normal"
android:layout_marginStart="@dimen/space_normal"
android:background="@color/transparent"
android:clickable="true"
android:text="@string/layout_activity_binder_alipay_07"
@@ -152,7 +152,7 @@
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:layout_toLeftOf="@id/btn_get_code"
android:src="@drawable/ic_nick_delete" />
@@ -164,9 +164,9 @@
android:id="@+id/btn_binder"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:layout_marginTop="30dp"
android:layout_marginRight="32dp"
android:layout_marginEnd="32dp"
android:background="@drawable/selector_common_confirm"
android:clickable="true"
android:text="@string/layout_activity_binder_alipay_08"
@@ -177,9 +177,9 @@
android:id="@+id/btn_binder_request"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:layout_marginTop="30dp"
android:layout_marginRight="32dp"
android:layout_marginEnd="32dp"
android:background="@drawable/selector_common_confirm"
android:clickable="true"
android:text="@string/layout_activity_binder_alipay_09"

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"

78
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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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="@dimen/sp_11" />
@@ -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
@@ -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/selector_common_confirm"
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/selector_common_confirm"
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/bg_common_cancel_30"
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"

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

@@ -16,8 +16,8 @@
android:layout_height="44dp"
android:background="#FFF8F5"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="25dp">
android:paddingStart="15dp"
android:paddingEnd="25dp">
<ImageView
android:layout_width="wrap_content"
@@ -27,7 +27,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/layout_activity_exchange_gold_01"
android:textColor="@color/color_FFB606"
@@ -49,8 +49,8 @@
android:layout_height="44dp"
android:background="#FFF1F3"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="25dp">
android:paddingStart="15dp"
android:paddingEnd="25dp">
<ImageView
android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/layout_activity_exchange_gold_02"
android:textColor="#FF3852"
@@ -93,7 +93,7 @@
android:layout_width="19dp"
android:layout_height="17.5dp"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:src="@drawable/icon_exchange_jew"
android:visibility="gone" />
@@ -102,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_toRightOf="@id/jew_exchange_number_img"
android:background="@null"
android:hint="@string/layout_activity_exchange_gold_03"
@@ -142,9 +142,9 @@
android:id="@+id/gold_exchange_number_img"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="30dp"
android:layout_marginEnd="30dp"
android:src="@drawable/icon_exchange_gold"
android:visibility="gone" />
@@ -152,9 +152,9 @@
android:id="@+id/gold_exchange_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:textColor="@color/text_tertiary"
android:textSize="@dimen/font_medium"
tools:text="@string/layout_activity_exchange_gold_05" />
@@ -176,9 +176,9 @@
android:id="@+id/tv_hammar_exchange_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:textColor="@color/text_tertiary"
android:textSize="@dimen/font_medium"
tools:text="@string/layout_activity_exchange_gold_06" />
@@ -197,9 +197,9 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="63dp"
android:layout_marginStart="63dp"
android:layout_marginTop="25dp"
android:layout_marginRight="63dp"
android:layout_marginEnd="63dp"
android:background="@drawable/shape_semi_round_grey_e5_solid"
android:enabled="false"
android:text="@string/layout_activity_exchange_gold_07"

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

@@ -121,8 +121,8 @@
android:background="@color/color_white"
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"
@@ -157,8 +157,8 @@
android:background="@color/color_white"
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">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_patriarch_avatar"
@@ -217,16 +217,16 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
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/color_F5F5F5" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_family_game_list"
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:layout_marginTop="13dp"
android:overScrollMode="never" />
@@ -280,16 +280,16 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
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/color_F5F5F5" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_family_member_list"
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:layout_marginTop="11dp"
android:overScrollMode="never" />
@@ -346,16 +346,16 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
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/color_F1F1F1" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_family_group_list"
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:nestedScrollingEnabled="false"
android:overScrollMode="never"
android:visibility="visible" />

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

@@ -22,8 +22,8 @@
android:background="@color/color_white"
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"
@@ -42,7 +42,7 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerHorizontal="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="centerCrop"
android:src="@drawable/default_cover"
app:riv_corner_radius="@dimen/dp_5" />
@@ -62,8 +62,8 @@
android:background="@color/color_white"
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"
@@ -77,7 +77,7 @@
android:id="@+id/tv_family_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:gravity="right"
android:textColor="@color/color_666666"
@@ -93,7 +93,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_F5F5F5" />
<LinearLayout
@@ -102,8 +102,8 @@
android:background="@color/color_white"
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"
@@ -121,7 +121,7 @@
android:id="@+id/sv_identity_check"
android:layout_width="44dp"
android:layout_height="27dp"
android:layout_marginRight="6dp" />
android:layout_marginEnd="6dp" />
</LinearLayout>
@@ -134,8 +134,8 @@
android:id="@+id/tv_family_disband"
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:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/shape_white_20dp_round"
android:gravity="center"

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

@@ -28,8 +28,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">
@@ -37,13 +37,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"
@@ -60,8 +60,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:paddingRight="@dimen/dp_15"
android:paddingLeft="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:background="@color/white"
android:gravity="center_vertical"
android:backgroundTint="@color/color_F5F5F5"

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

@@ -25,7 +25,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"
@@ -35,14 +35,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_search_member_hint"
@@ -60,8 +60,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:src="@mipmap/ic_text_clear" />
@@ -73,7 +73,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
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_family_plaza.xml
View File

@@ -58,8 +58,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="14dp"
android:text="@string/family_weekly_rank_board"
android:textColor="@color/color_1A1A1A"

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

@@ -27,7 +27,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"
@@ -37,14 +37,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_search_hint"
@@ -62,8 +62,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:src="@mipmap/ic_text_clear" />
@@ -75,7 +75,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
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_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"

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

@@ -24,7 +24,7 @@
android:drawableLeft="@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" />

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">

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

@@ -22,9 +22,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.yizhuan.erban.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" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

8
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"
@@ -40,9 +40,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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"

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

@@ -4,8 +4,8 @@
android:layout_height="match_parent"
android:background="@drawable/bg_start_live"
android:orientation="vertical"
android:paddingLeft="25dp"
android:paddingRight="20dp"
android:paddingStart="25dp"
android:paddingEnd="20dp"
android:paddingTop="20dp"
>
@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/btn_close" />
</RelativeLayout>
@@ -57,8 +57,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="5dp"
android:layout_marginLeft="9dp"
android:layout_marginRight="5dp"
android:layout_marginStart="9dp"
android:layout_marginEnd="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:gravity="top"

2
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" />

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}">

34
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" />
@@ -248,9 +248,9 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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" />
@@ -279,9 +279,9 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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" />
@@ -310,9 +310,9 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -334,9 +334,9 @@
android:id="@+id/switch_audio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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

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

@@ -63,7 +63,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:text="@string/layout_activity_send_gold_01"
android:textColor="@color/color_333333"
android:textSize="14sp" />

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

@@ -181,8 +181,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="14sp"
@@ -265,8 +265,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="14sp"

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" />

12
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"

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" />

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

@@ -469,8 +469,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:paddingStart="15dp"
android:paddingEnd="15dp">
<ImageView
android:id="@+id/iv_user_back"

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

@@ -85,15 +85,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"
@@ -119,8 +119,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
@@ -155,8 +155,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
@@ -205,8 +205,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
@@ -247,8 +247,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" />
<androidx.constraintlayout.widget.ConstraintLayout
@@ -312,8 +312,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
@@ -393,8 +393,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
@@ -454,8 +454,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>

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

@@ -26,14 +26,14 @@
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@drawable/icon_zhifubao_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="67dp"
android:layout_marginStart="67dp"
android:maxLines="1"
android:text="@string/layout_activity_withdraw_01"
android:textColor="#666666"
@@ -43,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/arrow_right" />
</FrameLayout>
<!--绑定成功后显示用户信息的控件，变为可见-->
@@ -61,7 +61,7 @@
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:background="@drawable/icon_zhifubao" />
<LinearLayout
@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/zhifubao"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_toRightOf="@+id/zhifubao"
android:orientation="horizontal">
@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lly_zhifubao_user"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:layout_toRightOf="@+id/zhifubao"
android:orientation="horizontal"
@@ -106,9 +106,9 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/arrow_right" />
</RelativeLayout>
@@ -227,7 +227,7 @@
android:id="@+id/tv_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:layout_marginBottom="@dimen/dp_22"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/withdraw_notice" />
@@ -246,8 +246,8 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerInParent="true"
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:background="@drawable/shape_semi_round_gray_un_solid"
android:text="@string/layout_activity_withdraw_06"
android:textColor="@color/white"
@@ -258,8 +258,8 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerInParent="true"
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:background="@drawable/shape_semi_round_yellow_solid"
android:text="@string/layout_activity_withdraw_07"
android:textColor="@color/white"

16
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" />
@@ -50,10 +50,10 @@
android:id="@+id/tv_selector_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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>
@@ -71,9 +71,9 @@
android:id="@+id/iv_goto_top"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="50dp"
android:src="@mipmap/ic_goto_top" />

4
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"
@@ -31,7 +31,7 @@
android:id="@+id/tv_right_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="center"
android:text="@string/layout_default_toolbar_layout_02"
android:textColor="@color/text_tertiary"

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

@@ -11,7 +11,7 @@
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="@string/layout_dialog_bottom_auction_01"
android:textColor="@color/text_secondary_4f516a"
@@ -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: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" />

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

@@ -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" />
@@ -202,8 +202,8 @@
android:background="@drawable/shape_semi_round_white_solid_black_stroke"
android:drawableRight="@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"

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

@@ -472,9 +472,9 @@
android:id="@+id/send_container"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_room_bg_send"
android:orientation="horizontal">

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"

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"

18
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"
@@ -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"

12
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"

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.yizhuan.erban.ui.gift.dialog.PageIndicatorView
android:id="@+id/indicator"

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

@@ -21,8 +21,8 @@
android:id="@+id/tv_room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="35dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="35dp"
android:layout_marginTop="28dp"
android:textSize="12dp"
android:textColor="@color/white"
@@ -35,7 +35,7 @@
android:id="@+id/benefactor_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="50dp"
android:layout_marginStart="50dp"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
android:orientation="vertical">
@@ -109,8 +109,8 @@
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="45dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="45dp"
android:gravity="center_vertical"
android:paddingTop="30dp"
android:text="@{@string/x + giftBean.giftNum}"
@@ -122,7 +122,7 @@
android:id="@+id/gift_light_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_toLeftOf="@id/gift_number"
android:paddingTop="30dp">

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_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">

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

@@ -43,7 +43,7 @@
android:id="@+id/tv_red_team_score"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:gravity="center_horizontal"
android:includeFontPadding="false"
@@ -57,7 +57,7 @@
android:id="@+id/tv_blue_team_score"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="center_horizontal"
android:includeFontPadding="false"

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="@dimen/sp_15"
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/bg_common_confirm_30"
android:gravity="center"
android:onClick="@{click}"

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

@@ -20,8 +20,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:layout_marginRight="13dp"
android:layout_marginStart="13dp"
android:layout_marginEnd="13dp"
android:background="@drawable/dialog_background"
android:orientation="vertical"
app:cardElevation="0dp">
@@ -152,8 +152,8 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:layout_marginRight="13dp"
android:layout_marginStart="13dp"
android:layout_marginEnd="13dp"
android:background="@color/white"
android:paddingTop="5dp"
android:paddingBottom="5dp"

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

@@ -302,7 +302,7 @@
android:id="@+id/close_image"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:padding="@dimen/dp_8"
@@ -340,8 +340,8 @@
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:id="@+id/recyclerview_skill_card"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"

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
@@ -109,7 +109,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

@@ -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>

7
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">
@@ -77,8 +77,7 @@
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_333333"
android:textSize="15sp"
tools:text="@string/layout_fans_list_item_01" />
android:textSize="15sp" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_gender"

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"

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

@@ -35,8 +35,8 @@
<com.yizhuan.erban.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">
@@ -46,7 +46,7 @@
android:layout_height="match_parent"
app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp"
app:rollviewpager_hint_paddingLeft="@dimen/dp_10" />
app:rollviewpager_hint_paddingStart="@dimen/dp_10" />
</com.yizhuan.erban.ui.widget.RectLayout>
@@ -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"
@@ -345,8 +345,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.yizhuan.erban.common.widget.CircleImageView
android:layout_width="28dp"

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

@@ -28,8 +28,8 @@ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
app:layout_scrollFlags="scroll"
android:layout_height="48dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:background="@color/white"/>
</RelativeLayout>

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">

12
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" />
@@ -35,10 +35,10 @@
android:id="@+id/tv_selector_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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>

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

@@ -93,7 +93,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
app:layout_constraintEnd_toStartOf="@id/ll_user_attentions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/iv_user_head"
app:layout_constraintTop_toTopOf="@id/iv_user_head">
@@ -121,7 +121,7 @@
android:id="@+id/ll_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
@@ -152,8 +152,8 @@
android:id="@+id/iv_sex"
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:src="@{userInfo.gender==1?@drawable/ic_gender_male:@drawable/ic_gender_female}"
app:layout_constraintBottom_toBottomOf="@id/ll_id"
app:layout_constraintStart_toEndOf="@id/ll_id"
@@ -249,7 +249,6 @@
android:id="@+id/tv_user_attention_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_4"
android:text="@{String.valueOf(userInfo.followNum)}"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_11" />
@@ -281,7 +280,6 @@
android:id="@+id/tv_user_fan_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_4"
android:text="@{String.valueOf(userInfo.fansNum)}"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_11" />

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

12
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" />
@@ -41,10 +41,10 @@
android:id="@+id/tv_selector_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="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"

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

@@ -285,7 +285,7 @@
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_userinfo_userinfo.xml
View File

@@ -51,8 +51,8 @@
android:background="@drawable/shape_gradient_d3acfe_a486ff"
android:gravity="center"
android:includeFontPadding="false"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
tools:text="@string/layout_activity_user_info_03" />

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

@@ -17,9 +17,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"

14
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"
@@ -33,7 +33,7 @@
android:id="@+id/iv_family_currency_help"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@mipmap/ic_family_currency_help" />
</RelativeLayout>
@@ -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/white"
android:background="@drawable/bg_common_confirm_30"
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

@@ -22,8 +22,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">

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

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

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