diff --git a/app/src/common/res/drawable/bg_secondary_radius_10.xml b/app/src/common/res/drawable/bg_secondary_radius_10.xml
index acc004b9a..f30c12ee2 100644
--- a/app/src/common/res/drawable/bg_secondary_radius_10.xml
+++ b/app/src/common/res/drawable/bg_secondary_radius_10.xml
@@ -4,6 +4,6 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java
index e744d3581..463be1311 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java
@@ -149,7 +149,7 @@ public class MyVoiceActivity extends BaseMvpActivity onLeftClickListener());
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java
index 1d1fc3a73..a28428f33 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java
@@ -229,7 +229,7 @@ public class RecordingVoiceActivity extends BaseMvpActivity onLeftClickListener());
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
index 3908fe0e5..395534532 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
@@ -112,7 +112,7 @@ public class RadishRecordActivity extends BaseMvpActivity finish());
}
diff --git a/app/src/main/res/drawable-xhdpi/ic_female_normal.png b/app/src/main/res/drawable-xhdpi/ic_female_normal.png
index 55804a0a7..8cac92405 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_female_normal.png and b/app/src/main/res/drawable-xhdpi/ic_female_normal.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_female_press.png b/app/src/main/res/drawable-xhdpi/ic_female_press.png
index 51384e647..bd7dbb0f0 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_female_press.png and b/app/src/main/res/drawable-xhdpi/ic_female_press.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_male_normal.png b/app/src/main/res/drawable-xhdpi/ic_male_normal.png
index 2f9934fd0..5ad5aeb61 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_male_normal.png and b/app/src/main/res/drawable-xhdpi/ic_male_normal.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_male_press.png b/app/src/main/res/drawable-xhdpi/ic_male_press.png
index f27c43c67..fd798bc28 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_male_press.png and b/app/src/main/res/drawable-xhdpi/ic_male_press.png differ
diff --git a/app/src/main/res/drawable/bg_common_edit.xml b/app/src/main/res/drawable/bg_common_edit.xml
new file mode 100644
index 000000000..28ed2a09b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_common_edit.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index 100625430..e3c5e0daa 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25"
android:padding="@dimen/dp_17"
- android:src="@drawable/arrow_left_white"
+ android:src="@drawable/arrow_left"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_common_web_view.xml b/app/src/main/res/layout/activity_common_web_view.xml
index 478e796aa..92a1150a2 100644
--- a/app/src/main/res/layout/activity_common_web_view.xml
+++ b/app/src/main/res/layout/activity_common_web_view.xml
@@ -24,7 +24,7 @@
android:layout_width="45dp"
android:layout_height="45dp"
android:scaleType="center"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />
diff --git a/app/src/main/res/layout/activity_login_password.xml b/app/src/main/res/layout/activity_login_password.xml
index f46cf3ec7..0d40dc3eb 100644
--- a/app/src/main/res/layout/activity_login_password.xml
+++ b/app/src/main/res/layout/activity_login_password.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25"
android:padding="@dimen/dp_17"
- android:src="@drawable/arrow_left_white"
+ android:src="@drawable/arrow_left"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -24,7 +24,7 @@
android:layout_marginTop="75dp"
android:layout_marginEnd="@dimen/dp_15"
android:text="验证码登录"
- android:textColor="@color/white"
+ android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,7 +48,7 @@
android:layout_width="270dp"
android:layout_height="45dp"
android:layout_marginTop="70dp"
- android:background="@drawable/bg_common_disable"
+ android:background="@drawable/bg_common_edit"
android:baselineAligned="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +84,7 @@
android:layout_width="270dp"
android:layout_height="45dp"
android:layout_marginTop="15dp"
- android:background="@drawable/bg_common_disable"
+ android:background="@drawable/bg_common_edit"
android:baselineAligned="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -121,7 +121,7 @@
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="75dp"
android:text="忘记密码"
- android:textColor="@color/white"
+ android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_password" />
diff --git a/app/src/main/res/layout/activity_login_phone.xml b/app/src/main/res/layout/activity_login_phone.xml
index 0697f2011..cfd117cea 100644
--- a/app/src/main/res/layout/activity_login_phone.xml
+++ b/app/src/main/res/layout/activity_login_phone.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25"
android:padding="@dimen/dp_17"
- android:src="@drawable/arrow_left_white"
+ android:src="@drawable/arrow_left"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -59,7 +59,7 @@
android:layout_width="270dp"
android:layout_height="45dp"
android:layout_marginTop="70dp"
- android:background="@drawable/bg_common_disable"
+ android:background="@drawable/bg_common_edit"
android:baselineAligned="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_room_rank_list.xml b/app/src/main/res/layout/activity_room_rank_list.xml
index 4d51c881c..e1f14d9d1 100644
--- a/app/src/main/res/layout/activity_room_rank_list.xml
+++ b/app/src/main/res/layout/activity_room_rank_list.xml
@@ -45,7 +45,7 @@
android:onClick="@{click}"
android:padding="15dp"
android:scaleType="fitCenter"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />
+ android:src="@drawable/arrow_left" />
+ android:src="@drawable/arrow_left" />
@@ -137,7 +137,7 @@
android:layout_width="270dp"
android:layout_height="45dp"
android:layout_marginTop="20dp"
- android:background="@drawable/bg_common_disable_border"
+ android:background="@drawable/bg_common_edit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_code_title_top" />
diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml
index 125a941b5..aec487c4f 100644
--- a/app/src/main/res/layout/fragment_chatroom_game_main.xml
+++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml
@@ -36,7 +36,7 @@
android:layout_marginTop="30dp"
android:padding="10dp"
android:scaleType="fitCenter"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />
#FFFFFFFF
#FFD2D5D7
+
+ #E8E8F6
#FF333333
diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml
index 2c0ae3884..ba01f87b4 100644
--- a/app/src/module_labour_union/res/layout/activity_add_member.xml
+++ b/app/src/module_labour_union/res/layout/activity_add_member.xml
@@ -15,7 +15,7 @@
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:src="@drawable/arrow_left_white"
+ android:src="@drawable/arrow_left"
android:paddingStart="15dp"
android:paddingEnd="8dp"/>
diff --git a/app/src/module_labour_union/res/layout/activity_module_hall.xml b/app/src/module_labour_union/res/layout/activity_module_hall.xml
index b562f4d00..bc3438721 100644
--- a/app/src/module_labour_union/res/layout/activity_module_hall.xml
+++ b/app/src/module_labour_union/res/layout/activity_module_hall.xml
@@ -198,7 +198,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />
diff --git a/app/src/module_labour_union/res/layout/activity_super_admin_add.xml b/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
index 74e76d6be..bb82126ea 100644
--- a/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
+++ b/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
@@ -19,7 +19,7 @@
android:layout_gravity="center|start"
android:background="@color/transparent"
android:scaleType="centerInside"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />
+ android:src="@drawable/arrow_left" />
diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
index 644313453..5fec67294 100644
--- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
+++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
@@ -58,7 +58,7 @@ public class QuickLoginUiConfig {
.setSloganTopYOffset(sloganToTop)
.setSloganBottomYOffset(BOTTOM_OFFSET)
// 登录按钮
- .setLoginBtnTextColor(ContextCompat.getColor(context, R.color.text_title_white))
+ .setLoginBtnTextColor(ContextCompat.getColor(context, R.color.white))
.setLoginBtnText("本机号码一键登录")
.setLoginBtnBackgroundRes("bg_common_confirm")
.setLoginBtnWidth(280)
diff --git a/app/src/module_quick_pass/res/drawable/quick_pass_back.png b/app/src/module_quick_pass/res/drawable/quick_pass_back.png
index de9ed7eef..66cc0fe15 100644
Binary files a/app/src/module_quick_pass/res/drawable/quick_pass_back.png and b/app/src/module_quick_pass/res/drawable/quick_pass_back.png differ
diff --git a/app/src/module_quick_pass/res/drawable/quick_pass_logo.png b/app/src/module_quick_pass/res/drawable/quick_pass_logo.png
index a0b68a2a3..f76a604bc 100644
Binary files a/app/src/module_quick_pass/res/drawable/quick_pass_logo.png and b/app/src/module_quick_pass/res/drawable/quick_pass_logo.png differ
diff --git a/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml b/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
index 2b7a74288..4c4621803 100644
--- a/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
@@ -22,7 +22,7 @@
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:scaleType="center"
- android:src="@drawable/arrow_left_white" />
+ android:src="@drawable/arrow_left" />