feat(dark mode): 统一深色模式适配,所有窗体使用attrs.xml主题属性

## 核心变更
- 所有布局文件文本颜色统一使用 ?attr/* 主题属性引用
- 普通模式文本颜色: #000000 (黑色)
- 暗黑模式文本颜色: #E0E0E0 (灰色)

## attrs.xml 属性统一 (libappbase)
- 新增 AboutView 样式属性 (AboutView、AboutViewStyle)
- 新增 ButtonStyle 样式属性 (buttonBackgroundColor、buttonTextColor)
- 新增 DialogStyle 样式属性 (dialogBackgroundColor、dialogTextColor)
- 新增通用窗体属性 (activityBackgroundColor、activityTextColor、toolbarBackgroundColor 等)
- 移除 appbase/src/main/res/values/attrs.xml,合并到 libappbase

## styles.xml 主题配置
- 普通模式:背景色 #F5F5F5,文本色 #000000,工具栏/按钮背景色 #00B322
- 暗黑模式 (values-night):背景色 #0D1B2A,文本色 #E0E0E0,工具栏/按钮背景色 #1E3A5F

## 布局适配
- 所有窗体使用 ?attr/activityBackgroundColor / ?attr/activityTextColor
- 所有工具栏使用 ?attr/toolbarBackgroundColor
- 所有按钮使用 ?attr/buttonBackgroundColor / ?attr/buttonTextColor
- 所有对话框使用 ?attr/dialogBackgroundColor / ?attr/dialogTextColor
- AboutView 使用 ?attr/aboutViewBackgroundColor 等

## Java代码适配
- GlobalCrashReportView.java: 默认颜色改为黑色 (Color.BLACK)
- CrashHandler.java: 添加 isNightMode 判断,动态设置文本颜色
- AboutView.java: 深色模式标题颜色调整为 gray_500
This commit is contained in:
2026-05-10 07:22:06 +08:00
parent 54f77a8d87
commit 24af31d51d
40 changed files with 1056 additions and 154 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Sat May 09 21:14:54 GMT 2026
#Sun May 10 07:19:39 CST 2026
stageCount=0
libraryProject=libappbase
baseVersion=15.16
publishVersion=15.16.0
buildCount=1
buildCount=44
baseBetaVersion=15.16.1

View File

@@ -440,6 +440,9 @@ public final class CrashHandler {
// 设置系统默认主题(避免自定义主题冲突)
setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
// 判断是否为深色模式
boolean isNightMode = (getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
// 动态创建布局(避免 XML 布局加载异常)
setContentView: {
// 垂直滚动视图(处理日志过长)
@@ -448,7 +451,7 @@ public final class CrashHandler {
// 水平滚动视图(处理日志行过长)
HorizontalScrollView hw = new HorizontalScrollView(this);
hw.setBackgroundColor(Color.GRAY); // 背景色设为灰色
hw.setBackgroundColor(isNightMode ? 0xFF0D1B2A : 0xFFF5F5F5); // 深色模式灰色背景
// 日志显示文本框
TextView message = new TextView(this);
@@ -456,7 +459,7 @@ public final class CrashHandler {
int padding = dp2px(16); // 内边距 16dp适配不同屏幕
message.setPadding(padding, padding, padding, padding);
message.setText(mLog); // 设置崩溃日志
message.setTextColor(Color.BLACK); // 文字黑色
message.setTextColor(isNightMode ? 0xFFE0E0E0 : 0xFF000000); // 深色模式灰色文字,普通模式黑色文字
message.setTextIsSelectable(true); // 支持文本选择(便于手动复制)
}

View File

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
import cc.winboll.studio.libappbase.R;

View File

@@ -175,8 +175,8 @@ public class GlobalCrashReportView extends LinearLayout {
* 初始化默认配置(无自定义属性时使用)
*/
private void initDefaultConfig() {
// 设置默认配色
mTitleColor = Color.WHITE;
// 设置默认配色(普通模式黑色文字)
mTitleColor = Color.BLACK;
mTitleBackgroundColor = Color.BLACK;
mTextColor = Color.BLACK;
mTextBackgroundColor = Color.WHITE;
@@ -202,7 +202,7 @@ public class GlobalCrashReportView extends LinearLayout {
// 读取自定义属性值(无设置时使用默认值)
mTitleColor = typedArray.getColor(
R.styleable.GlobalCrashActivity_colorTittle,
Color.WHITE
Color.BLACK
);
mTitleBackgroundColor = typedArray.getColor(
R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注原拼写错误Backgound→Background保持与 attrs.xml 一致
@@ -241,12 +241,8 @@ public class GlobalCrashReportView extends LinearLayout {
* 初始化控件样式(设置配色和基础属性)
*/
private void initWidgetStyle() {
// 设置主布局背景颜色
setBackgroundColor(mTextBackgroundColor);
// 配置工具栏样式
if (mToolbar != null) {
mToolbar.setBackgroundColor(mTitleBackgroundColor);
mToolbar.setTitleTextColor(mTitleColor);
mToolbar.setSubtitleTextColor(mTitleColor);
}
@@ -254,8 +250,6 @@ public class GlobalCrashReportView extends LinearLayout {
// 配置日志文本控件样式
if (mTvReport != null) {
mTvReport.setTextColor(mTextColor);
mTvReport.setBackgroundColor(mTextBackgroundColor);
// 可选:设置日志文本换行方式(默认已换行,此处增强可读性)
mTvReport.setSingleLine(false);
mTvReport.setHorizontallyScrolling(false);
}

View File

@@ -421,7 +421,7 @@ public class AboutView extends LinearLayout {
*/
private android.graphics.drawable.Drawable create_item_background() {
android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_400));
drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_300));
drawable.setCornerRadius(4);
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
drawable.setColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_800) : mItemContext.getResources().getColor(android.R.color.white));
@@ -451,7 +451,7 @@ public class AboutView extends LinearLayout {
tvTitle.setText(mTitle);
tvTitle.setTextSize(16);
boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_100) : mItemContext.getResources().getColor(R.color.gray_900));
tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_500) : mItemContext.getResources().getColor(R.color.gray_900));
llText.addView(tvTitle);
// 内容
TextView tvContent = new TextView(mItemContext);

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">
<android.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/toolbar"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0"
android:id="@+id/aboutviewroot_ll"/>
</LinearLayout>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">>
<cc.winboll.studio.libappbase.GlobalCrashReportView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/activityglobalcrashGlobalCrashReportView1"/>
</LinearLayout>

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">
<cc.winboll.studio.libappbase.LogView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/logview"/>
</LinearLayout>

