Compare commits

...

7 Commits

Author SHA1 Message Date
05259e5ca9 <appbase>APK 15.20.1 release Publish. 2026-05-11 09:40:26 +08:00
a5a5b37121 refactor: 重构调试主题,统一定义应用调试文字颜色
1. 重命名调试主题属性
   - themeGlobalCrashActivity → themeDebug
   - GlobalCrashActivityTheme → DebugActivityTheme

2. 新增 debugTextColor 属性
   - 定义 debugTextColor 属性,用于统一应用调试文字颜色
   - 普通模式: 灰色 #808080
   - 深色模式: 绿色 #FF00FF00

3. 重构视图控件
   - view_globalcrashreport.xml 和 view_log.xml 使用 themeDebug 主题
   - 控件颜色统一引用主题属性
   - 日志显示文本使用 debugTextColor 属性

4. GlobalCrashReportView Java 代码
   - 新增 obtainDebugTextColor() 方法获取主题中的 debugTextColor
   - 崩溃视图文字颜色通过主题属性获取,与日志视图一致
2026-05-11 09:37:25 +08:00
29726828b0 refactor: 重构主题颜色系统,统一使用命名的颜色属性
1. 新增主窗口颜色属性定义
   - mainWindowBackgroundColor - 普通模式主窗口背景色
   - mainWindowTextColor - 普通模式主窗口文字色
   - mainWindowDarkBackgroundColor - 深色模式主窗口背景色
   - mainWindowDarkTextColor - 深色模式主窗口文字色

2. 重构 view_globalcrashreport.xml 布局
   - 添加 themeGlobalCrashActivity 主题
   - 控件颜色属性改为引用主题属性

3. 统一应用内颜色配置
   - APPBaseTheme 所有颜色属性统一引用命名颜色值
   - GlobalCrashActivityTheme 文字颜色引用主窗口文字色

4. 修复崩溃循环问题
   - 避免属性自引用导致的循环解析
2026-05-11 08:59:34 +08:00
436e92702f 把应用统一资源配置属性放到类库,方便其他应用统一调用。 2026-05-11 01:29:32 +08:00
3669a96768 chore: 移除文档质量不佳的docs目录 2026-05-10 15:44:36 +08:00
37c3d1563c refactor(build): 精简项目模块配置,统一Java编译版本
- 简化 settings.gradle,仅保留 appbase 和 libappbase 模块
- 更新根目录 build.gradle 编译语言为 Java 7
- 移除其他模块(aes、libaes、winboll、libwinboll)引用
- 添加技术文档:基于 sharedUserId + 自有签名 + LocalBroadcastManager 跨应用通信
- 确保 Java 源文件语法符合 API 26-30 适配范围
2026-05-10 15:39:12 +08:00
6741c41c83 <libappbase>Library Release 15.20.0 2026-05-10 13:31:38 +08:00
18 changed files with 171 additions and 118 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun May 10 13:24:08 HKT 2026 #Mon May 11 09:40:26 HKT 2026
stageCount=1 stageCount=2
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.0 publishVersion=15.20.1
buildCount=0 buildCount=0
baseBetaVersion=15.20.1 baseBetaVersion=15.20.2

View File

@@ -10,7 +10,7 @@
android:theme="@style/MyAPPBaseTheme" android:theme="@style/MyAPPBaseTheme"
android:resizeableActivity="true" android:resizeableActivity="true"
android:process=":App" android:process=":App"
android:sharedUserId="cc.winboll.studio" android:sharedUserId="@string/shared_user_id"
android:sharedUserLabel="@string/shared_user_label"> android:sharedUserLabel="@string/shared_user_label">
<activity <activity

