yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引入音游UI规范

Browse Source
This commit is contained in:
huangjian
2021-03-29 14:11:58 +08:00
parent 6735f1f1fb
commit 49eaaf4c4e
69 changed files with 193 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/common/res/drawable/bg_2a2a39_0_15.xml
View File

@@ -4,6 +4,6 @@
<corners android:radius="15dp"/>
<solid android:color="@color/color_2a2a39"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
</shape>

2
app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
View File

@@ -98,7 +98,7 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public void onDeselected(int index, int totalCount) {
// setBackgroundDrawable(null);
setTextColor(getResources().getColor(R.color.color_4F516A));
setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
}
@Override

3
app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java
View File

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -40,7 +39,7 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A"));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context,R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE);
scaleTransitionPagerTitleView.setMinScale(0.8f);
scaleTransitionPagerTitleView.setTextSize(16);

2
app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java
View File

@@ -37,7 +37,7 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false);
scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A"));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context,R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE);
scaleTransitionPagerTitleView.setMinScale(0.75f);
scaleTransitionPagerTitleView.setTextSize(21);

4
app/src/main/java/com/yizhuan/erban/home/fragment/CommunityNoticeAct.java
View File

@@ -11,12 +11,10 @@ import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
import com.yizhuan.erban.home.adapter.CommunityNoticeAdapter;
import com.yizhuan.erban.home.presenter.CommunityNoticePresenter;
@@ -55,7 +53,7 @@ public class CommunityNoticeAct extends BaseMvpActivity<ICommunityNoticeAct, Com
setContentView(R.layout.act_community_notice);
mUnbinder = ButterKnife.bind(this);
initWhiteTitleBar("全部消息");
mTitleBar.addAction(new TitleBar.TextAction("清空", getResources().getColor(R.color.color_c6c6e9)) {
mTitleBar.addAction(new TitleBar.TextAction("清空", getResources().getColor(R.color.text_normal_c6c6e9)) {
@Override
public void performAction(View view) {
getDialogManager().showOkCancelWithTitleDialog("清空后所有互动通知将被删除\n确定清空吗?", "确定",

2
app/src/main/res/drawable/bg_flutter_splash.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@color/color_1c1b22"
android:drawable="@color/bg_normal_1c1b22"
android:gravity="fill" />
</layer-list>

2
app/src/main/res/drawable/bg_logout.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_1c1b22"/>
<solid android:color="@color/bg_normal_1c1b22"/>
<corners android:topLeftRadius="23dp"
android:bottomRightRadius="23dp"

2
app/src/main/res/drawable/bg_nim_msg_touch.xml
View File

@@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/item_hover_nim" android:state_pressed="true" />
<item android:drawable="@color/item_hover_nim" android:state_focused="true" />
<item android:drawable="@color/color_1c1b22" />
<item android:drawable="@color/bg_normal_1c1b22" />
</selector>

4
app/src/main/res/drawable/bg_topic_publish_btn.xml
View File

@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="#7727E4"
android:endColor="#218EFF"
android:startColor="@color/color_7727e4"
android:endColor="@color/color_218eff"
/>

2
app/src/main/res/drawable/bg_white_top_0_8.xml
View File

@@ -6,7 +6,7 @@
android:topRightRadius="8dp"
android:bottomRightRadius="0dp"
android:bottomLeftRadius="0dp"/>
<solid android:color="@color/color_2a2a39"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
</shape>

2
app/src/main/res/drawable/shape_add_friends_2a2a39.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#2A2A39" />
<solid android:color="@color/bg_secondary_2a2a39" />
<corners android:radius="@dimen/dp_12"/>
</shape>

2
app/src/main/res/drawable/shape_home_bg_15dp.xml
View File

@@ -1,7 +1,7 @@
<?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_1c1b22"/>
<solid android:color="@color/bg_normal_1c1b22"/>
<corners android:topLeftRadius="@dimen/dp_15"
android:topRightRadius="@dimen/dp_15"/>
</shape>

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

@@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.yizhuan.erban.base.TitleBar

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

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar

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

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<View
@@ -71,7 +71,7 @@
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

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

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar

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

@@ -17,7 +17,7 @@
android:id="@+id/bg_main_tab"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="#2A2A39"
android:background="@color/bg_secondary_2a2a39"
app:layout_constraintBottom_toBottomOf="parent" />
<com.yizhuan.erban.ui.widget.MainTabLayout

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

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:layout_height="match_parent">
<LinearLayout
@@ -23,7 +23,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
app:subtitleTextAppearance="@style/Toolbar.SubTitleText"
app:titleTextAppearance="@style/Toolbar.TitleText">
@@ -73,7 +73,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
android:text="已经加入黑名单"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12dp" />
</LinearLayout>
@@ -84,7 +84,7 @@
android:layout_gravity="right"
android:textSize="@dimen/dp_13"
android:text="举报"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:gravity="center"
android:src="@drawable/icon_add_black_list"
android:visibility="gone"

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<LinearLayout
@@ -106,7 +106,7 @@
android:gravity="center"
android:paddingEnd="@dimen/dp_15"
android:text="@string/label_clear"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -150,7 +150,7 @@
android:gravity="center"
android:paddingEnd="@dimen/dp_15"
android:text="@string/label_clear"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
@@ -56,7 +56,7 @@
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@+id/account_right"
android:text="@string/text_setting_wx"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp" />
<ImageView
@@ -74,7 +74,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
</RelativeLayout>
@@ -112,7 +112,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/binder_right"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="123456" />
</RelativeLayout>
@@ -122,7 +122,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_alipay_binder"
@@ -160,7 +160,7 @@
android:layout_toStartOf="@id/iv_alipay_right"
android:layout_toEndOf="@id/label_alipay_binder"
android:gravity="end"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="未绑定" />
@@ -169,7 +169,7 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_pay_pwd"
@@ -205,7 +205,7 @@
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/iv_pay_pwd_arrow"
android:text="@string/text_modify"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp" />
</RelativeLayout>
@@ -214,7 +214,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/tv_privacy_setting"
@@ -235,7 +235,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/tv_notice_setting"
@@ -255,7 +255,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/tv_black_manager"
@@ -273,7 +273,7 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_help"
@@ -306,7 +306,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_content"
@@ -341,7 +341,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<!-- 1.3.1 版本隐藏社区规范和联系官方 -->
<TextView
@@ -363,7 +363,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548"
android:background="@color/line_color_353548"
android:visibility="gone" />
<RelativeLayout
@@ -398,7 +398,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548"
android:background="@color/line_color_353548"
android:visibility="gone" />
<!-- 1.3.1 版本隐藏社区规范和联系官方 -->
@@ -435,7 +435,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_update"
@@ -470,7 +470,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_check"
@@ -508,7 +508,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:id="@+id/rly_lab"
@@ -541,7 +541,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_353548">
android:background="@color/line_color_353548">
<TextView
android:id="@+id/btn_login_out"

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

@@ -11,7 +11,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9"
android:background="@color/bg_normal_1c1b22"
android:fitsSystemWindows="true">
<androidx.core.widget.NestedScrollView

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

@@ -106,7 +106,7 @@
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
tools:text="1234568940" />

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

@@ -14,7 +14,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:text="本轮竞拍设置"
android:textColor="@color/text_secondary"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/font_normal" />
<LinearLayout

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

@@ -41,7 +41,7 @@
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="'xxx'出价"
android:textColor="@color/text_secondary"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/font_larger" />
<TextView
@@ -78,7 +78,7 @@
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="您已出价"
android:textColor="@color/text_secondary"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/font_larger" />
<TextView

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

@@ -106,7 +106,7 @@
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="1234568940" />

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

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<FrameLayout

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

@@ -19,7 +19,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<LinearLayout
@@ -167,7 +167,7 @@
android:paddingTop="5dp"
android:paddingEnd="15dp"
android:text="更多房间"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/magic_indicator"

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

@@ -19,7 +19,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22">
android:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.ui.widget.ObservableScrollView
android:id="@+id/scroll_view"
@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.followNum)}"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_14"
tools:text="999" />
@@ -84,7 +84,7 @@
android:gravity="center_vertical"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.fansNum)}"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
tools:text="999999" />
@@ -181,7 +181,7 @@
android:drawablePadding="4dp"
android:gravity="center"
android:maxLines="1"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage"
tools:text="音游号:123456" />
@@ -292,7 +292,7 @@
app:shaderEnable="true"
app:shaderEndColor="#4A50DF"
app:shaderMode="leftToRight"
app:shaderStartColor="#218EFF" />
app:shaderStartColor="@color/color_218eff" />
<com.coorchice.library.SuperTextView
android:id="@+id/me_item_invite"
@@ -335,7 +335,7 @@
android:drawableTop="@drawable/ic_me_apply_record"
android:gravity="center"
android:text="报名记录"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
android:onClick="@{click}"
app:layout_columnWeight="1"
@@ -346,7 +346,7 @@
android:drawableTop="@drawable/ic_me_bonus"
android:gravity="center"
android:text="奖金"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
@@ -356,7 +356,7 @@
android:drawableTop="@drawable/ic_me_join_record"
android:gravity="center"
android:text="战绩"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
@@ -367,7 +367,7 @@
android:drawableTop="@drawable/ic_me_card_bag"
android:gravity="center"
android:text="卡包"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
@@ -380,7 +380,7 @@
android:gravity="center"
android:onClick="@{click}"
android:text="商城"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
@@ -391,7 +391,7 @@
android:drawableTop="@drawable/ic_me_link_account"
android:gravity="center"
android:text="关联账号"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
@@ -419,7 +419,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="我的房间"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
@@ -427,7 +427,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/ll_collect_room"
@@ -443,7 +443,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="我的收藏"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
@@ -451,7 +451,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/me_item_decoration_store"
@@ -467,7 +467,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_my_decoration"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
@@ -475,7 +475,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
android:id="@+id/me_item_level"
@@ -491,7 +491,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_my_level"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
@@ -499,7 +499,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
@@ -516,7 +516,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_my_income"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
android:visibility="gone" />
@@ -526,7 +526,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
@@ -543,7 +543,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_my_union"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
@@ -552,7 +552,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
@@ -569,7 +569,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/patriarch_mode"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<View
@@ -577,7 +577,7 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#353548" />
android:background="@color/line_color_353548" />
<TextView
@@ -595,7 +595,7 @@
android:paddingEnd="15dp"
android:paddingBottom="@dimen/dp_15"
android:text="@string/menu_certification"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>
@@ -687,7 +687,7 @@
android:gravity="center_vertical"
android:src="@mipmap/icon_setting"
android:text="@string/menu_setting"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>

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

@@ -20,7 +20,7 @@
android:layout_marginTop="15dp"
android:gravity="center"
android:text="@string/no_list_data"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>

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

@@ -24,7 +24,7 @@
android:gravity="center"
android:text="@string/no_list_data"
android:layout_marginTop="15dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>

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

@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="73dp"
android:gravity="center"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
tools:text="123" />
</LinearLayout>

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

@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/no_list_data"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>

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

@@ -96,7 +96,7 @@
android:layout_width="65dp"
android:layout_height="65dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#248CFE"
app:cborder_color="@color/app_248cfe"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
@@ -105,7 +105,7 @@
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#248CFE"
app:cborder_color="@color/app_248cfe"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
@@ -114,7 +114,7 @@
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#248CFE"
app:cborder_color="@color/app_248cfe"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
@@ -123,7 +123,7 @@
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#248CFE"
app:cborder_color="@color/app_248cfe"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
@@ -132,7 +132,7 @@
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#248CFE"
app:cborder_color="@color/app_248cfe"
app:cborder_width="@dimen/dp_2" />
</LinearLayout>

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

@@ -69,7 +69,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
android:lines="1"
android:layout_marginStart="@dimen/dp_15"

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

@@ -85,7 +85,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="房间名称房间名称房间名称" />

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

@@ -53,7 +53,7 @@
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp"
tools:text="x1"/>
@@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
tools:text="赠给 xxx"/>
</LinearLayout>

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

@@ -59,6 +59,6 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:drawableRight="@drawable/icon_arrow_right_small"
android:textColor="@color/color_c6c6e9"/>
android:textColor="@color/text_normal_c6c6e9"/>
</LinearLayout>
</RelativeLayout>

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

@@ -39,7 +39,7 @@
<TextView
android:gravity="center"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_15"
android:text="@string/go_to_sign_in"
android:layout_width="match_parent"

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

@@ -13,7 +13,7 @@
android:layout_marginEnd="@dimen/dp_15"
android:drawableEnd="@drawable/arrow_right_more_room"
android:text="@string/recommend_topic"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toTopOf="parent" />

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

@@ -100,7 +100,7 @@
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="1234568940" />

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

@@ -73,7 +73,7 @@
android:id="@+id/erban_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:gravity="center_vertical"
android:textSize="@dimen/dp_12"
tools:text="ID:8888"
@@ -132,6 +132,6 @@
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/ll_name"
android:background="@color/color_353548" />
android:background="@color/line_color_353548" />
</RelativeLayout>

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

@@ -18,7 +18,7 @@
app:tab_icon_select="@mipmap/ic_main_tab_game_pressed"
app:tab_text="派对"
app:tab_text_color="#555574"
app:tab_text_color_select="#248CFE" />
app:tab_text_color_select="@color/app_248cfe" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_attention_tab"
@@ -31,7 +31,7 @@
app:tab_icon_select="@mipmap/ic_main_tab_find_pressed"
app:tab_text="广场"
app:tab_text_color="#555574"
app:tab_text_color_select="#248CFE" />
app:tab_text_color_select="@color/app_248cfe" />
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_game_tab"
@@ -44,7 +44,7 @@
app:tab_icon_select="@mipmap/ic_main_tab_peace_pressed"
app:tab_text="赛事"
app:tab_text_color="#555574"
app:tab_text_color_select="#248CFE" />
app:tab_text_color_select="@color/app_248cfe" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_msg_tab"
@@ -57,7 +57,7 @@
app:tab_icon_select="@mipmap/ic_main_tab_msg_pressed"
app:tab_text="消息"
app:tab_text_color="#555574"
app:tab_text_color_select="#248CFE" />
app:tab_text_color_select="@color/app_248cfe" />
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_me_tab"
@@ -70,6 +70,6 @@
app:tab_icon_select="@mipmap/ic_main_tab_me_pressed"
app:tab_text="我的"
app:tab_text_color="#555574"
app:tab_text_color_select="#248CFE" />
app:tab_text_color_select="@color/app_248cfe" />
</merge>

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

@@ -125,7 +125,7 @@
<View
android:id="@+id/view_line"
android:background="#353548"
android:background="@color/line_color_353548"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="90dp"

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

@@ -6,7 +6,7 @@
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
tools:background="@color/color_1c1b22">
tools:background="@color/bg_normal_1c1b22">
<LinearLayout
android:layout_width="match_parent"
@@ -120,7 +120,7 @@
android:gravity="center_vertical"
android:lines="1"
android:text=""
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="我是内容" />
@@ -146,7 +146,7 @@
android:lines="1"
android:scrollHorizontally="true"
android:text=""
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -188,7 +188,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginTop="2dp"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="11dp"
tools:text="just now" />
@@ -201,6 +201,6 @@
android:layout_height="1px"
android:layout_marginStart="85dp"
android:layout_marginEnd="15dp"
android:background="#353548" />
android:background="@color/line_color_353548" />
</LinearLayout>

39
app/src/main/res/values/colors.xml
View File

@@ -216,15 +216,12 @@
<!-- text color -->
<!-- 用于标题 -->
<color name="text_primary">#333333</color>
<!-- 次级叙述性内容 -->
<color name="text_secondary">#666666</color>
<!-- 用于不重要的叙述性内容 -->
<color name="text_tertiary">#999999</color>
<!-- 用于站位性文本提示内容 -->
<color name="text_placeholder">#cccccc</color>
<!-- 用户深色背景 -->
<!-- 导航栏 颜色 -->
@@ -258,7 +255,6 @@
<color name="bubbleView_dark_press_background">#E6000000</color>
<color name="color_333333">#333333</color>
<color name="color_666666">#666666</color>
<color name="color_ffc160">#ffc160</color>
@@ -324,7 +320,7 @@
<color name="color_FF1E1E">#FF1E1E</color>
<color name="color_FFD888">#FFD888</color>
<color name="color_2E3047">#2E3047</color>
<!-- 30透明度-->
<!-- 30透明度-->
<color name="color_30_FFFFFF">#B3FFFFFF</color>
<!-- 75透明度-->
<color name="color_75_FFFFFF">#40FFFFFF</color>
@@ -449,7 +445,7 @@
<color name="color_FD6964">#FD6964</color>
<color name="color_B3B3B3">#B3B3B3</color>
<color name ="color_FEE900">#FEE900</color>
<color name="color_FEE900">#FEE900</color>
<color name="color_B48EFF">#B48EFF</color>
<color name="color_A67AFE">#A67AFE</color>
<color name="color_A4A4A6">#A4A4A6</color>
@@ -550,9 +546,32 @@
<color name="color_fe5d7f">#fe5d7f</color>
<color name="color_2D93FF">#2D93FF</color>
<color name="color_1c1b22">#1C1B22</color>
<color name="color_c6c6e9">#c6c6e9</color>
<color name="color_4F516A">#4F516A</color>
<color name="color_353548">#353548</color>
<!-- 音游UI规范 start-->
<!-- 主题色 -->
<color name="app_248cfe">#248cfe</color>
<!-- 页面背景色 -->
<color name="bg_normal_1c1b22">#1C1B22</color>
<!-- 页面次级背景 列表item背景色-->
<color name="bg_secondary_2a2a39">#2A2A39</color>
<!-- 标题文字颜色 -->
<color name="text_title_white">#FFFFFF</color>
<!-- 常用文字颜色 -->
<color name="text_normal_c6c6e9">#c6c6e9</color>
<!-- 日期等次级文案 -->
<color name="text_secondary_4f516a">#4F516A</color>
<!-- 分隔线颜色 -->
<color name="line_color_353548">#353548</color>
<!-- 弹窗取消按钮文字颜色 -->
<color name="color_4C5AF1">#4C5AF1</color>
<!-- 常用渐变按钮开始颜色 -->
<color name="color_218eff">#218EFF</color>
<!-- 常用渐变按钮结束颜色 -->
<color name="color_7727e4">#7727E4</color>
<!-- 按钮不可点击背景颜色 -->
<color name="color_303043">#303043</color>
<!-- 音游UI规范 end-->
</resources>

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java
View File

@@ -42,7 +42,7 @@ public class CommentReplyAdapter extends BaseQuickAdapter<Reply, BaseViewHolder>
builder.append("@" + item.getToNick(),
new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_7154EE)))
.append(" " + item.getContent(),
new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_c6c6e9)));
new ForegroundColorSpan(mContext.getResources().getColor(R.color.text_normal_c6c6e9)));
helper.setText(R.id.tv_content, builder.build());