View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="24dp"
android:gravity="center_horizontal"
android:background="?attr/activityBackgroundColor">
<!-- NFC状态提示文本 -->
<TextView
android:id="@+id/tv_nfc_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="正在监听NFC卡片请贴近设备检测密钥..."
android:textSize="17sp"
android:textColor="?attr/activityTextColor"
android:gravity="center"
android:padding="12dp"
android:layout_marginBottom="30dp"/>
<!-- 私钥显示区域 -->
<TextView
android:id="@+id/tv_private_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="私钥内容:无"
android:textSize="14sp"
android:textColor="?attr/activityTextColor"
android:layout_marginBottom="12dp"
android:maxLines="5"
android:ellipsize="end"/>
<!-- 公钥显示区域 -->
<TextView
android:id="@+id/tv_public_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="公钥内容:无"
android:textSize="14sp"
android:textColor="?attr/activityTextColor"
android:layout_marginBottom="40dp"
android:maxLines="5"
android:ellipsize="end"/>
<!-- 核心功能按钮(复用:保存本地/初始化密钥) -->
<Button
android:id="@+id/btn_create_write_key"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:text="功能按钮待激活"
android:textSize="16sp"
android:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:padding="14dp"
android:enabled="false"/>
</LinearLayout>

View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:gravity="center"
android:background="?attr/dialogBackgroundColor">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="应用指纹校验"
android:textSize="16sp"
android:textColor="?attr/dialogTextColor"
android:textStyle="bold"
android:layout_marginBottom="12dp"/>
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<EditText
android:id="@+id/et_sign_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:drawable/edit_text"
android:textSize="12sp"
android:gravity="top"
android:hint="签名获取中..."
android:singleLine="false"
android:scrollHorizontally="false"
android:scrollbars="vertical"
android:overScrollMode="always"
android:typeface="monospace"
android:paddingLeft="10dp"
android:paddingRight="10dp"/>
</ScrollView>
<TextView
android:id="@+id/tv_auth_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:textSize="11sp"
android:gravity="center"
android:textColor="?attr/dialogTextColor"/>/>
</LinearLayout>

View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:background="?attr/dialogBackgroundColor">
<!-- 标题 -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置服务器地址"
android:textSize="16sp"
android:textColor="?attr/dialogTextColor"
android:textStyle="bold"
android:layout_marginBottom="16dp"/>
<!-- 地址输入框 -->
<EditText
android:id="@+id/et_host_input"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="请输入服务器地址如http://localhost:8080"
android:textSize="14sp"
android:textColor="?attr/dialogTextColor"
android:inputType="textUri"
android:padding="8dp"
android:background="@android:drawable/edit_text"
android:layout_marginBottom="16dp"/>
<!-- 按钮容器 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="end">
<!-- 取消按钮 -->
<Button
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取消"
android:textSize="14sp"
android:textColor="?attr/dialogTextColor"
android:layout_marginRight="8dp"/>
<!-- 确认按钮 -->
<Button
android:id="@+id/btn_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确认"
android:textSize="14sp"
android:backgroundTint="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"/>
</LinearLayout>
</LinearLayout>

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/bg_border_round">
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:layout_marginLeft="5dp"
android:id="@+id/viewlogtagTextView1"/>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:id="@+id/viewlogtagCheckBox1"/>
</LinearLayout>

