<colorpickerdialogex>APK 15.0.0 release Publish.

- 创建带图案打开意图过滤器的 PatternLockActivity
- 构建图案锁布局和点背景样式
- 添加图案锁颜色和字符串资源
- 更新构建计数到 11

注意：图案锁 UI 已创建但尚未集成

colorpickerdialogex/README.md

@@ -1,7 +1,8 @@
-# Gallery
+# ColorPickerDialogEx
+[![](https://jitpack.io/v/ZhanGSKen/ColorPickerDialogEx.svg)](https://jitpack.io/#ZhanGSKen/ColorPickerDialogEx)
 
 #### 介绍
-云宝相册应用
+WinBoLL ColorPickerDialogEx 调试版类库。
 
 #### 软件架构
 适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
@@ -10,7 +11,8 @@
 
 #### Gradle 编译说明
 调试版编译命令 ：gradle assembleBetaDebug
-阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh gallery
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh colorpickerdialogex
+阶段版类库发布命令 ：git pull &&bash .winboll/bashPublishLIBAddTag.sh libcolorpickerdialogex
 
 #### 使用说明
 

colorpickerdialogex/build.gradle

@@ -23,7 +23,7 @@ android {
     buildToolsVersion "30.0.3"
 	
     defaultConfig {
-        applicationId "cc.winboll.studio.gallery"
+        applicationId "cc.winboll.studio.colorpickerdialogex"
 	    minSdkVersion 23
 		// 适配MIUI12
         targetSdkVersion 30
@@ -50,8 +50,7 @@ android {
 }
 
 dependencies {
-    
-    api 'com.google.code.gson:gson:2.10.1'
+	api project(':libcolorpickerdialogex')
 	
 	// 下拉控件
     api 'com.baoyz.pullrefreshlayout:library:1.2.0'
@@ -103,17 +102,17 @@ 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.9'
-    api 'cc.winboll.studio:libappbase:15.15.19'
+    api 'cc.winboll.studio:libappbase:15.15.21'
 	
 	// WinBoLL备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
 	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
 	
-	api fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

colorpickerdialogex/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sat May 02 21:13:04 HKT 2026
+stageCount=1
+libraryProject=libcolorpickerdialogex
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=0
+baseBetaVersion=15.0.1

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

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

colorpickerdialogex/src/main/AndroidManifest.xml

@@ -1,21 +1,16 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    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"/>
+    package="cc.winboll.studio.colorpickerdialogex">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalWinBoLLApplication"
-		android:requestLegacyExternalStorage="true">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
@@ -31,28 +26,15 @@
 
         </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"/>
 
         <activity android:name=".GlobalApplication$CrashActivity"/>
 
+        <activity android:name=".AboutActivity"
+			android:exported="true"/>
+
     </application>
 
 </manifest>

colorpickerdialogex/src/main/java/cc/winboll/studio/colorpickerdialogex/AboutActivity.java

@@ -0,0 +1,50 @@
+package cc.winboll.studio.colorpickerdialogex;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toolbar;
+import cc.winboll.studio.colorpickerdialogex.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/01/11 12:55
+ * @Describe AboutActivity
+ */
+public class AboutActivity extends Activity {
+
+    public static final String TAG = "AboutActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setActionBar(toolbar);
+
+		AboutView aboutView = findViewById(R.id.aboutview);
+		aboutView.setAPPInfo(genDefaultAppInfo());
+    }
+
+	private APPInfo genDefaultAppInfo() {
+        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
+        String branchName = "colorpickerdialogex";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("ColorPickerDialogEx");
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("ColorPickerDialogEx");
+        appInfo.setAppGitOwner("ZhanGSKen");
+        appInfo.setAppGitAPPBranch(branchName);
+        appInfo.setAppGitAPPSubProjectFolder(branchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=ColorPickerDialogEx");
+        appInfo.setAppAPKName("ColorPickerDialogEx");
+        appInfo.setAppAPKFolderName("ColorPickerDialogEx");
+        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
+        return appInfo;
+    }
+}

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

@@ -0,0 +1,344 @@
+package cc.winboll.studio.colorpickerdialogex;
+
+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();
+		// 如果应用不在调试状态，就根据编译类型设置调试状态
+		if (isDebugging() != true) {
+			setIsDebugging(BuildConfig.DEBUG);
+		}
+        
+        // 初始化 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();
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package cc.winboll.studio.colorpickerdialogex;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.LibraryActivity;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.libcolorpickerdialogex.ColorPickerDialogEx;
+
+public class MainActivity extends AppCompatActivity {
+
+	LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        mLogView = findViewById(R.id.logview);
+
+        ToastUtils.show("onCreate");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (App.isDebugging() == true) {
+			mLogView.setVisibility(View.VISIBLE);
+			mLogView.start();
+		} else {
+			mLogView.setVisibility(View.GONE);
+		}
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.menu_about) {
+            startActivity(new Intent(this, AboutActivity.class));
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+	public void onSettingBackgroundWithColorPickerDialogEx(View view) {
+		ColorPickerDialogEx dlg = new ColorPickerDialogEx(this, getResources().getColor(R.color.colorPrimary));
+		dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+				@Override
+				public void beforeColorChanged() {
+				}
+
+				@Override
+				public void onColorChanged(int color) {
+					LinearLayout llMain=(LinearLayout)findViewById(R.id.ll_main);
+					llMain.setBackgroundColor(color);
+				}
+
+				@Override
+				public void afterColorChanged() {
+				}
+
+
+			});
+		dlg.show();
+    }
+
+    public void onLibraryActivity(View view) {
+		startActivity(new Intent(this, LibraryActivity.class));
+    }
+}

colorpickerdialogex/src/main/res/layout/activity_about.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<cc.winboll.studio.libappbase.views.AboutView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutview"/>
+
+</LinearLayout>
+

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

@@ -0,0 +1,58 @@
+<?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"
+	android:id="@+id/ll_main">
+
+	<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">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Setting Background With ColorPickerDialogEx"
+			android:onClick="onSettingBackgroundWithColorPickerDialogEx"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Open LibraryActivity"
+			android:onClick="onLibraryActivity"/>
+
+	</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>
+

colorpickerdialogex/src/main/res/menu/main_menu.xml

@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_about"
+        android:title="About"
+        android:icon="@android:drawable/ic_dialog_info"
+        app:showAsAction="ifRoom" />
+</menu>

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

@@ -3,6 +3,4 @@
     <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>

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

@@ -0,0 +1,5 @@
+<resources>
+    <string name="app_name">ColorPickerDialogEx</string>
+    <string name="app_description">WinBoLL ColorPickerDialogEx 调试版类库调试应用。</string>
+	
+</resources>

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

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

gallery/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 06:42:01 HKT 2026
-stageCount=3
-libraryProject=
-baseVersion=15.0
-publishVersion=15.0.2
-buildCount=0
-baseBetaVersion=15.0.3

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

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

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

@@ -1,25 +0,0 @@
-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

@@ -1,153 +0,0 @@
-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();
-        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();
-        }
-    }
-}

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