2
app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
View File

@@ -261,7 +261,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
tvInputLimit.setText(s.length() + "/500");
updatePublishStatus();
String inputText = s.toString().trim();
tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE):getResources().getColor(R.color.color_c6c6e9));
tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE):getResources().getColor(R.color.text_normal_c6c6e9));
tvPublish.setEnabled(!TextUtils.isEmpty(inputText));
}
});

6
app/src/module_community/res/layout/activity_dynamic_detail.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:paddingTop="25dp">
<com.yizhuan.erban.base.TitleBar
@@ -39,14 +39,14 @@
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#353548"
android:background="@color/line_color_353548"
app:layout_constraintBottom_toTopOf="@+id/ll_reply" />
<LinearLayout
android:id="@+id/ll_reply"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_2a2a39"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:minHeight="50dp"
android:orientation="horizontal"

12
app/src/module_community/res/layout/activity_publish.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22">
android:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
@@ -25,7 +25,7 @@
android:gravity="center"
android:maxLength="500"
android:text="@string/dy_publish"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/title_bar"
app:layout_constraintEnd_toEndOf="parent"
@@ -45,7 +45,7 @@
android:maxLength="500"
android:textSize="@dimen/sp_13"
android:textColor="@color/white"
android:textColorHint="@color/color_4F516A"
android:textColorHint="@color/text_secondary_4f516a"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:text="0/500"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/et_content"
app:layout_constraintEnd_toEndOf="parent"/>
@@ -64,7 +64,7 @@
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_353548"
android:background="@color/line_color_353548"
app:layout_constraintTop_toBottomOf="@id/tv_input_limit"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
@@ -80,7 +80,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_25"
android:text="@string/dy_publish_user_tips"
android:textColor="@color/color_4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_11"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/module_community/res/layout/dy_empty_dynamic_comment.xml
View File