View File

@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/aboutViewBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:paddingLeft="16dp"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingBottom="16dp">
<cc.winboll.studio.libappbase.views.DebugSwitchImageView
android:id="@+id/iv_app_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"/>
<TextView
android:id="@+id/tv_app_name_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="?attr/aboutViewTitleColor"/>
<TextView
android:id="@+id/tv_app_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:textSize="14sp"
android:textColor="?attr/aboutViewTextColor"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:background="?attr/aboutViewDividerColor"/>
<LinearLayout
android:id="@+id/ll_function_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="8dp"
android:spacing="20dp">
<ImageButton
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_debug_step_over"
android:id="@+id/ib_debug_step_over"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:background="@null"/>
<ImageButton
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_winboll"
android:id="@+id/ib_winbollhostdialog"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:background="@null"/>
<ImageButton
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_key"
android:id="@+id/ib_signgetdialog"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:background="@null"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor"
android:id="@+id/viewglobalcrashreportLinearLayout1">
<android.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/viewglobalcrashreportToolbar1"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0"
android:fillViewport="true">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textColor="?attr/activityTextColor"
android:id="@+id/viewglobalcrashreportTextView1"/>
</HorizontalScrollView>
</ScrollView>
</LinearLayout>

View File

@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="34dp"
android:layout_alignParentTop="true"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/viewlogRelativeLayoutToolbar">
<Button
android:layout_width="@dimen/log_button_width"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:text="Clean"
android:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:layout_centerVertical="true"
android:id="@+id/viewlogButtonClean"
android:layout_marginLeft="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:textSize="@dimen/log_text_size"
android:padding="@dimen/log_text_padding"
android:text="LV:"
android:layout_toRightOf="@+id/viewlogButtonClean"
android:layout_centerVertical="true"
android:id="@+id/viewlogTextView1"
android:background="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"/>
<cc.winboll.studio.libappbase.widget.LogTagSpinner
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/viewlogTextView1"
android:layout_centerVertical="true"
android:id="@+id/viewlogSpinner1"
android:padding="@dimen/log_spinner_text_padding"/>
<CheckBox
android:layout_width="@dimen/log_checkbox_width"
android:layout_height="@dimen/log_checkbox_height"
android:textSize="@dimen/log_text_size"
android:layout_toLeftOf="@+id/viewlogButtonCopy"
android:layout_centerVertical="true"
android:text="Selectable"
android:background="?attr/buttonBackgroundColor"
android:id="@+id/viewlogCheckBoxSelectable"
android:padding="@dimen/log_text_padding"
android:textColor="?attr/buttonTextColor"/>
<Button
android:layout_width="@dimen/log_button_width"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:text="Copy"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:id="@+id/viewlogButtonCopy"
android:layout_marginRight="5dp"/>
</RelativeLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/log_button_height"
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
android:id="@+id/viewlogLinearLayout1"
android:gravity="center_vertical"
android:background="?attr/toolbarBackgroundColor">
<CheckBox
android:layout_width="wrap_content"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:text="ALL"
android:padding="2dp"
android:id="@+id/viewlogCheckBox1"
android:background="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
<EditText
android:layout_width="50dp"
android:ems="10"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:textColor="?attr/activityTextColor"
android:background="?attr/buttonBackgroundColor"
android:singleLine="true"
android:id="@+id/tagsearch_et"/>
<HorizontalScrollView
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="?attr/buttonBackgroundColor"
android:scrollbars="none"
android:padding="2dp"
android:layout_weight="1.0"
android:id="@+id/viewlogHorizontalScrollView1">
<cc.winboll.studio.libappbase.views.HorizontalListView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/tags_listview"/>
</HorizontalScrollView>
</LinearLayout>
<RelativeLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_alignParentBottom="true"
android:layout_below="@+id/viewlogLinearLayout1">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor"
android:id="@+id/viewlogScrollViewLog">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textSize="@dimen/log_text_size"
android:text="Text"
android:textColor="#FF00FF00"
android:textIsSelectable="true"
android:id="@+id/viewlogTextViewLog"/>
</ScrollView>
</RelativeLayout>
</RelativeLayout>

View File

@@ -4,11 +4,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">
<android.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/toolbar"/>
<LinearLayout

View File