@@ -1,117 +0,0 @@
-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;
-
-    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();
-    }
-
-    @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.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

@@ -1,44 +0,0 @@
-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

@@ -1,76 +0,0 @@
-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;
-
-    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();
-    }
-
-    @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) {
-        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

@@ -1,56 +0,0 @@
-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;
-
-    public ImagePagerAdapter(ArrayList<Uri> imageUrls) {
-        this.imageUrls = imageUrls;
-        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images");
-    }
-
-    @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);
-        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

@@ -1,377 +0,0 @@
-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 GestureDetector gestureDetector;
-    private TrashManager trashManager;
-    
-    @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);
-        
-        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);
-        
-        ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls);
-        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();
-            }
-        });
-    }
-    
-    private void toggleToolbar() {
-        if (toolbar.getVisibility() == View.VISIBLE) {
-            toolbar.setVisibility(View.GONE);
-        } else {
-            toolbar.setVisibility(View.VISIBLE);
-        }
-    }
-    
-    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));
-            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

@@ -1,290 +0,0 @@
-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();
-        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();
-        }
-    }
-    
-    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

@@ -1,33 +0,0 @@
-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 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();
-    }
-}

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

@@ -1,46 +0,0 @@
-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

@@ -1,193 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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

@@ -1,158 +0,0 @@
-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/ic_back.xml

@@ -1,9 +0,0 @@
-<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_delete.xml

@@ -1,9 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-<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

@@ -1,65 +0,0 @@
-<?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_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

@@ -1,28 +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>
-
-    <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

@@ -1,39 +0,0 @@
-<?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

@@ -1,37 +0,0 @@
-<?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

@@ -1,15 +0,0 @@
-<?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

@@ -1,14 +0,0 @@
-<?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"
-    android:background="@color/black">
-
-    <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

@@ -1,42 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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

@@ -1,15 +0,0 @@
-<?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/strings.xml

@@ -1,19 +0,0 @@
-<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>

libcolorpickerdialogex/.gitignore

@@ -0,0 +1 @@
+/build

libcolorpickerdialogex/build.gradle

@@ -0,0 +1,89 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 30
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+	api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// OkHttp网络请求
+     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
+    
+	// AndroidX 类库
+    /*api 'androidx.appcompat:appcompat:1.1.0'
+    //api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'*/
+	
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+	implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core:1.6.0"
+    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.guava:guava:24.1-jre"
+    /*
+	implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:linkify:$markwonVersion"
+    implementation "io.noties.markwon:recycler:$markwonVersion"
+	*/
+	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:libappbase:15.15.11'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}

libcolorpickerdialogex/build.properties

@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sat May 02 21:13:04 HKT 2026
+stageCount=1
+libraryProject=libcolorpickerdialogex
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=0
+baseBetaVersion=15.0.1

libcolorpickerdialogex/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

libcolorpickerdialogex/src/main/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.libcolorpickerdialogex" >
+
+    <application>
+        <activity
+            android:name="cc.winboll.studio.LibraryActivity"
+            android:label="@string/lib_name" >
+        </activity>
+    </application>
+
+</manifest>
+

libcolorpickerdialogex/src/main/java/cc/winboll/studio/LibraryActivity.java

@@ -0,0 +1,13 @@
+package cc.winboll.studio;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libcolorpickerdialogex.R;
+
+public class LibraryActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.library);
+    }
+}

libcolorpickerdialogex/src/main/java/cc/winboll/studio/libcolorpickerdialogex/ColorPickerDialogEx.java

@@ -0,0 +1,48 @@
+package cc.winboll.studio.libcolorpickerdialogex;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import com.a4455jkjh.colorpicker.view.ColorPickerLayout;
+import com.a4455jkjh.colorpicker.view.OnColorChangedListener;
+import java.lang.CharSequence;
+import java.lang.Object;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/05/02 15:14
+ */
+public class ColorPickerDialogEx extends com.a4455jkjh.colorpicker.ColorPickerDialog {
+
+    public static final String TAG = "ColorPickerDialog";
+
+	public ColorPickerDialogEx(Context context, int p) {
+		super(context, p);
+	}
+
+	public void dismiss() {
+		super.dismiss();
+	}
+
+	public void onClick(DialogInterface dialogInterface, int p) {
+		super.onClick(dialogInterface, p);
+	}
+
+	public ColorPickerDialog setOnColorChangedListener(OnColorChangedListener onColorChangedListener) {
+		return super.setOnColorChangedListener(onColorChangedListener);
+	}
+
+	public ColorPickerDialog setTitle(int p) {
+		return super.setTitle(p);
+	}
+
+	public ColorPickerDialog setTitle(CharSequence charSequence) {
+		return super.setTitle(charSequence);
+	}
+
+	public void show() {
+		super.show();
+	}
+
+}