@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/no_list_data"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>

2
app/src/module_community/res/layout/fragment_square.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout

10
app/src/module_community/res/layout/head_dynamic_detail.xml
View File

@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="3dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp" />
<LinearLayout
@@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:gravity="center"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_11"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
@@ -203,7 +203,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_5"
android:gravity="center_vertical"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_like"
@@ -238,7 +238,7 @@
android:layout_marginStart="5.5dp"
android:gravity="center_vertical"
android:text="@string/dy_comment_text"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_comment_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_comment"
@@ -282,7 +282,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:background="#353548"
android:background="@color/line_color_353548"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_option" />

8
app/src/module_community/res/layout/item_community_notice_list.xml
View File

@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textColor="@color/color_4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_13"
android:text="评论了你"
android:visibility="gone"
@@ -90,7 +90,7 @@
android:maxLines="6"
android:ellipsize="end"
android:textSize="@dimen/sp_13"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:layout_marginTop="8dp"
tools:text="啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦"/>
@@ -101,7 +101,7 @@
android:maxLines="6"
android:ellipsize="end"
android:textSize="@dimen/sp_11"
android:textColor="@color/color_4F516A"
android:textColor="@color/text_secondary_4f516a"
android:layout_marginTop="10.5dp"
android:layout_marginBottom="15dp"
tools:text="2-30 12:22"/>
@@ -111,7 +111,7 @@
<View
android:layout_width="0dp"
android:layout_height="1px"
android:background="@color/color_353548"
android:background="@color/line_color_353548"
android:layout_marginStart="15dp"
android:layout_marginEnd="15.5dp"
app:layout_constraintStart_toStartOf="parent"

