Studio/WinBoLL
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 统一应用文本颜色由主题控制，支持深色/普通模式自适应

Browse Source 
主题改造（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
This commit is contained in:
ALazyBoyInOpenCode
2026-05-09 10:02:44 +08:00
parent 99de6c05ba
commit 55c7f7d327
37 changed files with 201 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appbase/src/main/res/layout/activity_main.xml
View File

@@ -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"

2
appbase/src/main/res/layout/activity_main2.xml
View File

@@ -12,6 +12,6 @@
android:layout_height="wrap_content"
android:text="Main2Activity"
android:textSize="24sp"
android:textColor="@color/gray_900"/>
/>
</LinearLayout>

7
libaes/src/main/res/layout/dialog_privacy_agreement.xml
View File

@@ -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" />
<!-- 可点击链接（用TextView承载，通过代码设置蓝色+下划线） -->
<TextView
@@ -44,8 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="，点击链接查看完整政策"
android:textSize="14sp"
android:textColor="@android:color/darker_gray" />
android:textSize="14sp" />
</LinearLayout>
<!-- 按钮容器（水平排列） -->

6
libaes/src/main/res/layout/view_adscontrol.xml
View File

@@ -11,7 +11,6 @@
android:layout_height="wrap_content"
android:text="应用支持模式设置："
android:textSize="16sp"
android:textColor="@android:color/black"
android:layout_marginBottom="12dp"/>
<RadioGroup
@@ -26,7 +25,6 @@
android:layout_height="wrap_content"
android:text="无扰单机模式"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"
android:layout_marginBottom="8dp"/>
<RadioButton
@@ -35,7 +33,6 @@
android:layout_height="wrap_content"
android:text="米盟广告模式"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"
android:layout_marginBottom="8dp"/>
<RadioButton
@@ -43,8 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="云宝物语模式"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"/>
android:textSize="14sp"/>
</RadioGroup>

1
libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
View File

@@ -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); // 支持文本选择（便于手动复制）
}

5
libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
View File

@@ -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);

3
libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
View File

@@ -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);

1
libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
View File

@@ -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);

1
libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
View File

@@ -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);

4
libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
View File

@@ -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"/>

4
libappbase/src/main/res/layout/dialog_sign_get.xml
View File

@@ -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"/>
</LinearLayout>

4
libappbase/src/main/res/layout/dialog_winboll_host.xml
View File

@@ -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"/>
</LinearLayout>

6
libappbase/src/main/res/layout/layout_about_view.xml
View File

@@ -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"/>
<TextView
android:id="@+id/tv_app_desc"
@@ -34,8 +33,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:textSize="14sp"
android:textColor="@color/gray_500"/>
android:textSize="14sp"/>
<View
android:layout_width="match_parent"

11
libappbase/src/main/res/layout/view_log.xml
View File

@@ -19,7 +19,6 @@
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:text="Clean"
android:textColor="@color/white"
android:backgroundTint="@drawable/btn_gray_bg"
android:layout_centerVertical="true"
android:id="@+id/viewlogButtonClean"
@@ -34,8 +33,7 @@
android:layout_toRightOf="@+id/viewlogButtonClean"
android:layout_centerVertical="true"
android:id="@+id/viewlogTextView1"
android:background="@color/btn_gray_normal"
android:textColor="@color/black"/>
android:background="@color/btn_gray_normal"/>
<cc.winboll.studio.libappbase.widget.LogTagSpinner
android:layout_width="wrap_content"
@@ -54,14 +52,13 @@
android:text="Selectable"
android:background="@color/btn_gray_normal"
android:id="@+id/viewlogCheckBoxSelectable"
android:padding="@dimen/log_text_padding"
android:textColor="@color/white"/>
android:textColor="?android:attr/textColorPrimary"
android:padding="@dimen/log_text_padding"/>
<Button
android:layout_width="@dimen/log_button_width"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:textColor="@color/white"
android:backgroundTint="@drawable/btn_gray_bg"
android:text="Copy"
android:layout_alignParentRight="true"
@@ -89,6 +86,7 @@
android:id="@+id/viewlogCheckBox1"
android:background="@drawable/bg_border_round"
android:layout_marginLeft="5dp"
android:textColor="?android:attr/textColorPrimary"
android:layout_marginRight="5dp"/>
<EditText
@@ -136,7 +134,6 @@
android:layout_height="match_parent"
android:textSize="@dimen/log_text_size"
android:text="Text"
android:textColor="#FF00FF00"
android:textIsSelectable="true"
android:id="@+id/viewlogTextViewLog"/>

