<gallery>APK 15.0.3 release Publish.

- 主界面相册集预览封面使用背景设置
- 相册浏览界面图片预览使用背景设置
- 返回界面时自动刷新背景设置

README.md

@@ -1,104 +1,103 @@
-WinBoLL 源生态计划项目说明书
+# WinBoLL 源生态计划项目说明书
 
-一、项目概述
+## 一、项目概述
 
-1. 核心定位
+### 1. 核心定位
+WinBoLL 手机源码计划，旨在通过核心项目 WinBoLL 构建手机端与服务器端的 Android 项目的开发源码生态。实现手机与服务器的源码的联合开发。
 
-【OriginMaster】WinBoLL 源生态计划，旨在通过核心项目 WinBoLL 联动系列开发库，构建手机端 Android 项目开发与多端编译同步的完整生态，实现手机与电脑的源码同步开发。
+### 2. 仓库架构
+#### **仓库类型：功能说明**
+☆ 基础项目分支 WinBoLL：手机端安卓应用开发基础模板。
+☆ 应用项目分支 APPBase、AES、PowerBell、Positions**：安卓应用单一管理系列项目。
+☆ 源码汇总管理 OriginMaster**：各类分支源码合并存档，不适宜作为开发库使用。
 
-2. 仓库架构
+### 3. 源码合并管理推送路线图
+⚠️ **注意**：仅仅展示不同应用模块源码的综合管理路线。分支合并操作时，必须具备 Git 管理经验。
 
-仓库类型 包含仓库 功能说明 
+★ WinBoLL → APPBase → OriginMaster
-开发库 WinBoLL、APPBase、AES、PowerBell、Positions 核心开发依赖库，其中 WinBoLL 可作为应用开发的基础继承模板 
+★ WinBoLL → AES → OriginMaster
-分支汇总存档库 OriginMaster 仅用于汇总各开发库分支，不适宜作为开发库克隆使用，非应用开发基础库 
+★ WinBoLL → PowerBell → OriginMaster
+★ WinBoLL → Positions → OriginMaster
 
-3. 源码推送路径
+## 二、WinBoLL 项目核心信息
 
-- WinBoLL → APPBase → OriginMaster
+### 1. 项目简介
-- WinBoLL → AES → OriginMaster
+☆ WinBoLL 项目是为手机端开发Android 项目的需求而设计的项目。
-- WinBoLL → PowerBell → OriginMaster
-- WinBoLL → Positions → OriginMaster
 
-二、WinBoLL APP 核心信息
+### 2. 官方资源
+#### ☆ 官方网站**：https://www.winboll.cc/
+#### ☆ 源码地址：
+★ Gitea：https://gitea.winboll.cc/Studio/WinBoLL.git
+★ GitHub：https://github.com/ZhanGSKen/WinBoLL.git
+★ 码云：https://gitee.com/zhangsken/winboll.git
 
-1. 项目简介
+## 三、应用编译环境检查问题
+### 核心判断条件：
+☆ WinBoLL 项目以文件夹 `"/sdcard/WinBoLLStudio/APKs"` 是否存在为判断环境编译输出条件，因为编译输出的APK文件需要一个可供保存的环境。
 
-WinBoLL Studio Android 应用开源项目，专注于手机端 Android 开发与多端编译同步。
+☆ 文件夹"/sdcard/WinBoLLStudio/APKs" 目录条件设置方法：
+***Linux 服务器端方面***：建立 `/sdcard/WinBoLLStudio/APKs` 目录即可。
+***手机开发端方面***：建立 `"/sdcard/WinBoLLStudio/APKs"` 目录(即 `"/storage/emulated/0/WinBoLLStudio/APKs"` 目录) 即可。
 
-2. 官方资源
+## 四、前置条件
 
-- 官方网站：https://www.winboll.cc/
+### 1. WinBoLL APP 开发环境配置介绍
-- 源码地址：
+####  WinBoLL APK 编译输出内容包括：
-- Gitea：https://gitea.winboll.cc/Studio/WinBoLL.git
+☆ "/sdcard/WinBoLLStudio/APKs"` 目录内的所有应用分支的 APK 文件。
-- GitHub：https://github.com/ZhanGSKen/WinBoLL.git
+☆ "/sdcard/AppProjects/app.apk"文件。
-- 码云：https://gitee.com/zhangsken/winboll.git
+#### WinBoLL APK 源码命名空间规范
-- 托管类库源码：
+☆ WinBoLL 项目使用 "cc.winboll.studio" 作为源码命名空间。在此命名空间下进行源码定义。
-- APPBase（jitpack.io）：https://github.com/ZhanGSKen/APPBase.git
-- AES（jitpack.io）：https://github.com/ZhanGSKen/AES.git
 
-三、通用特征文件夹前置（/sdcard）
+## 五、核心需求规划
 
-- Linux 系统文件夹直接使用  /sdcard 。
+### 1. WinBoLL 应用安全验证需求
-- 手机 SD 卡存储（ /storage/emulated/0 ）挂载的别名也可为  /sdcard 。
+#### ☆ 支持访问 https://console.winboll.cc/ 服务器以校验应用包签名与版本。
 
-四、前置条件
+### 2. 手机端源码开发管理需求
+#### ☆ 支持切换不同 WinBoLL 分支，以开发不同安卓应用。
 
-1. WinBoLL-APP 配置
+## 六、编译与使用指南
 
-- APK 编译输出目录： /sdcard/WinBoLLStudio/APKs/ ，以及  /sdcard/AppProjects/ （命名为  app.apk ）
+### 1. 项目初始化（必须）
-- 签名与命名空间：支持应用签名验证定制化，与衍生 APP 共享  cc.winboll.studio  命名空间
+#### 1.  复制 `settings.gradle-demo` 为 `settings.gradle`。编辑 `settings.gradle` 文件内容，取消对应项目模块注释。
+#### 2.  复制 `gradle.properties-androidx-demo` (Android X 项目) 或 `gradle.properties-android-demo` (基本 Android 项目) 为 `gradle.properties`。
+#### 3.  复制（可选）`local.properties-demo` 为 `local.properties`，编辑 `local.properties` 文件内容，配置 Android SDK 目录。
+#### 4.  **签名设置**：
+    ☆ **调试编译秘钥制作**：使用 Termux 应用终端，cd 进入 GenKeyStore 目录，运行 `bash gen_debug_keystore.sh` 脚本即可生成应用调试秘钥。
+    ☆  **应用秘钥配置方法**：拷贝调试编译秘钥制作生成的 `appkey.jks` 与 `appkey.keystore` 文件到项目根目录即可。
 
-五、核心需求规划
+## 七、应用编译命令介绍
 
-1. 主机端需求
+### （1）类库型模块配置要点
+#### 1.  **优先修改配置文件**：优先修改应用测试项目（目录为 `"<WinBoLl根目录>/<类库测试应用>/"`）内 `build.properties` 文件，设置对应的类库项目名称：`libraryProject=<类库项目模块名>`。
+#### 2.  **编译优先启动步骤**：使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishAPKAddTag.sh <类库测试项目模块名>` 命令。运行后可生成测试项目与类库项目的编译参数文件 `build.properties`。生成的 `build.properties` 文件有两份，一份在测试项目模块的文件夹内，一份在类库项目本身的模块文件夹内。
+#### 3.  **最后类库编译发布步骤**：使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishLIBAddTag.sh <类库项目模块名>` 命令。运行后可发布至 WinBoLL Nexus Maven 库、本地 maven 目录或者是通用默认的 Gradle Maven 库。
 
-- 支持  winboll.cc  域名的用户注册登录服务
+### （2）单一应用型模块与类库测试型模块配置要点
-- 支持  https://console.winboll.cc/api  访问
+#### ☆ APK 编译方法：
+使用 Termux 应用，进入 `"<WinBoLl根目录>"`，运行 `$ bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名>`。
+#### ☆ 运行后的 APK 输出路径：
+★ 默认路径 (`$ bash gradlew assembleBetaDebug` 任务)：APK 在 `/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/debug/` 目录。
+★ 默认路径 (`$ bash assembleStageRelease` 任务)：APK 在 `/sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/` 目录。
+★ 额外输出路径：(假设 `winboll.properties` 文件已配置 `ExtraAPKOutputPath` 属性) 输出至 `ExtraAPKOutputPath` 属性配置的目录下。
 
-2. APP 端需求
+### （3）手机端应用调试命令介绍
+#### ☆ Beta 渠道调试命令
+$bash gradlew assembleBetaDebug
 
-- 实现手机端 Android 应用开发与管理功能
+#### ☆ Stage 渠道调试命令
+$bash gradlew assembleStageDebug
 
-六、编译与使用指南
+### （4）服务器端开发命令介绍
+##### ☆ Stage 渠道应用发布命令为：
+（"<WinBoLl根目录>/settings.gradle"文件需要配置编译模块开启参数，拷贝 settings.gradle-demo 为 settings.gradle 文件取消对应的分支配置部分即可。）
+$bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
+或者是
+$bash gradlew assembleStageRelease
  
-1. 项目初始化（必须）
 
-1. 复制  settings.gradle-demo  为  settings.gradle ，取消对应项目模块注释
+## 八、WinBoLL 应用 APK 版本号命名规则
-2. 复制  gradle.properties-androidx-demo  或  gradle.properties-android-demo  为  gradle.properties 
+### ☆ Stage 渠道：
-3. （可选）复制  local.properties-demo  为  local.properties ，配置 Android SDK 目录
+#### V<应用开发环境编号><应用功能变更号><应用调试阶段号> （示例： APPBase_15.7.0 ）
-4. 签名设置：
+### ☆ Beta 渠道：
-- 调试编译：进入 GenKeyStore 目录执行  bash gen_debug_keystore.sh 
+#### V<应用开发环境编号><应用功能变更号><应用调试阶段号>-beta<调试编译计数>_<调试编译时间(分钟+秒钟)> （示例： APPBase_15.9.6-beta8_5413 ）
-- 非必须：clone keystore 模块，拷贝  appkey.jks  与  appkey.keystore  到项目根目录
- 
-2. 编译命令
- 
-（1）类库型项目
- 
-1. 修改测试项目  build.properties ，设置  libraryProject=<类库项目模块名> 
-2. 编译测试项目： bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
-3. 编译类库项目： bash .winboll/bashPublishLIBAddTag.sh <类库项目模块名> （发布至 WinBoLL Nexus Maven 库）
- 
-（2）应用型项目
- 
-- 编译命令： bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
- 
-（3）调试编译
- 
-- Beta 调试： bash gradlew assembleBetaDebug 
-- Stage 调试： bash gradlew assembleStageDebug
- 
-（4）发布编译
- 
-- Stage 发布：bash .winboll/bashPublishAPKAddTag.sh <应用项目模块名> 
-             或者执行  bash gradlew assembleStageRelease
- 
-3. 编译输出路径
- 
-- 默认路径(assembleBetaDebug任务)： /sdcard/WinBoLLStudio/APKs/<项目根目录名称>/debug/ 
-- 默认路径(assembleStageRelease任务)： /sdcard/WinBoLLStudio/APKs/<项目根目录名称>/tag/ 
-- 额外路径：若  winboll.properties  配置  ExtraAPKOutputPath ，APK 同步拷贝至该ExtraAPKOutputPath路径
- 
-4. 版本号命名规则
- 
-- Stage 渠道： V<应用开发环境编号><应用功能变更号><应用调试阶段号> （示例： APPBase_15.7.0 ）
-- Beta 渠道： V<应用开发环境编号><应用功能变更号><应用调试阶段号>-beta<调试编译计数>_<调试编译时间(分钟+秒钟)> （示例： APPBase_15.9.6-beta8_5413 ）