@@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">>
<cc.winboll.studio.libappbase.GlobalCrashReportView
android:layout_width="match_parent"

View File

@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor">
<cc.winboll.studio.libappbase.LogView
android:layout_width="match_parent"

View File

@@ -5,7 +5,7 @@
android:orientation="vertical"
android:padding="24dp"
android:gravity="center_horizontal"
android:background="@android:color/white">
android:background="?attr/activityBackgroundColor">
<!-- NFC状态提示文本 -->
<TextView
@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:text="正在监听NFC卡片请贴近设备检测密钥..."
android:textSize="17sp"
android:textColor="@android:color/black"
android:textColor="?attr/activityTextColor"
android:gravity="center"
android:padding="12dp"
android:layout_marginBottom="30dp"/>
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:text="私钥内容:无"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"
android:textColor="?attr/activityTextColor"
android:layout_marginBottom="12dp"
android:maxLines="5"
android:ellipsize="end"/>
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:text="公钥内容:无"
android:textSize="14sp"
android:textColor="@android:color/darker_gray"
android:textColor="?attr/activityTextColor"
android:layout_marginBottom="40dp"
android:maxLines="5"
android:ellipsize="end"/>
@@ -50,10 +50,9 @@
android:layout_height="wrap_content"
android:text="功能按钮待激活"
android:textSize="16sp"
android:textColor="@android:color/white"
android:backgroundTint="@android:color/holo_blue_light"
android:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:padding="14dp"
android:enabled="false"/>
</LinearLayout>
</LinearLayout>

View File

@@ -6,14 +6,14 @@
android:orientation="vertical"
android:padding="16dp"
android:gravity="center"
android:background="#FFDCDCDC">
android:background="?attr/dialogBackgroundColor">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="应用指纹校验"
android:textSize="16sp"
android:textColor="@color/gray_900"
android:textColor="?attr/dialogTextColor"
android:textStyle="bold"
android:layout_marginBottom="12dp"/>
@@ -46,7 +46,7 @@
android:layout_marginTop="12dp"
android:textSize="11sp"
android:gravity="center"
android:textColor="@color/gray_900"/>
android:textColor="?attr/dialogTextColor"/>/>
</LinearLayout>

View File

@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:background="#FFFFFF">
android:background="?attr/dialogBackgroundColor">
<!-- 标题 -->
<TextView
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:text="设置服务器地址"
android:textSize="16sp"
android:textColor="#212121"
android:textColor="?attr/dialogTextColor"
android:textStyle="bold"
android:layout_marginBottom="16dp"/>
@@ -23,6 +23,7 @@
android:layout_height="wrap_content"
android:hint="请输入服务器地址如http://localhost:8080"
android:textSize="14sp"
android:textColor="?attr/dialogTextColor"
android:inputType="textUri"
android:padding="8dp"
android:background="@android:drawable/edit_text"
@@ -42,6 +43,7 @@
android:layout_height="wrap_content"
android:text="取消"
android:textSize="14sp"
android:textColor="?attr/dialogTextColor"
android:layout_marginRight="8dp"/>
<!-- 确认按钮 -->
@@ -51,8 +53,8 @@
android:layout_height="wrap_content"
android:text="确认"
android:textSize="14sp"
android:backgroundTint="#2196F3"
android:textColor="#FFFFFF"/>
android:backgroundTint="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"/>
</LinearLayout>

View File

@@ -2,7 +2,8 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/aboutViewBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@@ -26,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="@color/colorPrimaryDark"/>
android:textColor="?attr/aboutViewTitleColor"/>
<TextView
android:id="@+id/tv_app_desc"
@@ -35,14 +36,14 @@
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:textSize="14sp"
android:textColor="@color/gray_500"/>
android:textColor="?attr/aboutViewTextColor"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:background="@color/gray_400"/>
android:background="?attr/aboutViewDividerColor"/>
<LinearLayout
android:id="@+id/ll_function_container"

View File

@@ -5,26 +5,30 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor"
android:id="@+id/viewglobalcrashreportLinearLayout1">
<android.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/viewglobalcrashreportToolbar1"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0">
android:layout_weight="1.0"
android:fillViewport="true">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFFFF"
android:padding="16dp"
android:textColor="?attr/activityTextColor"
android:id="@+id/viewglobalcrashreportTextView1"/>
</HorizontalScrollView>

View File