libcolorpickerdialogex/src/main/res/layout/library.xml

@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <TextView
+        android:text="@string/text_libraryactivity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

libcolorpickerdialogex/src/main/res/values-v21/styles.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
+	</style>
+</resources>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="lib_name">libdebugtemp</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="text_libraryactivity">LibraryActivity</string>
+
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
+	</style>
+</resources>

settings.gradle-demo

@@ -30,6 +30,11 @@
 //include ':libaes'
 //rootProject.name = "aes"
 
+// ColorPickerDialogEx 项目编译设置
+//include ':colorpickerdialogex'
+//include ':libcolorpickerdialogex'
+//rootProject.name = "colorpickerdialogex"
+
 // Contacts 项目编译设置
 //include ':contacts'
 //rootProject.name = "contacts"
@@ -77,7 +82,3 @@
 // RegExpUtils 项目编译设置
 //include ':regexputils'
 //rootProject.name = "regexputils"
-
-// Gallery 项目编译设置
-//include ':gallery'
-//rootProject.name = "gallery"

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Apr 08 17:37:24 GMT 2026
-stageCount=26
+#Thu Apr 30 14:58:25 CST 2026
+stageCount=27
 libraryProject=
 baseVersion=15.11
-publishVersion=15.11.25
-buildCount=30
-baseBetaVersion=15.11.26
+publishVersion=15.11.26
+buildCount=11
+baseBetaVersion=15.11.27

winboll/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cc.winboll.studio.winboll"
     xmlns:tools="http://schemas.android.com/tools"
-	android:sharedUserId="com.termux">
+    package="cc.winboll.studio.winboll"
+    android:sharedUserId="com.termux">
 
     <!-- 拥有完全的网络访问权限 -->
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,11 +13,15 @@
 
     <!-- 对正在运行的应用重新排序 -->
     <uses-permission android:name="android.permission.REORDER_TASKS"/>
-	<!-- Android 11+ 查询已安装应用权限 -->
-	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-		tools:ignore="QueryAllPackagesPermission" />
-	<!-- 可选：兼容低版本系统 -->
-	<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
+
+    <!-- 计算应用存储空间 -->
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission"/>
+
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
 
     <application
         android:allowBackup="true"
@@ -289,20 +293,39 @@
 
         <activity android:name="cc.winboll.studio.winboll.activities.WXPayActivity"/>
 
+        <activity android:name="cc.winboll.studio.winboll.activities.PatternLockActivity"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.winboll.activities.PatternLockActivity.ACTION_OPEN_PATTERN"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
         <activity android:name="cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity"/>
 
-		<activity
-			android:name=".termux.NfcTermuxBridgeActivity"
-			android:exported="true"> <!-- 必须设置为 true，允许外部应用调用 -->
+        <activity
+            android:name=".termux.NfcTermuxBridgeActivity"
+            android:exported="true">
 
-			<!-- 接收 ACTION_BUILD 意图 -->
-			<intent-filter>
-				<action android:name="cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
+            <intent-filter>
 
-		</activity>
+                <action android:name="cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.winboll.applications.MyTermuxActivity"
+            android:label="@string/my_termux_activity"
+            android:exported="true"/>
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -15,6 +15,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
 import cc.winboll.studio.winboll.activities.AboutActivity;
 import cc.winboll.studio.winboll.activities.SettingsActivity;
+import cc.winboll.studio.winboll.applications.MyTermuxActivity;
 import cc.winboll.studio.winboll.fragments.BrowserFragment;
 import cc.winboll.studio.winboll.unittest.TermuxEnvTestActivity;
 import java.util.ArrayList;