View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyAPPBaseTheme" parent="APPBaseTheme"> <style name="MyAPPBaseTheme" parent="APPBaseTheme">
<item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item> <item name="themeDebug">@style/MyDebugActivityTheme</item>
</style> </style>
<style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme"> <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
<item name="colorTittle">#FFFFFFFF</item> <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
<item name="colorTittleBackgound">#FF00A4B3</item> <item name="colorTittleBackgound">#FF1E3A5F</item>
<item name="colorText">#FFFFFFFF</item> <item name="colorText">?attr/mainWindowDarkTextColor</item>
<item name="colorTextBackgound">#FFFFFFFF</item> <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
</style> </style>
</resources> </resources>

View File

@@ -6,5 +6,4 @@
<string name="app_debug">Click here is switch to APP DEBUG</string> <string name="app_debug">Click here is switch to APP DEBUG</string>
<string name="gitea_home">GITEA HOME</string> <string name="gitea_home">GITEA HOME</string>
<string name="app_update">APP UPDATE</string> <string name="app_update">APP UPDATE</string>
<string name="shared_user_label">studio@winboll.cc</string>
</resources> </resources>

View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyAPPBaseTheme" parent="APPBaseTheme"> <style name="MyAPPBaseTheme" parent="APPBaseTheme">
<item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item> <item name="themeDebug">@style/MyDebugActivityTheme</item>
</style> </style>
<style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme"> <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
<item name="colorTittle">#FFFFFFFF</item> <item name="colorTittle">?attr/mainWindowTextColor</item>
<item name="colorTittleBackgound">#FF00A4B3</item> <item name="colorTittleBackgound">#FF00B322</item>
<item name="colorText">#FFFFFFFF</item> <item name="colorText">?attr/mainWindowTextColor</item>
<item name="colorTextBackgound">#FF000000</item> <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
</style> </style>
</resources> </resources>

View File