@@ -4,14 +4,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF000000">
android:background="?attr/activityBackgroundColor">
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="34dp"
android:layout_alignParentTop="true"
android:background="@drawable/bg_toolbar_log"
android:background="?attr/toolbarBackgroundColor"
android:id="@+id/viewlogRelativeLayoutToolbar">
<Button
@@ -19,8 +19,8 @@
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:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:layout_centerVertical="true"
android:id="@+id/viewlogButtonClean"
android:layout_marginLeft="5dp"/>
@@ -34,8 +34,8 @@
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="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"/>
<cc.winboll.studio.libappbase.widget.LogTagSpinner
android:layout_width="wrap_content"
@@ -52,17 +52,17 @@
android:layout_toLeftOf="@+id/viewlogButtonCopy"
android:layout_centerVertical="true"
android:text="Selectable"
android:background="@color/btn_gray_normal"
android:background="?attr/buttonBackgroundColor"
android:id="@+id/viewlogCheckBoxSelectable"
android:padding="@dimen/log_text_padding"
android:textColor="@color/white"/>
android:textColor="?attr/buttonTextColor"/>
<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:textColor="?attr/buttonTextColor"
android:backgroundTint="?attr/buttonBackgroundColor"
android:text="Copy"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
@@ -78,7 +78,7 @@
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
android:id="@+id/viewlogLinearLayout1"
android:gravity="center_vertical"
android:background="@drawable/bg_toolbar_log">
android:background="?attr/toolbarBackgroundColor">
<CheckBox
android:layout_width="wrap_content"
@@ -87,7 +87,8 @@
android:text="ALL"
android:padding="2dp"
android:id="@+id/viewlogCheckBox1"
android:background="@drawable/bg_border_round"
android:background="?attr/buttonBackgroundColor"
android:textColor="?attr/buttonTextColor"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
@@ -96,13 +97,15 @@
android:ems="10"
android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size"
android:textColor="?attr/activityTextColor"
android:background="?attr/buttonBackgroundColor"
android:singleLine="true"
android:id="@+id/tagsearch_et"/>
<HorizontalScrollView
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@drawable/bg_border"
android:background="?attr/buttonBackgroundColor"
android:scrollbars="none"
android:padding="2dp"
android:layout_weight="1.0"
@@ -128,7 +131,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF000000"
android:background="?attr/activityBackgroundColor"
android:id="@+id/viewlogScrollViewLog">
<TextView
@@ -144,5 +147,4 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- 全局主题属性 -->
<attr name="themeGlobalCrashActivity" format="reference"/>
<!-- GlobalCrashActivity 样式属性 -->
<declare-styleable name="GlobalCrashActivity">
<attr name="colorTittle" format="color" />
<attr name="colorTittleBackgound" format="color" />
<attr name="colorText" format="color" />
<attr name="colorTextBackgound" format="color" />
</declare-styleable>
<!-- AboutView 样式属性 -->
<declare-styleable name="AboutViewStyle">
<attr name="aboutViewBackgroundColor" format="color" />
<attr name="aboutViewTextColor" format="color" />
<attr name="aboutViewTitleColor" format="color" />
<attr name="aboutViewDividerColor" format="color" />
</declare-styleable>
<!-- ButtonStyle 样式属性 -->
<declare-styleable name="ButtonStyle">
<attr name="buttonBackgroundColor" format="color" />
<attr name="buttonTextColor" format="color" />
</declare-styleable>
<!-- DialogStyle 样式属性 -->
<declare-styleable name="DialogStyle">
<attr name="dialogBackgroundColor" format="color" />
<attr name="dialogTextColor" format="color" />
</declare-styleable>
<!-- 窗体/控件通用背景色属性 -->
<attr name="toolbarBackgroundColor" format="color"/>
<attr name="textViewBackgroundColor" format="color"/>
<attr name="editTextBackgroundColor" format="color"/>
<attr name="scrollViewBackgroundColor" format="color"/>
<!-- 窗体/控件通用文字色属性 -->
<attr name="toolbarTextColor" format="color"/>
<attr name="textViewTextColor" format="color"/>
<attr name="editTextTextColor" format="color"/>
<!-- ActivityStyle 样式属性 -->
<attr name="activityBackgroundColor" format="color"/>
<attr name="activityTextColor" format="color"/>
</resources>

View File