@@ -155,6 +156,10 @@ public class MainActivity extends DrawerFragmentActivity {
 			Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
 
 			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+        } else if (nItemId == R.id.item_mytermux) {
+			Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
+			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			startActivity(intent);
         } else if (nItemId == R.id.item_termux_env_test) {
 			Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
 

winboll/src/main/java/cc/winboll/studio/winboll/activities/PatternLockActivity.java

@@ -0,0 +1,295 @@
+package cc.winboll.studio.winboll.activities;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.MotionEvent;
+import android.widget.FrameLayout;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.R;
+
+public class PatternLockActivity extends BaseWinBoLLActivity {
+
+    public static final String TAG = "PatternLockActivity";
+
+    private static final int DOT_RADIUS = 8;
+    private static final int PATTERN_ERROR_DURATION = 1500;
+
+    private static final String PREFS_NAME = "pattern_lock_prefs";
+    static final String KEY_LOCK_PATTERN = "lock_pattern";
+    static final String KEY_ERROR_STATE = "error_state";
+    private static final String KEY_ERROR_REPEAT_PATTERN = "error_repeat_pattern";
+
+    private boolean mIsInErrorState;
+    private boolean mNeedRestart;
+    private Handler mHandler;
+
+    private FrameLayout mContainer;
+    private PatternView mPatternView;
+
+    public PatternLockActivity() {
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    PatternLockActivity(Context context) {
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        AESThemeUtil.applyAppTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pattern_lock);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setSubtitle(TAG);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(v -> finish());
+
+        mContainer = findViewById(R.id.container);
+        mPatternView = new PatternView(this);
+        mContainer.addView(mPatternView);
+        mPatternView.invalidate();
+        
+        mNeedRestart = false;
+        boolean isEnoughPoints = savedInstanceIsEnoughPoints();
+
+        if (savedInstanceState != null) {
+            mIsInErrorState = savedInstanceState.getBoolean(KEY_ERROR_STATE, false);
+            mNeedRestart = savedInstanceState.getBoolean(KEY_ERROR_REPEAT_PATTERN, false);
+        }
+
+        if (mIsInErrorState) {
+            mPatternView.invalidate();
+        }
+    }
+
+    boolean savedInstanceIsEnoughPoints() {
+        int count = 0;
+        if (mPatternView != null) {
+            for (int i = 0; i < 9; i++) {
+                if (mPatternView.mDotState[i] == 1) {
+                    count++;
+                }
+            }
+        }
+        return count >= 4 || count == 0;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        if (mIsInErrorState) {
+            outState.putBoolean(KEY_ERROR_STATE, mIsInErrorState);
+        }
+        if (mNeedRestart) {
+            outState.putBoolean(KEY_ERROR_REPEAT_PATTERN, mNeedRestart);
+        }
+        super.onSaveInstanceState(outState);
+    }
+
+    private void showErrorState() {
+        mIsInErrorState = true;
+        invalidatePattern();
+        mHandler.postDelayed(() -> {
+            mIsInErrorState = false;
+            SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+            prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
+            invalidatePattern();
+            if (mPatternView != null) mPatternView.invalidate();
+        }, PATTERN_ERROR_DURATION);
+    }
+
+    private void clearErrorState() {
+        mIsInErrorState = false;
+        SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+        prefs.edit().putBoolean(KEY_ERROR_STATE, false).apply();
+        invalidatePattern();
+        if (mPatternView != null) mPatternView.invalidate();
+    }
+
+    private void showErrorToast() {
+        android.widget.Toast.makeText(this, "图案点数不足，请重新绘制", 
+            android.widget.Toast.LENGTH_SHORT).show();
+        mNeedRestart = true;
+    }
+
+    private void showSuccessDialog() {
+        android.app.AlertDialog alertDialog = new android.app.AlertDialog.Builder(this)
+            .setTitle("设置成功")
+            .setMessage("图案密码已设置成功")
+            .setPositiveButton("确定", (dialog, which) -> finish())
+            .setCancelable(false)
+            .create();
+        alertDialog.show();
+    }
+
+    void finishWithRestart() {
+        finish();
+    }
+
+    private void invalidatePattern() {
+        if (mPatternView != null) {
+            mPatternView.invalidate();
+        }
+    }
+
+    class PatternView extends FrameLayout {
+        int mPatternSize = 0;
+        int MAX_DOT_COUNT = 9;
+        int[] mDotX = new int[MAX_DOT_COUNT];
+        int[] mDotY = new int[MAX_DOT_COUNT];
+        int[] mDotState = new int[MAX_DOT_COUNT];
+        Bitmap mDotBitmap;
+        Paint mPaintConnector;
+        Paint mPaintErrorBackground;
+        int mDotCount = 0;
+
+        PatternView(Context context) {
+            super(context);
+            setBackgroundColor(Color.WHITE);
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                mDotX[i] = -1;
+                mDotY[i] = -1;
+                mDotState[i] = 0;
+            }
+        }
+
+        @Override
+        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+            super.onSizeChanged(w, h, oldw, oldh);
+            if (w == 0 || h == 0) return;
+            mPatternSize = w > h ? h : w;
+            int grid = 3;
+            int cell = mPatternSize / grid;
+
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                mDotX[i] = (i % grid) * cell + cell / 2 - cell / 24;
+                mDotY[i] = (i / grid) * cell + cell / 2 - cell / 24;
+                mDotState[i] = 0;
+            }
+
+            if (mDotBitmap == null) {
+                mDotBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.dot_darkgreen_dark);
+            }
+            if (mPaintConnector == null) {
+                mPaintConnector = new Paint(Paint.FILTER_BITMAP_FLAG);
+                mPaintConnector.setColor(-0xFF006400);
+            }
+            if (mPaintErrorBackground == null) {
+                mPaintErrorBackground = new Paint(Paint.ANTI_ALIAS_FLAG);
+                mPaintErrorBackground.setColor(Color.RED);
+            }
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            if (mDotCount > 0) return false;
+
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN:
+                    invalidate();
+                    return true;
+                case MotionEvent.ACTION_MOVE:
+                    float x = event.getX();
+                    float y = event.getY();
+
+                    for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                        int dx = (int) Math.abs(x - mDotX[i]);
+                        int dy = (int) Math.abs(y - mDotY[i]);
+                        if (dx <= DOT_RADIUS && dy <= DOT_RADIUS && mDotState[i] == 0) {
+                            mDotState[i] = 1;
+                            mDotCount++;
+                        }
+                    }
+
+                    for (int i = 0; i < mDotCount - 1; i++) {
+                        int a = -1, b = -1;
+                        for (int k = 0; k < MAX_DOT_COUNT; k++) {
+                            if (mDotState[k] == 1) {
+                                if (a < 0) a = k;
+                                else b = k;
+                            }
+                        }
+                        if (a >= 0 && b >= 0) {
+                            a = Math.min(a, b);
+                            b = Math.max(a, b);
+                        }
+                        if (mDotState[a] == 1 && mDotState[b] == 1) {
+                            int dx = mDotX[b] - mDotX[a];
+                            int dy = mDotY[b] - mDotY[a];
+                            if ((Math.abs(dx) <= 1 && Math.abs(dy) <= 1) ||
+                                (Math.abs(dx) <= 2 && Math.abs(dy) <= 1)) {
+                                if (mDotState[b] == 1) {
+                                    for (int k = a + 1; k < b; k++) {
+                                        if (mDotState[k] == 0) {
+                                            mDotState[k] = 1;
+                                        }
+                                    }
+                                    mDotCount += (b - a - 1);
+                                }
+                            }
+                        }
+                    }
+                    invalidate();
+                    return true;
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    if (mDotCount < 4) {
+                        showErrorState();
+                        showErrorToast();
+                    }
+                    break;
+            }
+            return true;
+        }
+
+        @Override
+        public void onDraw(Canvas canvas) {
+            if (mPatternSize == 0) return;
+
+            int activeCount = 0;
+            for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                if (mDotState[i] == 1) activeCount++;
+            }
+
+            if (activeCount == 0) {
+                mPaintErrorBackground.setAlpha(50);
+            } else {
+                mPaintErrorBackground.setAlpha(mIsInErrorState ? 80 : 60);
+            }
+
+            canvas.clipRect(0, 0, mPatternSize * 80 / 100, mPatternSize * 80 / 100);
+
+            canvas.drawRect(0, 0, mPatternSize, mPatternSize, mPaintErrorBackground);
+
+            if (mDotBitmap != null) {
+                for (int i = 0; i < MAX_DOT_COUNT; i++) {
+                    if (mDotState[i] == 1) {
+                        canvas.drawBitmap(mDotBitmap, mDotX[i], mDotY[i], mPaintConnector);
+                    }
+                }
+            }
+        }
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java