8
app/src/module_community/res/layout/item_dy_comment.xml
View File

@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_11"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toTopOf="@id/tv_nick"
@@ -51,7 +51,7 @@
android:layout_marginEnd="@dimen/dp_29"
android:paddingTop="8dp"
android:paddingBottom="@dimen/dp_13"
android:textColor="#C6C6E9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_nick"
@@ -62,7 +62,7 @@
android:layout_width="0dp"
android:layout_height="1px"
android:layout_marginEnd="@dimen/dp_15"
android:background="#353548"
android:background="@color/line_color_353548"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_content"
@@ -80,7 +80,7 @@
android:id="@+id/line_reply_bottom"
android:layout_width="0dp"
android:layout_height="1px"
android:background="#353548"
android:background="@color/line_color_353548"
app:layout_constraintEnd_toEndOf="@id/line_reply_top"
app:layout_constraintStart_toStartOf="@id/line_reply_top"
app:layout_constraintTop_toBottomOf="@id/rv_reply" />

6
app/src/module_community/res/layout/item_dy_reply.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_11"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
@@ -52,7 +52,7 @@
android:paddingTop="10dp"
android:paddingBottom="@dimen/sp_13"
tools:text="回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_15"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_29"
@@ -65,7 +65,7 @@
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/tv_content"
android:background="#353548"
android:background="@color/line_color_353548"
android:layout_width="0dp"
android:layout_height="1px" />