@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#FF1E3A5F</color>
<color name="colorPrimaryDark">#FF15253D</color>
<color name="colorAccent">#FF4DA6FF</color>
<color name="colorText">#FFE0E0E0</color>
<color name="colorTextBackgound">#FF0D1B2A</color>
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
<color name="blue_light">#4A90E2</color>
<color name="blue_normal">#2196F3</color>
<color name="blue_dark">#1976D2</color>
<color name="green_light">#66BB6A</color>
<color name="green_normal">#4CAF50</color>
<color name="green_dark">#388E3C</color>
<color name="red_light">#EF5350</color>
<color name="red_normal">#F44336</color>
<color name="red_dark">#D32F2F</color>
<color name="yellow_light">#FFF59D</color>
<color name="yellow_normal">#FFC107</color>
<color name="yellow_dark">#FFA000</color>
<color name="orange_normal">#FF9800</color>
<color name="purple_normal">#9C27B0</color>
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
<color name="transparent">#00000000</color>
<color name="black_transparent_50">#80000000</color>
<!-- ============== 不透明灰色(常用深浅梯度) ============== -->
<color name="gray_100">#1A1A1A</color>
<color name="gray_200">#262626</color>
<color name="gray_300">#333333</color>
<color name="gray_400">#4D4D4D</color>
<color name="gray_500">#666666</color>
<color name="gray_600">#808080</color>
<color name="gray_700">#999999</color>
<color name="gray_800">#B3B3B3</color>
<color name="gray_900">#CCCCCC</color>
<!-- ============== 半透明灰色 ============== -->
<color name="gray_transparent_30">#4D333333</color>
<color name="gray_transparent_50">#80333333</color>
<color name="gray_transparent_70">#B3333333</color>
<color name="gray_light">#333333</color>
<color name="gray_mid">#666666</color>
<color name="gray_dark">#999999</color>
<color name="gray_black">#CCCCCC</color>
<!-- ============== 遮罩/蒙层 ============== -->
<color name="mask_gray">#804D4D4D</color>
<color name="bg_overlay_gray">#4D1A1A1A</color>
<!-- ============== 按钮灰色 ============== -->
<color name="btn_gray_normal">#666666</color>
<color name="btn_gray_pressed">#4D4D4D</color>
<color name="btn_gray_disabled">#333333</color>
</resources>

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- APPBaseTheme 深色模式主题 -->
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
<item name="aboutViewBackgroundColor">#FF0D1B2A</item>
<item name="aboutViewTextColor">#FFE0E0E0</item>
<item name="aboutViewTitleColor">#FFE0E0E0</item>
<item name="aboutViewDividerColor">#FF333333</item>
<item name="buttonBackgroundColor">#FF1E3A5F</item>
<item name="buttonTextColor">#FFE0E0E0</item>
<item name="dialogBackgroundColor">#FF0D1B2A</item>
<item name="dialogTextColor">#FFE0E0E0</item>
<item name="toolbarBackgroundColor">#FF1E3A5F</item>
<item name="toolbarTextColor">#FFE0E0E0</item>
<item name="textViewBackgroundColor">#FF0D1B2A</item>
<item name="textViewTextColor">#FFE0E0E0</item>
<item name="editTextBackgroundColor">#FF1E3A5F</item>
<item name="editTextTextColor">#FFE0E0E0</item>
<item name="scrollViewBackgroundColor">#FF0D1B2A</item>
<item name="activityBackgroundColor">#FF0D1B2A</item>
<item name="activityTextColor">#FFE0E0E0</item>
</style>
<!-- GlobalCrashActivityTheme 深色模式样式 -->
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="android:statusBarColor">#FF0D1B2A</item>
<item name="colorTittle">#FFE0E0E0</item>
<item name="colorTittleBackgound">#FF1E3A5F</item>
<item name="colorText">#FFE0E0E0</item>
<item name="colorTextBackgound">#FF0D1B2A</item>
</style>
<!-- DialogStyle 对话框样式 -->
<style name="DialogStyle" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>

View File

@@ -1,13 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- 全局主题属性 -->
<attr name="themeGlobalCrashActivity" format="reference"/>
<declare-styleable name="GlobalCrashActivity">
<attr name="colorTittle" format="color" />
<attr name="colorTittleBackgound" format="color" />
<attr name="colorText" format="color" />
<attr name="colorTextBackgound" format="color" />
<!-- AboutView 样式属性 -->
<declare-styleable name="AboutView">
<attr name="app_name" format="string" />
<attr name="app_apkfoldername" format="string" />
<attr name="app_apkname" format="string" />
<attr name="app_gitname" format="string" />
<attr name="app_gitowner" format="string" />
<attr name="app_gitappbranch" format="string" />
<attr name="app_gitappsubprojectfolder" format="string" />
<attr name="appdescription" format="string" />
<attr name="appicon" format="reference" />
<attr name="is_adddebugtools" format="boolean" />
</declare-styleable>
</resources>
<!-- AboutViewStyle 样式属性 -->
<declare-styleable name="AboutViewStyle">
<attr name="aboutViewBackgroundColor" format="color" />
<attr name="aboutViewTextColor" format="color" />
<attr name="aboutViewTitleColor" format="color" />
<attr name="aboutViewDividerColor" format="color" />
</declare-styleable>
<!-- ButtonStyle 样式属性 -->
<declare-styleable name="ButtonStyle">
<attr name="buttonBackgroundColor" format="color" />
<attr name="buttonTextColor" format="color" />
</declare-styleable>
<!-- DialogStyle 样式属性 -->
<declare-styleable name="DialogStyle">
<attr name="dialogBackgroundColor" format="color" />
<attr name="dialogTextColor" format="color" />
</declare-styleable>
<!-- 窗体/控件通用背景色属性 -->
<attr name="toolbarBackgroundColor" format="color"/>
<attr name="textViewBackgroundColor" format="color"/>
<attr name="editTextBackgroundColor" format="color"/>
<attr name="scrollViewBackgroundColor" format="color"/>
<!-- 窗体/控件通用文字色属性 -->
<attr name="toolbarTextColor" format="color"/>
<attr name="textViewTextColor" format="color"/>
<attr name="editTextTextColor" format="color"/>
<!-- ActivityStyle 样式属性 -->
<attr name="activityBackgroundColor" format="color"/>
<attr name="activityTextColor" format="color"/>
</resources>

