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

主题色替换

Browse Source
This commit is contained in:
huangjian
2023-03-17 19:32:07 +08:00
parent eb25a1244c
commit cd7b4db946
43 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
View File

@@ -86,7 +86,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
tvUsed.setText("取消使用"); tvUsed.setText("取消使用");
tvUsed.setBackgroundResource(R.drawable.bg_common_cancel); tvUsed.setBackgroundResource(R.drawable.bg_common_cancel);
tvUsed.setEnabled(true); tvUsed.setEnabled(true);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1)); tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_normal_282828));
} else { } else {
tvUsed.setVisibility(View.VISIBLE); tvUsed.setVisibility(View.VISIBLE);
tvUsed.setText("使用"); tvUsed.setText("使用");

2
app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoIndicatorAdapter.java
View File

@@ -64,7 +64,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT); indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
indicator.setLineHeight(UIUtil.dip2px(mContext, 10)); indicator.setLineHeight(UIUtil.dip2px(mContext, 10));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 7)); indicator.setRoundRadius(UIUtil.dip2px(mContext, 7));
indicator.setColors(Color.parseColor("#5FCCE4")); indicator.setColors(Color.parseColor("#FFE710"));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lp.gravity = Gravity.END; lp.gravity = Gravity.END;
lp.bottomMargin = UIUtil.dip2px(mContext, 0); lp.bottomMargin = UIUtil.dip2px(mContext, 0);

2
app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java
View File

@@ -871,7 +871,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
} }
SpannableBuilder text = new SpannableBuilder() SpannableBuilder text = new SpannableBuilder()
.append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD"))) .append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD")))
.append(diamond + "", new ForegroundColorSpan(Color.parseColor("#5FCCE4"))); .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#FFE710")));
tvGiftValue.setText(text.build()); tvGiftValue.setText(text.build());
} }

2
app/src/main/java/com/nnbc123/app/ui/widget/PrivateChatGiftDialog.java
View File

@@ -477,7 +477,7 @@ public class PrivateChatGiftDialog extends BottomSheetDialog implements View.OnC
} }
SpannableBuilder text = new SpannableBuilder() SpannableBuilder text = new SpannableBuilder()
.append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD"))) .append("总价值: ", new ForegroundColorSpan(Color.parseColor("#BABBCD")))
.append(diamond + "", new ForegroundColorSpan(Color.parseColor("#5FCCE4"))); .append(diamond + "", new ForegroundColorSpan(Color.parseColor("#FFE710")));
tvGiftValue.setText(text.build()); tvGiftValue.setText(text.build());
} }

BIN
app/src/main/res/drawable-xhdpi/ic_home_hot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_resource_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

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

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#5FCCE4" /> <solid android:color="#FFE710" />
<size <size
android:width="@dimen/dp_12" android:width="@dimen/dp_12"
android:height="@dimen/dp_4" /> android:height="@dimen/dp_4" />

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

@@ -101,7 +101,7 @@
android:gravity="center" android:gravity="center"
android:text="开启青少年模式" android:text="开启青少年模式"
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:textColor="@color/app_248cfe" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />

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

@@ -27,7 +27,7 @@
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="38dp" android:layout_height="38dp"
android:text="@string/label_common_close" android:text="@string/label_common_close"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:textSize="15sp" android:textSize="15sp"
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"

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

@@ -56,7 +56,7 @@
android:gravity="center" android:gravity="center"
android:text="取消" android:text="取消"
android:layout_marginEnd="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_5"
android:textColor="@color/color_4C5AF1" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_15" /> android:textSize="@dimen/sp_15" />
<TextView <TextView

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

@@ -59,7 +59,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:textSize="15sp" android:textSize="15sp"
android:layout_marginEnd="2.5dp" android:layout_marginEnd="2.5dp"

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

@@ -55,7 +55,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="不同意" android:text="不同意"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<TextView <TextView

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

@@ -116,7 +116,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView

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

@@ -66,7 +66,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_14"
android:onClick="@{click}" android:onClick="@{click}"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"

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

@@ -32,7 +32,7 @@
android:text="@string/close" android:text="@string/close"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:layout_marginBottom="17dp" android:layout_marginBottom="17dp"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:textSize="15sp" /> android:textSize="15sp" />