@@ -0,0 +1,77 @@
+package cc.winboll.studio.winboll.applications;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
+
+public class MyTermuxActivity extends AppCompatActivity {
+
+    public static final String TAG = "MyTermuxActivity";
+
+    private Toolbar mToolbar;
+    private Button mTermuxButton;
+	private Button mTermuxWorkSpacesButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_my_termux);
+
+        // 初始化工具栏
+        initToolbar();
+        // 初始化按钮
+        initView();
+    }
+
+    private void initToolbar() {
+        mToolbar = findViewById(R.id.toolbar);
+        if (mToolbar != null) {
+            setSupportActionBar(mToolbar);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "点击返回按钮");
+						finish();
+					}
+				});
+            LogUtils.d(TAG, "工具栏初始化完成");
+        }
+    }
+
+    private void initView() {
+        mTermuxButton = findViewById(R.id.btn_termux);
+        if (mTermuxButton != null) {
+            mTermuxButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "点击 Termux 按钮");
+						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~");
+						//TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
+					}
+				});
+            LogUtils.d(TAG, "Termux 按钮初始化完成");
+        }
+
+		mTermuxWorkSpacesButton = findViewById(R.id.btn_termuxworkspaces);
+        if (mTermuxWorkSpacesButton != null) {
+            mTermuxWorkSpacesButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "点击 TermuxWorkSpaces 按钮");
+						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
+					}
+				});
+            LogUtils.d(TAG, "TermuxWorkSpaces 按钮初始化完成");
+        }
+    }
+
+    private boolean isTermuxAvailable() {
+        return TermuxCommandExecutor.isTermuxInstalled(this);
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonModel.java

@@ -0,0 +1,142 @@
+package cc.winboll.studio.winboll.models;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/30 10:47
+ */
+public class TermuxButtonModel extends BaseBean {
+
+    public static final String TAG = "TermuxButtonModel";
+
+    String buttonName;
+    String exeCommand;
+    String workDir;
+
+    // 已修改：isCommit 改为规范过去式命名 isCommitted
+    boolean isCommitted;
+    String commitTitle;
+    String commitInfo;
+
+    public TermuxButtonModel() {
+        this.buttonName = "";
+        this.exeCommand = "";
+        this.workDir = "";
+        // 默认初始化
+        this.isCommitted = false;
+        this.commitTitle = "";
+        this.commitInfo = "";
+    }
+
+    public void setButtonName(String buttonName) {
+        this.buttonName = buttonName;
+    }
+
+    public String getButtonName() {
+        return buttonName;
+    }
+
+    public void setExeCommand(String exeCommand) {
+        this.exeCommand = exeCommand;
+    }
+
+    public String getExeCommand() {
+        return exeCommand;
+    }
+
+    public void setWorkDir(String workDir) {
+        this.workDir = workDir;
+    }
+
+    public String getWorkDir() {
+        return workDir;
+    }
+
+    // ========== 已修改 对应 isCommitted 完整 Get & Set ==========
+    public boolean isCommitted() {
+        return isCommitted;
+    }
+
+    public void setCommitted(boolean committed) {
+        isCommitted = committed;
+    }
+
+    public String getCommitTitle() {
+        return commitTitle;
+    }
+
+    public void setCommitTitle(String commitTitle) {
+        this.commitTitle = commitTitle;
+    }
+
+    public String getCommitInfo() {
+        return commitInfo;
+    }
+
+    public void setCommitInfo(String commitInfo) {
+        this.commitInfo = commitInfo;
+    }
+
+    @Override
+    public String getName() {
+        return TermuxButtonModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("buttonName").value(getButtonName());
+        jsonWriter.name("exeCommand").value(getExeCommand());
+        jsonWriter.name("workDir").value(getWorkDir());
+
+        // JSON写入同步修改
+        jsonWriter.name("isCommitted").value(isCommitted());
+        jsonWriter.name("commitTitle").value(getCommitTitle());
+        jsonWriter.name("commitInfo").value(getCommitInfo());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            return true;
+        } else {
+            if (name.equals("buttonName")) {
+                setButtonName(jsonReader.nextString());
+            } else if (name.equals("exeCommand")) {
+                setExeCommand(jsonReader.nextString());
+            } else if (name.equals("workDir")) {
+                setWorkDir(jsonReader.nextString());
+            }
+            // JSON解析字段同步修改
+            else if (name.equals("isCommitted")) {
+                setCommitted(jsonReader.nextBoolean());
+            } else if (name.equals("commitTitle")) {
+                setCommitTitle(jsonReader.nextString());
+            } else if (name.equals("commitInfo")) {
+                setCommitInfo(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        return this;
+    }
+
+}
+

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

@@ -22,6 +22,7 @@ public class TermuxCommandExecutor {
     // Termux RunCommandService 完整类名（包名+类名）
     private static final String TERMUX_RUN_CMD_SERVICE_CLASS = "com.termux.app.RunCommandService";
     private static final String TERMUX_RUN_CMD_ACTION = TermuxConstants.TERMUX_APP.RUN_COMMAND_SERVICE.ACTION_RUN_COMMAND;
+	private static final String TERMUX_HOME_PATH = "/data/data/com.termux/files/home";
 
     /**
      * 执行 Termux 命令（核心方法）
@@ -114,7 +115,7 @@ public class TermuxCommandExecutor {
             context,
             "/data/data/com.termux/files/usr/bin/bash", // Termux 默认 bash 路径（正确）
             args,
-            "/data/data/com.termux/files/home", // 默认工作目录
+            TERMUX_HOME_PATH, // 默认工作目录
             false, // 终端会话执行（可见）
             null // 不输出到文件
         );
@@ -173,5 +174,49 @@ public class TermuxCommandExecutor {
         LogUtils.d(TAG, "外部应用调用权限提示：" + tip);
         return tip;
     }
+
+	public static boolean openTermuxBash(Context context, String command) {
+		return openTermuxBash(context, command, "~");
+	}
+
+	public static boolean openTermuxBash(Context context, String command, String workDir) {
+        LogUtils.d(TAG, "openTermuxBash() 按钮点击，执行Gradle命令（实时输出）");
+
+        // 1. 校验Termux是否安装
+        if (!TermuxCommandExecutor.isTermuxInstalled(context)) {
+            LogUtils.e(TAG, "openTermuxBash() 错误：未安装Termux应用");
+            return false;
+        }
+
+        // 2. 定义核心路径（确保路径与Termux中一致）
+		String projectPath = TERMUX_HOME_PATH;
+		if (workDir.startsWith("~") || workDir.startsWith(".")) {
+			projectPath = TERMUX_HOME_PATH + "/" + workDir.substring(1);
+		}
+
+        // 3. 构造命令（核心：用stdbuf禁用缓冲，实现实时输出）
+        String targetCmd = "";
+        // 步骤1：进入项目目录（不存在则创建）
+        targetCmd += "cd " + projectPath + " && ";
+        // 步骤2：加载环境变量
+        targetCmd += "source ~/.bashrc && ";
+        // 步骤3：显式配置PATH
+        targetCmd += "export PATH=/data/data/com.termux/files/usr/bin:$PATH && ";
+        // 步骤4：用stdbuf禁用stdout/stderr缓冲（关键！），执行Gradle命令
+        // -o0：stdout无缓冲；-e0：stderr无缓冲；-i0：stdin无缓冲
+        //targetCmd += "stdbuf -o0 -e0 -i0 " + gradleFullPath + " task --all | grep assemble && ";
+        //targetCmd += "stdbuf -o0 -e0 -i0 " + gradleFullPath + " -Pandroid.aapt2FromMavenOverride=/data/data/com.termux/files/home/android-sdk/build-tools/34.0.4/aapt2 assembleBetaDebug && ";
+        targetCmd += "stdbuf -o0 -e0 -i0 bash && ";
+        // 步骤5：执行成功提示
+        targetCmd += "echo '\n✅ 命令执行完成！' && echo '\n📌 当前目录：" + projectPath + "' && read -p '按回车键关闭终端...'";
+
+
+        // 4. 执行命令（终端会话模式，唤起Termux窗口）
+        boolean cmdSuccess = TermuxCommandExecutor.executeTerminalCommand(context, targetCmd);
+        if (!cmdSuccess) {
+            return true;
+        }
+		return false;
+    }
 }
 

winboll/src/main/java/cc/winboll/studio/winboll/views/TermuxButton.java

@@ -0,0 +1,264 @@
+package cc.winboll.studio.winboll.views;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.winboll.models.TermuxButtonModel;
+
+/**
+ * 自定义Termux功能按钮控件
+ * 绑定TermuxButtonModel实体数据，拦截点击事件做确认弹窗逻辑判断
+ * isCommitted为true直接执行点击事件，为false弹出确认对话框二次确认
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026/04/30 10:57:00
+ * @EditTime 2026/04/30 13:52:15
+ */
+public class TermuxButton extends Button {
+
+    public static final String TAG = "TermuxButton";
+
+    /** 绑定按钮对应数据实体 */
+    private TermuxButtonModel buttonModel;
+    /** 保存外部设置的原始点击监听 */
+    private OnClickListener originClickListener;
+
+    //==================== 构造方法 ====================
+    /**
+     * 代码动态创建控件构造
+     * @param context 上下文
+     */
+    public TermuxButton(Context context) {
+        super(context);
+        LogUtils.d(TAG, "TermuxButton 无参构造执行，上下文：" + context);
+        initView(null, null);
+    }
+
+    /**
+     * XML布局引用控件基础构造
+     * @param context 上下文
+     * @param attrs XML属性集
+     */
+    public TermuxButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        LogUtils.d(TAG, "TermuxButton XML构造执行");
+        initView(attrs, null);
+    }
+
+    /**
+     * XML布局带自定义属性构造
+     * @param context 上下文
+     * @param attrs XML属性集
+     * @param defStyleAttr 默认样式属性
+     */
+    public TermuxButton(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        LogUtils.d(TAG, "TermuxButton 带样式属性构造执行");
+        initView(attrs, null);
+    }
+
+    /**
+     * 高版本Android完整全参构造
+     * @param context 上下文
+     * @param attrs XML属性集
+     * @param defStyleAttr 默认样式属性
+     * @param defStyleRes 默认样式资源
+     */
+    public TermuxButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        LogUtils.d(TAG, "TermuxButton 全参构造执行");
+        initView(attrs, null);
+    }
+
+    /**
+     * 直接传入Model初始化控件构造
+     * @param context 上下文
+     * @param model 按钮数据实体
+     */
+    public TermuxButton(Context context, TermuxButtonModel model) {
+        super(context);
+        LogUtils.d(TAG, "TermuxButton Model入参构造执行");
+        initView(null, model);
+    }
+
+    //==================== 核心初始化 ====================
+    /**
+     * 控件统一初始化方法
+     * @param attrs XML属性集合
+     * @param model 绑定数据实体
+     */
+    private void initView(AttributeSet attrs, TermuxButtonModel model) {
+        this.buttonModel = model;
+
+        // 按钮基础默认配置
+        setClickable(true);
+        setFocusable(true);
+
+        // 解析XML布局自定义属性
+        if (attrs != null) {
+            parseXmlCustomAttr(attrs);
+        }
+
+        // 同步Model内按钮名称到控件展示文本
+        refreshButtonText();
+        // 绑定自定义拦截点击事件
+        setCustomClickEvent();
+    }
+
+    /**
+     * 解析XML布局属性，读取原生android:text与自定义属性赋值到Model
+     * @param attrs XML属性集
+     */
+    private void parseXmlCustomAttr(AttributeSet attrs) {
+        if (buttonModel == null) {
+            buttonModel = new TermuxButtonModel();
+            LogUtils.d(TAG, "自动初始化空的TermuxButtonModel实体");
+        }
+
+        // 读取原生android:text作为按钮名称
+        String androidText = attrs.getAttributeValue("http://schemas.android.com/apk/res/android", "text");
+        // 读取自定义扩展属性
+        String exeCommand = attrs.getAttributeValue("http://schemas.android.com/apk/res-auto", "exeCommand");
+        String workDir = attrs.getAttributeValue("http://schemas.android.com/apk/res-auto", "workDir");
+        String isCommittedStr = attrs.getAttributeValue("http://schemas.android.com/apk/res-auto", "isCommitted");
+        String commitTitle = attrs.getAttributeValue("http://schemas.android.com/apk/res-auto", "commitTitle");
+        String commitInfo = attrs.getAttributeValue("http://schemas.android.com/apk/res-auto", "commitInfo");
+
+        // 属性赋值绑定
+        if (androidText != null) {
+            buttonModel.setButtonName(androidText);
+        }
+        if (exeCommand != null) {
+            buttonModel.setExeCommand(exeCommand);
+        }
+        if (workDir != null) {
+            buttonModel.setWorkDir(workDir);
+        }
+        if (isCommittedStr != null) {
+            buttonModel.setCommitted(Boolean.parseBoolean(isCommittedStr));
+        }
+        if (commitTitle != null) {
+            buttonModel.setCommitTitle(commitTitle);
+        }
+        if (commitInfo != null) {
+            buttonModel.setCommitInfo(commitInfo);
+        }
+
+        LogUtils.d(TAG, "XML属性解析完成，按钮名称：" + androidText);
+    }
+
+    /**
+     * 同步Model中buttonName，更新按钮展示文字
+     */
+    private void refreshButtonText() {
+        if (buttonModel != null) {
+            setText(buttonModel.getButtonName());
+        }
+    }
+
+    //==================== 点击事件相关 ====================
+    /**
+     * 重写点击监听设置，保存外部原始点击事件
+     * @param l 外部传入点击监听
+     */
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        this.originClickListener = l;
+        LogUtils.d(TAG, "保存外部原始按钮点击监听");
+    }
+
+    /**
+     * 自定义拦截按钮点击逻辑
+     * isCommitted=true 直接执行原始点击事件
+     * isCommitted=false 弹出确认二次弹窗
+     */
+    private void setCustomClickEvent() {
+        super.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					if (buttonModel == null) {
+						LogUtils.d(TAG, "无绑定Model，直接执行原始点击事件");
+						if (originClickListener != null) {
+							originClickListener.onClick(view);
+						}
+						return;
+					}
+
+					boolean commitState = buttonModel.isCommitted();
+					LogUtils.d(TAG, "按钮点击触发，isCommitted状态：" + commitState);
+					if (commitState) {
+						// 无需确认，直接执行原有点击任务
+						if (originClickListener != null) {
+							originClickListener.onClick(view);
+						}
+					} else {
+						// 需要二次确认，弹出提示对话框
+						showCommitDialog();
+					}
+				}
+			});
+    }
+
+    /**
+     * 弹出操作确认对话框
+     * 标题：commitTitle  内容：commitInfo
+     * 取消：关闭弹窗无操作  确定：执行原始点击事件
+     */
+    private void showCommitDialog() {
+        Context context = getContext();
+        String dialogTitle = buttonModel.getCommitTitle();
+        String dialogMsg = buttonModel.getCommitInfo();
+
+        // 空值默认兜底处理
+        if (dialogTitle == null || "".equals(dialogTitle)) {
+            dialogTitle = "温馨提示";
+        }
+        if (dialogMsg == null || "".equals(dialogMsg)) {
+            dialogMsg = "确定要执行该操作吗？";
+        }
+
+        LogUtils.d(TAG, "弹出确认对话框，标题：" + dialogTitle);
+        new AlertDialog.Builder(context)
+			.setTitle(dialogTitle)
+			.setMessage(dialogMsg)
+			.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					LogUtils.d(TAG, "对话框点击取消，终止操作");
+				}
+			})
+			.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					LogUtils.d(TAG, "对话框点击确定，继续执行操作");
+					if (originClickListener != null) {
+						originClickListener.onClick(TermuxButton.this);
+					}
+				}
+			})
+			.setCancelable(false)
+			.show();
+    }
+
+    //==================== Getter & Setter ====================
+    public TermuxButtonModel getButtonModel() {
+        return buttonModel;
+    }
+
+    /**
+     * 设置绑定按钮数据实体，自动刷新按钮展示文字
+     * @param buttonModel 数据实体类
+     */
+    public void setButtonModel(TermuxButtonModel buttonModel) {
+        this.buttonModel = buttonModel;
+        LogUtils.d(TAG, "外部设置ButtonModel，自动刷新按钮文本");
+        refreshButtonText();
+    }
+
+}
+

