Compare commits

...

6 Commits

Author SHA1 Message Date
fe248349df <gallery>APK 15.0.12 release Publish. 2026-05-01 08:34:01 +08:00
4790238343 更新图片浏览窗口工具栏Gallery按钮图标
- 将ImageViewerActivity工具栏中的btn_gallery图标从ic_cover替换为ic_view_gallery_outline
- 修改ic_view_gallery_outline的fillColor从黑色(#ff000000)改为白色(#FFFFFF),与工具栏其他图标颜色保持一致
2026-05-01 08:31:11 +08:00
f144d91bb6 添加ic_view_gallery_outline图标 2026-05-01 08:22:37 +08:00
9c0e56462e <gallery>APK 15.0.11 release Publish. 2026-05-01 04:09:20 +08:00
4d977646e6 Merge remote-tracking branch 'origin/gallery' into gallery 2026-05-01 03:59:54 +08:00
2d912abf92 feat: 重构主窗口菜单,将系统相册入口移至图片浏览窗口
- MainActivity: 移除 action_gallery 按钮,替换为 action_mi_gallery (小米相册)
- MainActivity: 移除 action_reset_gallery 按钮及响应代码
- ImageViewerActivity: 新增 btn_gallery 按钮,点击当前浏览图片打开相册选择器
- menu_main: 删除 action_gallery 和 action_reset_gallery 菜单项
- drawable: ic_cover 颜色改为白色以适配暗色工具栏
- drawable: 新增 ic_mi_gallery (小米相册图标),删除 ic_cover_reset
- strings: 新增 mi_gallery 字符串资源
2026-05-01 03:56:03 +08:00
10 changed files with 67 additions and 59 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Thu Apr 30 23:01:42 HKT 2026
stageCount=11
#Fri May 01 08:34:01 HKT 2026
stageCount=13
libraryProject=
baseVersion=15.0
publishVersion=15.0.10
publishVersion=15.0.12
buildCount=0
baseBetaVersion=15.0.11
baseBetaVersion=15.0.13

View File

@@ -12,6 +12,7 @@ import android.view.View;
import android.view.View.OnTouchListener;
import android.view.WindowManager;
import android.widget.ImageButton;
import android.widget.Toast;
import androidx.viewpager.widget.ViewPager;
import java.io.File;
import java.util.ArrayList;
@@ -34,6 +35,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
private ImageButton btnShare;
private ImageButton btnInfo;
private ImageButton btnBg;
private ImageButton btnGallery;
private int bgType = 0;
private GestureDetector gestureDetector;
private TrashManager trashManager;
@@ -63,6 +65,8 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
btnInfo = findViewById(R.id.btn_info);
btnBg = findViewById(R.id.btn_bg);
btnGallery = findViewById(R.id.btn_gallery);
applyBg();
ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls, bgType);
@@ -119,6 +123,20 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
switchBg();
}
});
btnGallery.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(ImageViewerActivity.this, "Gallery", Toast.LENGTH_SHORT).show();
if (imageUrls != null && currentPosition >= 0 && currentPosition < imageUrls.size()) {
Uri imageUri = imageUrls.get(currentPosition);
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(imageUri, "image/*");
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
startActivity(Intent.createChooser(intent, "打开相册"));
}
}
});
}
private void toggleToolbar() {

View File

@@ -289,31 +289,12 @@ private void loadAlbums() {
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
int id = item.getItemId();
if (id == R.id.action_gallery) {
Intent intent = new Intent(Intent.ACTION_VIEW, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
if (id == R.id.action_mi_gallery) {
Toast.makeText(this, "Gallery clicked", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_APP_GALLERY);
startActivity(intent);
return true;
} else if (id == R.id.action_reset_gallery) {
// 清除 图库/ACTION_VIEW 图片 Uri 的默认打开记录
PackageManager pm = getPackageManager();
// 构建和你跳转一模一样的 Intent
Intent clearIntent = new Intent(Intent.ACTION_VIEW, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
try {
// 仅在 API <= 30 时执行重置操作
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
String mimeType = clearIntent.resolveType(getContentResolver());
pm.clearPackagePreferredActivities(mimeType);
Toast.makeText(this, "已清除默认打开方式", Toast.LENGTH_SHORT).show();
} else {
// API > 30 时,弹出提示说明适配限制
Toast.makeText(this, "应用开发资源有限,本应用适配目标安卓版本为 (" + Build.VERSION_CODES.R + ")。", Toast.LENGTH_LONG).show();
}
} catch (SecurityException e) {
Toast.makeText(this, "需要授予重置默认应用权限,请在系统设置中开启", Toast.LENGTH_LONG).show();
}
return true;
} else if (id == R.id.action_settings) {
startActivity(new Intent(this, SettingsActivity.class));
return true;

View File

@@ -5,9 +5,9 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:fillColor="#FFFFFF"
android:pathData="M21,3H3C1.9,3 1,3.9 1,5v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM21,19H3V5h18V19z"/>
<path
android:fillColor="#000000"
android:fillColor="#FFFFFF"
android:pathData="M9,12l2,2l4,-4l1.5,1.5L11,17l-3,-3z"/>
</vector>

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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="#000000"
android:pathData="M21,3H3C1.9,3 1,3.9 1,5v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM21,19H3V5h18V19z"/>
<path
android:fillColor="#000000"
android:pathData="M9,12l2,2l4,-4l1.5,1.5L11,17l-3,-3z"/>
<!-- 上层 纯白色逆时针箭头 -->
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12.63,2C18.16,2 22.64,6.5 22.64,12C22.64,17.5 18.16,22 12.63,22C9.12,22 6.05,20.18 4.26,17.43L5.84,16.18C7.25,18.47 9.76,20 12.64,20A8,8 0,0 0,20.64 12A8,8 0,0 0,12.64 4C8.56,4 5.2,7.06 4.71,11H7.47L3.73,14.73L0,11H2.69C3.19,5.95 7.45,2 12.63,2"/>
</vector>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<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="#000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8s-3.59,8 -8,8z"/>
<path
android:fillColor="#000000"
android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5s-2.24,-5 -5,-5zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3s-1.34,3 -3,3z"/>
<path
android:fillColor="#000000"
android:pathData="M8,12l1.5,-2l2,2.5l2.5,-3l2,2.5"/>
</vector>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M1,3V21H23V3H1M21,5V14H3V5H21M11,16V19H8V16H11M3,16H6V19H3V16M13,19V16H16V19H13M18,19V16H21V19H18Z"/>
</vector>

View File

@@ -36,6 +36,14 @@
android:layout_height="0dp"
android:layout_weight="1"/>
<ImageButton
android:id="@+id/btn_gallery"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_view_gallery_outline"
android:contentDescription="Gallery"/>
<ImageButton
android:id="@+id/btn_share"
android:layout_width="48dp"

View File

@@ -3,17 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_gallery"
android:title="@string/system_gallery"
android:icon="@drawable/ic_cover"
android:id="@+id/action_mi_gallery"
android:title="@string/mi_gallery"
android:icon="@drawable/ic_mi_gallery"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_reset_gallery"
android:title="@string/reset_gallery"
android:icon="@drawable/ic_cover_reset"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_trash"
android:title="@string/trash"

View File

@@ -19,5 +19,6 @@
<string name="debug_log">Debug Log</string>
<string name="debug_message">Debug log message</string>
<string name="system_gallery">系统相册</string>
<string name="mi_gallery">小米相册</string>
<string name="reset_gallery">重置</string>
</resources>