7
app/src/main/res/layout/fragment_home.xml
View File

@@ -61,11 +61,10 @@
<ImageView <ImageView
android:id="@+id/iv_ranking" android:id="@+id/iv_ranking"
android:layout_width="wrap_content" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:layout_marginEnd="23dp" android:layout_marginEnd="23dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
android:onClick="@{click}" android:onClick="@{click}"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_home_rank" /> android:src="@drawable/ic_home_rank" />

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

@@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="22dp" android:layout_marginTop="18dp"
android:layout_marginEnd="15dp"> android:layout_marginEnd="15dp">
<LinearLayout <LinearLayout

9
app/src/main/res/layout/fragment_recommend.xml
View File

@@ -175,14 +175,13 @@
app:layout_constraintStart_toStartOf="@id/iv_resource_0" app:layout_constraintStart_toStartOf="@id/iv_resource_0"
app:layout_constraintTop_toBottomOf="@id/iv_resource_0"> app:layout_constraintTop_toBottomOf="@id/iv_resource_0">
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="21dp" android:layout_marginStart="21dp"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
android:text="热门" android:src="@drawable/ic_home_hot"
android:textColor="@color/text_normal_282828" />
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_gift_service" android:id="@+id/rv_gift_service"
@@ -254,7 +253,7 @@
android:id="@+id/fl_indicator" android:id="@+id/fl_indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="20dp"
android:paddingBottom="5dp"> android:paddingBottom="5dp">
<com.nnbc123.app.ui.widget.magicindicator.MagicIndicator <com.nnbc123.app.ui.widget.magicindicator.MagicIndicator

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

@@ -79,7 +79,7 @@
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="赠送" android:text="赠送"
android:textColor="@color/color_FFA957" android:textColor="@color/text_normal_282828"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_buy" app:layout_constraintEnd_toStartOf="@id/tv_buy"

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

@@ -98,7 +98,7 @@
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="赠送" android:text="赠送"
android:textColor="@color/color_FFA957" android:textColor="@color/text_normal_282828"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_buy" app:layout_constraintEnd_toStartOf="@id/tv_buy"

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

@@ -29,7 +29,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:lines="1" android:lines="1"
android:text="赠送" android:text="赠送"
android:textColor="#ffffa826" android:textColor="#FFA826"
android:textSize="12dp" /> android:textSize="12dp" />
<com.nnbc123.app.common.widget.CircleImageView <com.nnbc123.app.common.widget.CircleImageView
@@ -56,7 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:lines="1" android:lines="1"
android:textColor="#ffffa826" android:textColor="#FFA826"
android:textSize="12dp" android:textSize="12dp"
tools:text="星语心愿" /> tools:text="星语心愿" />

3
app/src/main/res/layout/item_my_chat_bubble.xml
View File

@@ -81,7 +81,7 @@
android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}" android:background="@{headWearInfo.hasUsed ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
android:gravity="center" android:gravity="center"
android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}" android:text="@{headWearInfo.hasUsed ? @string/label_used : @string/label_can_use}"
android:textColor="@{headWearInfo.hasUsed ? @color/color_4C5AF1 : @color/white}" android:textColor="@color/text_normal_282828"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/tv_counters" app:layout_constraintBottom_toTopOf="@id/tv_counters"
@@ -90,7 +90,6 @@
app:layout_constraintTop_toBottomOf="@id/iv_user_card_wear" app:layout_constraintTop_toBottomOf="@id/iv_user_card_wear"
tools:background="@drawable/bg_common_confirm" tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use" tools:text="@string/label_can_use"
tools:textColor="@color/white"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView

3
app/src/main/res/layout/item_my_head_wear.xml
View File

@@ -64,12 +64,11 @@
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}" android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
android:gravity="center" android:gravity="center"
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}" android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_282828}" android:textColor="@color/text_title_282828"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" android:visibility="gone"
tools:background="@drawable/bg_common_confirm" tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use" tools:text="@string/label_can_use"
tools:textColor="@color/text_title_282828"
tools:visibility="visible" /> tools:visibility="visible" />