winboll/src/main/res/drawable/dot_background.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadiusRatio="3"
+    android:thicknessRatio="8"
+    android:useLevel="false">
+    <solid android:color="#00000000"/>
+</shape>

winboll/src/main/res/drawable/dot_darkgreen_dark.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="2dp"
+    android:insetTop="2dp"
+    android:insetRight="2dp"
+    android:insetBottom="2dp">
+    <shape android:shape="ring"
+        android:innerRadiusRatio="2"
+        android:thicknessRatio="2.5"
+        android:useLevel="false">
+        <solid android:color="#006400"/>
+        <stroke android:width="1dp" android:color="#006400"/>
+    </shape>
+</inset>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="top">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?attr/actionBarSize"
+		android:background="?attr/colorPrimary"
+		app:title="@string/app_name"
+		app:subtitle="@string/my_termux_activity"
+		app:titleTextColor="@android:color/white"
+		app:subtitleTextColor="@android:color/white"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<HorizontalScrollView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.0">
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content">
+
+						<cc.winboll.studio.winboll.views.TermuxButton
+							android:id="@+id/btn_termux"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Termux"
+							android:textSize="18sp"
+							android:padding="16dp"
+							android:backgroundTint="@android:color/holo_blue_dark"
+							app:exeCommand="cd ~"
+							app:workDir="~"
+							app:isCommitted="true"
+							app:commitTitle="打开 Termux"
+							app:commitInfo="打开 Termux 应用"/>
+
+						<cc.winboll.studio.winboll.views.TermuxButton
+							android:id="@+id/btn_termuxworkspaces"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TermuxWorkSpaces"
+							android:textSize="18sp"
+							android:padding="16dp"
+							android:backgroundTint="@android:color/holo_blue_dark"
+							app:exeCommand="cd ~/TermuxWorkSpaces"
+							app:workDir="~"
+							app:isCommitted="false"
+							app:commitTitle="打开 TermuxWorkSpaces"
+							app:commitInfo="打开 Termux 应用，进入 TermuxWorkSpaces 目录。"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="+"
+					android:id="@+id/btn_addtermuxbutton"/>
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
+

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@android:color/black">
+
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="?attr/actionBarSize"
+		android:background="?attr/colorPrimary"
+		android:gravity="center"
+		app:titleTextColor="@android:color/white"
+		app:subtitleTextColor="@android:color/white"/>
+
+	<FrameLayout
+		android:id="@+id/container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="#FFFFFF"/>
+
+</LinearLayout>