build.gradle

@@ -1,6 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/public/' } 
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
+        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
+        maven { url "https://clojars.org/repo/" }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
+        google()
+		
         mavenLocal {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
@@ -11,19 +20,6 @@ buildscript {
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
-        
-        maven { url 'https://maven.aliyun.com/repository/public/' } 
-        maven { url 'https://maven.aliyun.com/repository/google/' }
-        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
-        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
-        maven { url "https://clojars.org/repo/" }
-        maven { url "https://jitpack.io" }
-        mavenCentral()
-        google()
-        //println "mavenLocal : ==========="
-        //println mavenLocal().url
-        //println "mavenLocal : ==========="
-        //mavenLocal()
     }
     dependencies {
 	    // 适配MIUI12
@@ -35,6 +31,15 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/public/' } 
+        maven { url 'https://maven.aliyun.com/repository/google/' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
+        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
+        maven { url "https://clojars.org/repo/" }
+        maven { url "https://jitpack.io" }
+        mavenCentral()
+        google()
+		
         mavenLocal {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
@@ -45,19 +50,6 @@ allprojects {
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoLL Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
-        
-        maven { url 'https://maven.aliyun.com/repository/public/' } 
-        maven { url 'https://maven.aliyun.com/repository/google/' }
-        maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
-        maven { url 'https://dl.bintray.com/ppartisan/maven/' }
-        maven { url "https://clojars.org/repo/" }
-        maven { url "https://jitpack.io" }
-        mavenCentral()
-        google()
-        //println "mavenLocal : ==========="
-        //println mavenLocal().url
-        //println "mavenLocal : ==========="
-        //mavenLocal()
     }
     ext {
         // 定义全局变量，常用于版本管理

debugtemp/src/beta/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">DebugTemp☆</string>
-
-</resources>

debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java

@@ -1,340 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.ToastUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-		
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    public static void write(InputStream input, OutputStream output) throws IOException {
-        byte[] buf = new byte[1024 * 8];
-        int len;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}

debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java

@@ -1,33 +0,0 @@
-package cc.winboll.studio.debugtemp;
-
-
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.ToastUtils;
-
-public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
-		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
-        
-        ToastUtils.show("onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}

debugtemp/src/main/res/layout/activity_main.xml

@@ -1,51 +0,0 @@
-<?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:orientation="vertical">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:gravity="center_vertical|center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="DebugTemp"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-

debugtemp/src/main/res/values/strings.xml

@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">DebugTemp</string>
-    
-</resources>

gallery/README.md

@@ -1,7 +1,7 @@
-# WinBoLL
+# Gallery
 
 #### 介绍
-WinBoLL 应用编译功能临时调试项目
+云宝相册应用
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
@@ -10,12 +10,9 @@ WinBoLL 应用编译功能临时调试项目
 
 #### Gradle 编译说明
 调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh debugtemp
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh gallery
 
 #### 使用说明
-3. Termux应用配置：
-- 已安装Termux（包名 com.termux ）；
-- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
 
 #### 参与贡献
 

gallery/build.gradle

@@ -23,7 +23,7 @@ android {
     buildToolsVersion "30.0.3"
 	
     defaultConfig {
-        applicationId "cc.winboll.studio.debugtemp"
+        applicationId "cc.winboll.studio.gallery"
 	    minSdkVersion 23
 		// 适配MIUI12
         targetSdkVersion 30
@@ -103,13 +103,13 @@ dependencies {
     implementation "io.noties.markwon:linkify:$markwonVersion"
     implementation "io.noties.markwon:recycler:$markwonVersion"
 	*/
-	implementation 'com.termux:terminal-emulator:0.118.0'
+	/*implementation 'com.termux:terminal-emulator:0.118.0'
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
-	
+	*/
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.2'
+	api 'cc.winboll.studio:libaes:15.15.9'
-    api 'cc.winboll.studio:libappbase:15.15.11'
+    api 'cc.winboll.studio:libappbase:15.15.19'
 	
 	// WinBoLL备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'

gallery/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 17 04:07:14 HKT 2026
+#Sat Apr 25 20:05:35 HKT 2026
-stageCount=36
+stageCount=4
 libraryProject=
 baseVersion=15.0
-publishVersion=15.0.35
+publishVersion=15.0.3
 buildCount=0
-baseBetaVersion=15.0.36
+baseBetaVersion=15.0.4

gallery/src/beta/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+    <string name="app_name">Gallery+</string>
+</resources>

gallery/src/main/AndroidManifest.xml

@@ -1,16 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.debugtemp">
+    package="cc.winboll.studio.gallery">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
+        android:theme="@style/AppTheme"
         android:resizeableActivity="true"
-        android:name=".App">
+        android:name=".GlobalWinBoLLApplication"
+		android:requestLegacyExternalStorage="true">
 
         <activity
             android:name=".MainActivity"
@@ -26,6 +31,22 @@
 
         </activity>
 
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/settings_title"/>
+
+        <activity
+            android:name=".AlbumActivity"
+            android:label="@string/app_name"/>
+
+        <activity
+            android:name=".ImageViewerActivity"
+            android:label="@string/app_name"/>
+
+        <activity
+            android:name=".TrashActivity"
+            android:label="@string/trash"/>
+
         <meta-data
             android:name="android.max_aspect"
             android:value="4.0"/>

gallery/src/main/java/cc/winboll/studio/gallery/Album.java

@@ -0,0 +1,25 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class Album {
+    public static final String TAG = "Album";
+    private String name;
+    private String path;
+    private Uri coverUri;
+    private int imageCount;
+
+    public Album(String name, String path, Uri coverUri, int imageCount) {
+        LogUtils.d(TAG, "Album created: " + name);
+        this.name = name;
+        this.path = path;
+        this.coverUri = coverUri;
+        this.imageCount = imageCount;
+    }
+
+    public String getName() { return name; }
+    public String getPath() { return path; }
+    public Uri getCoverUri() { return coverUri; }
+    public int getImageCount() { return imageCount; }
+}

gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java

@@ -0,0 +1,157 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.gallery.ImageAdapter.OnImageClickListener;
+
+public class AlbumActivity extends AppCompatActivity {
+    public static final String TAG = "AlbumActivity";
+    private static final int PERMISSION_REQUEST_CODE = 101;
+    public static final String EXTRA_ALBUM_PATH = "album_path";
+    public static final String EXTRA_ALBUM_NAME = "album_name";
+    private RecyclerView recyclerView;
+    private ImageAdapter adapter;
+    private String albumPath;
+    private String albumName;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+        
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        
+        albumPath = getIntent().getStringExtra(EXTRA_ALBUM_PATH);
+        albumName = getIntent().getStringExtra(EXTRA_ALBUM_NAME);
+        
+        getSupportActionBar().setTitle(albumName);
+        
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+        adapter = new ImageAdapter();
+        adapter.setContext(this);
+        recyclerView.setAdapter(adapter);
+        
+        adapter.setOnImageClickListener(new OnImageClickListener() {
+            @Override
+            public void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths) {
+                Intent intent = new Intent(AlbumActivity.this, ImageViewerActivity.class);
+                intent.putParcelableArrayListExtra(ImageViewerActivity.EXTRA_IMAGE_URLS, urls);
+                intent.putStringArrayListExtra(ImageViewerActivity.EXTRA_POSITIONS, paths);
+                intent.putExtra(ImageViewerActivity.EXTRA_POSITION, position);
+                startActivity(intent);
+            }
+        });
+        
+        if (checkPermission()) {
+            loadImages();
+        } else {
+            requestPermission();
+        }
+    }
+
+    private boolean checkPermission() {
+        return ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+            new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, 
+            PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadImages();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void loadImages() {
+        LogUtils.d(TAG, "loadImages");
+        ArrayList<Uri> imageUrls = new ArrayList<>();
+        ArrayList<String> imagePaths = new ArrayList<>();
+        ContentResolver contentResolver = getContentResolver();
+        Uri collection = android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+        
+        String selection = android.provider.MediaStore.Images.Media.DATA + " LIKE ?";
+        String[] selectionArgs = new String[]{albumPath + "%"};
+        String sortOrder = android.provider.MediaStore.Images.Media.DATE_ADDED + " DESC";
+        
+        try (Cursor cursor = contentResolver.query(collection, null, selection, selectionArgs, sortOrder)) {
+            if (cursor != null) {
+                int dataColumn = cursor.getColumnIndexOrThrow(android.provider.MediaStore.Images.Media.DATA);
+                while (cursor.moveToNext()) {
+                    String path = cursor.getString(dataColumn);
+                    if (path != null && path.startsWith(albumPath + "/")) {
+                        long id = cursor.getLong(cursor.getColumnIndexOrThrow(android.provider.MediaStore.Images.Media._ID));
+                        Uri contentUri = Uri.withAppendedPath(collection, String.valueOf(id));
+                        imageUrls.add(contentUri);
+                        imagePaths.add(path);
+                    }
+                }
+            }
+        }
+        
+        if (imageUrls.isEmpty()) {
+            Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No images found");
+        }
+        adapter.setData(imageUrls, imagePaths);
+        LogUtils.d(TAG, "Loaded " + imageUrls.size() + " images");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == R.id.action_refresh) {
+            if (checkPermission()) {
+                loadImages();
+            }
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (checkPermission()) {
+            loadImages();
+        }
+        if (adapter != null) {
+            adapter.refreshBg();
+        }
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java

@@ -0,0 +1,146 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.io.File;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder> {
+    public static final String TAG = "AlbumAdapter";
+    private ArrayList<Album> albums = new ArrayList<>();
+    private OnAlbumClickListener listener;
+    private Preferences prefs;
+    private int bgType = 0;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
+
+    public interface OnAlbumClickListener {
+        void onAlbumClick(Album album);
+    }
+
+    public void setOnAlbumClickListener(OnAlbumClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setData(ArrayList<Album> albums) {
+        this.albums = albums;
+        LogUtils.d(TAG, "setData: " + albums.size() + " albums");
+        notifyDataSetChanged();
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+            notifyDataSetChanged();
+        }
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_album, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        final Album album = albums.get(position);
+        LogUtils.d(TAG, "bind: " + album.getName() + ", cover=" + album.getCoverUri());
+        
+        holder.coverImage.setBackgroundResource(getBgRes());
+        
+        holder.albumName.setText(album.getName());
+        holder.imageCount.setText(album.getImageCount() + " photos");
+        
+        holder.itemView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onAlbumClick(album);
+                }
+            }
+        });
+        
+        Uri coverUri = album.getCoverUri();
+        if (coverUri != null) {
+            String uriString = coverUri.toString();
+            LogUtils.d(TAG, "uri scheme: " + coverUri.getScheme() + ", path: " + uriString);
+            
+            // For content:// URIs, try to get the actual file path
+            if ("content".equals(coverUri.getScheme())) {
+                try {
+                    android.database.Cursor cursor = holder.coverImage.getContext().getContentResolver()
+                        .query(coverUri, new String[]{MediaStore.Images.Media.DATA}, null, null, null);
+                    if (cursor != null && cursor.moveToFirst()) {
+                        int dataColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                        String filePath = cursor.getString(dataColumn);
+                        cursor.close();
+                        if (filePath != null) {
+                            File actualFile = new File(filePath);
+                            LogUtils.d(TAG, "actual file: " + actualFile.getAbsolutePath() + ", exists=" + actualFile.exists());
+                            // Use file path instead of content URI for better compatibility
+                            Glide.with(holder.coverImage.getContext())
+                                .load(actualFile)
+                                .centerCrop()
+                                .into(holder.coverImage);
+                            return;
+                        }
+                    }
+                } catch (Exception e) {
+                    LogUtils.e(TAG, "query error: " + e.getMessage());
+                }
+            }
+        }
+        
+        // Fallback to content URI
+        Glide.with(holder.coverImage.getContext())
+            .load(coverUri)
+            .centerCrop()
+            .into(holder.coverImage);
+    }
+
+    @Override
+    public int getItemCount() {
+        return albums.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView coverImage;
+        TextView albumName;
+        TextView imageCount;
+        ViewHolder(View itemView) {
+            super(itemView);
+            coverImage = itemView.findViewById(R.id.album_cover);
+            albumName = itemView.findViewById(R.id.album_name);
+            imageCount = itemView.findViewById(R.id.image_count);
+        }
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/GlobalWinBoLLApplication.java

@@ -0,0 +1,44 @@
+package cc.winboll.studio.gallery;
+
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/24 15:23
+ */
+public class GlobalWinBoLLApplication extends GlobalApplication {
+    
+    public static final String TAG = "GlobalWinBoLLApplication";
+    
+
+@Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate");
+        setIsDebugging(BuildConfig.DEBUG);
+        //setIsDebugging(false);
+
+        WinBoLLActivityManager.init(this);
+
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
+    }
+
+@Override
+    public void onTerminate() {
+        super.onTerminate();
+        LogUtils.d(TAG, "onTerminate");
+        ToastUtils.release();
+    }
+    
+}

gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java

@@ -0,0 +1,105 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder> {
+    public static final String TAG = "ImageAdapter";
+    private ArrayList<Uri> imageUrls = new ArrayList<>();
+    private ArrayList<String> imagePaths = new ArrayList<>();
+    private OnImageClickListener listener;
+    private int bgType = 0;
+    private Preferences prefs;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
+
+    public interface OnImageClickListener {
+        void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths);
+    }
+
+    public void setOnImageClickListener(OnImageClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setData(ArrayList<Uri> urls, ArrayList<String> paths) {
+        this.imageUrls = urls;
+        this.imagePaths = paths;
+        LogUtils.d(TAG, "setData: " + urls.size() + " images");
+        notifyDataSetChanged();
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+            notifyDataSetChanged();
+        }
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_gallery, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        holder.imageView.setBackgroundResource(getBgRes());
+        
+        Glide.with(holder.imageView.getContext())
+            .load(imageUrls.get(position))
+            .centerCrop()
+            .into(holder.imageView);
+        
+        final ArrayList<Uri> urls = imageUrls;
+        final ArrayList<String> paths = imagePaths;
+        holder.imageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onImageClick(position, urls, paths);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return imageUrls.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView imageView;
+        ViewHolder(View itemView) {
+            super(itemView);
+            imageView = itemView.findViewById(R.id.image);
+        }
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/ImagePagerAdapter.java

@@ -0,0 +1,72 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImagePagerAdapter extends PagerAdapter {
+    public static final String TAG = "ImagePagerAdapter";
+    private ArrayList<Uri> imageUrls;
+    private int bgType;
+
+    public ImagePagerAdapter(ArrayList<Uri> imageUrls, int bgType) {
+        this.imageUrls = imageUrls;
+        this.bgType = bgType;
+        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images, bgType=" + bgType);
+    }
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return imageUrls.size();
+    }
+
+    @NonNull
+    @Override
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
+        View view = LayoutInflater.from(container.getContext())
+            .inflate(R.layout.item_image_pager, container, false);
+        view.setBackgroundResource(getBgRes());
+        ImageView imageView = view.findViewById(R.id.image);
+        
+        Glide.with(imageView.getContext())
+            .load(imageUrls.get(position))
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .skipMemoryCache(true)
+            .into(imageView);
+        
+        container.addView(view);
+        return view;
+    }
+
+    @Override
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+        container.removeView((View) object);
+    }
+
+    @Override
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+        return view == object;
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/ImageViewerActivity.java

@@ -0,0 +1,438 @@
+package cc.winboll.studio.gallery;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.WindowManager;
+import android.widget.ImageButton;
+import androidx.viewpager.widget.ViewPager;
+import java.io.File;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImageViewerActivity extends Activity implements ViewPager.OnPageChangeListener {
+    public static final String TAG = "ImageViewerActivity";
+    public static final String EXTRA_IMAGE_URLS = "image_urls";
+    public static final String EXTRA_POSITIONS = "image_positions";
+    public static final String EXTRA_POSITION = "position";
+    
+    private ArrayList<Uri> imageUrls;
+    private ArrayList<String> imagePaths;
+    private int currentPosition;
+    private ViewPager viewPager;
+    private View toolbar;
+    private ImageButton btnBack;
+    private ImageButton btnDelete;
+    private ImageButton btnShare;
+    private ImageButton btnInfo;
+    private ImageButton btnBg;
+    private int bgType = 0;
+    private GestureDetector gestureDetector;
+    private TrashManager trashManager;
+    private Preferences prefs;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+            WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setContentView(R.layout.activity_image_viewer);
+        LogUtils.d(TAG, "onCreate");
+        
+        imageUrls = getIntent().getParcelableArrayListExtra(EXTRA_IMAGE_URLS);
+        imagePaths = getIntent().getStringArrayListExtra(EXTRA_POSITIONS);
+        currentPosition = getIntent().getIntExtra(EXTRA_POSITION, 0);
+        
+        trashManager = new TrashManager(this);
+        prefs = new Preferences(this);
+        bgType = prefs.getBgType();
+        
+        viewPager = findViewById(R.id.view_pager);
+        toolbar = findViewById(R.id.toolbar);
+        btnBack = findViewById(R.id.btn_back);
+        btnDelete = findViewById(R.id.btn_delete);
+        btnShare = findViewById(R.id.btn_share);
+        btnInfo = findViewById(R.id.btn_info);
+        btnBg = findViewById(R.id.btn_bg);
+        
+        applyBg();
+        
+        ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls, bgType);
+        viewPager.setAdapter(adapter);
+        viewPager.setCurrentItem(currentPosition);
+        viewPager.addOnPageChangeListener(this);
+        
+        gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                toggleToolbar();
+                return true;
+            }
+        });
+        
+        viewPager.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return gestureDetector.onTouchEvent(event);
+            }
+        });
+        
+        btnBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        
+        btnDelete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDeleteDialog();
+            }
+        });
+        
+        btnShare.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                shareCurrentImage();
+            }
+        });
+        
+        btnInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showImageInfo();
+            }
+        });
+        
+        btnBg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                switchBg();
+            }
+        });
+    }
+    
+    private void toggleToolbar() {
+        if (toolbar.getVisibility() == View.VISIBLE) {
+            toolbar.setVisibility(View.GONE);
+        } else {
+            toolbar.setVisibility(View.VISIBLE);
+        }
+    }
+    
+    private void applyBg() {
+        int bgRes;
+        switch (bgType) {
+            case 0:
+                bgRes = R.drawable.bg_checkerboard;
+                break;
+            case 1:
+                bgRes = R.drawable.bg_white;
+                break;
+            case 2:
+                bgRes = R.drawable.bg_black;
+                break;
+            default:
+                bgRes = R.drawable.bg_checkerboard;
+        }
+        View container = findViewById(R.id.container);
+        if (container != null) {
+            container.setBackgroundResource(bgRes);
+        }
+    }
+    
+    private void switchBg() {
+        final String[] bgNames = {"灰白相间", "全白", "全黑"};
+        final int[] bgResources = {R.drawable.bg_checkerboard, R.drawable.bg_white, R.drawable.bg_black};
+        
+        new AlertDialog.Builder(this)
+            .setTitle("选择背景")
+            .setSingleChoiceItems(bgNames, bgType, new android.content.DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(android.content.DialogInterface dialog, int which) {
+                    bgType = which;
+                    prefs.setBgType(which);
+                    int currentItem = viewPager.getCurrentItem();
+                    View container = findViewById(R.id.container);
+                    if (container != null) {
+                        container.setBackgroundResource(bgResources[which]);
+                    }
+                    viewPager.setAdapter(new ImagePagerAdapter(imageUrls, bgType));
+                    viewPager.setCurrentItem(currentItem);
+                    dialog.dismiss();
+                }
+            })
+            .setNegativeButton("取消", null)
+            .show();
+    }
+    
+    private void showDeleteDialog() {
+        new AlertDialog.Builder(this)
+            .setMessage("Delete to trash?")
+            .setPositiveButton("Yes", new android.content.DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(android.content.DialogInterface dialog, int which) {
+                    moveToTrash();
+                }
+            })
+            .setNegativeButton("No", null)
+            .show();
+    }
+    
+    private void moveToTrash() {
+        LogUtils.d(TAG, "moveToTrash");
+        if (currentPosition >= 0 && currentPosition < imageUrls.size()) {
+            String imagePath = "";
+            if (imagePaths != null && currentPosition < imagePaths.size()) {
+                imagePath = imagePaths.get(currentPosition);
+            } else {
+                imagePath = getPathFromUri(imageUrls.get(currentPosition));
+            }
+            
+            Uri imageUri = imageUrls.get(currentPosition);
+            long result = -1;
+            
+            if (!imagePath.isEmpty()) {
+                result = trashManager.addToTrash(imagePath);
+            }
+            
+            if (result > 0) {
+                try {
+                    getContentResolver().delete(imageUri, null, null);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                android.widget.Toast.makeText(this, "Moved to trash", android.widget.Toast.LENGTH_SHORT).show();
+                LogUtils.i(TAG, "Moved to trash");
+                removeCurrentImage();
+            } else {
+                try {
+                    int deleted = getContentResolver().delete(imageUri, null, null);
+                    android.widget.Toast.makeText(this, "Deleted: " + deleted, android.widget.Toast.LENGTH_SHORT).show();
+                    removeCurrentImage();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    removeCurrentImage();
+                }
+            }
+        }
+    }
+    
+    private void removeCurrentImage() {
+        imageUrls.remove(currentPosition);
+        if (imagePaths != null) {
+            imagePaths.remove(currentPosition);
+        }
+        
+        if (imageUrls.isEmpty()) {
+            finish();
+        } else {
+            if (currentPosition >= imageUrls.size()) {
+                currentPosition = imageUrls.size() - 1;
+            }
+            viewPager.setAdapter(new ImagePagerAdapter(imageUrls, bgType));
+            viewPager.setCurrentItem(currentPosition);
+        }
+    }
+    
+    private String getPathFromUri(Uri uri) {
+        String[] projection = { MediaStore.Images.Media.DATA };
+        android.database.Cursor cursor = getContentResolver().query(uri, projection, null, null, null);
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                    return cursor.getString(columnIndex);
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+        return uri.getPath();
+    }
+    
+    private void shareCurrentImage() {
+        if (currentPosition >= 0 && currentPosition < imageUrls.size()) {
+            Uri imageUri = imageUrls.get(currentPosition);
+            Intent shareIntent = new Intent(Intent.ACTION_SEND);
+            shareIntent.setType("image/*");
+            shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
+            shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            startActivity(Intent.createChooser(shareIntent, "Share Image"));
+        }
+    }
+    
+    private void showImageInfo() {
+        if (currentPosition < 0 || currentPosition >= imageUrls.size()) {
+            return;
+        }
+        
+        String imagePath = "";
+        if (imagePaths != null && currentPosition < imagePaths.size()) {
+            imagePath = imagePaths.get(currentPosition);
+        } else {
+            imagePath = getPathFromUri(imageUrls.get(currentPosition));
+        }
+        
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists()) {
+            imageFile = new File(imagePath);
+        }
+        
+        android.widget.LinearLayout layout = new android.widget.LinearLayout(this);
+        layout.setOrientation(android.widget.LinearLayout.VERTICAL);
+        layout.setPadding(48, 32, 48, 32);
+        
+        android.widget.TextView labelPath = new android.widget.TextView(this);
+        labelPath.setText("Path:");
+        labelPath.setTextColor(getColor(android.R.color.darker_gray));
+        labelPath.setTextSize(14);
+        labelPath.setTypeface(null, android.graphics.Typeface.BOLD);
+        layout.addView(labelPath);
+        
+        android.widget.TextView valuePath = new android.widget.TextView(this);
+        valuePath.setText(imagePath);
+        valuePath.setTextColor(getColor(android.R.color.black));
+        valuePath.setTextSize(14);
+        valuePath.setTextIsSelectable(true);
+        layout.addView(valuePath);
+        
+        if (imageFile.exists()) {
+            long sizeBytes = imageFile.length();
+            String size;
+            if (sizeBytes < 1024) {
+                size = sizeBytes + " B";
+            } else if (sizeBytes < 1024 * 1024) {
+                size = String.format("%.2f KB", sizeBytes / 1024.0);
+            } else {
+                size = String.format("%.2f MB", sizeBytes / (1024.0 * 1024.0));
+            }
+            
+            android.widget.TextView labelSize = new android.widget.TextView(this);
+            labelSize.setText("Size:");
+            labelSize.setTextColor(getColor(android.R.color.darker_gray));
+            labelSize.setTextSize(14);
+            labelSize.setTypeface(null, android.graphics.Typeface.BOLD);
+            layout.addView(labelSize);
+            
+            android.widget.TextView valueSize = new android.widget.TextView(this);
+            valueSize.setText(size);
+            valueSize.setTextColor(getColor(android.R.color.black));
+            valueSize.setTextSize(14);
+            valueSize.setTextIsSelectable(true);
+            layout.addView(valueSize);
+        }
+        
+        try {
+            android.graphics.BitmapFactory.Options options = new android.graphics.BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            android.graphics.BitmapFactory.decodeFile(imagePath, options);
+            if (options.outWidth > 0 && options.outHeight > 0) {
+                android.widget.TextView labelPixels = new android.widget.TextView(this);
+                labelPixels.setText("Pixels:");
+                labelPixels.setTextColor(getColor(android.R.color.darker_gray));
+                labelPixels.setTextSize(14);
+                labelPixels.setTypeface(null, android.graphics.Typeface.BOLD);
+                layout.addView(labelPixels);
+                
+                android.widget.TextView valuePixels = new android.widget.TextView(this);
+                valuePixels.setText(options.outWidth + " x " + options.outHeight);
+                valuePixels.setTextColor(getColor(android.R.color.black));
+                valuePixels.setTextSize(14);
+                valuePixels.setTextIsSelectable(true);
+                layout.addView(valuePixels);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "get pixels error: " + e.getMessage());
+        }
+        
+        try {
+            String[] projection = {
+                MediaStore.Images.Media.DATE_ADDED,
+                MediaStore.Images.Media.DATE_MODIFIED,
+                MediaStore.Images.Media.DATE_TAKEN
+            };
+            android.database.Cursor cursor = getContentResolver().query(
+                imageUrls.get(currentPosition), projection, null, null, null);
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    int dateAddedCol = cursor.getColumnIndex(MediaStore.Images.Media.DATE_ADDED);
+                    int dateTakenCol = cursor.getColumnIndex(MediaStore.Images.Media.DATE_TAKEN);
+                    
+                    java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    
+                    if (dateTakenCol >= 0) {
+                        long dateTaken = cursor.getLong(dateTakenCol);
+                        if (dateTaken > 0) {
+                            android.widget.TextView labelTaken = new android.widget.TextView(this);
+                            labelTaken.setText("Date Taken:");
+                            labelTaken.setTextColor(getColor(android.R.color.darker_gray));
+                            labelTaken.setTextSize(14);
+                            labelTaken.setTypeface(null, android.graphics.Typeface.BOLD);
+                            layout.addView(labelTaken);
+                            
+                            android.widget.TextView valueTaken = new android.widget.TextView(this);
+                            valueTaken.setText(sdf.format(new java.util.Date(dateTaken)));
+                            valueTaken.setTextColor(getColor(android.R.color.black));
+                            valueTaken.setTextSize(14);
+                            valueTaken.setTextIsSelectable(true);
+                            layout.addView(valueTaken);
+                        }
+                    }
+                    if (dateAddedCol >= 0) {
+                        long dateAdded = cursor.getLong(dateAddedCol);
+                        if (dateAdded > 0) {
+                            android.widget.TextView labelAdded = new android.widget.TextView(this);
+                            labelAdded.setText("Date Added:");
+                            labelAdded.setTextColor(getColor(android.R.color.darker_gray));
+                            labelAdded.setTextSize(14);
+                            labelAdded.setTypeface(null, android.graphics.Typeface.BOLD);
+                            layout.addView(labelAdded);
+                            
+                            android.widget.TextView valueAdded = new android.widget.TextView(this);
+                            valueAdded.setText(sdf.format(new java.util.Date(dateAdded * 1000)));
+                            valueAdded.setTextColor(getColor(android.R.color.black));
+                            valueAdded.setTextSize(14);
+                            valueAdded.setTextIsSelectable(true);
+                            layout.addView(valueAdded);
+                        }
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "get date error: " + e.getMessage());
+        }
+        
+        new AlertDialog.Builder(this)
+            .setTitle("Image Info")
+            .setView(layout)
+            .setPositiveButton("OK", null)
+            .show();
+    }
+    
+    @Override
+    public void onPageSelected(int position) {
+        currentPosition = position;
+    }
+    
+    @Override
+    public void onPageScrollStateChanged(int state) {}
+    
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+    
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java