View File

@@ -1,74 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#FF00B322</color>
<color name="colorPrimaryDark">#FF005C12</color>
<color name="colorPrimaryDark">#FF008F1A</color>
<color name="colorAccent">#FF8DFFA2</color>
<color name="colorText">#FFFFFB8D</color>
<color name="colorTextBackgound">#FF000000</color>
<color name="colorText">#FF000000</color>
<color name="colorTextBackgound">#FFF5F5F5</color>
<!-- ============== 基础黑白(必含,适配文字/背景) ============== -->
<color name="white">#FFFFFF</color> <!-- 纯白色(文字/背景) -->
<color name="black">#000000</color> <!-- 近黑色(重要文字) -->
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<!-- ============== 基础色系(按钮/强调色常用) ============== -->
<!-- 蓝色系(常用:确认/链接/主题色) -->
<color name="blue_light">#4A90E2</color> <!-- 浅蓝(次要按钮) -->
<color name="blue_normal">#2196F3</color> <!-- 标准蓝(主题/确认按钮) -->
<color name="blue_dark">#1976D2</color> <!-- 深蓝(按压态/重要强调) -->
<!-- 绿色系(常用:成功/完成/安全提示) -->
<color name="green_light">#66BB6A</color> <!-- 浅绿(次要成功态) -->
<color name="green_normal">#4CAF50</color> <!-- 标准绿(成功按钮/提示) -->
<color name="green_dark">#388E3C</color> <!-- 深绿(按压态/重要成功) -->
<!-- 红色系(常用:错误/警告/删除按钮) -->
<color name="red_light">#EF5350</color> <!-- 浅红(次要错误提示) -->
<color name="red_normal">#F44336</color> <!-- 标准红(删除/错误按钮) -->
<color name="red_dark">#D32F2F</color> <!-- 深红(按压态/重要错误) -->
<!-- 黄色系(常用:警告/提醒/高亮) -->
<color name="yellow_light">#FFF59D</color> <!-- 浅黄(次要提醒) -->
<color name="yellow_normal">#FFC107</color> <!-- 标准黄(警告提示/高亮) -->
<color name="yellow_dark">#FFA000</color> <!-- 深黄(重要警告) -->
<!-- 橙色系(常用:提醒/进度/活力色) -->
<color name="orange_normal">#FF9800</color> <!-- 标准橙(提醒按钮/进度) -->
<!-- 紫色系(常用:特殊强调/个性按钮) -->
<color name="purple_normal">#9C27B0</color> <!-- 标准紫(特殊功能按钮) -->
<color name="blue_light">#4A90E2</color>
<color name="blue_normal">#2196F3</color>
<color name="blue_dark">#1976D2</color>
<color name="green_light">#66BB6A</color>
<color name="green_normal">#4CAF50</color>
<color name="green_dark">#388E3C</color>
<color name="red_light">#EF5350</color>
<color name="red_normal">#F44336</color>
<color name="red_dark">#D32F2F</color>
<color name="yellow_light">#FFF59D</color>
<color name="yellow_normal">#FFC107</color>
<color name="yellow_dark">#FFA000</color>
<color name="orange_normal">#FF9800</color>
<color name="purple_normal">#9C27B0</color>
<!-- ============== 透明色(遮罩/背景叠加) ============== -->
<color name="transparent">#00000000</color> <!-- 全透明 -->
<color name="black_transparent_50">#80000000</color> <!-- 50%透明黑(遮罩) -->
<color name="transparent">#00000000</color>
<color name="black_transparent_50">#80000000</color>
<!-- ============== 不透明灰色(常用深浅梯度) ============== -->
<color name="gray_100">#F5F5F5</color>
<color name="gray_200">#EEEEEE</color>
<color name="gray_300">#E0E0E0</color>
<color name="gray_400">#BDBDBD</color>
<color name="gray_500">#9E9E9E</color>
<color name="gray_600">#757575</color>
<color name="gray_700">#616161</color>
<color name="gray_800">#424242</color>
<color name="gray_900">#212121</color>
<!-- ============== 半透明灰色 ============== -->
<color name="gray_transparent_30">#4D9E9E9E</color>
<color name="gray_transparent_50">#809E9E9E</color>
<color name="gray_transparent_70">#B39E9E9E</color>
<!-- 1. 不透明灰色(常用深浅梯度,直接用) -->
<color name="gray_100">#F5F5F5</color> <!-- 极浅灰(接近白色,背景用) -->
<color name="gray_200">#EEEEEE</color> <!-- 浅灰(卡片/分割线背景) -->
<color name="gray_300">#E0E0E0</color> <!-- 中浅灰(边框/次要背景) -->
<color name="gray_400">#BDBDBD</color> <!-- 中灰(次要文字/图标) -->
<color name="gray_500">#9E9E9E</color> <!-- 标准中灰(常用辅助文字) -->
<color name="gray_600">#757575</color> <!-- 中深灰(常规辅助文字) -->
<color name="gray_700">#616161</color> <!-- 深灰(重要辅助文字) -->
<color name="gray_800">#424242</color> <!-- 极深灰(接近黑色,标题副文本) -->
<color name="gray_900">#212121</color> <!-- 近黑色(特殊场景用) -->
<color name="gray_light">#EEE</color>
<color name="gray_mid">#999</color>
<color name="gray_dark">#666</color>
<color name="gray_black">#333</color>
<!-- 2. 半透明灰色(带透明度,遮罩/蒙层用) -->
<color name="gray_transparent_30">#4D9E9E9E</color> <!-- 30%透明中灰A=4D -->
<color name="gray_transparent_50">#809E9E9E</color> <!-- 50%透明中灰A=80 -->
<color name="gray_transparent_70">#B39E9E9E</color> <!-- 70%透明中灰A=B3 -->
<color name="gray_light">#EEE</color> <!-- 等价 #EEEEEE浅灰 -->
<color name="gray_mid">#999</color> <!-- 等价 #999999中灰 -->
<color name="gray_dark">#666</color> <!-- 等价 #666666深灰 -->
<color name="gray_black">#333</color> <!-- 等价 #333333极深灰 -->
<!-- 50% 透明中灰(弹窗遮罩常用) -->
<!-- ============== 遮罩/蒙层 ============== -->
<color name="mask_gray">#809E9E9E</color>
<!-- 30% 透明深灰(背景叠加) -->
<color name="bg_overlay_gray">#4D424242</color>
<!-- 1. 常规灰色(按钮默认态,常用中灰) -->
<!-- ============== 按钮灰色 ============== -->
<color name="btn_gray_normal">#9E9E9E</color>
<!-- 2. 按压深色(按钮点击态,加深一级,提升交互感) -->
<color name="btn_gray_pressed">#757575</color>
<!-- 3. 禁用灰色(按钮不可点击态,浅灰) -->
<color name="btn_gray_disabled">#E0E0E0</color>
</resources>
</resources>