8
app/src/module_community/res/layout/item_square_dynamic.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="@color/color_1c1b22"
tools:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<View
@@ -79,7 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="4dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp" />
<LinearLayout
@@ -155,7 +155,7 @@
android:layout_marginStart="2.5dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_12"
tools:text="0123" />
</LinearLayout>
@@ -183,7 +183,7 @@
android:layout_height="@dimen/dp_24"
android:layout_marginStart="2.5dp"
android:gravity="center_vertical"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_12"
tools:text="0" />
</LinearLayout>

8
app/src/module_community/res/layout/item_world_dynamic.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="@color/color_1c1b22"
tools:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<View
@@ -79,7 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="4dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp" />
<LinearLayout
@@ -155,7 +155,7 @@
android:layout_marginStart="2.5dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_12"
tools:text="0123" />
</LinearLayout>
@@ -183,7 +183,7 @@
android:layout_height="@dimen/dp_24"
android:layout_marginStart="2.5dp"
android:gravity="center_vertical"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_12"
tools:text="0" />
</LinearLayout>

4
app/src/module_community/res/layout/item_worlds_choose.xml
View File

@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="3.5dp"
android:layout_marginStart="12dp"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
android:maxLines="1"
android:ellipsize="end"
@@ -53,7 +53,7 @@
<View
android:layout_width="220dp"
android:layout_height="1dp"
android:background="@color/color_4F516A"
android:background="@color/text_secondary_4f516a"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_world_desc"
app:layout_constraintTop_toBottomOf="@id/rriv_world"