7
mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/ComposeSMSActivity.java
View File

@@ -334,13 +334,6 @@ public class ComposeSMSActivity extends WinBoLLActivity implements IWinBoLLActiv
mlvContracts.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
// 选中时可添加额外反馈（如改变文本颜色，可选）
if (view != null) {
TextView tvName = (TextView) view.findViewById(R.id.listviewcontractsTextView1);
TextView tvPhone = (TextView) view.findViewById(R.id.listviewcontractsTextView2);
if (tvName != null) tvName.setTextColor(getResources().getColor(R.color.white));
if (tvPhone != null) tvPhone.setTextColor(getResources().getColor(R.color.white));
}
}
@Override

4
mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/dialogs/CharsetRefuseEditDialog.java
View File

@@ -2,7 +2,6 @@ package cc.winboll.studio.mymessagemanager.dialogs;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
@@ -68,7 +67,6 @@ public class CharsetRefuseEditDialog extends Dialog {
TextView titleTv = new TextView(getContext());
titleTv.setText("拒绝显示字符集编辑");
titleTv.setTextSize(18);
titleTv.setTextColor(Color.BLACK);
titleTv.setGravity(Gravity.CENTER);
titleTv.setPadding(0, 0, 0, 20); // 标题与编辑框间距
rootLayout.addView(titleTv);
@@ -100,7 +98,6 @@ public class CharsetRefuseEditDialog extends Dialog {
TextView cancelBtn = new TextView(getContext());
cancelBtn.setText("取消");
cancelBtn.setTextSize(16);
cancelBtn.setTextColor(Color.parseColor("#666666"));
cancelBtn.setPadding(20, 10, 20, 10);
cancelBtn.setOnClickListener(new View.OnClickListener(){
@@ -115,7 +112,6 @@ public class CharsetRefuseEditDialog extends Dialog {
TextView confirmBtn = new TextView(getContext());
confirmBtn.setText("确定");
confirmBtn.setTextSize(16);
confirmBtn.setTextColor(Color.parseColor("#0066CC"));
confirmBtn.setPadding(20, 10, 20, 10);
confirmBtn.setOnClickListener(new View.OnClickListener(){

10
mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/ConfirmSwitchView.java
View File

@@ -5,6 +5,8 @@ package cc.winboll.studio.mymessagemanager.views;
* @Date 2023/07/25 13:37:55
*/
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Switch;
@@ -39,10 +41,10 @@ public class ConfirmSwitchView extends Switch {
void initView(Context context) {
mContext = context;
/*TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.SMSView, 0, 0);
colorInbox = a.getColor(R.styleable.SMSView_attrSMSViewInboxColor, 0);
colorSend = a.getColor(R.styleable.SMSView_attrSMSViewSendColor, 0);
a.recycle();*/
TypedArray a = context.obtainStyledAttributes(new int[]{android.R.attr.textColorPrimary});
ColorStateList csl = a.getColorStateList(0);
if (csl != null) setTextColor(csl);
a.recycle();
}
@Override

10
mymessagemanager/src/main/res/layout/activity_appsettings.xml
View File

@@ -45,7 +45,7 @@
android:background="#999999"
android:layout_marginBottom="8dp"/>
<Switch
<cc.winboll.studio.mymessagemanager.views.ConfirmSwitchView
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="回收站短信保护式预览开关："
@@ -153,7 +153,8 @@
android:text="简洁模式（SMSRecycleActivity）"
android:id="@+id/activityappsettingsRadioButton1"
android:gravity="center_vertical"
android:textSize="14sp"/>
android:textSize="14sp"
android:textColor="?android:attr/textColorPrimary"/>
<RadioButton
android:layout_width="match_parent"
@@ -161,7 +162,8 @@
android:text="自由模式（SMSRecycle2Activity）"
android:id="@+id/activityappsettingsRadioButton2"
android:gravity="center_vertical"
android:textSize="14sp"/>
android:textSize="14sp"
android:textColor="?android:attr/textColorPrimary"/>
</RadioGroup>
@@ -228,7 +230,7 @@
android:layout_marginHorizontal="8dp"
android:textSize="13sp"/>
<Switch
<cc.winboll.studio.mymessagemanager.views.ConfirmSwitchView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/activityappsettingsSwitch1"/>

9
mymessagemanager/src/main/res/layout/activity_smsacceptrulesetting.xml
View File

@@ -53,20 +53,23 @@
android:layout_height="wrap_content"
android:text="Accept"
android:id="@+id/activitysmsacceptrulesettingRadioButton1"
android:onClick="onAcceptRuleType"/>
android:onClick="onAcceptRuleType"
android:textColor="?android:attr/textColorPrimary"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Refuse"
android:id="@+id/activitysmsacceptrulesettingRadioButton2"
android:onClick="onRefuseRuleType"/>
android:onClick="onRefuseRuleType"
android:textColor="?android:attr/textColorPrimary"/>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Enable"
android:id="@+id/activitysmsacceptrulesettingCheckBox1"/>
android:id="@+id/activitysmsacceptrulesettingCheckBox1"
android:textColor="?android:attr/textColorPrimary"/>
<Button
android:layout_width="wrap_content"

9
mymessagemanager/src/main/res/layout/listview_smsacceptrule.xml
View File

@@ -34,19 +34,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Accept"
android:id="@+id/listviewsmsacceptruleRadioButton1"/>
android:id="@+id/listviewsmsacceptruleRadioButton1"
android:textColor="?android:attr/textColorPrimary"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Refuse"
android:id="@+id/listviewsmsacceptruleRadioButton2"/>
android:id="@+id/listviewsmsacceptruleRadioButton2"
android:textColor="?android:attr/textColorPrimary"/>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/listviewsmsacceptruleCheckBox1"
android:text="Enable"/>
android:text="Enable"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>

3
mymessagemanager/src/main/res/layout/listview_smsacceptrule_simple.xml
View File

@@ -36,7 +36,8 @@
android:layout_height="wrap_content"
android:text="Enable"
android:id="@+id/listviewsmsacceptrulesimpleCheckBox1"
android:enabled="false"/>
android:enabled="false"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>

6
mymessagemanager/src/main/res/layout/toast_custom_view.xml
View File

@@ -12,8 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textStyle="bold"
android:textColor="#FF000000"/>
android:textStyle="bold"/>
<LinearLayout
android:orientation="horizontal"
@@ -29,8 +28,7 @@
android:id="@android:id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textColor="#FF000000"/>
android:layout_margin="10dp"/>
</LinearLayout>

4
mymessagemanager/src/main/res/layout/view_tts_back.xml
View File

@@ -20,7 +20,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="#FF000000"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceLarge"/>
@@ -34,8 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Click To Stop TTS Play"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#FF000000"/>
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>

7
mymessagemanager/src/main/res/values-night/colors.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="text_color_primary">#FF00FF00</color>
<color name="window_background">#FF000000</color>
</resources>

52
mymessagemanager/src/main/res/values-night/styles.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MyAppTheme" parent="AESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
<style name="MyDepthAESTheme" parent="DepthAESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
<style name="MySkyAESTheme" parent="SkyAESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
<style name="MyGoldenAESTheme" parent="GoldenAESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
<style name="MyMemorAESTheme" parent="MemorAESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
<style name="MyTaoAESTheme" parent="TaoAESTheme">
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
</style>
</resources>

1
mymessagemanager/src/main/res/values/attrs.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--<attr name="appTheme" format="reference"/>-->
<attr name="textColorPrimary" format="color" />
<declare-styleable name="SMSView">
<attr name="attrSMSType" format="string"/>
<attr name="attrSMSViewSendColor" format="color" />

3
mymessagemanager/src/main/res/values/colors.xml
View File

@@ -3,6 +3,9 @@
<color name="white">#FFFFFFFF</color>
<color name="text_color_primary">#FF000000</color>
<color name="window_background">#FFFFFFFF</color>
<color name="colorSMSSendColor">#FFDCDA3D</color>
<color name="colorSMSInboxColor">#FF3DDC84</color>
<color name="colorTTSRuleViewBackgroundColor">#FFDCDA3D</color>

30
mymessagemanager/src/main/res/values/styles.xml
View File

@@ -3,6 +3,11 @@
<style name="MyAppTheme" parent="AESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColor</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColor</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColor</item>
@@ -11,6 +16,11 @@
<style name="MyDepthAESTheme" parent="DepthAESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColorDepth</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColorDepth</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColorDepth</item>
@@ -18,6 +28,11 @@
<style name="MySkyAESTheme" parent="SkyAESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColorSky</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColorSky</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColorSky</item>
@@ -25,6 +40,11 @@
<style name="MyGoldenAESTheme" parent="GoldenAESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColorGolden</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColorGolden</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColorGolden</item>
@@ -32,6 +52,11 @@
<style name="MyMemorAESTheme" parent="MemorAESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColorMemor</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColorMemor</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColorMemor</item>
@@ -39,6 +64,11 @@
<style name="MyTaoAESTheme" parent="TaoAESTheme">
<item name="android:textSize">20sp</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color_primary</item>
<item name="colorTextColor">@color/text_color_primary</item>
<item name="attrSMSViewSendColor">@color/colorSMSSendColorTao</item>
<item name="attrSMSViewInboxColor">@color/colorSMSInboxColorTao</item>
<item name="attrTTSRuleViewBackgroundColor">@color/colorTTSRuleViewBackgroundColorTao</item>

16
winboll/src/beta/res/layout/activity_ollama_window.xml
View File

@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ollama 模型对话"
android:textColor="#FFFFFF"
android:textSize="18sp"
android:textStyle="bold" />
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="系统提示："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etSystemPrompt"
@@ -57,7 +57,7 @@
android:layout_height="100dp"
android:background="#2D2D2D"
android:hint="请输入系统提示"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:gravity="top|start"
android:inputType="textMultiLine" />
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="模型名称："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etModelName"
@@ -76,7 +76,7 @@
android:background="#2D2D2D"
android:hint="llama3"
android:text="llama3"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:singleLine="true" />
@@ -85,7 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="系统消息："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etUserMessage"
@@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="发送"
android:textColor="#FFFFFF" />
/>
<Button
android:id="@+id/btnStop"
@@ -129,7 +129,7 @@
android:layout_marginStart="8dp"
android:layout_weight="1"
android:text="停止"
android:textColor="#FF5252" />
/>
</LinearLayout>

6
winboll/src/main/res/layout/activity_logon.xml
View File

@@ -20,14 +20,16 @@
android:layout_height="wrap_content"
android:text="10.8.0.250:456"
android:id="@+id/rb_debughost"
android:onClick="onSwitchHost"/>
android:onClick="onSwitchHost"
android:textColor="?android:attr/textColorPrimary"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="yun.winboll.cc"
android:id="@+id/rb_yunhost"
android:onClick="onSwitchHost"/>
android:onClick="onSwitchHost"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>

24
winboll/src/main/res/layout/activity_ollama_window.xml
View File

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ollama 模型对话"
android:textColor="#FFFFFF"
android:textSize="18sp"
android:textStyle="bold" />
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="系统提示："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etSystemPrompt"
@@ -47,7 +47,7 @@
android:layout_height="100dp"
android:background="#2D2D2D"
android:hint="请输入系统提示"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:gravity="top|start"
android:inputType="textMultiLine" />
@@ -59,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="模型名称："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etModelName"
@@ -68,7 +68,7 @@
android:background="#2D2D2D"
android:hint="llama3"
android:text="llama3"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:singleLine="true" />
@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="温度设置："
android:textColor="#B0B0B0" />
/>
<LinearLayout
android:layout_width="match_parent"
@@ -92,7 +92,7 @@
android:layout_weight="1"
android:background="#2D2D2D"
android:hint="0.7"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:digits="0123456789.,-"
android:singleLine="true" />
@@ -104,7 +104,7 @@
android:layout_weight="1"
android:background="#2D2D2D"
android:hint="4096"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:digits="0123456789."
android:singleLine="true" />
@@ -116,7 +116,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="系统消息："
android:textColor="#B0B0B0" />
/>
<LinearLayout
android:layout_width="match_parent"
@@ -128,7 +128,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="用户消息："
android:textColor="#B0B0B0" />
/>
<EditText
android:id="@+id/etUserMessage"
@@ -147,7 +147,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="响应消息："
android:textColor="#B0B0B0" />
/>
<LinearLayout
android:layout_width="match_parent"
@@ -170,7 +170,7 @@
android:layout_weight="1"
android:layout_marginStart="8dp"
android:text="清空"
android:textColor="#FFFFFF" />
/>
</LinearLayout>

3
winboll/src/main/res/layout/activity_winbollunittest.xml
View File

@@ -55,7 +55,8 @@
android:text="Debug Mode"
android:layout_weight="1.0"
android:onClick="onSwitchDebugMode"
android:id="@+id/activitymainCheckBox1"/>
android:id="@+id/activitymainCheckBox1"
android:textColor="?android:attr/textColorPrimary"/>
<Button
android:layout_width="wrap_content"

3
winboll/src/main/res/layout/activity_wxpay.xml
View File

@@ -30,8 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="支付状态：未支付"
android:textSize="16sp"
android:textColor="@android:color/black"/>
android:textSize="16sp"/>
<Button
android:id="@+id/btn_create_order"

6
winboll/src/main/res/layout/activity_yun.xml
View File

@@ -20,14 +20,16 @@
android:layout_height="wrap_content"
android:text="10.8.0.250:456"
android:id="@+id/rb_debughost"
android:onClick="onSwitchHost"/>
android:onClick="onSwitchHost"
android:textColor="?android:attr/textColorPrimary"/>
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="yun.winboll.cc"
android:id="@+id/rb_yunhost"
android:onClick="onSwitchHost"/>
android:onClick="onSwitchHost"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>

40
winboll/src/main/res/layout/dialog_ollama_config.xml
View File

@@ -16,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ollama 配置"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="API 地址"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:hint="http://localhost:11434"
android:text="http://localhost:11434"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="textUri"
android:singleLine="true"
@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="模型名称"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:hint="模型名称 (如：llama3)"
android:text="llama3"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="textCapCharacters"
android:singleLine="true"
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="温度设置"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:hint="0.7"
android:text="0.7"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="text"
android:singleLine="true"
@@ -101,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="最大 token 数"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:hint="4096"
android:text="4096"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="text"
android:singleLine="true"
@@ -124,7 +124,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="系统提示"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -134,7 +134,7 @@
android:layout_height="wrap_content"
android:hint="你是 WinBoLL Ollama API 客户端..."
android:text="你是 WinBoLL Ollama API 客户端。用户将向你提问，请给予有用的、详细的回答。"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="textMultiLine"
android:gravity="top|start"
@@ -148,7 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="API 版本"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -158,7 +158,7 @@
android:layout_height="wrap_content"
android:hint="v1"
android:text="v1"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="textCapCharacters"
android:singleLine="true"
@@ -171,7 +171,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="调试模式"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:layout_marginBottom="4dp" />
@@ -181,7 +181,7 @@
android:layout_height="wrap_content"
android:hint="false"
android:text="false"
android:textColor="#FFFFFF"
android:textColorHint="#666666"
android:inputType="text"
android:singleLine="true"
@@ -207,7 +207,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="保存配置"
android:textColor="#FFFFFF"
android:textSize="14sp"
android:paddingStart="40dp"
android:paddingEnd="40dp"
@@ -219,7 +219,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="加载配置"
android:textColor="#4A90E2"
android:textSize="14sp"
android:paddingStart="40dp"
android:paddingEnd="40dp"
@@ -231,7 +231,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="重置"
android:textColor="#B0B0B0"
android:textSize="14sp"
android:paddingStart="40dp"
android:paddingEnd="40dp"
@@ -249,7 +249,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#00CC00"
android:textSize="12sp"
android:layout_gravity="center"
android:layout_marginTop="8dp" />
@@ -258,7 +258,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="保存后，配置将对所有会话生效"
android:textColor="#666666"
android:textSize="12sp"
android:layout_marginTop="8dp" />

3
winboll/src/main/res/layout/fragment_main.xml
View File

@@ -16,7 +16,8 @@
android:layout_height="wrap_content"
android:text="Position Service"
android:padding="10dp"
android:id="@+id/fragmentmainSwitch1"/>
android:id="@+id/fragmentmainSwitch1"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>

2
winboll/src/main/res/layout/view_toolbar.xml
View File

@@ -19,7 +19,7 @@
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:textSize="18sp"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/toolbar_icon"