winboll/src/main/res/menu/toolbar_main.xml

@@ -5,6 +5,9 @@
         android:id="@+id/item_home"
         android:title="HOME"/>
 	<item
+        android:id="@+id/item_mytermux"
+        android:title="MyTermuxActivity"/>
+	<item
         android:id="@+id/item_settings"
         android:title="Settings"/>
 	<item

winboll/src/main/res/values/attrs.xml

@@ -5,5 +5,13 @@
         <attr name="toolbarTitleColor" format="color" />
         <attr name="toolbarBackgroundColor" format="color" />
     </declare-styleable>
+
+	<declare-styleable name="TermuxButton">
+		<attr name="exeCommand" format="string" />
+		<attr name="workDir" format="string" />
+		<attr name="isCommitted" format="boolean" />
+		<attr name="commitTitle" format="string" />
+		<attr name="commitInfo" format="string" />
+	</declare-styleable>
 </resources>
 

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

@@ -3,4 +3,5 @@
     <color name="colorPrimary">#009688</color>
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
+    <color name="pattern_lock_black">#000000</color>
 </resources>

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

@@ -11,4 +11,6 @@
     <string name="cn2_switch_disabled">金抖云 X</string>
     <string name="tileservice_name">WinBoLL</string>
     <string name="toolbar_icon_description">WinBoLL APP</string>
+    <string name="my_termux_activity">MyTermuxActivity</string>
+    <string name="pattern_lock_title">图案密码设置</string>
 </resources>