diff --git a/appbase/build.gradle b/appbase/build.gradle index 14f2a08..5b6b64e 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -33,7 +33,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.20" + versionName "15.21" if(true) { versionName = genVersionName("${versionName}") } @@ -44,10 +44,24 @@ android { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } + packagingOptions { + exclude 'META-INF/LICENSE.md' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE.md' + exclude 'META-INF/NOTICE.txt' + } } dependencies { api project(':libappbase') - + + // WinBoLL库 nexus.winboll.cc 地址 + //api 'cc.winboll.studio:libappbase:15.20.+' + api 'cc.winboll.studio:libaes:15.20.21' + api 'androidx.appcompat:appcompat:1.3.1' + // JavaMail SMTP (Android兼容版) + api 'com.sun.mail:android-mail:1.6.7' + api 'com.sun.mail:android-activation:1.6.7' + api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/appbase/build.properties b/appbase/build.properties index c69f63b..1bef60a 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jun 28 20:55:57 HKT 2026 -stageCount=35 +#Tue Jul 21 18:04:08 HKT 2026 +stageCount=4 libraryProject=libappbase -baseVersion=15.20 -publishVersion=15.20.34 -buildCount=0 -baseBetaVersion=15.20.35 +baseVersion=15.21 +publishVersion=15.21.3 +buildCount=15 +baseBetaVersion=15.21.4 diff --git a/appbase/proguard-rules.pro b/appbase/proguard-rules.pro index 574eeec..be86632 100644 --- a/appbase/proguard-rules.pro +++ b/appbase/proguard-rules.pro @@ -73,6 +73,10 @@ -dontwarn java.util.function.** # ============================== 第三方框架规则 ============================== +# JavaMail(libaes SMTPConfigView依赖) +-keep class javax.mail.** { *; } +-dontwarn javax.mail.** + # Retrofit + OkHttp -keep class retrofit2.** { *; } -keep interface retrofit2.** { *; } diff --git a/appbase/src/beta/AndroidManifest.xml b/appbase/src/beta/AndroidManifest.xml index 32817e8..26dcaf0 100644 --- a/appbase/src/beta/AndroidManifest.xml +++ b/appbase/src/beta/AndroidManifest.xml @@ -1,14 +1,15 @@ - - + + + + + - - - - + \ No newline at end of file diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 4c0df09..90f90be 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -22,15 +22,17 @@ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"> + + + + - - + + diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/App.java b/appbase/src/main/java/cc/winboll/studio/appbase/App.java index cfd440d..3895eab 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java @@ -1,9 +1,13 @@ package cc.winboll.studio.appbase; +import android.content.SharedPreferences; + import cc.winboll.studio.libappbase.CrashActivity; import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils; +import cc.winboll.studio.libappbase.utils.SMTPUtils; import java.io.PrintWriter; import java.io.StringWriter; @@ -18,6 +22,9 @@ public class App extends GlobalApplication { /** 当前应用类的日志 TAG(用于调试输出,标识日志来源) */ public static final String TAG = "App"; + /** SMTP配置 SharedPreferences 名称 */ + private static final String PREF_NAME = "smtp_config"; + /** * 应用创建时回调(全局初始化入口) * 在应用进程启动时执行,仅调用一次,用于初始化全局工具类、第三方库等 @@ -41,9 +48,62 @@ public class App extends GlobalApplication { stackTraceStr, CrashActivity.class ); + sendExceptionMail(stackTraceStr); } } + /** + * 发送异常报告邮件 + * 读取SMTP配置,若配置完整则在子线程发送异常堆栈邮件 + * @param stackTraceStr 异常堆栈信息 + */ + private void sendExceptionMail(final String stackTraceStr) { + SharedPreferences sp = getSharedPreferences(PREF_NAME, MODE_PRIVATE); + final String host = sp.getString("smtp_server", ""); + final String portStr = sp.getString("smtp_port", ""); + final String sender = sp.getString("sender_email", ""); + final String auth = sp.getString("auth_code", ""); + final String recipient = sp.getString("recipient_email", ""); + + if (host.isEmpty() || portStr.isEmpty() || sender.isEmpty() + || auth.isEmpty() || recipient.isEmpty()) { + LogUtils.d(TAG, "sendExceptionMail skipped, SMTP config incomplete"); + return; + } + + final int port; + try { + port = Integer.parseInt(portStr); + } catch (NumberFormatException e) { + LogUtils.e(TAG, "sendExceptionMail failed, port format error: " + portStr); + return; + } + + new Thread(new Runnable() { + @Override + public void run() { + String deviceInfo = "\n\n--- Device Info ---\n" + + "Package: " + getPackageName() + "\n" + + "Time: " + System.currentTimeMillis() + "\n"; + + boolean success = SMTPUtils.sendTextMail( + recipient, + "APPBase 异常报告", + stackTraceStr + deviceInfo, + sender, + auth, + host, + port); + + if (success) { + LogUtils.d(TAG, "sendExceptionMail success"); + } else { + LogUtils.e(TAG, "sendExceptionMail failed"); + } + } + }).start(); + } + /** * 应用终止时回调(资源释放入口) * 仅在模拟环境(如 Android Studio 模拟器)中可靠触发,真机上可能因系统回收进程不执行 @@ -56,4 +116,3 @@ public class App extends GlobalApplication { ToastUtils.release(); } } - diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index 96b99c4..b26c08e 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -1,8 +1,12 @@ package cc.winboll.studio.appbase; import android.app.Activity; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.ShortcutInfo; +import android.content.pm.ShortcutManager; +import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Bundle; import android.view.Menu; @@ -11,6 +15,7 @@ import android.view.View; import android.widget.Toolbar; import cc.winboll.studio.appbase.R; import cc.winboll.studio.appbase.model.TestBean; +import cc.winboll.studio.appbase.develop.APPExcetionMailSettingsActivity; import cc.winboll.studio.libappbase.LogActivity; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; @@ -45,6 +50,7 @@ public class MainActivity extends Activity { setActionBar(mToolbar); // 将 Toolbar 替代系统默认 ActionBar initTestData(); + setupShortcuts(); } void initTestData() { @@ -60,6 +66,36 @@ public class MainActivity extends Activity { return "/BaseBaen/"+TestBean.class.getName()+".json"; } + /** + * 注册桌面图标静态快捷方式 + * 长按桌面图标后显示快捷菜单,点击可直接打开异常邮件接收设置页面 + */ + private void setupShortcuts() { + if (!"cc.winboll.studio.appbase.beta".equals(getPackageName())) { + return; + } + + ShortcutManager shortcutManager = getSystemService(ShortcutManager.class); + if (shortcutManager == null) { + return; + } + + Intent intent = new Intent(this, APPExcetionMailSettingsActivity.class); + intent.setAction(Intent.ACTION_VIEW); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + + ShortcutInfo shortcut = new ShortcutInfo.Builder(this, "exception_mail_settings") + .setShortLabel("邮件设置") + .setLongLabel("异常邮件接收设置") + .setIcon(Icon.createWithResource(this, R.drawable.ic_winboll)) + .setIntent(intent) + .build(); + + shortcutManager.setDynamicShortcuts( + java.util.Arrays.asList(shortcut) + ); + } + /** * 创建菜单时回调(加载工具栏菜单) * 初始化 ActionBar 菜单,加载自定义菜单布局 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/develop/APPExcetionMailSettingsActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/develop/APPExcetionMailSettingsActivity.java new file mode 100644 index 0000000..8a982d0 --- /dev/null +++ b/appbase/src/main/java/cc/winboll/studio/appbase/develop/APPExcetionMailSettingsActivity.java @@ -0,0 +1,27 @@ +package cc.winboll.studio.appbase.develop; + +import android.app.Activity; +import android.os.Bundle; +import cc.winboll.studio.appbase.R; +import cc.winboll.studio.libaes.views.SMTPConfigView; + +/** + * @Author 豆包&BigPickle&MiMo&ZhanGSKen + * @Date 2026/07/21 12:44 + * @Describe 应用异常信息邮件接收账号设置 + * 使用libaes的SMTPConfigView控件配置SMTP服务器参数 + */ +public class APPExcetionMailSettingsActivity extends Activity { + + public static final String TAG = "APPExcetionMailSettingsActivity"; + + private SMTPConfigView mSMTPConfigView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_appexcetionmailsettings); + + mSMTPConfigView = (SMTPConfigView) findViewById(R.id.smtp_config_view); + } +} diff --git a/appbase/src/main/res/layout-night/activity_main2.xml b/appbase/src/main/res/layout-night/activity_main2.xml index 7a96c0c..7e447c2 100644 --- a/appbase/src/main/res/layout-night/activity_main2.xml +++ b/appbase/src/main/res/layout-night/activity_main2.xml @@ -12,6 +12,6 @@ android:layout_height="wrap_content" android:text="Main2Activity" android:textSize="24sp" - android:textColor="@color/gray_900"/> + android:textColor="#212121"/> \ No newline at end of file diff --git a/appbase/src/main/res/layout/activity_appexcetionmailsettings.xml b/appbase/src/main/res/layout/activity_appexcetionmailsettings.xml new file mode 100644 index 0000000..9f38164 --- /dev/null +++ b/appbase/src/main/res/layout/activity_appexcetionmailsettings.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/appbase/src/main/res/values-night/styles.xml b/appbase/src/main/res/values-night/styles.xml index a03559c..350b676 100644 --- a/appbase/src/main/res/values-night/styles.xml +++ b/appbase/src/main/res/values-night/styles.xml @@ -9,6 +9,6 @@ ?attr/toolbarBackgroundColor ?attr/debugTextColor ?attr/mainWindowDarkBackgroundColor - @color/toolbarTextColor + #FF000000 \ No newline at end of file diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml index be91a4e..62c6e3a 100644 --- a/appbase/src/main/res/values/styles.xml +++ b/appbase/src/main/res/values/styles.xml @@ -9,6 +9,6 @@ ?attr/toolbarBackgroundColor ?attr/debugTextColor ?attr/mainWindowBackgroundColor - @color/toolbarTextColor + #FF000000 diff --git a/libappbase/build.properties b/libappbase/build.properties index 653f2a0..1bef60a 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jun 28 20:55:33 HKT 2026 -stageCount=35 +#Tue Jul 21 18:04:08 HKT 2026 +stageCount=4 libraryProject=libappbase -baseVersion=15.20 -publishVersion=15.20.34 -buildCount=0 -baseBetaVersion=15.20.35 +baseVersion=15.21 +publishVersion=15.21.3 +buildCount=15 +baseBetaVersion=15.21.4 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashActivity.java index 552f706..a86531f 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashActivity.java @@ -14,6 +14,7 @@ import android.widget.HorizontalScrollView; import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; +import cc.winboll.studio.libappbase.common.ViewColorTable; public final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener { private static final int MENUITEM_COPY = 0; @@ -35,13 +36,13 @@ public final class CrashActivity extends Activity implements MenuItem.OnMenuItem contentView.setFillViewport(true); HorizontalScrollView hw = new HorizontalScrollView(this); - hw.setBackgroundColor(0xFFF5F5F5); + hw.setBackgroundColor(ViewColorTable.ListItemBgPressedColor); TextView message = new TextView(this); final int padding = dp2px(16); message.setPadding(padding, padding, padding, padding); message.setText(mLog); - message.setTextColor(0xFF000000); + message.setTextColor(ViewColorTable.TextPrimaryColor); message.setTextIsSelectable(true); hw.addView(message); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java index 7ecedcc..712ae6b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java @@ -2,7 +2,6 @@ package cc.winboll.studio.libappbase; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Color; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; @@ -12,6 +11,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toolbar; import cc.winboll.studio.libappbase.R; +import cc.winboll.studio.libappbase.common.ViewColorTable; import android.content.res.Resources; /** @@ -179,9 +179,9 @@ public class GlobalCrashReportView extends LinearLayout { // 设置默认配色(使用 debugTextColor 属性) Resources.Theme theme = mContext.getTheme(); mTitleColor = theme.getResources().getColor(android.R.color.holo_green_dark); - mTitleBackgroundColor = Color.GRAY; + mTitleBackgroundColor = ViewColorTable.SwitchTrackNormalColor; mTextColor = obtainDebugTextColor(theme); - mTextBackgroundColor = Color.WHITE; + mTextBackgroundColor = ViewColorTable.CardSurfaceColor; // 加载布局 inflateView(); // 初始化控件样式 @@ -196,11 +196,11 @@ public class GlobalCrashReportView extends LinearLayout { 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); + int color = debugTypedArray.getColor(0, ViewColorTable.TextSecondaryColor); debugTypedArray.recycle(); return color; } - return Color.GRAY; + return ViewColorTable.TextSecondaryColor; } /** @@ -219,16 +219,16 @@ public class GlobalCrashReportView extends LinearLayout { // 读取自定义属性值(无设置时使用默认值) mTitleColor = typedArray.getColor( R.styleable.GlobalCrashActivity_colorTittle, - Color.BLACK + ViewColorTable.TextPrimaryColor ); mTitleBackgroundColor = typedArray.getColor( R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注:原拼写错误(Backgound→Background),保持与 attrs.xml 一致 - Color.BLACK + ViewColorTable.TextPrimaryColor ); mTextColor = obtainDebugTextColor(mContext.getTheme()); mTextBackgroundColor = typedArray.getColor( R.styleable.GlobalCrashActivity_colorTextBackgound, // 注:原拼写错误,保持与 attrs.xml 一致 - Color.WHITE + ViewColorTable.CardSurfaceColor ); // 回收 TypedArray,避免内存泄漏 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java index 56f5d38..f76ba6f 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java @@ -28,6 +28,7 @@ import android.widget.ScrollView; import android.widget.TextView; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.R; +import cc.winboll.studio.libappbase.common.ViewColorTable; import cc.winboll.studio.libappbase.views.HorizontalListView; import cc.winboll.studio.libappbase.widget.LogTagSpinner; import java.text.Collator; @@ -117,7 +118,7 @@ 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.setTextColor(ViewColorTable.EditTextContentColor); metTagSearch.addTextChangedListener(new TextWatcher() { @Override @@ -250,7 +251,7 @@ public class LogView extends RelativeLayout { mSelectAllTAGCheckBox.setLayoutParams(layoutParams2); //mSelectAllTAGCheckBox.setPadding(0,0,0,0); TypedArray ta1 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor }); - int toolbarTextColor1 = ta1.getColor(0, mContext.getResources().getColor(R.color.white)); + int toolbarTextColor1 = ta1.getColor(0, ViewColorTable.ToolbarTitleTextColor); ta1.recycle(); mSelectAllTAGCheckBox.setTextColor(toolbarTextColor1); mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){ @@ -507,14 +508,14 @@ public class LogView extends RelativeLayout { holder.tvText.setLayoutParams(layoutParams); holder.tvText.setPadding(0,0,0,0); TypedArray ta2 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor }); - int toolbarTextColor2 = ta2.getColor(0, mContext.getResources().getColor(R.color.white)); + int toolbarTextColor2 = ta2.getColor(0, ViewColorTable.ToolbarTitleTextColor); ta2.recycle(); holder.tvText.setTextColor(toolbarTextColor2); holder.cbChecked.setChecked(item.isChecked()); holder.cbChecked.setLayoutParams(layoutParams); holder.cbChecked.setPadding(0,0,0,0); TypedArray ta3 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor }); - int toolbarTextColor3 = ta3.getColor(0, mContext.getResources().getColor(R.color.white)); + int toolbarTextColor3 = ta3.getColor(0, ViewColorTable.ToolbarTitleTextColor); ta3.recycle(); holder.cbChecked.setTextColor(toolbarTextColor3); holder.cbChecked.setOnClickListener(new View.OnClickListener(){ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/common/ViewColorTable.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/common/ViewColorTable.java new file mode 100644 index 0000000..0653e40 --- /dev/null +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/common/ViewColorTable.java @@ -0,0 +1,202 @@ +package cc.winboll.studio.libappbase.common; + +import android.graphics.Color; +import cc.winboll.studio.libappbase.LogUtils; + +/** + * @Author 豆包&Big Pickle&MiMo&ZhanGSKen + * @CreateDate 2026/07/21 11:55:00 + * @LastEditDate 2026/07/21 11:56:46 + * @Describe 全局静态控件颜色常量表 + * 命名规范:控件类型+状态/用途+Color + * 全部常量基于android.graphics.Color原生色值定义,统一控件前缀命名规则,无实例化入口,纯静态常量工具类 + * Java7兼容标准,无高版本语法特性,所有函数入参、内部临时变量强制final修饰 + */ +public final class ViewColorTable { + + // 私有构造,禁止外部实例化 + private ViewColorTable() { + final String errMsg = "Cannot instantiate static class ViewColorTable"; + LogUtils.e("ViewColorTable", "constructor invoke failed, msg = " + errMsg); + throw new AssertionError(errMsg); + } + + // ====================== TextView 文本控件颜色常量 ====================== + // 主文本 + public static final int TextPrimaryColor = Color.BLACK; + // 次要说明文本 + public static final int TextSecondaryColor = Color.GRAY; + // 提示占位文字 + public static final int TextHintColor = Color.LTGRAY; + // 错误警告文本 + public static final int TextErrorColor = Color.RED; + // 链接可点击文本 + public static final int TextLinkColor = Color.parseColor("#007AFF"); + // 禁用置灰文本 + public static final int TextDisabledColor = Color.DKGRAY; + // 标题大号文本 + public static final int TextTitleColor = Color.BLACK; + // 白色背景下浅色标题 + public static final int TextTitleLightColor = Color.WHITE; + + // ====================== Button 普通按钮颜色常量 ====================== + // 按钮正常文字 + public static final int ButtonTextNormalColor = Color.WHITE; + // 按钮按下文字 + public static final int ButtonTextPressedColor = Color.LTGRAY; + // 按钮禁用文字 + public static final int ButtonTextDisabledColor = Color.GRAY; + // 边框按钮文字(空心按钮) + public static final int ButtonStrokeTextColor = Color.parseColor("#007AFF"); + + // ====================== Switch 原生开关控件颜色常量 ====================== + // 开关滑块文字 + public static final int SwitchTextColor = Color.WHITE; + // 开关轨道 关闭状态 + public static final int SwitchTrackNormalColor = Color.GRAY; + // 开关轨道 开启状态 + public static final int SwitchTrackCheckedColor = Color.parseColor("#34C759"); + // 开关滑块 + public static final int SwitchThumbColor = Color.WHITE; + + // ====================== EditText 输入框颜色常量 ====================== + // 输入正文文字 + public static final int EditTextContentColor = Color.BLACK; + // 输入框提示文字 + public static final int EditTextHintColor = Color.GRAY; + // 输入框光标 + public static final int EditTextCursorColor = Color.parseColor("#007AFF"); + // 输入框底部线 正常 + public static final int EditTextLineNormalColor = Color.LTGRAY; + // 输入框底部线 聚焦 + public static final int EditTextLineFocusedColor = Color.parseColor("#007AFF"); + // 输入框底部线 错误 + public static final int EditTextLineErrorColor = Color.RED; + + // ====================== CheckBox 多选框颜色常量 ====================== + // 多选框文字 + public static final int CheckBoxTextColor = Color.BLACK; + // 多选框勾选状态 + public static final int CheckBoxCheckedColor = Color.parseColor("#007AFF"); + // 多选框未勾选边框 + public static final int CheckBoxUnCheckStrokeColor = Color.GRAY; + + // ====================== RadioButton 单选框颜色常量 ====================== + public static final int RadioTextColor = Color.BLACK; + public static final int RadioCheckedCircleColor = Color.parseColor("#007AFF"); + public static final int RadioUnCheckedStrokeColor = Color.GRAY; + + // ====================== ProgressBar 进度条颜色常量 ====================== + // 进度底色 + public static final int ProgressTrackColor = Color.LTGRAY; + // 已完成进度 + public static final int ProgressValueColor = Color.parseColor("#34C759"); + // 缓冲进度(视频/文件下载) + public static final int ProgressBufferColor = Color.GRAY; + + // ====================== SeekBar 拖动条颜色常量 ====================== + public static final int SeekBarTrackNormalColor = Color.LTGRAY; + public static final int SeekBarTrackProgressColor = Color.parseColor("#007AFF"); + public static final int SeekBarThumbColor = Color.parseColor("#007AFF"); + + // ====================== TabLayout 标签栏颜色常量 ====================== + // Tab未选中文字 + public static final int TabTextNormalColor = Color.GRAY; + // Tab选中文字 + public static final int TabTextSelectedColor = Color.parseColor("#007AFF"); + // Tab底部指示器 + public static final int TabIndicatorColor = Color.parseColor("#007AFF"); + + // ====================== Divider 分割线颜色常量 ====================== + public static final int DividerLineColor = Color.parseColor("#EEEEEE"); + public static final int DividerDarkLineColor = Color.parseColor("#DDDDDD"); + + // ====================== CardView 卡片颜色常量 ====================== + // 卡片背景 + public static final int CardSurfaceColor = Color.WHITE; + // 卡片边框 + public static final int CardStrokeColor = Color.parseColor("#EEEEEE"); + + // ====================== Dialog / Popup 弹窗颜色常量 ====================== + // 弹窗标题文字 + public static final int DialogTitleTextColor = Color.BLACK; + // 弹窗内容文字 + public static final int DialogContentTextColor = Color.GRAY; + // 弹窗取消按钮文字 + public static final int DialogCancelTextColor = Color.GRAY; + // 弹窗确认按钮文字 + public static final int DialogConfirmTextColor = Color.parseColor("#007AFF"); + // 弹窗遮罩背景 + public static final int DialogMaskBgColor = 0xCC000000; + + // ====================== Toolbar / TopBar 顶部栏颜色常量 ====================== + public static final int ToolbarTitleTextColor = Color.WHITE; + public static final int ToolbarSubTitleTextColor = Color.LTGRAY; + public static final int ToolbarIconTintColor = Color.WHITE; + + // ====================== StatusBar / NavigationBar 系统栏颜色常量 ====================== + // 浅色状态栏(黑文字) + public static final int StatusBarLightBgColor = Color.WHITE; + // 深色状态栏(白文字) + public static final int StatusBarDarkBgColor = Color.parseColor("#212121"); + public static final int NavBarBgLightColor = Color.WHITE; + public static final int NavBarBgDarkColor = Color.parseColor("#212121"); + + // ====================== SwitchCompat AppCompat兼容开关颜色常量 ====================== + public static final int SwitchCompatTrackOffColor = Color.GRAY; + public static final int SwitchCompatTrackOnColor = Color.parseColor("#34C759"); + public static final int SwitchCompatThumbNormalColor = Color.WHITE; + + // ====================== Chip 标签气泡控件颜色常量 ====================== + public static final int ChipTextNormalColor = Color.parseColor("#007AFF"); + public static final int ChipBgNormalColor = Color.parseColor("#E6F0FF"); + public static final int ChipCloseIconTintColor = Color.GRAY; + + // ====================== FloatingActionButton 悬浮按钮颜色常量 ====================== + public static final int FabIconTintColor = Color.WHITE; + public static final int FabBgNormalColor = Color.parseColor("#007AFF"); + public static final int FabBgPressedColor = Color.parseColor("#005CC8"); + + // ====================== RadioGroup/CheckBoxGroup 选择组颜色常量 ====================== + public static final int GroupLabelTextColor = Color.BLACK; + + // ====================== RecyclerView 列表颜色常量 ====================== + // 列表条目背景 + public static final int ListItemBgNormalColor = Color.WHITE; + // 列表条目按压背景 + public static final int ListItemBgPressedColor = Color.parseColor("#F5F5F5"); + // 列表条目禁用背景 + public static final int ListItemBgDisabledColor = Color.parseColor("#FAFAFA"); + + // ====================== Badge 角标红点颜色常量 ====================== + public static final int BadgeDotBgColor = Color.RED; + public static final int BadgeTextColor = Color.WHITE; + + // ====================== 静态工具函数区域 ====================== + /** + * 调试打印指定颜色常量十六进制字符串 + * @param color 目标颜色值,强制final + * @param tag 颜色标识标签,强制final + * @return 格式化十六进制颜色字符串 + */ + public static String getColorHex(final int color, final String tag) { + LogUtils.d("ViewColorTable", "getColorHex invoke, tag = " + tag + ", rawColorInt = " + color); + final String hexStr = String.format("#%06X", 0xFFFFFF & color); + LogUtils.d("ViewColorTable", "getColorHex result hex = " + hexStr); + return hexStr; + } + + /** + * 校验颜色值是否为透明色 + * @param color 待校验颜色值,强制final + * @return true=完全透明,false=非透明 + */ + public static boolean isColorTransparent(final int color) { + LogUtils.d("ViewColorTable", "isColorTransparent invoke, checkColor = " + color); + final int alpha = Color.alpha(color); + final boolean result = alpha == 0; + LogUtils.d("ViewColorTable", "isColorTransparent alpha = " + alpha + ", result = " + result); + return result; + } +} + diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/SMTPUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/SMTPUtils.java new file mode 100644 index 0000000..6f5fb4f --- /dev/null +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/SMTPUtils.java @@ -0,0 +1,323 @@ +package cc.winboll.studio.libappbase.utils; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.Socket; +import javax.net.ssl.SSLSocketFactory; + +import cc.winboll.studio.libappbase.LogUtils; + +/** + * @Author 豆包&BigPickle&MiMo&ZhanGSKen + * @CreateDate 2026/07/21 + * @LastEditDate 2026/07/21 + * @Describe SMTP邮件发送工具类(原生Socket实现,零外部依赖) + * 基于QQ SMTP服务(smtp.qq.com:465 SSL),支持纯文本和HTML邮件 + * Java7兼容标准,无高版本语法特性 + */ +public final class SMTPUtils { + + private static final String TAG = "SMTPUtils"; + + // QQ SMTP 服务器地址 + private static final String DEFAULT_SMTP_HOST = "smtp.qq.com"; + // QQ SMTP SSL 端口 + private static final int DEFAULT_SMTP_PORT = 465; + + // 私有构造,禁止实例化 + private SMTPUtils() { + final String errMsg = "Cannot instantiate static class SMTPUtils"; + LogUtils.e(TAG, "constructor invoke failed, msg = " + errMsg); + throw new AssertionError(errMsg); + } + + /** + * 发送纯文本邮件(QQ SMTP SSL) + * @param to收件人邮箱地址 + * @param subject 邮件主题 + * @param body 邮件正文(纯文本) + * @param from 发件人QQ邮箱地址 + * @param authCode QQ邮箱授权码(非QQ密码) + * @return true=发送成功,false=发送失败 + */ + public static boolean sendTextMail( + final String to, + final String subject, + final String body, + final String from, + final String authCode) { + return sendMail(to, subject, body, from, authCode, false, + DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT); + } + + /** + * 发送纯文本邮件(自定义SMTP服务器) + * @param to 收件人邮箱地址 + * @param subject 邮件主题 + * @param body 邮件正文(纯文本) + * @param from 发件人邮箱地址 + * @param authCode 邮箱授权码 + * @param host SMTP服务器地址 + * @param port SMTP端口 + * @return true=发送成功,false=发送失败 + */ + public static boolean sendTextMail( + final String to, + final String subject, + final String body, + final String from, + final String authCode, + final String host, + final int port) { + return sendMail(to, subject, body, from, authCode, false, host, port); + } + + /** + * 发送HTML邮件(QQ SMTP SSL) + * @param to 收件人邮箱地址 + * @param subject 邮件主题 + * @param body 邮件正文(HTML格式) + * @param from 发件人QQ邮箱地址 + * @param authCode QQ邮箱授权码(非QQ密码) + * @return true=发送成功,false=发送失败 + */ + public static boolean sendHtmlMail( + final String to, + final String subject, + final String body, + final String from, + final String authCode) { + return sendMail(to, subject, body, from, authCode, true, + DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT); + } + + /** + * 发送HTML邮件(自定义SMTP服务器) + * @param to 收件人邮箱地址 + * @param subject 邮件主题 + * @param body 邮件正文(HTML格式) + * @param from 发件人邮箱地址 + * @param authCode 邮箱授权码 + * @param host SMTP服务器地址 + * @param port SMTP端口 + * @return true=发送成功,false=发送失败 + */ + public static boolean sendHtmlMail( + final String to, + final String subject, + final String body, + final String from, + final String authCode, + final String host, + final int port) { + return sendMail(to, subject, body, from, authCode, true, host, port); + } + + /** + * 发送邮件核心方法(QQ SMTP SSL) + * @param to 收件人邮箱地址 + * @param subject 邮件主题 + * @param body 邮件正文 + * @param from 发件人QQ邮箱地址 + * @param authCode QQ邮箱授权码 + * @param isHtml 是否HTML格式 + * @return true=发送成功,false=发送失败 + */ + private static boolean sendMail( + final String to, + final String subject, + final String body, + final String from, + final String authCode, + final boolean isHtml, + final String host, + final int port) { + + LogUtils.d(TAG, "sendMail invoke, to=" + to + ", subject=" + subject + + ", isHtml=" + isHtml + ", host=" + host + ":" + port); + + // 参数校验 + if (to == null || to.isEmpty()) { + LogUtils.e(TAG, "sendMail failed, reason: recipient address is empty"); + return false; + } + if (from == null || from.isEmpty()) { + LogUtils.e(TAG, "sendMail failed, reason: sender address is empty"); + return false; + } + if (authCode == null || authCode.isEmpty()) { + LogUtils.e(TAG, "sendMail failed, reason: auth code is empty"); + return false; + } + + Socket socket = null; + BufferedReader reader = null; + OutputStream output = null; + + try { + // 1. 创建SSL连接 + LogUtils.d(TAG, " connecting to " + host + ":" + port); + SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault(); + socket = factory.createSocket(host, port); + socket.setSoTimeout(10000); + + reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8")); + output = socket.getOutputStream(); + + // 2. 读取服务器欢迎信息 + String response = readResponse(reader); + LogUtils.d(TAG, "S: " + response); + if (!response.startsWith("220")) { + LogUtils.e(TAG, "sendMail failed, SMTP server greeting error: " + response); + return false; + } + + // 3. EHLO 握手 + sendCommand(output, "EHLO localhost", reader); + + // 4. AUTH LOGIN + sendCommand(output, "AUTH LOGIN", reader); + + // 5. 发送Base64编码的用户名(发件人邮箱) + sendCommand(output, base64Encode(from), reader); + + // 6. 发送Base64编码的授权码 + sendCommand(output, base64Encode(authCode), reader); + + // 7. 设置发件人 + sendCommand(output, "MAIL FROM:<" + from + ">", reader); + + // 8. 设置收件人 + sendCommand(output, "RCPT TO:<" + to + ">", reader); + + // 9. 开始数据传输 + sendCommand(output, "DATA", reader); + + // 10. 构建邮件内容 + String contentType = isHtml ? "text/html; charset=UTF-8" : "text/plain; charset=UTF-8"; + StringBuilder mailContent = new StringBuilder(); + mailContent.append("From: ").append(from).append("\r\n"); + mailContent.append("To: ").append(to).append("\r\n"); + mailContent.append("Subject: ").append(subject).append("\r\n"); + mailContent.append("Content-Type: ").append(contentType).append("\r\n"); + mailContent.append("\r\n"); + mailContent.append(body).append("\r\n"); + mailContent.append(".\r\n"); + + // 11. 发送邮件内容 + output.write(mailContent.toString().getBytes("UTF-8")); + output.flush(); + response = readResponse(reader); + LogUtils.d(TAG, "S: " + response); + + // 12. QUIT 退出 + sendCommand(output, "QUIT", reader); + + LogUtils.d(TAG, "sendMail success, to=" + to + ", subject=" + subject); + return true; + + } catch (Exception e) { + LogUtils.e(TAG, "sendMail exception: " + e.getMessage(), e); + return false; + } finally { + // 关闭资源 + try { + if (output != null) output.close(); + } catch (Exception e) { + LogUtils.e(TAG, "close output exception: " + e.getMessage()); + } + try { + if (reader != null) reader.close(); + } catch (Exception e) { + LogUtils.e(TAG, "close reader exception: " + e.getMessage()); + } + try { + if (socket != null) socket.close(); + } catch (Exception e) { + LogUtils.e(TAG, "close socket exception: " + e.getMessage()); + } + } + } + + /** + * 发送SMTP命令并读取多行响应 + * @param output 输出流 + * @param command SMTP命令 + * @param reader 输入流 + * @return 服务器响应字符串 + */ + private static String sendCommand( + final OutputStream output, + final String command, + final BufferedReader reader) throws Exception { + + LogUtils.d(TAG, "C: " + command); + output.write((command + "\r\n").getBytes("UTF-8")); + output.flush(); + return readResponse(reader); + } + + /** + * 读取SMTP服务器多行响应 + * SMTP协议:以"数字 "开头表示最后一行,以"数字-"开头表示后续还有行 + * @param reader 输入流 + * @return 完整的服务器响应字符串 + */ + private static String readResponse(final BufferedReader reader) throws Exception { + StringBuilder response = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + response.append(line).append("\n"); + // 最后一行:第4位是空格(如 "250 OK") + if (line.length() >= 4 && line.charAt(3) == ' ') { + break; + } + } + return response.toString().trim(); + } + + /** + * 标准Base64编码(Java7兼容,无第三方依赖) + * @param input 待编码字符串 + * @return Base64编码后的字符串 + */ + static String base64Encode(final String input) { + if (input == null || input.isEmpty()) { + return ""; + } + try { + byte[] data = input.getBytes("UTF-8"); + final String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + StringBuilder result = new StringBuilder(); + int i; + // 每3字节一组处理 + for (i = 0; i + 2 < data.length; i += 3) { + int triple = ((data[i] & 0xFF) << 16) + | ((data[i + 1] & 0xFF) << 8) + | (data[i + 2] & 0xFF); + result.append(alphabet.charAt((triple >> 18) & 0x3F)); + result.append(alphabet.charAt((triple >> 12) & 0x3F)); + result.append(alphabet.charAt((triple >> 6) & 0x3F)); + result.append(alphabet.charAt(triple & 0x3F)); + } + // 处理剩余字节 + if (i < data.length) { + int remaining = data[i] & 0xFF; + result.append(alphabet.charAt((remaining >> 2) & 0x3F)); + if (i + 1 < data.length) { + remaining = ((remaining << 8) | (data[i + 1] & 0xFF)); + result.append(alphabet.charAt((remaining >> 4) & 0x3F)); + result.append(alphabet.charAt((remaining << 2) & 0x3F)); + } else { + result.append(alphabet.charAt((remaining << 4) & 0x3F)); + result.append('='); + } + } + return result.toString(); + } catch (Exception e) { + LogUtils.e(TAG, "base64Encode exception: " + e.getMessage(), e); + return ""; + } + } +} diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java index 633bd04..57ad86d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java @@ -19,6 +19,7 @@ import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.R; import cc.winboll.studio.libappbase.ToastUtils; +import cc.winboll.studio.libappbase.common.ViewColorTable; import cc.winboll.studio.libappbase.dialogs.DebugHostDialog; import cc.winboll.studio.libappbase.models.APPInfo; @@ -465,10 +466,10 @@ 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_300)); + drawable.setStroke(1, ViewColorTable.DividerDarkLineColor); 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)); + drawable.setColor(isNightMode ? ViewColorTable.StatusBarDarkBgColor : ViewColorTable.CardSurfaceColor); return drawable; } @@ -495,7 +496,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_500) : mItemContext.getResources().getColor(R.color.gray_900)); + tvTitle.setTextColor(isNightMode ? ViewColorTable.TextDisabledColor : ViewColorTable.TextPrimaryColor); llText.addView(tvTitle); // 内容 TextView tvContent = new TextView(mItemContext); @@ -524,7 +525,7 @@ public class AboutView extends LinearLayout { @Override protected int getContentTextColor() { - return mItemContext.getResources().getColor(R.color.blue_normal); + return ViewColorTable.TextLinkColor; } @Override @@ -567,7 +568,7 @@ public class AboutView extends LinearLayout { @Override protected int getContentTextColor() { - return mItemContext.getResources().getColor(R.color.blue_normal); + return ViewColorTable.TextLinkColor; } @Override diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java index 6c03ff2..7cc3948 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/DebugSwitchInfoImageView.java @@ -9,6 +9,8 @@ import android.content.SharedPreferences; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; +import android.widget.Toast; +import java.util.HashMap; import java.util.UUID; import cc.winboll.studio.libappbase.GlobalApplication; @@ -24,12 +26,26 @@ public class DebugSwitchInfoImageView extends ImageView { // 连续点击计数 private int mClickCount = 0; // 目标点击次数 - private static final int TARGET_CLICK_COUNT = 7; + private static final int TARGET_CLICK_COUNT = 10; private static String mDebugToken = null; private static final String SP_DEBUG_TOKEN = "debug_token_prefs"; private static final String KEY_DEBUG_TOKEN = "debug_token"; + private static final HashMap NUMBER_WORDS = new HashMap(); + static { + NUMBER_WORDS.put(1, "one"); + NUMBER_WORDS.put(2, "two"); + NUMBER_WORDS.put(3, "three"); + NUMBER_WORDS.put(4, "four"); + NUMBER_WORDS.put(5, "five"); + NUMBER_WORDS.put(6, "six"); + NUMBER_WORDS.put(7, "seven"); + NUMBER_WORDS.put(8, "eight"); + NUMBER_WORDS.put(9, "nine"); + NUMBER_WORDS.put(10, "ten"); + } + public static String getDebugToken() { if (mDebugToken != null) { return mDebugToken; @@ -116,6 +132,11 @@ public class DebugSwitchInfoImageView extends ImageView { @Override public void onClick(View v) { mClickCount++; + String word = NUMBER_WORDS.get(mClickCount); + if (word == null) { + word = "One Piece!"; + } + Toast.makeText(getContext(), word, Toast.LENGTH_SHORT).show(); if (mClickCount >= TARGET_CLICK_COUNT) { mClickCount = 0; showDebugTokenDialog(); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java index 32609ec..4ac0b1c 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java @@ -1,7 +1,6 @@ package cc.winboll.studio.libappbase.widget; import android.content.Context; -import android.graphics.Color; import android.text.TextUtils; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -13,6 +12,7 @@ import android.widget.Spinner; import android.widget.TextView; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.R; +import cc.winboll.studio.libappbase.common.ViewColorTable; /** * @Author ZhanGSKen&豆包大模型 @@ -105,7 +105,7 @@ public class LogTagSpinner extends Spinner { setLayoutParams(layoutParams); // 统一背景色(外部可通过 setBackground 手动覆盖) - setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal)); + setBackgroundColor(ViewColorTable.SwitchTrackNormalColor); } @@ -156,10 +156,10 @@ public class LogTagSpinner extends Spinner { //itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START); // 5. 文字颜色(使用主题属性 ?attr/toolbarTextColor) TypedArray ta = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor }); - int toolbarTextColor = ta.getColor(0, mContext.getResources().getColor(R.color.white)); + int toolbarTextColor = ta.getColor(0, ViewColorTable.ToolbarTitleTextColor); ta.recycle(); itemTv.setTextColor(toolbarTextColor); - itemTv.setBackgroundColor(this.mContext.getResources().getColor(R.color.btn_gray_normal)); + itemTv.setBackgroundColor(ViewColorTable.SwitchTrackNormalColor); // 6. 文字溢出处理(最多 2 行,超出省略,避免长标签换行过多) itemTv.setSingleLine(false); itemTv.setMaxLines(2); diff --git a/libappbase/src/main/res/drawable/bg_toolbar_log.xml b/libappbase/src/main/res/drawable/bg_toolbar_log.xml index 84fda8a..5b8627c 100644 --- a/libappbase/src/main/res/drawable/bg_toolbar_log.xml +++ b/libappbase/src/main/res/drawable/bg_toolbar_log.xml @@ -10,8 +10,8 @@ + android:endColor="#FF00B322" + android:startColor="#FF00B322" /> + android:endColor="#FF00B322" + android:startColor="#FF00B322" /> - + - + - + diff --git a/libappbase/src/main/res/drawable/ic_launcher_background.xml b/libappbase/src/main/res/drawable/ic_launcher_background.xml index 9486190..17514cf 100644 --- a/libappbase/src/main/res/drawable/ic_launcher_background.xml +++ b/libappbase/src/main/res/drawable/ic_launcher_background.xml @@ -5,7 +5,7 @@ android:viewportWidth="108" android:viewportHeight="108"> ?attr/mainWindowDarkBackgroundColor ?attr/mainWindowDarkTextColor - @color/toolbarBackgroundColor - @color/toolbarTextColor + #FF00B322 + #FF000000 ?attr/mainWindowDarkBackgroundColor ?attr/mainWindowDarkTextColor ?attr/mainWindowDarkBackgroundColor @@ -21,21 +21,21 @@ ?attr/mainWindowDarkBackgroundColor ?attr/mainWindowDarkBackgroundColor ?attr/mainWindowDarkTextColor - @color/mainWindowBackgroundColor - @color/mainWindowTextColor - @color/mainWindowBackgroundColor - @color/mainWindowTextColor + #FFF5F5F5 + #FF000000 + #FFF5F5F5 + #FF000000 diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml index 92d8143..e59019b 100644 --- a/libappbase/src/main/res/values/styles.xml +++ b/libappbase/src/main/res/values/styles.xml @@ -12,8 +12,8 @@ ?attr/mainWindowBackgroundColor ?attr/mainWindowTextColor - @color/toolbarBackgroundColor - @color/toolbarTextColor + #FF00B322 + #FF000000 ?attr/mainWindowBackgroundColor ?attr/mainWindowTextColor ?attr/mainWindowBackgroundColor @@ -21,21 +21,21 @@ ?attr/mainWindowBackgroundColor ?attr/mainWindowBackgroundColor ?attr/mainWindowTextColor - @color/mainWindowBackgroundColor - @color/mainWindowTextColor - @color/mainWindowBackgroundColor - @color/mainWindowTextColor + #FFF5F5F5 + #FF000000 + #FFF5F5F5 + #FF000000