[Modify]统一按钮颜色
This commit is contained in:
@@ -87,12 +87,12 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
|
||||
tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_03));
|
||||
tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
|
||||
tvUsed.setEnabled(true);
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1));
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
|
||||
} else {
|
||||
tvUsed.setVisibility(View.VISIBLE);
|
||||
tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
|
||||
tvUsed.setBackgroundResource(R.drawable.selector_common_confirm);
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_color));
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_first));
|
||||
tvUsed.setEnabled(true);
|
||||
}
|
||||
|
||||
|
@@ -37,8 +37,8 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
|
||||
//使用按钮
|
||||
TextView tvUsed = helper.getView(R.id.tv_used);
|
||||
tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel_30 : R.drawable.selector_common_confirm);
|
||||
tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_4C5AF1) :
|
||||
mContext.getResources().getColor(R.color.white));
|
||||
tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.text_button_color_gray) :
|
||||
mContext.getResources().getColor(R.color.text_button_color_first));
|
||||
tvUsed.setText(item.isUsing() ? R.string.label_used : R.string.label_can_use);
|
||||
if (item.isIsExpired()) { // 过期
|
||||
// 日期展示
|
||||
@@ -47,7 +47,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
|
||||
tvUsed.setEnabled(false);
|
||||
tvUsed.setBackgroundResource(R.drawable.bg_common_cancel_30);
|
||||
tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mynameplateadapter_01));
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
|
||||
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_gray));
|
||||
} else {
|
||||
String days;
|
||||
if (item.getExpireDays() > 99) {
|
||||
|
@@ -98,10 +98,10 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
|
||||
mBinding.tvCommit.setClickable(canClick);
|
||||
if (canClick) {
|
||||
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_30);
|
||||
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_color));
|
||||
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_first));
|
||||
} else {
|
||||
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_cancel_30);
|
||||
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
|
||||
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_button_color_gray));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<solid android:color="@color/color_E6E6F0" />
|
||||
<corners android:radius="@dimen/dp_30" />
|
||||
<solid android:color="@color/color_E6E6F0"/>
|
||||
|
||||
</shape>
|
@@ -4,8 +4,9 @@
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#19EBFF"
|
||||
android:startColor="#ED66FF"
|
||||
android:endColor="#13E2F5"
|
||||
android:centerColor="#9DB4FF"
|
||||
android:startColor="#CC67FF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="@dimen/dp_15" />
|
||||
|
@@ -4,8 +4,9 @@
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#19EBFF"
|
||||
android:startColor="#ED66FF"
|
||||
android:endColor="#13E2F5"
|
||||
android:centerColor="#9DB4FF"
|
||||
android:startColor="#CC67FF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="@dimen/dp_30" />
|
||||
|
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<solid android:color="@color/color_E6E6F0" />
|
||||
<corners android:radius="@dimen/dp_30" />
|
||||
|
||||
</shape>
|
13
app/src/main/res/drawable/bg_common_confirm_second_30.xml
Normal file
13
app/src/main/res/drawable/bg_common_confirm_second_30.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#EEDCFF"
|
||||
android:startColor="#CCF8F9"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="@dimen/dp_18" />
|
||||
|
||||
</shape>
|
@@ -460,7 +460,7 @@
|
||||
android:background="@drawable/selector_common_confirm"
|
||||
android:gravity="center"
|
||||
android:text="@string/recreate_pk"
|
||||
android:textColor="@color/color_FFFFFF" />
|
||||
android:textColor="@color/text_button_color_first" />
|
||||
|
||||
|
||||
<TextView
|
||||
@@ -473,7 +473,7 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/close_pk_mode"
|
||||
android:textColor="@color/text_secondary_4f516a" />
|
||||
android:textColor="@color/text_button_color_gray" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
@@ -99,8 +99,8 @@
|
||||
android:layout_marginTop="100dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/layout_activity_patriarch_mode_06"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:textSize="15sp" />
|
||||
|
||||
|
||||
|
@@ -78,7 +78,7 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/layout_activity_patriarch_pwd_02"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="15sp"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
@@ -93,11 +93,11 @@
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:background="@drawable/selector_common_confirm"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/text_ok"
|
||||
android:textColor="@color/text_title_color"
|
||||
android:textSize="15dp" />
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:textSize="@dimen/sp_14" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
@@ -27,9 +27,9 @@
|
||||
android:layout_width="140dp"
|
||||
android:layout_height="38dp"
|
||||
android:text="@string/label_common_close"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:textSize="15sp"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="24dp"/>
|
||||
|
@@ -56,7 +56,7 @@
|
||||
android:gravity="center"
|
||||
android:text="@string/layout_dialog_common_edit_03"
|
||||
android:layout_marginEnd="@dimen/dp_5"
|
||||
android:textColor="@color/color_4C5AF1"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="@dimen/sp_15" />
|
||||
|
||||
<TextView
|
||||
@@ -66,8 +66,8 @@
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_width="120dp"
|
||||
android:layout_height="38dp"
|
||||
android:background="@drawable/selector_common_confirm"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/layout_dialog_common_edit_04"
|
||||
android:textColor="@color/text_title_color" />
|
||||
android:textColor="@color/text_button_color_first" />
|
||||
</RelativeLayout>
|
@@ -59,7 +59,7 @@
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:textSize="15sp"
|
||||
android:layout_marginEnd="2.5dp"
|
||||
|
@@ -140,7 +140,7 @@
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="16sp"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:text="@string/cancel_mic_queue"
|
||||
|
@@ -55,7 +55,7 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/layout_dialog_protocol_update_02"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="@dimen/sp_14" />
|
||||
|
||||
<TextView
|
||||
|
@@ -116,7 +116,7 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<TextView
|
||||
|
@@ -62,11 +62,11 @@
|
||||
android:id="@+id/btn_cancel"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/dp_38"
|
||||
android:layout_marginLeft="@dimen/dp_16"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="@dimen/sp_14"
|
||||
android:onClick="@{click}"
|
||||
android:layout_marginTop="12dp"
|
||||
@@ -80,7 +80,7 @@
|
||||
android:layout_height="@dimen/dp_38"
|
||||
android:layout_marginLeft="@dimen/dp_16"
|
||||
android:layout_marginRight="@dimen/dp_16"
|
||||
android:background="@drawable/common_btn_bg"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:onClick="@{click}"
|
||||
android:text="@string/ok"
|
||||
|
@@ -125,7 +125,7 @@
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/layout_dialog_room_pk_received_08"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -136,7 +136,7 @@
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="35dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:background="@drawable/selector_common_confirm"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/layout_dialog_room_pk_received_09"
|
||||
|
@@ -32,9 +32,9 @@
|
||||
android:text="@string/close"
|
||||
android:layout_marginTop="13dp"
|
||||
android:layout_marginBottom="17dp"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:textSize="15sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -20,8 +20,8 @@
|
||||
android:layout_marginLeft="20dp"
|
||||
android:gravity="center"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textSize="16dp"
|
||||
android:textColor="@color/appColor"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:textColor="@color/text_title_color"
|
||||
tools:text="@string/layout_fragment_dialog_room_title_01" />
|
||||
|
||||
<TextView
|
||||
@@ -34,20 +34,20 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="205dp"
|
||||
android:textColor="@color/color_424242"
|
||||
android:textSize="13dp"
|
||||
android:textSize="@dimen/sp_13"
|
||||
android:scrollbars="vertical" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_close"
|
||||
android:layout_width="140dp"
|
||||
android:layout_height="38dp"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_second"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:text="@string/close"
|
||||
android:gravity="center"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:background="@drawable/bg_common_cancel_30" />
|
||||
android:background="@drawable/bg_common_confirm_second_30" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
@@ -75,11 +75,11 @@
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:background="@drawable/bg_common_confirm_second_30"
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/layout_item_decoration_common_03"
|
||||
android:textColor="@color/color_FFA957"
|
||||
android:textColor="@color/text_button_color_second"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/tv_buy"
|
||||
|
@@ -94,11 +94,11 @@
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:background="@drawable/bg_common_confirm_second_30"
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/layout_item_decoration_user_card_03"
|
||||
android:textColor="@color/color_FFA957"
|
||||
android:textColor="@color/text_button_color_second"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/tv_buy"
|
||||
|
@@ -81,7 +81,7 @@
|
||||
android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
|
||||
android:gravity="center"
|
||||
android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
|
||||
android:textColor="@{headWearInfo.hasUsed ? @color/color_4C5AF1 : @color/white}"
|
||||
android:textColor="@{headWearInfo.hasUsed ? @color/text_button_color_gray : @color/white}"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@id/tv_counters"
|
||||
|
@@ -64,12 +64,12 @@
|
||||
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
|
||||
android:gravity="center"
|
||||
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
|
||||
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_color}"
|
||||
android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/text_button_color_first}"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"
|
||||
tools:background="@drawable/selector_common_confirm"
|
||||
tools:text="@string/label_can_use"
|
||||
tools:textColor="@color/text_title_color"
|
||||
tools:textColor="@color/text_button_color_first"
|
||||
tools:visibility="visible" />
|
||||
|
||||
|
||||
|
@@ -75,7 +75,7 @@
|
||||
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel_30 : @drawable/selector_common_confirm}"
|
||||
android:gravity="center"
|
||||
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
|
||||
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/white}"
|
||||
android:textColor="@{headWearInfo.used ? @color/text_button_color_gray : @color/white}"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
@@ -60,7 +60,7 @@
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginEnd="@dimen/dp_28"
|
||||
android:background="@drawable/bg_common_confirm_gray_30"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_B3B3C3"
|
||||
|
@@ -76,7 +76,7 @@
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginEnd="@dimen/dp_28"
|
||||
android:background="@drawable/bg_common_confirm_gray_30"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_B3B3C3"
|
||||
|
@@ -41,7 +41,7 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<TextView
|
||||
|
@@ -98,7 +98,7 @@
|
||||
android:layout_height="38dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:textSize="15sp" />
|
||||
|
@@ -75,7 +75,7 @@
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginEnd="@dimen/dp_28"
|
||||
android:background="@drawable/bg_common_confirm_gray_30"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_B3B3C3"
|
||||
|
@@ -570,7 +570,7 @@
|
||||
<!-- 输入框背景颜色 -->
|
||||
<color name="bg_edit_e8e8f6">#E8E8F6</color>
|
||||
<!-- 标题文字颜色 -->
|
||||
<color name="text_title_color">#1F1A4E</color>
|
||||
<color name="text_title_color">#171A58</color>
|
||||
<!-- 常用文字颜色 -->
|
||||
<color name="text_normal_c6c6e9">#FF333333</color>
|
||||
<!-- 日期等次级文案 -->
|
||||
@@ -591,7 +591,12 @@
|
||||
<color name="color_5caaff">#5CAAFF</color>
|
||||
<!-- 首页tab未选中颜色 -->
|
||||
<color name="main_tab_normal">#66333333</color>
|
||||
|
||||
<!-- 按钮文字颜色一级 -->
|
||||
<color name="text_button_color_first">#FFFFFF</color>
|
||||
<!-- 按钮文字颜色二级 -->
|
||||
<color name="text_button_color_second">#9168FA</color>
|
||||
<!-- 按钮文字颜色置灰 -->
|
||||
<color name="text_button_color_gray">#B3B3C3</color>
|
||||
|
||||
<!-- PekoUI规范 end-->
|
||||
|
||||
|
@@ -1541,7 +1541,7 @@
|
||||
<string name="avroom_fragment_roomcharmrankinglistfragment_01">房間</string>
|
||||
<string name="avroom_fragment_roomrankdialogutils_01">萬</string>
|
||||
<string name="avroom_fragment_roomtitledialogfragment_01">房間公告</string>
|
||||
<string name="avroom_fragment_roomtitledialogfragment_02">這個房主很懶喲...</string>
|
||||
<string name="avroom_fragment_roomtitledialogfragment_02">這個房主很懶喲…</string>
|
||||
<string name="avroom_newuserchargegift_newuserchargegiftdialog_01">新人專享禮物彈窗充值點擊</string>
|
||||
<string name="avroom_newuserchargegift_newuserchargeprizedialog_01">新人專享禮物彈窗充值完成後彈窗</string>
|
||||
<string name="avroom_presenter_avroompresenter_01">區分房間類型:</string>
|
||||
|
@@ -53,17 +53,17 @@
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_button_color_gray"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btn_ok"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="28dp"
|
||||
android:background="@drawable/selector_common_confirm"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/text_ok"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:textSize="15sp" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@@ -30,7 +30,7 @@ class EnableExchangeAdapter :
|
||||
)
|
||||
helper.getView<AppCompatTextView>(R.id.tv_confirm).background = ContextCompat.getDrawable(
|
||||
mContext,
|
||||
R.drawable.bg_common_confirm_gray_15
|
||||
R.drawable.bg_common_cancel_15
|
||||
)
|
||||
helper.setText(R.id.tv_confirm, mContext.getString(R.string.close_exchange))
|
||||
.setTextColor(R.id.tv_confirm, ContextCompat.getColor(mContext, R.color.color_B3B3C3))
|
||||
|
@@ -30,10 +30,10 @@
|
||||
android:layout_height="38dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="24dp"
|
||||
android:background="@drawable/bg_common_cancel_30"
|
||||
android:background="@drawable/bg_common_confirm_30"
|
||||
android:gravity="center"
|
||||
android:text="@string/label_common_close"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/text_button_color_first"
|
||||
android:textSize="15sp" />
|
||||
|
||||
</LinearLayout>
|
@@ -1,4 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="color_white">#FFFFFF</color>
|
||||
<color name="color_B3B3C3">#B3B3C3</color>
|
||||
</resources>
|
||||
|
@@ -1,11 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="100dp" />
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#4DFFA936"
|
||||
android:startColor="#4DFFCB47"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="30dp" />
|
||||
<solid android:color="#E6E6F0" />
|
||||
</shape>
|
@@ -4,10 +4,11 @@
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#19EBFF"
|
||||
android:startColor="#ED66FF"
|
||||
android:endColor="#13E2F5"
|
||||
android:centerColor="#9DB4FF"
|
||||
android:startColor="#CC67FF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="28dp" />
|
||||
<corners android:radius="30dp" />
|
||||
|
||||
</shape>
|
@@ -36,7 +36,7 @@
|
||||
android:background="@drawable/bg_common_cancel"
|
||||
android:gravity="center"
|
||||
android:text="@string/cancel"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/color_B3B3C3"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<Button
|
||||
|
Reference in New Issue
Block a user