From 55c7f7d327d2622fc9784f575d428810145c018d Mon Sep 17 00:00:00 2001 From: LaizyBoy Date: Sat, 9 May 2026 10:02:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E9=A2=9C=E8=89=B2=E7=94=B1=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E6=B7=B1=E8=89=B2?= =?UTF-8?q?/=E6=99=AE=E9=80=9A=E6=A8=A1=E5=BC=8F=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主题改造(mymessagemanager): - values/styles.xml + values-night/styles.xml:6种风格x2模式共12个主题 统一设置 android:textColorPrimary / textColorPrimary / android:textColor / colorTextColor 指向 @color/text_color_primary - values/colors.xml:text_color_primary=#FF000000(普通模式黑色) - values-night/colors.xml:text_color_primary=#FF00FF00(深色模式绿色) - attrs.xml:声明 textColorPrimary 属性解决 AAPT2 编译错误 清除硬编码文本颜色(跨模块): - 移除 13 个布局文件中的 android:textColor 属性(libappbase/libaes/winboll/appbase) - 移除 3 个 Java 文件中的 setTextColor(Color.BLACK/white/gray) 调用 - 移除 ComposeSMSActivity / CharsetRefuseEditDialog 中的自定义文本颜色 - 移除 toast_custom_view.xml / view_tts_back.xml 中的 android:textColor CompoundButton 文本颜色适配: - ConfirmSwitchView:initView 中读取主题 textColorPrimary 的 ColorStateList 并显式设置 - activity_appsettings.xml:平台 Switch 替换为 ConfirmSwitchView - fragment_main.xml:Switch 添加 textColor=?android:attr/textColorPrimary - 10个 RadioButton + 4个 CheckBox 添加 textColor=?android:attr/textColorPrimary --- appbase/src/main/res/layout/activity_main.xml | 14 ++--- .../src/main/res/layout/activity_main2.xml | 2 +- .../res/layout/dialog_privacy_agreement.xml | 7 +-- .../src/main/res/layout/view_adscontrol.xml | 6 +-- .../studio/libappbase/CrashHandler.java | 1 - .../libappbase/GlobalCrashReportView.java | 5 +- .../cc/winboll/studio/libappbase/LogView.java | 3 -- .../studio/libappbase/views/AboutView.java | 1 - .../libappbase/widget/LogTagSpinner.java | 1 - .../res/layout/activity_nfc_rsa_operate.xml | 4 -- .../src/main/res/layout/dialog_sign_get.xml | 4 +- .../main/res/layout/dialog_winboll_host.xml | 4 +- .../src/main/res/layout/layout_about_view.xml | 6 +-- libappbase/src/main/res/layout/view_log.xml | 11 ++-- .../activitys/ComposeSMSActivity.java | 7 --- .../dialogs/CharsetRefuseEditDialog.java | 4 -- .../views/ConfirmSwitchView.java | 16 +++--- .../main/res/layout/activity_appsettings.xml | 10 ++-- .../layout/activity_smsacceptrulesetting.xml | 9 ++-- .../res/layout/listview_smsacceptrule.xml | 9 ++-- .../layout/listview_smsacceptrule_simple.xml | 3 +- .../src/main/res/layout/toast_custom_view.xml | 6 +-- .../src/main/res/layout/view_tts_back.xml | 6 +-- .../src/main/res/values-night/colors.xml | 7 +++ .../src/main/res/values-night/styles.xml | 52 +++++++++++++++++++ .../src/main/res/values/attrs.xml | 1 + .../src/main/res/values/colors.xml | 3 ++ .../src/main/res/values/styles.xml | 30 +++++++++++ .../res/layout/activity_ollama_window.xml | 16 +++--- .../src/main/res/layout/activity_logon.xml | 6 ++- .../res/layout/activity_ollama_window.xml | 24 ++++----- .../res/layout/activity_winbollunittest.xml | 3 +- .../src/main/res/layout/activity_wxpay.xml | 3 +- winboll/src/main/res/layout/activity_yun.xml | 6 ++- .../main/res/layout/dialog_ollama_config.xml | 40 +++++++------- winboll/src/main/res/layout/fragment_main.xml | 3 +- winboll/src/main/res/layout/view_toolbar.xml | 2 +- 37 files changed, 201 insertions(+), 134 deletions(-) create mode 100644 mymessagemanager/src/main/res/values-night/colors.xml create mode 100644 mymessagemanager/src/main/res/values-night/styles.xml diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index d7a5e0b..a0ec292 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:text="关于应用" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:text="应用崩溃测试" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:text="应用日志测试" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:text="应用日志测试(新窗口)" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:text="应用吐司测试" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:text="分屏测试" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:text="多开窗口" android:textSize="16sp" - android:textColor="@android:color/white" + android:background="#81C7F5" android:paddingVertical="12dp" android:layout_marginHorizontal="24dp" diff --git a/appbase/src/main/res/layout/activity_main2.xml b/appbase/src/main/res/layout/activity_main2.xml index 7a96c0c..17061d0 100644 --- a/appbase/src/main/res/layout/activity_main2.xml +++ b/appbase/src/main/res/layout/activity_main2.xml @@ -12,6 +12,6 @@ android:layout_height="wrap_content" android:text="Main2Activity" android:textSize="24sp" - android:textColor="@color/gray_900"/> + /> \ No newline at end of file diff --git a/libaes/src/main/res/layout/dialog_privacy_agreement.xml b/libaes/src/main/res/layout/dialog_privacy_agreement.xml index ebe6fe2..9e6814b 100644 --- a/libaes/src/main/res/layout/dialog_privacy_agreement.xml +++ b/libaes/src/main/res/layout/dialog_privacy_agreement.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:text="用户须知" android:textSize="18sp" - android:textColor="@android:color/black" android:textStyle="bold" android:layout_marginBottom="16dp" /> @@ -28,8 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="小米广告SDK隐私政策: " - android:textSize="14sp" - android:textColor="@android:color/darker_gray" /> + android:textSize="14sp" /> + android:textSize="14sp" /> diff --git a/libaes/src/main/res/layout/view_adscontrol.xml b/libaes/src/main/res/layout/view_adscontrol.xml index 10e5846..0f51040 100644 --- a/libaes/src/main/res/layout/view_adscontrol.xml +++ b/libaes/src/main/res/layout/view_adscontrol.xml @@ -11,7 +11,6 @@ android:layout_height="wrap_content" android:text="应用支持模式设置:" android:textSize="16sp" - android:textColor="@android:color/black" android:layout_marginBottom="12dp"/> + android:textSize="14sp"/> diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java index a839e2b..4906548 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java @@ -456,7 +456,6 @@ public final class CrashHandler { int padding = dp2px(16); // 内边距 16dp(适配不同屏幕) message.setPadding(padding, padding, padding, padding); message.setText(mLog); // 设置崩溃日志 - message.setTextColor(Color.BLACK); // 文字黑色 message.setTextIsSelectable(true); // 支持文本选择(便于手动复制) } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java index 9151822..08bf0d8 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java @@ -178,7 +178,6 @@ public class GlobalCrashReportView extends LinearLayout { // 设置默认配色 mTitleColor = Color.WHITE; mTitleBackgroundColor = Color.BLACK; - mTextColor = Color.BLACK; mTextBackgroundColor = Color.WHITE; // 加载布局 inflateView(); @@ -210,7 +209,7 @@ public class GlobalCrashReportView extends LinearLayout { ); mTextColor = typedArray.getColor( R.styleable.GlobalCrashActivity_colorText, - Color.BLACK + 0 ); mTextBackgroundColor = typedArray.getColor( R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致 @@ -253,7 +252,7 @@ public class GlobalCrashReportView extends LinearLayout { // 配置日志文本控件样式 if (mTvReport != null) { - mTvReport.setTextColor(mTextColor); + if (mTextColor != 0) mTvReport.setTextColor(mTextColor); mTvReport.setBackgroundColor(mTextBackgroundColor); // 可选:设置日志文本换行方式(默认已换行,此处增强可读性) mTvReport.setSingleLine(false); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java index fa2f438..09e7e28 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java @@ -116,7 +116,6 @@ public class LogView extends RelativeLayout { // 获取Log Level spinner实例 mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1); - metTagSearch.setTextColor(mContext.getResources().getColor(R.color.white)); metTagSearch.addTextChangedListener(new TextWatcher() { @Override @@ -248,7 +247,6 @@ public class LogView extends RelativeLayout { } mSelectAllTAGCheckBox.setLayoutParams(layoutParams2); //mSelectAllTAGCheckBox.setPadding(0,0,0,0); - mSelectAllTAGCheckBox.setTextColor(mContext.getResources().getColor(R.color.white)); mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View v) { @@ -502,7 +500,6 @@ public class LogView extends RelativeLayout { } holder.tvText.setLayoutParams(layoutParams); holder.tvText.setPadding(0,0,0,0); - holder.tvText.setTextColor(mContext.getResources().getColor(R.color.white)); holder.cbChecked.setChecked(item.isChecked()); holder.cbChecked.setLayoutParams(layoutParams); holder.cbChecked.setPadding(0,0,0,0); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java index 5634df0..c5d2848 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java @@ -449,7 +449,6 @@ public class AboutView extends LinearLayout { TextView tvTitle = new TextView(mItemContext); tvTitle.setText(mTitle); tvTitle.setTextSize(16); - tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900)); llText.addView(tvTitle); // 内容 TextView tvContent = new TextView(mItemContext); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java index 4bc6f0f..fde2cd4 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java @@ -154,7 +154,6 @@ public class LogTagSpinner extends Spinner { // 4. 文字对齐(垂直居中+靠左,符合常规 UI 设计) //itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START); // 5. 文字颜色(统一深色,可改为项目颜色资源) - itemTv.setTextColor(this.mContext.getColor(R.color.white)); itemTv.setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal)); // 6. 文字溢出处理(最多 2 行,超出省略,避免长标签换行过多) itemTv.setSingleLine(false); diff --git a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml index f379304..f440d78 100644 --- a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml +++ b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml @@ -14,7 +14,6 @@ android:layout_height="wrap_content" android:text="正在监听NFC卡片,请贴近设备检测密钥..." android:textSize="17sp" - android:textColor="@android:color/black" android:gravity="center" android:padding="12dp" android:layout_marginBottom="30dp"/> @@ -26,7 +25,6 @@ android:layout_height="wrap_content" android:text="私钥内容:无" android:textSize="14sp" - android:textColor="@android:color/darker_gray" android:layout_marginBottom="12dp" android:maxLines="5" android:ellipsize="end"/> @@ -38,7 +36,6 @@ android:layout_height="wrap_content" android:text="公钥内容:无" android:textSize="14sp" - android:textColor="@android:color/darker_gray" android:layout_marginBottom="40dp" android:maxLines="5" android:ellipsize="end"/> @@ -50,7 +47,6 @@ android:layout_height="wrap_content" android:text="功能按钮待激活" android:textSize="16sp" - android:textColor="@android:color/white" android:backgroundTint="@android:color/holo_blue_light" android:padding="14dp" android:enabled="false"/> diff --git a/libappbase/src/main/res/layout/dialog_sign_get.xml b/libappbase/src/main/res/layout/dialog_sign_get.xml index f05f7aa..b8193f0 100644 --- a/libappbase/src/main/res/layout/dialog_sign_get.xml +++ b/libappbase/src/main/res/layout/dialog_sign_get.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:text="应用指纹校验" android:textSize="16sp" - android:textColor="@color/gray_900" android:textStyle="bold" android:layout_marginBottom="12dp"/> @@ -45,8 +44,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textSize="11sp" - android:gravity="center" - android:textColor="@color/gray_900"/> + android:gravity="center"/> diff --git a/libappbase/src/main/res/layout/dialog_winboll_host.xml b/libappbase/src/main/res/layout/dialog_winboll_host.xml index 807a0e7..5f7a304 100644 --- a/libappbase/src/main/res/layout/dialog_winboll_host.xml +++ b/libappbase/src/main/res/layout/dialog_winboll_host.xml @@ -12,7 +12,6 @@ android:layout_height="wrap_content" android:text="设置服务器地址" android:textSize="16sp" - android:textColor="#212121" android:textStyle="bold" android:layout_marginBottom="16dp"/> @@ -51,8 +50,7 @@ android:layout_height="wrap_content" android:text="确认" android:textSize="14sp" - android:backgroundTint="#2196F3" - android:textColor="#FFFFFF"/> + android:backgroundTint="#2196F3"/> diff --git a/libappbase/src/main/res/layout/layout_about_view.xml b/libappbase/src/main/res/layout/layout_about_view.xml index 38949c4..0d08d44 100644 --- a/libappbase/src/main/res/layout/layout_about_view.xml +++ b/libappbase/src/main/res/layout/layout_about_view.xml @@ -25,8 +25,7 @@ android:id="@+id/tv_app_name_version" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp" - android:textColor="@color/gray_900"/> + android:textSize="18sp"/> + android:textSize="14sp"/> + android:background="@color/btn_gray_normal"/> + android:textColor="?android:attr/textColorPrimary" + android:padding="@dimen/log_text_padding"/>