3
app/src/main/res/layout/item_my_user_card_wear.xml
View File

@@ -75,14 +75,13 @@
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}" android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
android:gravity="center" android:gravity="center"
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}" android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/white}" android:textColor="@color/text_normal_282828"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:background="@drawable/bg_common_confirm" tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use" tools:text="@string/label_can_use"
tools:textColor="@color/white"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView

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

@@ -24,6 +24,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:scaleType="centerCrop"
android:src="@drawable/default_cover" android:src="@drawable/default_cover"
app:layout_constraintBottom_toBottomOf="@id/view_bg" app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
@@ -49,15 +50,16 @@
<TextView <TextView
android:id="@+id/tv_room_title" android:id="@+id/tv_room_title"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="50dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/text_primary" android:textColor="@color/text_normal_282828"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/ll_tag" app:layout_constraintBottom_toTopOf="@id/ll_tag"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toEndOf="@id/iv_room_image" app:layout_constraintStart_toEndOf="@id/iv_room_image"
app:layout_constraintTop_toTopOf="@id/view_bg" app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"

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

@@ -31,7 +31,7 @@
android:visibility="gone" android:visibility="gone"
android:text="直播中" android:text="直播中"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_11" android:textSize="@dimen/dp_11"
tools:visibility="visible"/> tools:visibility="visible"/>

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

@@ -57,10 +57,10 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/text_normal_282828" android:textColor="@color/text_normal_282828"
android:textSize="14sp" android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/ll_gender_age" app:layout_constraintBottom_toTopOf="@id/ll_gender_age"
app:layout_constraintEnd_toStartOf="@id/ll_online" app:layout_constraintEnd_toStartOf="@id/ll_online"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@id/iv_vip_icon" app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
app:layout_constraintTop_toTopOf="@id/view_bg" app:layout_constraintTop_toTopOf="@id/view_bg"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"

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

@@ -64,7 +64,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="编辑" android:text="编辑"
android:textColor="#5FCCE4" android:textColor="@color/text_normal_282828"
android:textSize="10sp" /> android:textSize="10sp" />
<TextView <TextView
@@ -75,7 +75,7 @@
android:background="@drawable/bg_common_confirm_normal" android:background="@drawable/bg_common_confirm_normal"
android:gravity="center" android:gravity="center"
android:text="删除" android:text="删除"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </LinearLayout>

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

@@ -119,7 +119,7 @@
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="进入房间" android:text="进入房间"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar" app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

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

@@ -41,7 +41,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_7154EE" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
@@ -51,7 +51,7 @@
android:background="@drawable/bg_common_confirm" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="@string/text_ok" android:text="@string/text_ok"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>

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

@@ -109,7 +109,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:gravity="center" android:gravity="center"
android:text="@string/text_ok" android:text="@string/text_ok"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:background="@drawable/bg_common_confirm" android:background="@drawable/bg_common_confirm"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>

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

@@ -122,7 +122,7 @@
android:paddingEnd="@dimen/dp_16" android:paddingEnd="@dimen/dp_16"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:text="邀请" android:text="邀请"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />

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

@@ -144,7 +144,7 @@
android:tag="beta_confirm_button" android:tag="beta_confirm_button"
android:text="立刻升级" android:text="立刻升级"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14" />
</LinearLayout> </LinearLayout>

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

@@ -17,7 +17,7 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center" android:gravity="center"
android:text="@string/send_msg" android:text="@string/send_msg"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
<com.nnbc123.library.widget.DrawableCenterTextView <com.nnbc123.library.widget.DrawableCenterTextView
@@ -30,7 +30,7 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center" android:gravity="center"
android:text="@string/attention" android:text="@string/attention"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />

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