2
app/src/module_community/res/layout/layout_dy_nick_detail.xml
View File

@@ -137,7 +137,7 @@
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:textColor="#4F516A"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ll_official_mask"

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
View File

@@ -16,9 +16,7 @@ import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.module_hall.hall.view.dialog.TimePickerDialog;
import com.yizhuan.erban.module_hall.hall.view.indicator.StatisticsIndicatorAdapter;
import com.yizhuan.erban.module_hall.income.ClanIncomeFragment;
import com.yizhuan.erban.module_hall.income.DayIncomeFragment;
import com.yizhuan.erban.module_hall.income.presenter.ClanIncomePresenter;
import com.yizhuan.erban.module_hall.income.presenter.IncomeStatisticsPresenter;
import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView;
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;

6
app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
View File

@@ -4,16 +4,12 @@ import android.content.Context;
import android.os.Build;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import com.yizhuan.xchat_android_core.home.bean.TabInfo;
import java.util.List;
@@ -42,7 +38,7 @@ public class MWMagicIndicator extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_4F516A));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_white));
scaleTransitionPagerTitleView.setMinScale(0.85f);
scaleTransitionPagerTitleView.setTextSize(18);

2
app/src/module_mini_world/res/layout/activity_all_topic.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical"
tools:context="com.yizhuan.erban.miniworld.activity.MiniWorldActivity">