@@ -0,0 +1,294 @@
+package cc.winboll.studio.gallery;
+
+import android.Manifest;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.provider.Settings;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.gallery.AlbumAdapter.OnAlbumClickListener;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogActivity;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+
+public class MainActivity extends AppCompatActivity {
+    public static final String TAG = "MainActivity";
+    private static final int PERMISSION_REQUEST_CODE = 100;
+    private static final int MANAGE_PERMISSION_REQUEST_CODE = 101;
+    private RecyclerView recyclerView;
+    private AlbumAdapter adapter;
+    private Preferences prefs;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+        
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        
+        prefs = new Preferences(this);
+        
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
+        adapter = new AlbumAdapter();
+        adapter.setContext(this);
+        recyclerView.setAdapter(adapter);
+        
+        adapter.setOnAlbumClickListener(new OnAlbumClickListener() {
+            @Override
+            public void onAlbumClick(Album album) {
+                Intent intent = new Intent(MainActivity.this, AlbumActivity.class);
+                intent.putExtra(AlbumActivity.EXTRA_ALBUM_PATH, album.getPath());
+                intent.putExtra(AlbumActivity.EXTRA_ALBUM_NAME, album.getName());
+                startActivity(intent);
+            }
+        });
+        
+        checkAndRequestPermissions();
+    }
+    
+    private void checkAndRequestPermissions() {
+        LogUtils.i(TAG, "checkAndRequestPermissions");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                try {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                    intent.setData(Uri.parse("package:" + getPackageName()));
+                    startActivityForResult(intent, MANAGE_PERMISSION_REQUEST_CODE);
+                } catch (Exception e) {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+                    startActivityForResult(intent, MANAGE_PERMISSION_REQUEST_CODE);
+                }
+                return;
+            }
+        }
+        
+        if (checkPermission()) {
+            loadAlbums();
+        } else {
+            requestPermission();
+        }
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == MANAGE_PERMISSION_REQUEST_CODE) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                if (Environment.isExternalStorageManager()) {
+                    loadAlbums();
+                } else {
+                    Toast.makeText(this, "Permission required", Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+    
+    private boolean checkPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return Environment.isExternalStorageManager();
+        }
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+            new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 
+            PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadAlbums();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void loadAlbums() {
+        LogUtils.d(TAG, "loadAlbums");
+        String folderPath = prefs.getFolderPath();
+        File baseFolder = new File(folderPath);
+        LogUtils.d(TAG, "baseFolder: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+        
+        if (!baseFolder.exists() || !baseFolder.isDirectory()) {
+            folderPath = Preferences.getDefaultPath();
+            baseFolder = new File(folderPath);
+            LogUtils.d(TAG, "try default: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+            if (!baseFolder.exists()) {
+                folderPath = Environment.getExternalStorageDirectory() + "/Pictures";
+                baseFolder = new File(folderPath);
+                LogUtils.d(TAG, "try Pictures: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+            }
+        }
+        
+        ArrayList<Album> albums = new ArrayList<>();
+        
+        FileFilter directoryFilter = new FileFilter() {
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory();
+            }
+        };
+        File[] subfolders = baseFolder.listFiles(directoryFilter);
+        LogUtils.d(TAG, "subfolders: " + (subfolders != null ? subfolders.length : 0));
+        if (subfolders != null) {
+            for (File subfolder : subfolders) {
+                LogUtils.d(TAG, "scanning folder: " + subfolder.getName());
+                ArrayList<Uri> images = getImagesInFolder(subfolder.getAbsolutePath());
+                if (!images.isEmpty()) {
+                    Uri latestImage = images.get(0);
+                    albums.add(new Album(subfolder.getName(), subfolder.getAbsolutePath(), latestImage, images.size()));
+                    LogUtils.d(TAG, "album added: " + subfolder.getName() + ", " + images.size() + " images");
+                }
+            }
+        }
+        
+        if (albums.isEmpty()) {
+            Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No albums found");
+        }
+        adapter.setData(albums);
+        LogUtils.d(TAG, "Loaded " + albums.size() + " albums");
+    }
+
+    private ArrayList<Uri> getImagesInFolder(String folderPath) {
+        ArrayList<Uri> imageUrls = new ArrayList<>();
+        ContentResolver contentResolver = getContentResolver();
+        Uri collection = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+        
+        String selection = MediaStore.Images.Media.DATA + " LIKE ?";
+        String[] selectionArgs = new String[]{folderPath + "/%"};
+        String sortOrder = MediaStore.Images.Media.DATE_ADDED + " DESC";
+        
+        LogUtils.d(TAG, "getImagesInFolder: " + folderPath);
+        
+        try (Cursor cursor = contentResolver.query(collection, null, selection, selectionArgs, sortOrder)) {
+            if (cursor != null) {
+                LogUtils.d(TAG, "cursor count: " + cursor.getCount());
+                int dataColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                while (cursor.moveToNext()) {
+                    String path = cursor.getString(dataColumn);
+                    if (path != null) {
+                        long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID));
+                        Uri contentUri = Uri.withAppendedPath(collection, String.valueOf(id));
+                        LogUtils.d(TAG, "image: id=" + id + ", path=" + path);
+                        imageUrls.add(contentUri);
+                    }
+                }
+            }
+        }
+        LogUtils.d(TAG, "found " + imageUrls.size() + " images");
+        return imageUrls;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            startActivity(new Intent(this, SettingsActivity.class));
+            return true;
+        } else if (id == R.id.action_trash) {
+            startActivity(new Intent(this, TrashActivity.class));
+            return true;
+        } else if (id == R.id.action_refresh) {
+            if (checkPermission()) {
+                loadAlbums();
+            }
+            return true;
+        } else if (id == R.id.action_debug) {
+			LogActivity.startLogActivity(this);
+//            Log.d("Gallery", "Debug log message");
+//            Toast.makeText(this, R.string.debug_message, Toast.LENGTH_SHORT).show();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (checkPermission()) {
+            scanMediaStore();
+            loadAlbums();
+        }
+        if (adapter != null) {
+            adapter.refreshBg();
+        }
+    }
+    
+    private void scanMediaStore() {
+        String folderPath = prefs.getFolderPath();
+        File baseFolder = new File(folderPath);
+        if (baseFolder.exists() && baseFolder.isDirectory()) {
+            File[] subfolders = baseFolder.listFiles(new FileFilter() {
+                @Override
+                public boolean accept(File file) {
+                    return file.isDirectory();
+                }
+            });
+            if (subfolders != null) {
+                ArrayList<String> paths = new ArrayList<>();
+                for (File subfolder : subfolders) {
+                    File[] images = subfolder.listFiles(new FilenameFilter() {
+                        @Override
+                        public boolean accept(File dir, String name) {
+                            String lower = name.toLowerCase();
+                            return lower.endsWith(".jpg") || lower.endsWith(".jpeg") 
+                                || lower.endsWith(".png") || lower.endsWith(".gif")
+                                || lower.endsWith(".webp") || lower.endsWith(".bmp");
+                        }
+                    });
+                    if (images != null) {
+                        for (File img : images) {
+                            paths.add(img.getAbsolutePath());
+                        }
+                    }
+                }
+                if (!paths.isEmpty()) {
+                    LogUtils.d(TAG, "scanning " + paths.size() + " files to MediaStore");
+                    String[] pathArray = paths.toArray(new String[0]);
+                    MediaScannerConnection.scanFile(this, pathArray, null, new MediaScannerConnection.OnScanCompletedListener() {
+                        @Override
+                        public void onScanCompleted(String path, Uri uri) {
+                            LogUtils.d(TAG, "scanCompleted: " + path + " -> " + uri);
+                        }
+                    });
+                }
+            }
+        }
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/Preferences.java

@@ -0,0 +1,44 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class Preferences {
+    public static final String TAG = "Preferences";
+    private static final String PREF_NAME = "gallery_prefs";
+    private static final String KEY_FOLDER_PATH = "folder_path";
+    private static final String KEY_BG_TYPE = "bg_type";
+    private static final int DEFAULT_BG_TYPE = 0;
+    private static final String DEFAULT_PATH = "/storage/emulated/0/Pictures/Gallery/owner";
+    
+    public static String getDefaultPath() {
+        return DEFAULT_PATH;
+    }
+    
+    private final SharedPreferences prefs;
+    
+    public Preferences(Context context) {
+        prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+    }
+    
+    public String getFolderPath() {
+        String path = prefs.getString(KEY_FOLDER_PATH, DEFAULT_PATH);
+        LogUtils.d(TAG, "getFolderPath: " + path);
+        return path;
+    }
+    
+    public void setFolderPath(String path) {
+        LogUtils.d(TAG, "setFolderPath: " + path);
+        prefs.edit().putString(KEY_FOLDER_PATH, path).apply();
+    }
+    
+    public int getBgType() {
+        return prefs.getInt(KEY_BG_TYPE, DEFAULT_BG_TYPE);
+    }
+    
+    public void setBgType(int type) {
+        LogUtils.d(TAG, "setBgType: " + type);
+        prefs.edit().putInt(KEY_BG_TYPE, type).apply();
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/SettingsActivity.java

@@ -0,0 +1,46 @@
+package cc.winboll.studio.gallery;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class SettingsActivity extends AppCompatActivity {
+    public static final String TAG = "SettingsActivity";
+    private Preferences prefs;
+    private EditText editFolderPath;
+    private TextView textCurrentPath;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        LogUtils.d(TAG, "onCreate");
+        
+        prefs = new Preferences(this);
+        
+        editFolderPath = findViewById(R.id.edit_folder_path);
+        textCurrentPath = findViewById(R.id.text_current_path);
+        Button btnSave = findViewById(R.id.btn_save);
+        
+        String currentPath = prefs.getFolderPath();
+        editFolderPath.setText(currentPath);
+        textCurrentPath.setText("Current: " + currentPath);
+        
+        btnSave.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String newPath = editFolderPath.getText().toString().trim();
+                if (!newPath.isEmpty()) {
+                    prefs.setFolderPath(newPath);
+                    textCurrentPath.setText("Current: " + newPath);
+                }
+                finish();
+            }
+        });
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/TrashActivity.java

@@ -0,0 +1,193 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import java.io.File;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashActivity extends AppCompatActivity {
+    public static final String TAG = "TrashActivity";
+    private static final int PERMISSION_REQUEST_CODE = 102;
+    private RecyclerView recyclerView;
+    private TrashAdapter adapter;
+    private TrashManager trashManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+        
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("Trash");
+        
+        trashManager = new TrashManager(this);
+        
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+        adapter = new TrashAdapter();
+        recyclerView.setAdapter(adapter);
+        
+        adapter.setOnTrashClickListener(new TrashAdapter.OnTrashClickListener() {
+            @Override
+            public void onRestoreClick(int position) {
+                restoreImage(position);
+            }
+            
+            @Override
+            public void onDeleteClick(int position) {
+                permanentlyDelete(position);
+            }
+        });
+        
+        if (checkPermission()) {
+            loadTrash();
+        } else {
+            requestPermission();
+        }
+    }
+
+    private boolean checkPermission() {
+        return ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+            new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, 
+            PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadTrash();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void loadTrash() {
+        LogUtils.d(TAG, "loadTrash");
+        Cursor cursor = trashManager.getTrashList();
+        ArrayList<TrashItem> items = new ArrayList<TrashItem>();
+        ArrayList<Uri> uris = new ArrayList<Uri>();
+        
+        String trashPath = TrashDbHelper.getTrashPath();
+        File trashDir = new File(trashPath);
+        
+        if (cursor != null && cursor.getCount() > 0) {
+            cursor.moveToFirst();
+            do {
+                try {
+                    long id = cursor.getLong(cursor.getColumnIndexOrThrow("_id"));
+                    String fileName = cursor.getString(cursor.getColumnIndexOrThrow("file_name"));
+                    String originalPath = cursor.getString(cursor.getColumnIndexOrThrow("original_path"));
+                    String originalFolder = cursor.getString(cursor.getColumnIndexOrThrow("original_folder"));
+                    
+                    TrashItem item = new TrashItem();
+                    item.id = id;
+                    item.fileName = fileName;
+                    item.originalPath = originalPath;
+                    item.originalFolder = originalFolder;
+                    
+                    File trashFile = new File(trashDir, fileName);
+                    if (trashFile.exists()) {
+                        items.add(item);
+                        uris.add(Uri.fromFile(trashFile));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (cursor.moveToNext());
+            cursor.close();
+        }
+        
+        adapter.setData(items, uris);
+        
+        if (items.isEmpty()) {
+            Toast.makeText(this, "Trash is empty", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void restoreImage(int position) {
+        LogUtils.d(TAG, "restoreImage: " + position);
+        long id = adapter.getItemId(position);
+        String fileName = adapter.getFileName(position);
+        String originalPath = adapter.getOriginalPath(position);
+        
+        if (trashManager.restore(id, fileName, originalPath)) {
+            Toast.makeText(this, "Image restored", Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "Image restored");
+            loadTrash();
+        } else {
+            Toast.makeText(this, "Restore failed", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void permanentlyDelete(int position) {
+        long id = adapter.getItemId(position);
+        String fileName = adapter.getFileName(position);
+        
+        if (trashManager.deletePermanently(id, fileName)) {
+            Toast.makeText(this, "Image deleted", Toast.LENGTH_SHORT).show();
+            loadTrash();
+        } else {
+            Toast.makeText(this, "Delete failed", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_trash, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == R.id.action_clear_trash) {
+            trashManager.clearTrash();
+            Toast.makeText(this, "Trash cleared", Toast.LENGTH_SHORT).show();
+            loadTrash();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (checkPermission()) {
+            loadTrash();
+        }
+    }
+    
+    public static class TrashItem {
+        public long id;
+        public String fileName;
+        public String originalPath;
+        public String originalFolder;
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java

@@ -0,0 +1,111 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashAdapter extends RecyclerView.Adapter<TrashAdapter.ViewHolder> {
+    public static final String TAG = "TrashAdapter";
+    private ArrayList<TrashActivity.TrashItem> trashItems = new ArrayList<TrashActivity.TrashItem>();
+    private ArrayList<Uri> imageUrls = new ArrayList<Uri>();
+    private OnTrashClickListener listener;
+
+    public interface OnTrashClickListener {
+        void onRestoreClick(int position);
+        void onDeleteClick(int position);
+    }
+
+    public void setOnTrashClickListener(OnTrashClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setData(ArrayList<TrashActivity.TrashItem> items, ArrayList<Uri> uris) {
+        this.trashItems = items;
+        this.imageUrls = uris;
+        LogUtils.d(TAG, "setData: " + items.size() + " items");
+        notifyDataSetChanged();
+    }
+
+    public long getItemId(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).id;
+        }
+        return -1;
+    }
+    
+    public String getFileName(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).fileName;
+        }
+        return "";
+    }
+    
+    public String getOriginalPath(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).originalPath;
+        }
+        return "";
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_trash, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        if (position < imageUrls.size()) {
+            Glide.with(holder.imageView.getContext())
+                .load(imageUrls.get(position))
+                .centerCrop()
+                .into(holder.imageView);
+        }
+        
+        holder.btnRestore.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onRestoreClick(position);
+                }
+            }
+        });
+        
+        holder.btnDelete.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onDeleteClick(position);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return trashItems.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView imageView;
+        ImageView btnRestore;
+        ImageView btnDelete;
+        ViewHolder(View itemView) {
+            super(itemView);
+            imageView = itemView.findViewById(R.id.image);
+            btnRestore = itemView.findViewById(R.id.btn_restore);
+            btnDelete = itemView.findViewById(R.id.btn_delete);
+        }
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/TrashDbHelper.java

@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.Environment;
+import java.io.File;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "TrashDbHelper";
+    private static final String DB_NAME = "trash.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "trash_items";
+    private static final String COL_ID = "_id";
+    private static final String COL_FILE_NAME = "file_name";
+    private static final String COL_ORIGINAL_PATH = "original_path";
+    private static final String COL_ORIGINAL_FOLDER = "original_folder";
+    private static final String COL_DELETE_TIME = "delete_time";
+    
+    public TrashDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        LogUtils.d(TAG, "onCreate");
+        db.execSQL("CREATE TABLE " + TABLE_NAME + " (" +
+            COL_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+            COL_FILE_NAME + " TEXT, " +
+            COL_ORIGINAL_PATH + " TEXT, " +
+            COL_ORIGINAL_FOLDER + " TEXT, " +
+            COL_DELETE_TIME + " INTEGER)");
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        LogUtils.i(TAG, "onUpgrade: " + oldVersion + " -> " + newVersion);
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public long insert(String fileName, String originalPath, String originalFolder) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COL_FILE_NAME, fileName);
+        values.put(COL_ORIGINAL_PATH, originalPath);
+        values.put(COL_ORIGINAL_FOLDER, originalFolder);
+        values.put(COL_DELETE_TIME, System.currentTimeMillis());
+        return db.insert(TABLE_NAME, null, values);
+    }
+    
+    public Cursor getAll() {
+        SQLiteDatabase db = getReadableDatabase();
+        return db.query(TABLE_NAME, null, null, null, null, null, COL_DELETE_TIME + " DESC");
+    }
+    
+    public int delete(long id) {
+        SQLiteDatabase db = getWritableDatabase();
+        return db.delete(TABLE_NAME, COL_ID + "=?", new String[]{String.valueOf(id)});
+    }
+    
+    public void clear() {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, null, null);
+    }
+    
+    public static String getTrashPath() {
+        File trashDir = new File(Environment.getExternalStorageDirectory(), ".Trash");
+        if (!trashDir.exists()) {
+            trashDir.mkdirs();
+        }
+        return trashDir.getAbsolutePath();
+    }
+}

gallery/src/main/java/cc/winboll/studio/gallery/TrashManager.java

@@ -0,0 +1,158 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+import java.io.File;
+import java.util.UUID;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashManager {
+    public static final String TAG = "TrashManager";
+    private final Context context;
+    private final TrashDbHelper dbHelper;
+    
+    public TrashManager(Context context) {
+        LogUtils.d(TAG, "TrashManager created");
+        this.context = context;
+        this.dbHelper = new TrashDbHelper(context);
+    }
+    
+    public long addToTrash(String imagePath) {
+        LogUtils.d(TAG, "addToTrash: " + imagePath);
+        File sourceFile = new File(imagePath);
+        if (!sourceFile.exists()) {
+            return -1;
+        }
+        
+        String uniqueId = UUID.randomUUID().toString();
+        String extension = getExtension(imagePath);
+        String newFileName = uniqueId + extension;
+        String trashPath = TrashDbHelper.getTrashPath();
+        File destFile = new File(trashPath, newFileName);
+        
+        if (sourceFile.renameTo(destFile)) {
+            String originalFolder = sourceFile.getParent();
+            long result = dbHelper.insert(newFileName, imagePath, originalFolder);
+            LogUtils.i(TAG, "Added to trash: " + newFileName);
+            return result;
+        }
+        LogUtils.e(TAG, "Failed to move to trash");
+        return -1;
+    }
+    
+    public Cursor getTrashList() {
+        return dbHelper.getAll();
+    }
+    
+    public boolean restore(long id, String fileName, String originalPath) {
+        LogUtils.i(TAG, "restore: " + fileName + " -> " + originalPath);
+        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+        LogUtils.d(TAG, "trashFile exists: " + trashFile.exists() + ", path: " + trashFile.getAbsolutePath());
+        if (!trashFile.exists()) {
+            LogUtils.e(TAG, "trashFile not exists: " + trashFile.getAbsolutePath());
+            return false;
+        }
+        
+        File originalFolder = new File(originalPath).getParentFile();
+        LogUtils.d(TAG, "originalFolder: " + originalFolder + ", exists: " + (originalFolder != null && originalFolder.exists()));
+        if (originalFolder != null && !originalFolder.exists()) {
+            boolean created = originalFolder.mkdirs();
+            LogUtils.d(TAG, "mkdirs result: " + created + ", path: " + originalFolder.getAbsolutePath());
+        }
+        
+        File originalFile = new File(originalPath);
+        String restoreName = originalFile.getName();
+        File restoreFile = new File(originalFolder, restoreName);
+        LogUtils.d(TAG, "restoreFile: " + restoreFile.getAbsolutePath() + ", exists: " + restoreFile.exists());
+        
+        boolean renameResult = trashFile.renameTo(restoreFile);
+        LogUtils.d(TAG, "renameTo result: " + renameResult);
+        
+        if (renameResult) {
+            dbHelper.delete(id);
+            LogUtils.i(TAG, "Restored: " + fileName);
+            scanMedia(restoreFile.getAbsolutePath());
+            return true;
+        }
+        
+        // Try copy + delete if rename failed
+        LogUtils.i(TAG, "renameTo failed, trying copy + delete");
+        try {
+            java.io.InputStream in = new java.io.FileInputStream(trashFile);
+            java.io.OutputStream out = new java.io.FileOutputStream(restoreFile);
+            byte[] buffer = new byte[4096];
+            int len;
+            while ((len = in.read(buffer)) > 0) {
+                out.write(buffer, 0, len);
+            }
+            in.close();
+            out.close();
+            boolean deleted = trashFile.delete();
+            LogUtils.d(TAG, "copy+delete result: " + deleted);
+            if (deleted) {
+                dbHelper.delete(id);
+                LogUtils.i(TAG, "Restored (copy): " + fileName);
+                scanMedia(restoreFile.getAbsolutePath());
+                return true;
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "copy failed: " + e.getMessage());
+        }
+        
+        LogUtils.e(TAG, "Failed to restore: " + fileName);
+        return false;
+    }
+    
+    public boolean deletePermanently(long id, String fileName) {
+        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+        boolean deleted = trashFile.delete();
+        if (deleted) {
+            dbHelper.delete(id);
+        }
+        return deleted;
+    }
+    
+    public void clearTrash() {
+        Cursor cursor = getTrashList();
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                try {
+                    int colIndex = cursor.getColumnIndexOrThrow("_id");
+                    if (!cursor.isNull(colIndex)) {
+                        String fileName = cursor.getString(cursor.getColumnIndexOrThrow("file_name"));
+                        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+                        trashFile.delete();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            cursor.close();
+        }
+        dbHelper.clear();
+    }
+    
+    private String getExtension(String path) {
+        int lastDot = path.lastIndexOf('.');
+        if (lastDot > 0) {
+            return path.substring(lastDot);
+        }
+        return ".jpg";
+    }
+    
+    private void scanMedia(String filePath) {
+        LogUtils.d(TAG, "scanMedia: " + filePath);
+        MediaScannerConnection.scanFile(context, new String[]{filePath}, null, new android.media.MediaScannerConnection.OnScanCompletedListener() {
+            @Override
+            public void onScanCompleted(String path, Uri uri) {
+                LogUtils.d(TAG, "scanCompleted: " + path + " -> " + uri);
+            }
+        });
+    }
+}

gallery/src/main/res/drawable/bg_black.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#000000"/>
+</shape>

gallery/src/main/res/drawable/bg_checkerboard.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+    <path
+        android:fillColor="#808080"
+        android:pathData="M0,0h1v1h-1z M2,0h1v1h-1z M4,0h1v1h-1z M6,0h1v1h-1z M8,0h1v1h-1z
+                             M1,1h1v1h-1z M3,1h1v1h-1z M5,1h1v1h-1z M7,1h1v1h-1z M9,1h1v1h-1z
+                             M0,2h1v1h-1z M2,2h1v1h-1z M4,2h1v1h-1z M6,2h1v1h-1z M8,2h1v1h-1z
+                             M1,3h1v1h-1z M3,3h1v1h-1z M5,3h1v1h-1z M7,3h1v1h-1z M9,3h1v1h-1z
+                             M0,4h1v1h-1z M2,4h1v1h-1z M4,4h1v1h-1z M6,4h1v1h-1z M8,4h1v1h-1z
+                             M1,5h1v1h-1z M3,5h1v1h-1z M5,5h1v1h-1z M7,5h1v1h-1z M9,5h1v1h-1z
+                             M0,6h1v1h-1z M2,6h1v1h-1z M4,6h1v1h-1z M6,6h1v1h-1z M8,6h1v1h-1z
+                             M1,7h1v1h-1z M3,7h1v1h-1z M5,7h1v1h-1z M7,7h1v1h-1z M9,7h1v1h-1z
+                             M0,8h1v1h-1z M2,8h1v1h-1z M4,8h1v1h-1z M6,8h1v1h-1z M8,8h1v1h-1z
+                             M1,9h1v1h-1z M3,9h1v1h-1z M5,9h1v1h-1z M7,9h1v1h-1z M9,9h1v1h-1z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M1,0h1v1h-1z M3,0h1v1h-1z M5,0h1v1h-1z M7,0h1v1h-1z M9,0h1v1h-1z
+                             M0,1h1v1h-1z M2,1h1v1h-1z M4,1h1v1h-1z M6,1h1v1h-1z M8,1h1v1h-1z
+                             M1,2h1v1h-1z M3,2h1v1h-1z M5,2h1v1h-1z M7,2h1v1h-1z M9,2h1v1h-1z
+                             M0,3h1v1h-1z M2,3h1v1h-1z M4,3h1v1h-1z M6,3h1v1h-1z M8,3h1v1h-1z
+                             M1,4h1v1h-1z M3,4h1v1h-1z M5,4h1v1h-1z M7,4h1v1h-1z M9,4h1v1h-1z
+                             M0,5h1v1h-1z M2,5h1v1h-1z M4,5h1v1h-1z M6,5h1v1h-1z M8,5h1v1h-1z
+                             M1,6h1v1h-1z M3,6h1v1h-1z M5,6h1v1h-1z M7,6h1v1h-1z M9,6h1v1h-1z
+                             M0,7h1v1h-1z M2,7h1v1h-1z M4,7h1v1h-1z M6,7h1v1h-1z M8,7h1v1h-1z
+                             M1,8h1v1h-1z M3,8h1v1h-1z M5,8h1v1h-1z M7,8h1v1h-1z M9,8h1v1h-1z
+                             M0,9h1v1h-1z M2,9h1v1h-1z M4,9h1v1h-1z M6,9h1v1h-1z M8,9h1v1h-1z"/>
+</vector>

gallery/src/main/res/drawable/bg_white.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF"/>
+</shape>

gallery/src/main/res/drawable/ic_back.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>

gallery/src/main/res/drawable/ic_bg.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M4,4h7v7h-7z M13,4h7v7h-7z M4,13h7v7h-7z M13,13h7v7h-7z"/>
+    <path
+        android:fillColor="#808080"
+        android:pathData="M11,4h2v7h-2z M4,11h7v2h-7z M13,11h7v2h-7z M11,13h2v7h-2z M13,4h2v7h-2z M4,13h7v2h-7z"/>
+</vector>

gallery/src/main/res/drawable/ic_delete.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,-1H5v2h14V4z"/>
+</vector>

gallery/src/main/res/drawable/ic_info.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>

gallery/src/main/res/drawable/ic_restore.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,17.9 10.51,19 13,19c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
+</vector>

gallery/src/main/res/drawable/ic_share.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z"/>
+</vector>

gallery/src/main/res/layout/activity_image_viewer.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:clickable="true"
+    android:focusable="true">
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"/>
+
+    <LinearLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:background="#CC000000"
+        android:orientation="horizontal"
+        android:padding="4dp">
+
+        <ImageButton
+            android:id="@+id/btn_back"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_back"
+            android:contentDescription="Back"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <ImageButton
+            android:id="@+id/btn_share"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_share"
+            android:contentDescription="Share"/>
+
+        <ImageButton
+            android:id="@+id/btn_info"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_info"
+            android:contentDescription="Info"/>
+
+        <ImageButton
+            android:id="@+id/btn_bg"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_bg"
+            android:contentDescription="Background"/>
+
+        <ImageButton
+            android:id="@+id/btn_delete"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_delete"
+            android:contentDescription="Delete"/>
+
+    </LinearLayout>
+
+</FrameLayout>

gallery/src/main/res/layout/activity_main.xml

@@ -0,0 +1,28 @@
+<?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:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black"/>
+
+</LinearLayout>

gallery/src/main/res/layout/activity_settings.xml

@@ -0,0 +1,39 @@
+<?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="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/folder_path"
+        android:textSize="16sp"
+        android:textStyle="bold"/>
+
+    <EditText
+        android:id="@+id/edit_folder_path"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:hint="@string/enter_folder_path"
+        android:inputType="text"/>
+
+    <TextView
+        android:id="@+id/text_current_path"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="12sp"
+        android:textColor="#888888"/>
+
+    <Button
+        android:id="@+id/btn_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/save"/>
+
+</LinearLayout>

gallery/src/main/res/layout/item_album.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/album_cover"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:scaleType="centerCrop"
+        android:background="@color/black"/>
+
+    <TextView
+        android:id="@+id/album_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="#80000000"
+        android:padding="4dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <TextView
+        android:id="@+id/image_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|end"
+        android:background="#80000000"
+        android:padding="4dp"
+        android:textColor="@color/white"
+        android:textSize="10sp"/>
+
+</FrameLayout>

gallery/src/main/res/layout/item_gallery.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:scaleType="centerCrop"
+        android:background="@color/black"/>
+
+</FrameLayout>

gallery/src/main/res/layout/item_image_pager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"/>
+
+</FrameLayout>

gallery/src/main/res/layout/item_trash.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:scaleType="centerCrop"
+        android:background="@color/black"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="#80000000"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/btn_restore"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_weight="1"
+            android:padding="8dp"
+            android:src="@drawable/ic_restore"
+            android:contentDescription="Restore"/>
+
+        <ImageView
+            android:id="@+id/btn_delete"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_weight="1"
+            android:padding="8dp"
+            android:src="@drawable/ic_delete"
+            android:contentDescription="Delete"/>
+
+    </LinearLayout>
+
+</FrameLayout>

gallery/src/main/res/menu/menu_main.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <item
+        android:id="@+id/action_trash"
+        android:title="@string/trash"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_refresh"
+        android:title="@string/refresh"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_debug"
+        android:title="@string/debug_log"
+        app:showAsAction="never"/>
+    
+</menu>

gallery/src/main/res/menu/menu_trash.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <item
+        android:id="@+id/action_trash"
+        android:title="@string/trash"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_clear_trash"
+        android:title="@string/clear_trash"
+        app:showAsAction="never"/>
+    
+</menu>

gallery/src/main/res/values/colors.xml

@@ -3,4 +3,6 @@
     <color name="colorPrimary">#009688</color>
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
+    <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
 </resources>

gallery/src/main/res/values/strings.xml

@@ -0,0 +1,19 @@
+<resources>
+    <string name="app_name">Gallery</string>
+    <string name="refresh">Refresh</string>
+    <string name="settings">Settings</string>
+    <string name="settings_title">Settings</string>
+    <string name="folder_path">Folder Path</string>
+    <string name="enter_folder_path">Enter folder path</string>
+    <string name="save">Save</string>
+    <string name="cancel">Cancel</string>
+    <string name="no_images_found">No images found</string>
+    <string name="trash">Trash</string>
+    <string name="clear_trash">Clear Trash</string>
+    <string name="delete_confirm">Delete to trash?</string>
+    <string name="restore_confirm">Restore to original folder?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="debug_log">Debug Log</string>
+    <string name="debug_message">Debug log message</string>
+</resources>

gallery/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

settings.gradle-demo

@@ -78,6 +78,6 @@
 //include ':regexputils'
 //rootProject.name = "regexputils"
 
-// DebugTemp 项目编译设置
+// Gallery 项目编译设置
-//include ':debugtemp'
+//include ':gallery'
-//rootProject.name = "debugtemp"
+//rootProject.name = "gallery"

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Mar 15 11:48:40 HKT 2026
+#Wed Apr 08 17:37:24 GMT 2026
 stageCount=26
 libraryProject=
 baseVersion=15.11
 publishVersion=15.11.25
-buildCount=0
+buildCount=30
 baseBetaVersion=15.11.26

winboll/src/main/AndroidManifest.xml

@@ -293,11 +293,14 @@
 
 		<activity
 			android:name=".termux.NfcTermuxBridgeActivity"
-			android:exported="true">
+			android:exported="true"> <!-- 必须设置为 true，允许外部应用调用 -->
+
+			<!-- 接收 ACTION_BUILD 意图 -->
 			<intent-filter>
-				<action android:name="cc.winboll.nfc.ACTION_EXEC_TERMUX" />
+				<action android:name="cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
+
 		</activity>
 
     </application>

winboll/src/main/java/cc/winboll/studio/winboll/termux/NfcTermuxBridgeActivity.java

@@ -1,3 +1,12 @@
+/*
+ * 源码说明与描述：
+ * NFC 与 Termux 桥接活动，用于接收外部应用（包调用）传递的 JSON 指令并执行 Termux 脚本命令。
+ * 支持 ACTION_BUILD（后台执行）与 ACTION_BUILD_VIEW（终端窗口唤起）两种动作。
+ *
+ * 作者：豆包&ZhanGSKen<zhangsken@qq.com>
+ * 创建时间：2025-03-15 14:00:00
+ * 最后编辑时间：2026-03-16 10:00:00
+ */
 package cc.winboll.studio.winboll.termux;
 
 import android.app.Activity;
@@ -6,99 +15,227 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.winboll.models.NfcTermuxCmd;
 import com.google.gson.Gson;
 
 public class NfcTermuxBridgeActivity extends Activity {
 
-    private static final String TAG = "NfcTermuxBridge";
+    // ========================= 常量与静态属性 =========================
+    public static final String TAG = "NfcTermuxBridgeActivity";
+
+    // 外部应用调用时使用的 Action 常量
+    public static final String ACTION_BUILD = "cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD";
+
     private static final Gson GSON = new Gson();
 
+    // ========================= 生命周期方法 =========================
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        handleNfcIntent(getIntent());
+        LogUtils.d(TAG, "onCreate() 调用，savedInstanceState: " + (savedInstanceState != null ? "非空" : "空"));
+        dispatchIntent(getIntent());
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        handleNfcIntent(intent);
+        LogUtils.d(TAG, "onNewIntent() 调用，intent: " + (intent != null ? intent.toString() : "null"));
+        if (intent != null) {
+            LogUtils.d(TAG, "onNewIntent() action: " + intent.getAction());
+            LogUtils.d(TAG, "onNewIntent() data: " + intent.getDataString());
+            LogUtils.d(TAG, "onNewIntent() extras: " + intent.getExtras());
+            LogUtils.d(TAG, "onNewIntent() flags: " + intent.getFlags());
+            LogUtils.d(TAG, "onNewIntent() component: " + intent.getComponent());
+        } else {
+            LogUtils.w(TAG, "onNewIntent() intent is null");
+        }
+        dispatchIntent(intent);
     }
 
+    // ========================= 统一 Intent 分发（合并去重） =========================
     /**
-     * 处理 NFC 传递的 JSON 指令
+     * 统一分发 Intent，根据 Action 路由到不同业务逻辑
+     * @param intent 外部传入的 Intent
      */
-    private void handleNfcIntent(Intent intent) {
+    private void dispatchIntent(Intent intent) {
-        if (intent == null) return;
+        LogUtils.d(TAG, "dispatchIntent() 分发 intent");
+        if (intent == null) {
+            LogUtils.w(TAG, "dispatchIntent() intent is null");
+            return;
+        }
+
+        String action = intent.getAction();
+        if (ACTION_BUILD.equals(action)) {
+			ToastUtils.show("ACTION_BUILD 命中");
+            onOpenTermuxProjectBuild(intent);
+        } else {
+            LogUtils.w(TAG, "dispatchIntent() 未知 Action: " + action);
+            finish();
+        }
+    }
+
+    // ========================= 核心业务方法 =========================
+    /**
+     * 处理 ACTION_BUILD 动作：后台执行 NFC 指令
+     */
+//    private void handleNfcIntent(Intent intent) {
+//        LogUtils.d(TAG, "handleNfcIntent() 调用");
+//        if (intent == null) {
+//            LogUtils.w(TAG, "handleNfcIntent() intent 为空");
+//            return;
+//        }
+//
+//        try {
+//            String json = intent.getStringExtra(Intent.EXTRA_TEXT);
+//            LogUtils.d(TAG, "handleNfcIntent() json: " + json);
+//
+//            if (json == null || json.isEmpty()) {
+//                LogUtils.e(TAG, "handleNfcIntent() 指令为空");
+//                showToast("指令为空");
+//                finish();
+//                return;
+//            }
+//
+//            NfcTermuxCmd cmd = GSON.fromJson(json, NfcTermuxCmd.class);
+//            LogUtils.d(TAG, "handleNfcIntent() cmd: " + cmd);
+//
+//            if (cmd.script == null || cmd.script.isEmpty()) {
+//                LogUtils.e(TAG, "handleNfcIntent() script 为空");
+//                showToast("script 不能为空");
+//                finish();
+//                return;
+//            }
+//
+//            //String scriptPath = "/data/data/com.termux/files/home/TermuxWorkSpaces/BashShells/AutoNFC/" + cmd.script;
+//            String scriptPath = "/data/data/com.termux/files/home/TermuxWorkSpaces/BashShells/AutoNFC/" + "BuildWinBoLLProject.sh";
+//            LogUtils.d(TAG, "handleNfcIntent() 脚本路径: " + scriptPath);
+//
+//            boolean success = TermuxCommandExecutor.executeCommand(
+//                this, scriptPath, cmd.args, cmd.workDir, cmd.background, cmd.resultDir
+//            );
+//            LogUtils.d(TAG, "handleNfcIntent() 执行结果: " + success);
+//
+//            if (success) {
+//                showToast("指令已发送: " + cmd.script);
+//                LogUtils.i(TAG, "执行成功: " + scriptPath);
+//            } else {
+//                showToast("指令发送失败");
+//                LogUtils.e(TAG, "执行失败");
+//            }
+//
+//        } catch (Exception e) {
+//            LogUtils.e(TAG, "handleNfcIntent() 异常: " + e.getMessage(), e);
+//            showToast("解析失败");
+//        } finally {
+//            finish();
+//        }
+//    }
+
+    /**
+     * 处理 ACTION_BUILD_VIEW 动作：唤起 Termux 窗口执行命令
+     */
+    public void onOpenTermuxProjectBuild(Intent intent) {
+        LogUtils.d(TAG, "onOpenTermuxProjectBuildView() 调用");
+        if (intent == null) {
+            LogUtils.w(TAG, "onOpenTermuxProjectBuildView() intent 为空");
+            return;
+        }
 
         try {
             String json = intent.getStringExtra(Intent.EXTRA_TEXT);
+            LogUtils.d(TAG, "onOpenTermuxProjectBuildView() json: " + json);
 
-            // 1. 发布版逻辑：正常接收 NFC 传入的 JSON
             if (json == null || json.isEmpty()) {
-                LogUtils.e(TAG, "NFC 指令为空");
+                LogUtils.e(TAG, "onOpenTermuxProjectBuildView() 指令为空");
+                showToast("指令为空");
                 finish();
                 return;
             }
 
-            LogUtils.d(TAG, "接收 JSON：" + json);
-
-            // 2. 解析指令
             NfcTermuxCmd cmd = GSON.fromJson(json, NfcTermuxCmd.class);
+            LogUtils.d(TAG, "onOpenTermuxProjectBuildView() cmd: " + cmd);
+
             if (cmd.script == null || cmd.script.isEmpty()) {
-                LogUtils.e(TAG, "script 不能为空");
+                LogUtils.e(TAG, "onOpenTermuxProjectBuildView() script 为空");
+                showToast("script 不能为空");
                 finish();
                 return;
             }
 
-            // 3. 拼接脚本路径
+            StringBuilder targetCmd = new StringBuilder();
-            String scriptPath = "/data/data/com.termux/files/home/TermuxWorkSpaces/BashShells/AutoNFC/" + cmd.script;
+            String nfcScriptFolder = "/data/data/com.termux/files/home/TermuxWorkSpaces/BashShells/AutoNFC/";
+            targetCmd.append("cd " + nfcScriptFolder + " && ");
+            //targetCmd.append("stdbuf -o0 -e0 -i0 bash ").append(cmd.script).append(" ");
+            targetCmd.append("stdbuf -o0 -e0 -i0 bash ").append("BuildWinBoLLProject.sh").append(" ");
+            if (cmd.args != null) {
+                for (String arg : cmd.args) {
+                    targetCmd.append(arg).append(" ");
+                }
+            }
 
-            // 4. 执行 Termux 命令
+            LogUtils.d(TAG, "onOpenTermuxProjectBuildView() 命令: " + targetCmd);
-            boolean success = TermuxCommandExecutor.executeCommand(
+            boolean cmdSuccess = TermuxCommandExecutor.executeTerminalCommand(this, targetCmd.toString());
-                this,
+            LogUtils.d(TAG, "onOpenTermuxProjectBuildView() 执行结果: " + cmdSuccess);
-                scriptPath,
-                cmd.args,
-                cmd.workDir,
-                cmd.background,
-                cmd.resultDir
-            );
 
-            // 5. 结果反馈
+            if (cmdSuccess) {
-            if (success) {
+                showToast("指令已发送: " + cmd.script);
-                Toast.makeText(this, "指令已发送：" + cmd.script, Toast.LENGTH_SHORT).show();
-                LogUtils.i(TAG, "执行成功：" + scriptPath);
             } else {
-                Toast.makeText(this, "指令发送失败", Toast.LENGTH_SHORT).show();
+                showToast("指令发送失败");
-                LogUtils.e(TAG, "执行失败");
             }
 
         } catch (Exception e) {
-            LogUtils.e(TAG, "处理异常：" + e.getMessage(), e);
+            LogUtils.e(TAG, "onOpenTermuxProjectBuildView() 异常: " + e.getMessage(), e);
-            Toast.makeText(this, "解析失败", Toast.LENGTH_SHORT).show();
+            showToast("解析失败");
         } finally {
             finish();
         }
     }
 
-    // ===========================================================
+    // ========================= 公共静态测试方法 =========================
-    // 公共静态测试函数：外部可直接调用注入测试 JSON
+    /**
-    // ===========================================================
+     * 内部测试方法：发送 ACTION_BUILD 指令
+     */
     public static void testCommand(Context context) {
+        LogUtils.d(TAG, "testCommand()");
         try {
-            // 测试用指令
+            String testJson = "{\"script\":\"BuildWinBoLLProject.sh\",\"args\":[\"DebugTemp\"],\"workDir\":null,\"background\":true,\"resultDir\":null}";
-            String testJson = "{\"script\":\"BuildWinBoLLProject.sh\",\"args\":[\"WinBoLL_Demo\"],\"workDir\":null,\"background\":true,\"resultDir\":null}";
+            Intent intent = new Intent(context, NfcTermuxBridgeActivity.class);
-
+            intent.setAction(ACTION_BUILD); // 指定 Action
-            Intent testIntent = new Intent(context, NfcTermuxBridgeActivity.class);
+            intent.putExtra(Intent.EXTRA_TEXT, testJson);
-            testIntent.putExtra(Intent.EXTRA_TEXT, testJson);
+            context.startActivity(intent);
-
-            // 模拟跳转至自身 Activity
-            context.startActivity(testIntent);
-
         } catch (Exception e) {
-            LogUtils.e(TAG, "测试指令注入失败：" + e.getMessage());
+            LogUtils.e(TAG, "testCommand() 失败: " + e.getMessage());
-        }
+        }
+    }
+
+    /**
+     * 内部测试方法：发送 ACTION_BUILD_VIEW 指令
+     */
+//    public static void testViewCommand(Context context) {
+//        LogUtils.d(TAG, "testViewCommand()");
+//        try {
+//            String testJson = "{\"script\":\"BuildWinBoLLProjectView.sh\",\"args\":[\"DebugTemp\"],\"workDir\":null,\"background\":true,\"resultDir\":null}";
+//            Intent intent = new Intent(context, NfcTermuxBridgeActivity.class);
+//            intent.setAction(ACTION_BUILD_VIEW); // 指定 Action
+//            intent.putExtra(Intent.EXTRA_TEXT, testJson);
+//            context.startActivity(intent);
+//        } catch (Exception e) {
+//            LogUtils.e(TAG, "testViewCommand() 失败: " + e.getMessage());
+//        }
+//    }
+
+    // ========================= 工具方法 =========================
+    /**
+     * 统一显示 Toast，确保在主线程调用
+     */
+    private void showToast(final String message) {
+        runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					Toast.makeText(NfcTermuxBridgeActivity.this, message, Toast.LENGTH_SHORT).show();
+				}
+			});
     }
 }
 

winboll/src/main/java/cc/winboll/studio/winboll/unittest/TermuxEnvTestActivity.java

@@ -38,8 +38,8 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
 
     // 常量属性（置顶排列）
     public static final String TAG = "TermuxEnvTestActivity";
-    private static final String TERMUX_HOME_PATH = "/sdcard/WinBoLLStudio";
+    private static final String TERMUX_HOME_PATH = "/data/data/com.termux/files/home/TermuxWorkSpaces";
-    private static final String CMD_RESULT_FILE = TERMUX_HOME_PATH + "/.authcenter_cmd_result.tmp";
+    private static final String CMD_RESULT_FILE = TERMUX_HOME_PATH + "/CMD_RESULT_FILE.log";
 
     // 成员属性（常量后排列）
     private Toolbar mToolbar;
@@ -158,7 +158,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
     /**
      * 测试执行Gradle命令（实时输出版，唤起Termux窗口）
      */
-    public void onTestTermuxCMD(View view) {
+    public void onTestTermuxGradleBuildCMD(View view) {
         LogUtils.d(TAG, "onTestTermuxCMD() 按钮点击，执行Gradle命令（实时输出）");
         tvMessage.append("\n【测试：执行Gradle命令（实时输出）】\n");
 
@@ -171,7 +171,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
 
         // 2. 定义核心路径（确保路径与Termux中一致）
         String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle";
-        String projectPath = TERMUX_HOME_PATH + "/Sources/WinBoLL"; // 项目目录
+        String projectPath = TERMUX_HOME_PATH + "/Sources/DebugTemp"; // 项目目录
 
         // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
         String targetCmd = "";
@@ -218,10 +218,15 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
     }
 
 	public void onTestWinBoLLProjectBuild(View view) {
-		ToastUtils.show("onOpenTermuxBash");
+		ToastUtils.show("onTestWinBoLLProjectBuild");
 		NfcTermuxBridgeActivity.testCommand(this);
 	}
 	
+//	public void onTestWinBoLLProjectBuildView(View view) {
+//		ToastUtils.show("onTestWinBoLLProjectBuildView");
+//		NfcTermuxBridgeActivity.testViewCommand(this);
+//	}
+
 	public void onOpenTermuxBash(View view) {
         LogUtils.d(TAG, "onTestTermuxCMD() 按钮点击，执行Gradle命令（实时输出）");
         tvMessage.append("\n【测试：执行Gradle命令（实时输出）】\n");
@@ -235,7 +240,7 @@ public class TermuxEnvTestActivity extends BaseWinBoLLActivity {
 
         // 2. 定义核心路径（确保路径与Termux中一致）
         String gradleFullPath = "/data/data/com.termux/files/home/gradle/gradle-7.5.1/bin/gradle";
-        String projectPath = TERMUX_HOME_PATH + "/Sources/WinBoLL"; // 项目目录
+        String projectPath = TERMUX_HOME_PATH + "/"; // 项目目录
 
         // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
         String targetCmd = "";

winboll/src/main/res/layout/activity_termux_env_test.xml

@@ -18,24 +18,28 @@
 		android:gravity="right">
 
 		<Button
+			android:textAllCaps="false"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Open Termux Bash"
 			android:onClick="onOpenTermuxBash"/>
 
 		<Button
+			android:textAllCaps="false"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="TestTermuxCMD"
+			android:text="Test Termux Gradle Build CMD"
-			android:onClick="onTestTermuxCMD"/>
+			android:onClick="onTestTermuxGradleBuildCMD"/>
 
 		<Button
+			android:textAllCaps="false"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Test Termux Env"
 			android:onClick="onTestTermuxEnv"/>
 
 		<Button
+			android:textAllCaps="false"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="Test WinBoLL Project Build"