@@ -495,7 +495,7 @@
<color name="color_9af5ef">#9af5ef</color> <color name="color_9af5ef">#9af5ef</color>
<!-- 音萌主题色 --> <!-- 音萌主题色 -->
<color name="color_7154EE">#FFA936</color> <color name="color_7154EE">#FFE710</color>
<color name="color_39EBDF">#39EBDF</color> <color name="color_39EBDF">#39EBDF</color>
<color name="color_39D0EB">#39D0EB</color> <color name="color_39D0EB">#39D0EB</color>
@@ -557,7 +557,7 @@
<!-- 音萌UI规范 start--> <!-- 音萌UI规范 start-->
<!-- 主题色 --> <!-- 主题色 -->
<color name="app_248cfe">#5FCCE4</color> <color name="app_248cfe">#FFE710</color>
<!-- 页面背景色 --> <!-- 页面背景色 -->
<color name="bg_normal_1c1b22">#F8F8FB</color> <color name="bg_normal_1c1b22">#F8F8FB</color>
<!-- 页面次级背景 列表item背景色--> <!-- 页面次级背景 列表item背景色-->

2
app/src/module_labour_union/res/layout/activity_super_admin_manege.xml
View File

@@ -35,7 +35,7 @@
android:background="@drawable/bg_common_confirm" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="添加公会超管" android:text="添加公会超管"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/module_labour_union/res/layout/activity_super_admin_room_set.xml
View File

@@ -35,7 +35,7 @@
android:background="@drawable/bg_common_confirm" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="确认" android:text="确认"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/module_labour_union/res/layout/item_search_admin.xml
View File

@@ -60,7 +60,7 @@
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="设置为超管" android:text="设置为超管"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/module_mentoring_relationship/res/layout/dialog_release_mentoring_relationship_success.xml
View File

@@ -33,7 +33,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:gravity="center" android:gravity="center"
android:text="@string/label_common_close" android:text="@string/label_common_close"
android:textColor="@color/appColor" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>

2
app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickLoginUiConfig.java
View File

@@ -62,7 +62,7 @@ public class QuickLoginUiConfig {
.setSloganTopYOffset(sloganToTop) .setSloganTopYOffset(sloganToTop)
.setSloganBottomYOffset(BOTTOM_OFFSET) .setSloganBottomYOffset(BOTTOM_OFFSET)
// 登录按钮 // 登录按钮
.setLoginBtnTextColor(ContextCompat.getColor(context, R.color.white)) .setLoginBtnTextColor(ContextCompat.getColor(context, R.color.text_normal_282828))
.setLoginBtnText("本机号码一键登录") .setLoginBtnText("本机号码一键登录")
.setLoginBtnBackgroundRes("bg_common_confirm") .setLoginBtnBackgroundRes("bg_common_confirm")
.setLoginBtnWidth(280) .setLoginBtnWidth(280)

2
app/src/module_quick_pass/res/layout/dialog_protocol.xml
View File

@@ -49,7 +49,7 @@
android:background="@drawable/bg_common_confirm" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:text="同意" android:text="同意"
android:textColor="@color/white" android:textColor="@color/text_normal_282828"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView

2
app/src/module_upgrade_app/res/layout/dialog_update.xml
View File

@@ -67,7 +67,7 @@
android:background="@drawable/bg_common_cancel" android:background="@drawable/bg_common_cancel"
android:text="下次再说" android:text="下次再说"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="#5FCCE4" android:textColor="@color/text_normal_282828"
android:textSize="14sp" /> android:textSize="14sp" />

2
nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
View File

@@ -54,7 +54,7 @@ public class BubbleView extends AppCompatTextView {
gradientDrawable.setCornerRadius(ScreenUtil.dip2px(20)); gradientDrawable.setCornerRadius(ScreenUtil.dip2px(20));
gradientDrawable.setColor(Color.parseColor("#FF3B30")); gradientDrawable.setColor(Color.parseColor("#FF3B30"));
setBackground(gradientDrawable); setBackground(gradientDrawable);
setPadding(ScreenUtil.dip2px(6), ScreenUtil.dip2px(2), ScreenUtil.dip2px(6), ScreenUtil.dip2px(2)); setPadding(ScreenUtil.dip2px(4), ScreenUtil.dip2px(1), ScreenUtil.dip2px(4), ScreenUtil.dip2px(1));
setGravity(Gravity.CENTER); setGravity(Gravity.CENTER);
// TextViewCompat.setAutoSizeTextTypeWithDefaults(this,TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM); // TextViewCompat.setAutoSizeTextTypeWithDefaults(this,TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM);
// TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this, // TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this,