2
app/src/module_mini_world/res/layout/activity_topic_main.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/layout_world_guest_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<androidx.coordinatorlayout.widget.CoordinatorLayout

4
app/src/module_mini_world/res/layout/item_all_topic_list.xml
View File

@@ -37,7 +37,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,7 +48,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/color_353548"
android:background="@color/line_color_353548"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml
View File

@@ -3,7 +3,7 @@
android:id="@+id/messageActivityLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_1c1b22"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<RelativeLayout

4
app/src/module_room_chat/res/layout/activity_newbie_list.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="27dp"
android:background="@color/color_1c1b22">
android:background="@color/bg_normal_1c1b22">
<LinearLayout
android:layout_width="match_parent"
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每日更新推荐"
android:textColor="@color/color_c6c6e9"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_13" />
</LinearLayout>

2
nim_uikit/res/drawable/bg_nim_water_drop_other.xml
View File

@@ -13,6 +13,6 @@
android:topLeftRadius="4dp"
android:topRightRadius="20dp"/>
<solid android:color="#2A2A39"/>
<solid android:color="@color/color_2a2a39"/>
</shape>

2
nim_uikit/res/drawable/bg_nim_water_drop_self.xml
View File

@@ -13,6 +13,6 @@
android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp"/>
<solid android:color="#2A2A39"/>
<solid android:color="@color/color_2a2a39"/>
</shape>

2
nim_uikit/res/values/colors-ptr.xml
View File

@@ -3,5 +3,5 @@
<color name="left_ball_color">#7f01020a</color>
<color name="right_ball_color">#7f01020b</color>
<color name="item_hover">#dbdbdb</color>
<color name="item_hover_nim">#2A2A39</color>
<color name="item_hover_nim">@color/color_2a2a39</color>
</resources>