View File

@@ -1,20 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- APPBaseTheme 普通模式主题 -->
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
<item name="aboutViewBackgroundColor">#FFF5F5F5</item>
<item name="aboutViewTextColor">#FF000000</item>
<item name="aboutViewTitleColor">#FF000000</item>
<item name="aboutViewDividerColor">#FFE0E0E0</item>
<item name="buttonBackgroundColor">#FF00B322</item>
<item name="buttonTextColor">#FF000000</item>
<item name="dialogBackgroundColor">#FFF5F5F5</item>
<item name="dialogTextColor">#FF000000</item>
<item name="toolbarBackgroundColor">#FF00B322</item>
<item name="toolbarTextColor">#FF000000</item>
<item name="textViewBackgroundColor">#FFF5F5F5</item>
<item name="textViewTextColor">#FF000000</item>
<item name="editTextBackgroundColor">#FFFFFFFF</item>
<item name="editTextTextColor">#FF000000</item>
<item name="scrollViewBackgroundColor">#FFF5F5F5</item>
<item name="activityBackgroundColor">#FFF5F5F5</item>
<item name="activityTextColor">#FF000000</item>
</style>
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="colorTittle">#FFFFF600</item>
<!-- GlobalCrashActivityTheme 普通模式样式 -->
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="android:statusBarColor">#FF00B322</item>
<item name="colorTittle">#FF000000</item>
<item name="colorTittleBackgound">#FF00B322</item>
<item name="colorText">#FF00B322</item>
<item name="colorTextBackgound">#FF000000</item>
<item name="colorText">#FF000000</item>
<item name="colorTextBackgound">#FFF5F5F5</item>
</style>
<!-- DialogStyle 对话框样式 -->
<style name="DialogStyle" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>
</resources>