diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 6a6caf0a1..e2e2e07c0 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -212,8 +212,8 @@ public abstract class BaseActivity extends RxAppCompatActivity if (mTitleBar != null) { mTitleBar.setTitle(title); mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.white)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left_white); + mTitleBar.setTitleColor(getResources().getColor(R.color.text_title_white)); + mTitleBar.setLeftImageResource(R.drawable.arrow_left); mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent)); mTitleBar.setLeftClickListener(v -> onLeftClickListener()); } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java index d4bd6c9d0..96717bcd9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java @@ -38,7 +38,7 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter { public IPagerTitleView getTitleView(Context context, final int i) { ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false); scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context,R.color.text_secondary_4f516a)); - scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE); + scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context,R.color.text_title_white)); scaleTransitionPagerTitleView.setMinScale(0.75f); scaleTransitionPagerTitleView.setTextSize(21); scaleTransitionPagerTitleView.setText(mTitleList.get(i)); diff --git a/app/src/main/res/layout/activity_p2p_message.xml b/app/src/main/res/layout/activity_p2p_message.xml index 93c91ae84..3f641c62a 100644 --- a/app/src/main/res/layout/activity_p2p_message.xml +++ b/app/src/main/res/layout/activity_p2p_message.xml @@ -48,7 +48,7 @@ android:maxWidth="214dp" android:maxLines="1" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textAppearance="@style/Toolbar.TitleText" android:visibility="gone" tools:text="孙行者123" diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index dd9fa893d..73f00c07d 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="消息" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="21sp" /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index df822fdc9..ad8ad4c3b 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -108,7 +108,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{userInfo.nick}" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="@dimen/sp_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0" diff --git a/app/src/main/res/layout/maint_tab_red_poin_layout.xml b/app/src/main/res/layout/maint_tab_red_poin_layout.xml index 076df87b1..d15f72b18 100644 --- a/app/src/main/res/layout/maint_tab_red_poin_layout.xml +++ b/app/src/main/res/layout/maint_tab_red_poin_layout.xml @@ -15,7 +15,7 @@ app:tab_icon="@mipmap/ic_main_tab_game_home" app:tab_icon_select="@mipmap/ic_main_tab_game_pressed" app:tab_text="首页" - app:tab_text_color_select="@color/app_248cfe" + app:tab_text_color_select="@color/color_333333" app:tab_text_color="@color/main_tab_normal" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index dc96e906f..6a23616ee 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -553,31 +553,31 @@ - #248cfe + #FFFFBC52 - #1C1B22 + #FFF4F4FA - #2A2A39 + #FFFFFFFF - #303043 + #FFD2D5D7 - #FFFFFF + #FF333333 - #c6c6e9 + #FF333333 - #4F516A + #B3333333 - #555574 + #B3333333 - #353548 + #FFF4F4FA - #201F27 + #FFF4F4FA - #4C5AF1 + #FFFFA936 - #218EFF + #FFFFA936 - #7727E4 + #FFFFCB47 #66333333 diff --git a/app/src/module_community/res/layout/item_square_dynamic.xml b/app/src/module_community/res/layout/item_square_dynamic.xml index 11d305de4..5fb01201a 100644 --- a/app/src/module_community/res/layout/item_square_dynamic.xml +++ b/app/src/module_community/res/layout/item_square_dynamic.xml @@ -221,7 +221,7 @@ android:paddingStart="10dp" android:paddingEnd="10dp" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="@dimen/sp_12" android:textStyle="bold" tools:text="话题名称话题名称话题名称话题名称话题名称话题名称" /> diff --git a/app/src/module_community/res/layout/layout_dy_nick_detail.xml b/app/src/module_community/res/layout/layout_dy_nick_detail.xml index d7efd9056..8cf8de3d2 100644 --- a/app/src/module_community/res/layout/layout_dy_nick_detail.xml +++ b/app/src/module_community/res/layout/layout_dy_nick_detail.xml @@ -13,7 +13,7 @@ android:ellipsize="end" android:maxWidth="120dp" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_title_white" android:textSize="@dimen/dp_15" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/nim_uikit/res/drawable-xhdpi/arrow_left.webp b/nim_uikit/res/drawable-xhdpi/arrow_left.webp new file mode 100644 index 000000000..24514f1e3 Binary files /dev/null and b/nim_uikit/res/drawable-xhdpi/arrow_left.webp differ diff --git a/nim_uikit/src/com/netease/nim/uikit/api/wrapper/NimToolBarOptions.java b/nim_uikit/src/com/netease/nim/uikit/api/wrapper/NimToolBarOptions.java index b81c92f4a..1efe9f877 100644 --- a/nim_uikit/src/com/netease/nim/uikit/api/wrapper/NimToolBarOptions.java +++ b/nim_uikit/src/com/netease/nim/uikit/api/wrapper/NimToolBarOptions.java @@ -10,7 +10,7 @@ public class NimToolBarOptions extends ToolBarOptions { public NimToolBarOptions() { //logoId = R.drawable.nim_actionbar_nest_dark_logo; - navigateId = R.drawable.arrow_left_white; + navigateId = R.drawable.arrow_left; titleString = ""; isNeedNavigate = true; }