From 184d4eef64c3705dc3e1919c7fc30753e0b344c9 Mon Sep 17 00:00:00 2001 From: MiMo Date: Sat, 18 Jul 2026 14:56:28 +0800 Subject: [PATCH] =?UTF-8?q?Gallery:=20=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E9=85=8D=E7=BD=AE=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E7=85=A7aes=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 依赖升级 - libaes 15.15.9 → 15.20.21 - libappbase 15.15.21 → 15.20.34 2. 主题配置（参照aes模块） - AppTheme → GalleryTheme (parent: AESTheme) - 新增 values-night/ 支持暗色模式 - 补充主题颜色定义 3. 编译修复 - Adapter onBindViewHolder holder 参数加 final（Java 7 要求） --- gallery/build.gradle | 4 +-- gallery/build.properties | 4 +-- gallery/src/main/AndroidManifest.xml | 2 +- .../winboll/studio/gallery/AlbumAdapter.java | 2 +- .../winboll/studio/gallery/ImageAdapter.java | 2 +- .../winboll/studio/gallery/TrashAdapter.java | 2 +- gallery/src/main/res/values-night/colors.xml | 15 +++++++++++ gallery/src/main/res/values-night/styles.xml | 25 +++++++++++++++++++ gallery/src/main/res/values/colors.xml | 9 ++++++- gallery/src/main/res/values/styles.xml | 21 +++++++++++----- 10 files changed, 71 insertions(+), 15 deletions(-) create mode 100644 gallery/src/main/res/values-night/colors.xml create mode 100644 gallery/src/main/res/values-night/styles.xml diff --git a/gallery/build.gradle b/gallery/build.gradle index 84716ed..631148a 100644 --- a/gallery/build.gradle +++ b/gallery/build.gradle @@ -108,8 +108,8 @@ dependencies { 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.21' + api 'cc.winboll.studio:libaes:15.20.21' + api 'cc.winboll.studio:libappbase:15.20.34' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.7' diff --git a/gallery/build.properties b/gallery/build.properties index 167b855..d87fff5 100644 --- a/gallery/build.properties +++ b/gallery/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 02 10:32:03 CST 2026 +#Sat Jul 18 14:50:11 CST 2026 stageCount=16 libraryProject= baseVersion=15.0 publishVersion=15.0.15 -buildCount=19 +buildCount=22 baseBetaVersion=15.0.16 diff --git a/gallery/src/main/AndroidManifest.xml b/gallery/src/main/AndroidManifest.xml index e806f31..d44a06b 100644 --- a/gallery/src/main/AndroidManifest.xml +++ b/gallery/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" - android:theme="@style/AppTheme" + android:theme="@style/GalleryTheme" android:resizeableActivity="true" android:name=".GlobalWinBoLLApplication" android:requestLegacyExternalStorage="true"> diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java index fa435bd..1b3570c 100644 --- a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java +++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java @@ -159,7 +159,7 @@ private void showContextMenu(View view, final Album album) { } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { + public void onBindViewHolder(@NonNull final ViewHolder holder, final int position) { final Album album = albums.get(position); LogUtils.d(TAG, "bind: " + album.getName() + ", cover=" + album.getCoverUri()); diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java index 833a307..2a98797 100644 --- a/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java +++ b/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java @@ -188,7 +188,7 @@ public class ImageAdapter extends RecyclerView.Adapter } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { + public void onBindViewHolder(@NonNull final ViewHolder holder, final int position) { holder.imageView.setBackgroundResource(getBgRes()); Glide.with(holder.imageView.getContext()) diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java index 49a7cae..b9e339a 100644 --- a/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java +++ b/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java @@ -65,7 +65,7 @@ public class TrashAdapter extends RecyclerView.Adapter } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { + public void onBindViewHolder(@NonNull final ViewHolder holder, final int position) { if (position < imageUrls.size()) { Glide.with(holder.imageView.getContext()) .load(imageUrls.get(position)) diff --git a/gallery/src/main/res/values-night/colors.xml b/gallery/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..d27ba78 --- /dev/null +++ b/gallery/src/main/res/values-night/colors.xml @@ -0,0 +1,15 @@ + + + #009688 + #4DB6AC + #00796B + #000000 + #FFFFFF + + + #4DB6AC + #FFFFFF + #FF2C2C2C + #FFFFFFFF + #FFAAAAAA + diff --git a/gallery/src/main/res/values-night/styles.xml b/gallery/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..da64593 --- /dev/null +++ b/gallery/src/main/res/values-night/styles.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + diff --git a/gallery/src/main/res/values/colors.xml b/gallery/src/main/res/values/colors.xml index f91a689..17b7a08 100644 --- a/gallery/src/main/res/values/colors.xml +++ b/gallery/src/main/res/values/colors.xml @@ -5,4 +5,11 @@ #FF9800 #000000 #FFFFFF - \ No newline at end of file + + + #009688 + #FFFFFF + #FFF5F5F5 + #FF000000 + #FF808080 + diff --git a/gallery/src/main/res/values/styles.xml b/gallery/src/main/res/values/styles.xml index 0049172..04f3904 100644 --- a/gallery/src/main/res/values/styles.xml +++ b/gallery/src/main/res/values/styles.xml @@ -1,11 +1,20 @@ + - - + + +