@@ -93,11 +93,11 @@ allprojects {
} }
subprojects { subprojects {
// 1. 对纯 Java 模块的 JavaCompile 任务配置(升级为 Java 11 // 1. 对纯 Java 模块的 JavaCompile 任务配置(强制Java 7
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters" options.compilerArgs << "-parameters"
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_1_7
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun May 10 13:24:08 HKT 2026 #Mon May 11 09:40:26 HKT 2026
stageCount=1 stageCount=2
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.20 baseVersion=15.20
publishVersion=15.20.0 publishVersion=15.20.1
buildCount=0 buildCount=0
baseBetaVersion=15.20.1 baseBetaVersion=15.20.2

View File

@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toolbar; import android.widget.Toolbar;
import cc.winboll.studio.libappbase.R; import cc.winboll.studio.libappbase.R;
import android.content.res.Resources;
/** /**
* @Author ZhanGSKen&豆包大模型<zhangsken@qq.com> * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -175,10 +176,11 @@ public class GlobalCrashReportView extends LinearLayout {
* 初始化默认配置(无自定义属性时使用) * 初始化默认配置(无自定义属性时使用)
*/ */
private void initDefaultConfig() { private void initDefaultConfig() {
// 设置默认配色(普通模式黑色文字 // 设置默认配色(使用 debugTextColor 属性
mTitleColor = Color.BLACK; Resources.Theme theme = mContext.getTheme();
mTitleBackgroundColor = Color.BLACK; mTitleColor = theme.getResources().getColor(android.R.color.holo_green_dark);
mTextColor = Color.BLACK; mTitleBackgroundColor = Color.GRAY;
mTextColor = obtainDebugTextColor(theme);
mTextBackgroundColor = Color.WHITE; mTextBackgroundColor = Color.WHITE;
// 加载布局 // 加载布局
inflateView(); inflateView();
@@ -186,6 +188,21 @@ public class GlobalCrashReportView extends LinearLayout {
initWidgetStyle(); initWidgetStyle();
} }
private int obtainDebugTextColor(Resources.Theme theme) {
int[] attrs = new int[] { cc.winboll.studio.libappbase.R.attr.themeDebug };
TypedArray themeTypedArray = theme.obtainStyledAttributes(attrs);
int themeResId = themeTypedArray.getResourceId(0, 0);
themeTypedArray.recycle();
if (themeResId != 0) {
int[] debugAttrs = new int[] { cc.winboll.studio.libappbase.R.attr.debugTextColor };
TypedArray debugTypedArray = theme.obtainStyledAttributes(themeResId, debugAttrs);
int color = debugTypedArray.getColor(0, Color.GRAY);
debugTypedArray.recycle();
return color;
}
return Color.GRAY;
}
/** /**
* 初始化视图(解析自定义属性 + 加载布局 + 设置样式) * 初始化视图(解析自定义属性 + 加载布局 + 设置样式)
* @param attrs 自定义属性集合 * @param attrs 自定义属性集合
@@ -195,7 +212,7 @@ public class GlobalCrashReportView extends LinearLayout {
TypedArray typedArray = mContext.obtainStyledAttributes( TypedArray typedArray = mContext.obtainStyledAttributes(
attrs, attrs,
R.styleable.GlobalCrashActivity, R.styleable.GlobalCrashActivity,
R.attr.themeGlobalCrashActivity, R.attr.themeDebug,
0 0
); );
@@ -208,10 +225,7 @@ public class GlobalCrashReportView extends LinearLayout {
R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注原拼写错误Backgound→Background保持与 attrs.xml 一致 R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注原拼写错误Backgound→Background保持与 attrs.xml 一致
Color.BLACK Color.BLACK
); );
mTextColor = typedArray.getColor( mTextColor = obtainDebugTextColor(mContext.getTheme());
R.styleable.GlobalCrashActivity_colorText,
Color.BLACK
);
mTextBackgroundColor = typedArray.getColor( mTextBackgroundColor = typedArray.getColor(
R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致 R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致
Color.WHITE Color.WHITE

View File

@@ -2,16 +2,18 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:theme="?attr/themeDebug"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor" android:background="?attr/colorTextBackgound"
android:id="@+id/viewglobalcrashreportLinearLayout1"> android:id="@+id/viewglobalcrashreportLinearLayout1">
<android.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor" android:background="?attr/colorTittleBackgound"
android:titleTextColor="?attr/colorTittle"
android:id="@+id/viewglobalcrashreportToolbar1"/> android:id="@+id/viewglobalcrashreportToolbar1"/>
<ScrollView <ScrollView
@@ -28,7 +30,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="16dp"
android:textColor="?attr/activityTextColor" android:textColor="?attr/colorText"
android:id="@+id/viewglobalcrashreportTextView1"/> android:id="@+id/viewglobalcrashreportTextView1"/>
</HorizontalScrollView> </HorizontalScrollView>

View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="?attr/themeDebug"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor"> android:background="?attr/colorTextBackgound">
<RelativeLayout <RelativeLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="34dp" android:layout_height="34dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="?attr/toolbarBackgroundColor" android:background="?attr/colorTittleBackgound"
android:id="@+id/viewlogRelativeLayoutToolbar"> android:id="@+id/viewlogRelativeLayoutToolbar">
<Button <Button
@@ -19,8 +20,8 @@
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:text="Clean" android:text="Clean"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:backgroundTint="?attr/buttonBackgroundColor" android:backgroundTint="?attr/colorTittleBackgound"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:id="@+id/viewlogButtonClean" android:id="@+id/viewlogButtonClean"
android:layout_marginLeft="5dp"/> android:layout_marginLeft="5dp"/>
@@ -34,8 +35,8 @@
android:layout_toRightOf="@+id/viewlogButtonClean" android:layout_toRightOf="@+id/viewlogButtonClean"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:id="@+id/viewlogTextView1" android:id="@+id/viewlogTextView1"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:textColor="?attr/buttonTextColor"/> android:textColor="?attr/colorText"/>
<cc.winboll.studio.libappbase.widget.LogTagSpinner <cc.winboll.studio.libappbase.widget.LogTagSpinner
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -52,17 +53,17 @@
android:layout_toLeftOf="@+id/viewlogButtonCopy" android:layout_toLeftOf="@+id/viewlogButtonCopy"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="Selectable" android:text="Selectable"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:id="@+id/viewlogCheckBoxSelectable" android:id="@+id/viewlogCheckBoxSelectable"
android:padding="@dimen/log_text_padding" android:padding="@dimen/log_text_padding"
android:textColor="?attr/buttonTextColor"/> android:textColor="?attr/colorText"/>
<Button <Button
android:layout_width="@dimen/log_button_width" android:layout_width="@dimen/log_button_width"
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:backgroundTint="?attr/buttonBackgroundColor" android:backgroundTint="?attr/colorTittleBackgound"
android:text="Copy" android:text="Copy"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
@@ -78,7 +79,7 @@
android:layout_below="@+id/viewlogRelativeLayoutToolbar" android:layout_below="@+id/viewlogRelativeLayoutToolbar"
android:id="@+id/viewlogLinearLayout1" android:id="@+id/viewlogLinearLayout1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="?attr/toolbarBackgroundColor"> android:background="?attr/colorTittleBackgound">
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -87,8 +88,8 @@
android:text="ALL" android:text="ALL"
android:padding="2dp" android:padding="2dp"
android:id="@+id/viewlogCheckBox1" android:id="@+id/viewlogCheckBox1"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/> android:layout_marginRight="5dp"/>
@@ -97,15 +98,15 @@
android:ems="10" android:ems="10"
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:textColor="?attr/activityTextColor" android:textColor="?attr/colorText"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:singleLine="true" android:singleLine="true"
android:id="@+id/tagsearch_et"/> android:id="@+id/tagsearch_et"/>
<HorizontalScrollView <HorizontalScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:scrollbars="none" android:scrollbars="none"
android:padding="2dp" android:padding="2dp"
android:layout_weight="1.0" android:layout_weight="1.0"
@@ -131,7 +132,7 @@
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor" android:background="?attr/colorTextBackgound"
android:id="@+id/viewlogScrollViewLog"> android:id="@+id/viewlogScrollViewLog">
<TextView <TextView
@@ -139,7 +140,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:text="Text" android:text="Text"
android:textColor="#FF00FF00" android:textColor="?attr/debugTextColor"
android:textIsSelectable="true" android:textIsSelectable="true"
android:id="@+id/viewlogTextViewLog"/> android:id="@+id/viewlogTextViewLog"/>

View File

@@ -2,16 +2,18 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:theme="?attr/themeDebug"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor" android:background="?attr/colorTextBackgound"
android:id="@+id/viewglobalcrashreportLinearLayout1"> android:id="@+id/viewglobalcrashreportLinearLayout1">
<android.widget.Toolbar <android.widget.Toolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/toolbarBackgroundColor" android:background="?attr/colorTittleBackgound"
android:titleTextColor="?attr/colorTittle"
android:id="@+id/viewglobalcrashreportToolbar1"/> android:id="@+id/viewglobalcrashreportToolbar1"/>
<ScrollView <ScrollView
@@ -28,7 +30,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="16dp"
android:textColor="?attr/activityTextColor" android:textColor="?attr/colorText"
android:id="@+id/viewglobalcrashreportTextView1"/> android:id="@+id/viewglobalcrashreportTextView1"/>
</HorizontalScrollView> </HorizontalScrollView>

View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="?attr/themeDebug"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor"> android:background="?attr/colorTextBackgound">
<RelativeLayout <RelativeLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="34dp" android:layout_height="34dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="?attr/toolbarBackgroundColor" android:background="?attr/colorTittleBackgound"
android:id="@+id/viewlogRelativeLayoutToolbar"> android:id="@+id/viewlogRelativeLayoutToolbar">
<Button <Button
@@ -19,8 +20,8 @@
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:text="Clean" android:text="Clean"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:backgroundTint="?attr/buttonBackgroundColor" android:backgroundTint="?attr/colorTittleBackgound"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:id="@+id/viewlogButtonClean" android:id="@+id/viewlogButtonClean"
android:layout_marginLeft="5dp"/> android:layout_marginLeft="5dp"/>
@@ -34,8 +35,8 @@
android:layout_toRightOf="@+id/viewlogButtonClean" android:layout_toRightOf="@+id/viewlogButtonClean"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:id="@+id/viewlogTextView1" android:id="@+id/viewlogTextView1"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:textColor="?attr/buttonTextColor"/> android:textColor="?attr/colorText"/>
<cc.winboll.studio.libappbase.widget.LogTagSpinner <cc.winboll.studio.libappbase.widget.LogTagSpinner
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -52,17 +53,17 @@
android:layout_toLeftOf="@+id/viewlogButtonCopy" android:layout_toLeftOf="@+id/viewlogButtonCopy"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="Selectable" android:text="Selectable"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:id="@+id/viewlogCheckBoxSelectable" android:id="@+id/viewlogCheckBoxSelectable"
android:padding="@dimen/log_text_padding" android:padding="@dimen/log_text_padding"
android:textColor="?attr/buttonTextColor"/> android:textColor="?attr/colorText"/>
<Button <Button
android:layout_width="@dimen/log_button_width" android:layout_width="@dimen/log_button_width"
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:backgroundTint="?attr/buttonBackgroundColor" android:backgroundTint="?attr/colorTittleBackgound"
android:text="Copy" android:text="Copy"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
@@ -78,7 +79,7 @@
android:layout_below="@+id/viewlogRelativeLayoutToolbar" android:layout_below="@+id/viewlogRelativeLayoutToolbar"
android:id="@+id/viewlogLinearLayout1" android:id="@+id/viewlogLinearLayout1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="?attr/toolbarBackgroundColor"> android:background="?attr/colorTittleBackgound">
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -87,8 +88,8 @@
android:text="ALL" android:text="ALL"
android:padding="2dp" android:padding="2dp"
android:id="@+id/viewlogCheckBox1" android:id="@+id/viewlogCheckBox1"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:textColor="?attr/buttonTextColor" android:textColor="?attr/colorText"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/> android:layout_marginRight="5dp"/>
@@ -97,15 +98,15 @@
android:ems="10" android:ems="10"
android:layout_height="@dimen/log_button_height" android:layout_height="@dimen/log_button_height"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:textColor="?attr/activityTextColor" android:textColor="?attr/colorText"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:singleLine="true" android:singleLine="true"
android:id="@+id/tagsearch_et"/> android:id="@+id/tagsearch_et"/>
<HorizontalScrollView <HorizontalScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/buttonBackgroundColor" android:background="?attr/colorTittleBackgound"
android:scrollbars="none" android:scrollbars="none"
android:padding="2dp" android:padding="2dp"
android:layout_weight="1.0" android:layout_weight="1.0"
@@ -131,7 +132,7 @@
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/activityBackgroundColor" android:background="?attr/colorTextBackgound"
android:id="@+id/viewlogScrollViewLog"> android:id="@+id/viewlogScrollViewLog">
<TextView <TextView
@@ -139,7 +140,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:textSize="@dimen/log_text_size" android:textSize="@dimen/log_text_size"
android:text="Text" android:text="Text"
android:textColor="#FF00FF00" android:textColor="?attr/debugTextColor"
android:textIsSelectable="true" android:textIsSelectable="true"
android:id="@+id/viewlogTextViewLog"/> android:id="@+id/viewlogTextViewLog"/>

View File

@@ -2,7 +2,7 @@
<resources> <resources>
<!-- 全局主题属性 --> <!-- 全局主题属性 -->
<attr name="themeGlobalCrashActivity" format="reference"/> <attr name="themeDebug" format="reference"/>
<!-- GlobalCrashActivity 样式属性 --> <!-- GlobalCrashActivity 样式属性 -->
<declare-styleable name="GlobalCrashActivity"> <declare-styleable name="GlobalCrashActivity">
@@ -47,4 +47,15 @@
<attr name="activityBackgroundColor" format="color"/> <attr name="activityBackgroundColor" format="color"/>
<attr name="activityTextColor" format="color"/> <attr name="activityTextColor" format="color"/>
<!-- MainWindowStyle 主窗口样式属性 -->
<attr name="mainWindowBackgroundColor" format="color"/>
<attr name="mainWindowTextColor" format="color"/>
<!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
<attr name="mainWindowDarkBackgroundColor" format="color"/>
<attr name="mainWindowDarkTextColor" format="color"/>
<!-- DebugLogStyle 应用调试日志样式属性 -->
<attr name="debugTextColor" format="color"/>
</resources> </resources>

View File

@@ -3,33 +3,38 @@
<!-- APPBaseTheme 深色模式主题 --> <!-- APPBaseTheme 深色模式主题 -->
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar"> <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item> <item name="themeDebug">@style/DebugActivityTheme</item>
<item name="aboutViewBackgroundColor">#FF0D1B2A</item> <item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="aboutViewTextColor">#FFE0E0E0</item> <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
<item name="aboutViewTitleColor">#FFE0E0E0</item> <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
<item name="aboutViewDividerColor">#FF333333</item> <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
<item name="buttonBackgroundColor">#FF1E3A5F</item> <item name="buttonBackgroundColor">#FF1E3A5F</item>
<item name="buttonTextColor">#FFE0E0E0</item> <item name="buttonTextColor">?attr/mainWindowDarkTextColor</item>
<item name="dialogBackgroundColor">#FF0D1B2A</item> <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="dialogTextColor">#FFE0E0E0</item> <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
<item name="toolbarBackgroundColor">#FF1E3A5F</item> <item name="toolbarBackgroundColor">#FF1E3A5F</item>
<item name="toolbarTextColor">#FFE0E0E0</item> <item name="toolbarTextColor">?attr/mainWindowDarkTextColor</item>
<item name="textViewBackgroundColor">#FF0D1B2A</item> <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="textViewTextColor">#FFE0E0E0</item> <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
<item name="editTextBackgroundColor">#FF1E3A5F</item> <item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="editTextTextColor">#FFE0E0E0</item> <item name="editTextTextColor">?attr/mainWindowDarkTextColor</item>
<item name="scrollViewBackgroundColor">#FF0D1B2A</item> <item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="activityBackgroundColor">#FF0D1B2A</item> <item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
<item name="activityTextColor">#FFE0E0E0</item> <item name="activityTextColor">?attr/mainWindowDarkTextColor</item>
<item name="mainWindowBackgroundColor">#FF0D1B2A</item>
<item name="mainWindowTextColor">#FFE0E0E0</item>
<item name="mainWindowDarkBackgroundColor">#FF0D1B2A</item>
<item name="mainWindowDarkTextColor">#FFE0E0E0</item>
</style> </style>
<!-- GlobalCrashActivityTheme 深色模式样式 --> <!-- GlobalCrashActivityTheme 深色模式样式 -->
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar"> <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="android:statusBarColor">#FF0D1B2A</item> <item name="android:statusBarColor">#FF0D1B2A</item>
<item name="colorTittle">#FFE0E0E0</item> <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
<item name="colorTittleBackgound">#FF1E3A5F</item> <item name="colorTittleBackgound">#FF1E3A5F</item>
<item name="colorText">#FFE0E0E0</item> <item name="colorText">?attr/debugTextColor</item>
<item name="colorTextBackgound">#FF0D1B2A</item> <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
<item name="debugTextColor">#FF00FF00</item>
</style> </style>
<!-- DialogStyle 对话框样式 --> <!-- DialogStyle 对话框样式 -->

View File

@@ -2,7 +2,7 @@
<resources> <resources>
<!-- 全局主题属性 --> <!-- 全局主题属性 -->
<attr name="themeGlobalCrashActivity" format="reference"/> <attr name="themeDebug" format="reference"/>
<!-- AboutView 样式属性 --> <!-- AboutView 样式属性 -->
<declare-styleable name="AboutView"> <declare-styleable name="AboutView">
@@ -53,4 +53,15 @@
<attr name="activityBackgroundColor" format="color"/> <attr name="activityBackgroundColor" format="color"/>
<attr name="activityTextColor" format="color"/> <attr name="activityTextColor" format="color"/>
<!-- MainWindowStyle 主窗口样式属性 -->
<attr name="mainWindowBackgroundColor" format="color"/>
<attr name="mainWindowTextColor" format="color"/>
<!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
<attr name="mainWindowDarkBackgroundColor" format="color"/>
<attr name="mainWindowDarkTextColor" format="color"/>
<!-- DebugLogStyle 应用调试日志样式属性 -->
<attr name="debugTextColor" format="color"/>
</resources> </resources>

View File

@@ -3,4 +3,6 @@
<string name="lib_name">libappbase</string> <string name="lib_name">libappbase</string>
<string name="hello_world">Hello, world!</string> <string name="hello_world">Hello, world!</string>
<string name="shared_user_id">cc.winboll.studio</string>
<string name="shared_user_label">studio@winboll.cc</string>
</resources> </resources>

View File

@@ -3,33 +3,38 @@
<!-- APPBaseTheme 普通模式主题 --> <!-- APPBaseTheme 普通模式主题 -->
<style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar"> <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item> <item name="themeDebug">@style/DebugActivityTheme</item>
<item name="aboutViewBackgroundColor">#FFF5F5F5</item> <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="aboutViewTextColor">#FF000000</item> <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
<item name="aboutViewTitleColor">#FF000000</item> <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
<item name="aboutViewDividerColor">#FFE0E0E0</item> <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
<item name="buttonBackgroundColor">#FF00B322</item> <item name="buttonBackgroundColor">#FF00B322</item>
<item name="buttonTextColor">#FF000000</item> <item name="buttonTextColor">?attr/mainWindowTextColor</item>
<item name="dialogBackgroundColor">#FFF5F5F5</item> <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="dialogTextColor">#FF000000</item> <item name="dialogTextColor">?attr/mainWindowTextColor</item>
<item name="toolbarBackgroundColor">#FF00B322</item> <item name="toolbarBackgroundColor">#FF00B322</item>
<item name="toolbarTextColor">#FF000000</item> <item name="toolbarTextColor">?attr/mainWindowTextColor</item>
<item name="textViewBackgroundColor">#FFF5F5F5</item> <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="textViewTextColor">#FF000000</item> <item name="textViewTextColor">?attr/mainWindowTextColor</item>
<item name="editTextBackgroundColor">#FFFFFFFF</item> <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="editTextTextColor">#FF000000</item> <item name="editTextTextColor">?attr/mainWindowTextColor</item>
<item name="scrollViewBackgroundColor">#FFF5F5F5</item> <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="activityBackgroundColor">#FFF5F5F5</item> <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
<item name="activityTextColor">#FF000000</item> <item name="activityTextColor">?attr/mainWindowTextColor</item>
<item name="mainWindowBackgroundColor">#FFF5F5F5</item>
<item name="mainWindowTextColor">#FF000000</item>
<item name="mainWindowDarkBackgroundColor">#FF0D1B2A</item>
<item name="mainWindowDarkTextColor">#FFE0E0E0</item>
</style> </style>
<!-- GlobalCrashActivityTheme 普通模式样式 --> <!-- GlobalCrashActivityTheme 普通模式样式 -->
<style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar"> <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
<item name="android:statusBarColor">#FF00B322</item> <item name="android:statusBarColor">#FF00B322</item>
<item name="colorTittle">#FF000000</item> <item name="colorTittle">?attr/mainWindowTextColor</item>
<item name="colorTittleBackgound">#FF00B322</item> <item name="colorTittleBackgound">#FF00B322</item>
<item name="colorText">#FF000000</item> <item name="colorText">?attr/debugTextColor</item>
<item name="colorTextBackgound">#FFF5F5F5</item> <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
<item name="debugTextColor">#FF808080</item>
</style> </style>
<!-- DialogStyle 对话框样式 --> <!-- DialogStyle 对话框样式 -->