<gallery>APK 15.0.6 release Publish.

- AlbumCoverDbHelper添加裁剪封面字段crop_path
- 数据库升级从版本1到版本2
- 添加setCoverWithCrop方法保存裁剪封面

gallery/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 05:49:42 HKT 2026
-stageCount=1
+#Sun Apr 26 23:52:51 HKT 2026
+stageCount=7
 libraryProject=
 baseVersion=15.0
-publishVersion=15.0.0
+publishVersion=15.0.6
 buildCount=0
-baseBetaVersion=15.0.1
+baseBetaVersion=15.0.7

gallery/src/main/AndroidManifest.xml

@@ -46,6 +46,14 @@
         <activity
             android:name=".TrashActivity"
             android:label="@string/trash"/>
+            
+        <activity
+            android:name=".CropActivity"
+            android:label="调整封面"/>
+        
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"/>
 
         <meta-data
             android:name="android.max_aspect"

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

@@ -0,0 +1,51 @@
+package cc.winboll.studio.gallery;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+
+public class AboutActivity extends AppCompatActivity {
+
+    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);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        AboutView aboutView = findViewById(R.id.aboutview);
+        aboutView.setAPPInfo(genDefaultAppInfo());
+    }
+
+    private APPInfo genDefaultAppInfo() {
+        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
+        String branchName = "gallery";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("Gallery");
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(branchName);
+        appInfo.setAppGitAPPSubProjectFolder(branchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=Gallery");
+        appInfo.setAppAPKName("Gallery");
+        appInfo.setAppAPKFolderName("Gallery");
+        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
+        return appInfo;
+    }
+}

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

@@ -8,6 +8,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +17,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import java.util.ArrayList;
 
 import cc.winboll.studio.libappbase.LogUtils;
@@ -30,6 +32,8 @@ public class AlbumActivity extends AppCompatActivity {
     private ImageAdapter adapter;
     private String albumPath;
     private String albumName;
+    private FloatingActionButton fabScrollTop;
+    private Preferences prefs;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -45,11 +49,39 @@ public class AlbumActivity extends AppCompatActivity {
         
         getSupportActionBar().setTitle(albumName);
         
+        prefs = new Preferences(this);
+        
         recyclerView = findViewById(R.id.recycler_view);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
         adapter = new ImageAdapter();
+        adapter.setContext(this);
+        adapter.setAlbumPath(albumPath);
         recyclerView.setAdapter(adapter);
         
+        fabScrollTop = findViewById(R.id.fab_scroll_top);
+        fabScrollTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                recyclerView.scrollToPosition(0);
+            }
+        });
+        
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                GridLayoutManager layoutManager = (GridLayoutManager) recyclerView.getLayoutManager();
+                if (layoutManager != null) {
+                    int firstVisible = layoutManager.findFirstVisibleItemPosition();
+                    if (firstVisible > 0) {
+                        fabScrollTop.setVisibility(View.VISIBLE);
+                    } else {
+                        fabScrollTop.setVisibility(View.GONE);
+                    }
+                }
+            }
+        });
+        
         adapter.setOnImageClickListener(new OnImageClickListener() {
             @Override
             public void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths) {
@@ -92,6 +124,20 @@ public class AlbumActivity extends AppCompatActivity {
         }
     }
 
+private String getSortOrder(int sortMode) {
+        switch (sortMode) {
+            case Preferences.SORT_TIME_ASC:
+                return android.provider.MediaStore.Images.Media.DATE_ADDED + " ASC";
+            case Preferences.SORT_NAME_DESC:
+                return android.provider.MediaStore.Images.Media.DISPLAY_NAME + " DESC";
+            case Preferences.SORT_NAME_ASC:
+                return android.provider.MediaStore.Images.Media.DISPLAY_NAME + " ASC";
+            case Preferences.SORT_TIME_DESC:
+            default:
+                return android.provider.MediaStore.Images.Media.DATE_ADDED + " DESC";
+        }
+    }
+    
     private void loadImages() {
         LogUtils.d(TAG, "loadImages");
         ArrayList<Uri> imageUrls = new ArrayList<>();
@@ -101,7 +147,8 @@ public class AlbumActivity extends AppCompatActivity {
         
         String selection = android.provider.MediaStore.Images.Media.DATA + " LIKE ?";
         String[] selectionArgs = new String[]{albumPath + "%"};
-        String sortOrder = android.provider.MediaStore.Images.Media.DATE_ADDED + " DESC";
+        int sortMode = prefs.getAlbumSortMode();
+        String sortOrder = getSortOrder(sortMode);
         
         try (Cursor cursor = contentResolver.query(collection, null, selection, selectionArgs, sortOrder)) {
             if (cursor != null) {
@@ -125,19 +172,59 @@ public class AlbumActivity extends AppCompatActivity {
         adapter.setData(imageUrls, imagePaths);
         LogUtils.d(TAG, "Loaded " + imageUrls.size() + " images");
     }
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
+        getMenuInflater().inflate(R.menu.menu_album, menu);
+        int sortMode = prefs.getAlbumSortMode();
+        int menuId = getSortMenuId(sortMode);
+        MenuItem item = menu.findItem(menuId);
+        if (item != null) {
+            item.setChecked(true);
+        }
+        MenuItem sortItem = menu.findItem(R.id.action_sort);
+        if (sortItem != null && sortItem.getSubMenu() != null) {
+            sortItem.getSubMenu().setGroupCheckable(0, true, true);
+        }
         return true;
     }
-
+    
+    private int getSortMenuId(int sortMode) {
+        switch (sortMode) {
+            case Preferences.SORT_TIME_ASC:
+                return R.id.sort_time_asc;
+            case Preferences.SORT_NAME_DESC:
+                return R.id.sort_name_desc;
+            case Preferences.SORT_NAME_ASC:
+                return R.id.sort_name_asc;
+            case Preferences.SORT_TIME_DESC:
+            default:
+                return R.id.sort_time_desc;
+        }
+    }
+    
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == R.id.action_refresh) {
-            if (checkPermission()) {
-                loadImages();
-            }
+        int itemId = item.getItemId();
+        if (itemId == R.id.sort_time_desc) {
+            prefs.setAlbumSortMode(Preferences.SORT_TIME_DESC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_time_asc) {
+            prefs.setAlbumSortMode(Preferences.SORT_TIME_ASC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_name_desc) {
+            prefs.setAlbumSortMode(Preferences.SORT_NAME_DESC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_name_asc) {
+            prefs.setAlbumSortMode(Preferences.SORT_NAME_ASC);
+            item.setChecked(true);
+            loadImages();
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -149,5 +236,16 @@ public class AlbumActivity extends AppCompatActivity {
         if (checkPermission()) {
             loadImages();
         }
+        if (adapter != null) {
+            adapter.refreshBg();
+        }
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 100 && resultCode == RESULT_OK) {
+            loadImages();
+        }
     }
 }

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

@@ -5,6 +5,7 @@ import android.provider.MediaStore;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -13,6 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 import cc.winboll.studio.libappbase.LogUtils;
 
@@ -20,20 +23,132 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
     public static final String TAG = "AlbumAdapter";
     private ArrayList<Album> albums = new ArrayList<>();
     private OnAlbumClickListener listener;
+    private Preferences prefs;
+    private int bgType = 0;
+    private PinnedAlbumDbHelper pinnedDbHelper;
+    private OnCoverSizeListener coverSizeListener;
+    private boolean coverSizeReported = false;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
 
     public interface OnAlbumClickListener {
         void onAlbumClick(Album album);
     }
-
+    
+    public interface OnCoverSizeListener {
+        void onCoverSize(int width, int height);
+    }
+    
+    public static final int DEFAULT_COVER_WIDTH = 240;
+    public static final int DEFAULT_COVER_HEIGHT = 120;
+    
     public void setOnAlbumClickListener(OnAlbumClickListener listener) {
         this.listener = listener;
     }
+    
+    public void setOnCoverSizeListener(OnCoverSizeListener listener) {
+        this.coverSizeListener = listener;
+    }
 
     public void setData(ArrayList<Album> albums) {
-        this.albums = albums;
+        this.albums = sortAlbums(albums);
         LogUtils.d(TAG, "setData: " + albums.size() + " albums");
         notifyDataSetChanged();
     }
+    
+    private ArrayList<Album> sortAlbums(ArrayList<Album> list) {
+        if (pinnedDbHelper == null || list == null || list.isEmpty()) {
+            return list;
+        }
+        ArrayList<Album> pinned = new ArrayList<>();
+        ArrayList<Album> unpinned = new ArrayList<>();
+        for (Album album : list) {
+            if (pinnedDbHelper.isPinned(album.getPath())) {
+                pinned.add(album);
+            } else {
+                unpinned.add(album);
+            }
+        }
+        pinned.addAll(unpinned);
+        return pinned;
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+        pinnedDbHelper = PinnedAlbumDbHelper.getInstance(context);
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+        }
+        notifyDataSetChanged();
+    }
+    
+    public void refreshCover() {
+        notifyDataSetChanged();
+    }
+    
+    public void refreshPinned() {
+        if (pinnedDbHelper != null && albums != null && !albums.isEmpty()) {
+            ArrayList<Album> pinned = new ArrayList<>();
+            ArrayList<Album> unpinned = new ArrayList<>();
+            for (Album album : albums) {
+                if (pinnedDbHelper.isPinned(album.getPath())) {
+                    pinned.add(album);
+                } else {
+                    unpinned.add(album);
+                }
+            }
+            Comparator<Album> nameComparator = new Comparator<Album>() {
+                @Override
+                public int compare(Album a1, Album a2) {
+                    return a1.getName().compareToIgnoreCase(a2.getName());
+                }
+            };
+            Collections.sort(pinned, nameComparator);
+            Collections.sort(unpinned, nameComparator);
+            albums.clear();
+            albums.addAll(pinned);
+            albums.addAll(unpinned);
+            notifyDataSetChanged();
+        }
+    }
+    
+private void showContextMenu(View view, final Album album) {
+        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(view.getContext());
+        builder.setTitle(album.getName());
+        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(album.getPath());
+        String[] items = isPinned ? new String[]{"取消置顶"} : new String[]{"置顶"};
+        builder.setItems(items, new android.content.DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(android.content.DialogInterface dialog, int which) {
+                if (pinnedDbHelper != null) {
+                    if (which == 0) {
+                        if (isPinned) {
+                            pinnedDbHelper.unpinAlbum(album.getPath());
+                        } else {
+                            pinnedDbHelper.pinAlbum(album.getPath());
+                        }
+                        refreshPinned();
+                    }
+                }
+            }
+        });
+        builder.show();
+    }
 
     @NonNull
     @Override
@@ -48,9 +163,45 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
         final Album album = albums.get(position);
         LogUtils.d(TAG, "bind: " + album.getName() + ", cover=" + album.getCoverUri());
         
+        holder.coverImage.setBackgroundResource(getBgRes());
+        
+        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(album.getPath());
+        holder.pinIcon.setVisibility(isPinned ? View.VISIBLE : View.GONE);
+        
+        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showContextMenu(holder.itemView, album);
+                return true;
+            }
+        });
+        
         holder.albumName.setText(album.getName());
         holder.imageCount.setText(album.getImageCount() + " photos");
         
+        holder.itemView.post(new Runnable() {
+            @Override
+            public void run() {
+                if (!coverSizeReported && prefs != null) {
+                    int savedWidth = prefs.getCoverWidth();
+                    if (savedWidth == AlbumAdapter.DEFAULT_COVER_WIDTH) {
+                        int width = holder.coverImage.getWidth();
+                        int height = holder.coverImage.getHeight();
+                        if (width > 0 && height > 0) {
+                            prefs.setCoverWidth(width);
+                            prefs.setCoverHeight(height);
+                            float ratio = (float) width / height;
+                            prefs.setCoverRatio(ratio);
+                            coverSizeReported = true;
+                            if (coverSizeListener != null) {
+                                coverSizeListener.onCoverSize(width, height);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        
         holder.itemView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -65,37 +216,22 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
             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());
+            if ("file".equals(coverUri.getScheme())) {
+                File coverFile = new File(coverUri.getPath());
+                if (coverFile.exists()) {
+                    Glide.with(holder.coverImage.getContext())
+                        .load(coverFile)
+                        .fitCenter()
+                        .into(holder.coverImage);
+                    return;
                 }
             }
+            
+            Glide.with(holder.coverImage.getContext())
+                .load(coverUri)
+                .fitCenter()
+                .into(holder.coverImage);
         }
-        
-        // Fallback to content URI
-        Glide.with(holder.coverImage.getContext())
-            .load(coverUri)
-            .centerCrop()
-            .into(holder.coverImage);
     }
 
     @Override
@@ -105,11 +241,13 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
 
     static class ViewHolder extends RecyclerView.ViewHolder {
         ImageView coverImage;
+        ImageView pinIcon;
         TextView albumName;
         TextView imageCount;
         ViewHolder(View itemView) {
             super(itemView);
             coverImage = itemView.findViewById(R.id.album_cover);
+            pinIcon = itemView.findViewById(R.id.pin_icon);
             albumName = itemView.findViewById(R.id.album_name);
             imageCount = itemView.findViewById(R.id.image_count);
         }

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

@@ -0,0 +1,131 @@
+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 cc.winboll.studio.libappbase.LogUtils;
+
+public class AlbumCoverDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "AlbumCoverDbHelper";
+    private static final String DB_NAME = "album_cover.db";
+    private static final int DB_VERSION = 2;
+    private static final String TABLE_NAME = "album_covers";
+    private static final String COLUMN_ALBUM_PATH = "album_path";
+    private static final String COLUMN_IMAGE_PATH = "image_path";
+    private static final String COLUMN_CROP_PATH = "crop_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_ALBUM_PATH + " TEXT PRIMARY KEY, "
+        + COLUMN_IMAGE_PATH + " TEXT, "
+        + COLUMN_CROP_PATH + " TEXT)";
+    
+    private static AlbumCoverDbHelper dbHelper;
+    
+    public static AlbumCoverDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new AlbumCoverDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public AlbumCoverDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion < 2) {
+            try {
+                db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN " + COLUMN_CROP_PATH + " TEXT");
+            } catch (Exception e) {
+                db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+                onCreate(db);
+            }
+        }
+    }
+    
+    public void setCoverWithCrop(String albumPath, String imagePath, String cropPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_ALBUM_PATH, albumPath);
+        values.put(COLUMN_IMAGE_PATH, imagePath);
+        values.put(COLUMN_CROP_PATH, cropPath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        LogUtils.d(TAG, "setCoverWithCrop: album=" + albumPath + ", image=" + imagePath + ", crop=" + cropPath);
+    }
+    
+    public void setCover(String albumPath, String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_ALBUM_PATH, albumPath);
+        values.put(COLUMN_IMAGE_PATH, imagePath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        LogUtils.d(TAG, "setCover: album=" + albumPath + ", image=" + imagePath);
+    }
+    
+    public String getCover(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_CROP_PATH, COLUMN_IMAGE_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String coverPath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                coverPath = cursor.getString(0);
+                if (coverPath == null) {
+                    coverPath = cursor.getString(1);
+                }
+            }
+            cursor.close();
+        }
+        return coverPath;
+    }
+    
+    public String getCropPath(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_CROP_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String cropPath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                cropPath = cursor.getString(0);
+            }
+            cursor.close();
+        }
+        return cropPath;
+    }
+    
+    public String getOriginalImagePath(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_IMAGE_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String imagePath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                imagePath = cursor.getString(0);
+            }
+            cursor.close();
+        }
+        return imagePath;
+    }
+    
+    public void clearCover(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.putNull(COLUMN_CROP_PATH);
+        db.update(TABLE_NAME, values, COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "clearCover: " + albumPath);
+    }
+    
+    public void deleteCover(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "deleteCover: " + albumPath);
+    }
+}

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

@@ -0,0 +1,170 @@
+package cc.winboll.studio.gallery;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.RectF;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class CropActivity extends AppCompatActivity {
+    public static final String TAG = "CropActivity";
+    public static final String EXTRA_IMAGE_URI = "image_uri";
+    public static final String EXTRA_IMAGE_PATH = "image_path";
+    public static final String EXTRA_ALBUM_PATH = "album_path";
+    public static final String EXTRA_CROP_WIDTH = "crop_width";
+    public static final String EXTRA_CROP_HEIGHT = "crop_height";
+    
+    private CropCanvasView cropCanvasView;
+    private Bitmap originalBitmap;
+    private String imagePath;
+    private String albumPath;
+    private int cropWidth = 240;
+    private int cropHeight = 120;
+    private float cropRatio = 2.0f;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_crop);
+        
+        imagePath = getIntent().getStringExtra(EXTRA_IMAGE_PATH);
+        albumPath = getIntent().getStringExtra(EXTRA_ALBUM_PATH);
+        cropWidth = getIntent().getIntExtra(EXTRA_CROP_WIDTH, 240);
+        cropHeight = getIntent().getIntExtra(EXTRA_CROP_HEIGHT, 120);
+        
+        Preferences prefs = new Preferences(this);
+        if (cropWidth > 0 && cropHeight > 0) {
+            cropRatio = (float) cropWidth / cropHeight;
+        } else {
+            cropRatio = prefs.getCoverRatio();
+            cropWidth = (int) (120 * cropRatio);
+            cropHeight = 120;
+        }
+        
+        findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        
+        final ImageView btnColorPick = findViewById(R.id.btn_color_pick);
+        btnColorPick.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean pickMode = !cropCanvasView.isColorPickMode();
+                cropCanvasView.setColorPickMode(pickMode);
+                btnColorPick.setAlpha(pickMode ? 0.5f : 1.0f);
+            }
+        });
+        
+        findViewById(R.id.btn_done).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveCroppedCover();
+            }
+        });
+        
+        cropCanvasView = findViewById(R.id.crop_canvas_view);
+        loadImage();
+    }
+    
+    private void loadImage() {
+        try {
+            if (imagePath != null && new File(imagePath).exists()) {
+                originalBitmap = BitmapFactory.decodeFile(imagePath);
+            } else {
+                Uri imageUri = getIntent().getParcelableExtra(EXTRA_IMAGE_URI);
+                if (imageUri != null) {
+                    originalBitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), imageUri);
+                }
+            }
+            
+            if (originalBitmap != null) {
+                cropCanvasView.setImageBitmap(originalBitmap);
+                cropCanvasView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        initCrop();
+                    }
+                });
+            } else {
+                Toast.makeText(this, "Failed to load image", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "loadImage error: " + e.getMessage());
+            Toast.makeText(this, "Failed to load image", Toast.LENGTH_SHORT).show();
+            finish();
+        }
+    }
+    
+    private void initCrop() {
+        cropCanvasView.initCanvas(originalBitmap.getWidth(), originalBitmap.getHeight(), cropRatio);
+        
+        int viewW = cropCanvasView.getWidth();
+        int viewH = cropCanvasView.getHeight();
+        if (viewW > 0 && viewH > 0) {
+            cropCanvasView.scaleToView(viewW, viewH);
+        }
+    }
+    
+    private void saveCroppedCover() {
+        Bitmap canvasBitmap = cropCanvasView.getCanvasBitmap();
+        if (canvasBitmap == null) {
+            Toast.makeText(this, "Failed to get image", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        
+        try {
+            RectF cropRect = cropCanvasView.getCropRect();
+            
+            int cropX = (int) cropRect.left;
+            int cropY = (int) cropRect.top;
+            int cropW = (int) cropRect.width();
+            int cropH = (int) cropRect.height();
+            
+            cropX = Math.max(0, Math.min(cropX, canvasBitmap.getWidth() - 1));
+            cropY = Math.max(0, Math.min(cropY, canvasBitmap.getHeight() - 1));
+            cropW = Math.max(1, Math.min(cropW, canvasBitmap.getWidth() - cropX));
+            cropH = Math.max(1, Math.min(cropH, canvasBitmap.getHeight() - cropY));
+            
+            Bitmap cropped = Bitmap.createBitmap(canvasBitmap, cropX, cropY, cropW, cropH);
+            
+            File cacheDir = getCacheDir();
+            File coverFile = new File(cacheDir, "cover_" + System.currentTimeMillis() + ".png");
+            FileOutputStream fos = new FileOutputStream(coverFile);
+            cropped.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.close();
+            
+            cropped.recycle();
+            
+            AlbumCoverDbHelper coverDbHelper = AlbumCoverDbHelper.getInstance(this);
+            coverDbHelper.setCoverWithCrop(albumPath, imagePath, coverFile.getAbsolutePath());
+            
+            Toast.makeText(this, "封面已保存", Toast.LENGTH_SHORT).show();
+            setResult(RESULT_OK);
+            finish();
+        } catch (Exception e) {
+            LogUtils.e(TAG, "saveCroppedCover error: " + e.getMessage());
+            Toast.makeText(this, "Failed to save cover", Toast.LENGTH_SHORT).show();
+        }
+    }
+    
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (originalBitmap != null) {
+            originalBitmap.recycle();
+            originalBitmap = null;
+        }
+    }
+}

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

@@ -0,0 +1,400 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class CropCanvasView extends View {
+    private Paint imagePaint;
+    private Paint borderPaint;
+    private Paint cornerPaint;
+    private RectF cropRect;
+    private int touchArea = 50;
+    
+    private float lastX, lastY;
+    private int activeCorner = -1;
+    private static final int CORNER_TOP_LEFT = 0;
+    private static final int CORNER_TOP_RIGHT = 1;
+    private static final int CORNER_BOTTOM_LEFT = 2;
+    private static final int CORNER_BOTTOM_RIGHT = 3;
+    private static final int CORNER_CENTER = 4;
+    
+    private int imageWidth;
+    private int imageHeight;
+    private float coverRatio = 2.0f;
+    
+    private int extendHeight;
+    private int extendWidth;
+    private int canvasWidth;
+    private int canvasHeight;
+    private float minSize = 50;
+    
+    private RectF imageBounds = new RectF();
+    private RectF canvasBounds = new RectF();
+    private Bitmap originalBitmap;
+    private Bitmap canvasBitmap;
+    private float initialSpan;
+    private int backgroundColor = Color.GREEN;
+    private boolean colorPickMode = false;
+    private float pickX, pickY;
+    
+    public CropCanvasView(Context context) {
+        super(context);
+        init();
+    }
+    
+    public CropCanvasView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+    
+    public CropCanvasView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+    
+    private void init() {
+        imagePaint = new Paint();
+        imagePaint.setFilterBitmap(true);
+        
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.parseColor("#CCAA00"));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(3);
+        
+        cornerPaint = new Paint();
+        cornerPaint.setColor(Color.WHITE);
+        cornerPaint.setStyle(Paint.Style.FILL);
+    }
+    
+    public void setImageBitmap(Bitmap bitmap) {
+        this.originalBitmap = bitmap;
+    }
+    
+    public void initCanvas(int imgWidth, int imgHeight, float ratio) {
+        this.imageWidth = imgWidth;
+        this.imageHeight = imgHeight;
+        this.coverRatio = ratio;
+        
+        float imgRatio = (float) imgWidth / imgHeight;
+        
+        if (coverRatio >= imgRatio) {
+            extendHeight = imgHeight;
+            extendWidth = (int) (imgHeight * coverRatio);
+        } else {
+            extendWidth = imgWidth;
+            extendHeight = (int) (imgWidth / coverRatio);
+        }
+        
+        canvasHeight = Math.max(imageHeight, extendHeight);
+        canvasWidth = Math.max(imageWidth, extendWidth);
+        
+        float left = (canvasWidth - imageWidth) / 2f;
+        float top = (canvasHeight - imageHeight) / 2f;
+        imageBounds.set(left, top, left + imageWidth, top + imageHeight);
+        canvasBounds.set(0, 0, canvasWidth, canvasHeight);
+        
+        cropRect = new RectF(0, 0, canvasWidth, canvasHeight);
+        
+        createCanvasBitmap();
+        
+        requestLayout();
+        invalidate();
+    }
+    
+    private void createCanvasBitmap() {
+        if (canvasBitmap != null) {
+            canvasBitmap.recycle();
+        }
+        canvasBitmap = Bitmap.createBitmap(canvasWidth, canvasHeight, Bitmap.Config.ARGB_8888);
+        android.graphics.Canvas canvas = new android.graphics.Canvas(canvasBitmap);
+        canvas.drawColor(backgroundColor);
+        if (originalBitmap != null && !originalBitmap.isRecycled()) {
+            canvas.drawBitmap(originalBitmap, imageBounds.left, imageBounds.top, imagePaint);
+        }
+    }
+    
+    public Bitmap getCanvasBitmap() {
+        return canvasBitmap;
+    }
+    
+    public void setBackgroundColor(int color) {
+        this.backgroundColor = color;
+        createCanvasBitmap();
+        invalidate();
+    }
+    
+    public int getBackgroundColor() {
+        return backgroundColor;
+    }
+    
+    public void setColorPickMode(boolean enable) {
+        this.colorPickMode = enable;
+        if (enable) {
+            pickX = -1;
+            pickY = -1;
+        }
+        invalidate();
+    }
+    
+    public boolean isColorPickMode() {
+        return colorPickMode;
+    }
+    
+    public void scaleToView(int viewWidth, int viewHeight) {
+        if (viewWidth > 0 && viewHeight > 0 && canvasWidth > 0 && canvasHeight > 0) {
+            float scale = Math.max((float) viewWidth / canvasWidth, (float) viewHeight / canvasHeight);
+            int oldCanvasW = canvasWidth;
+            int oldCanvasH = canvasHeight;
+            canvasWidth = (int) (canvasWidth * scale);
+            canvasHeight = (int) (canvasHeight * scale);
+            
+            float left = (canvasWidth - imageWidth) / 2f;
+            float top = (canvasHeight - imageHeight) / 2f;
+            imageBounds.set(left, top, left + imageWidth, top + imageHeight);
+            canvasBounds.set(0, 0, canvasWidth, canvasHeight);
+            
+            if (cropRect != null) {
+                float scaleX = (float) canvasWidth / oldCanvasW;
+                float scaleY = (float) canvasHeight / oldCanvasH;
+                cropRect.left *= scaleX;
+                cropRect.top *= scaleY;
+                cropRect.right *= scaleX;
+                cropRect.bottom *= scaleY;
+            }
+            
+            requestLayout();
+            invalidate();
+        }
+    }
+    
+    public RectF getCropRect() {
+        return new RectF(cropRect);
+    }
+    
+    public int getCanvasWidth() {
+        return canvasWidth;
+    }
+    
+    public int getCanvasHeight() {
+        return canvasHeight;
+    }
+    
+    public RectF getCanvasBounds() {
+        return new RectF(canvasBounds);
+    }
+    
+    public RectF getImageBounds() {
+        return new RectF(imageBounds);
+    }
+    
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int w = canvasWidth > 0 ? canvasWidth : 0;
+        int h = canvasHeight > 0 ? canvasHeight : 0;
+        setMeasuredDimension(w, h);
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        
+        if (canvasBitmap != null && !canvasBitmap.isRecycled()) {
+            canvas.drawBitmap(canvasBitmap, 0, 0, null);
+        }
+        
+        if (cropRect != null) {
+            canvas.drawRect(cropRect, borderPaint);
+            
+            canvas.drawCircle(cropRect.left, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.left, cropRect.bottom, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.bottom, 12, cornerPaint);
+        }
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (cropRect == null || canvasBounds.isEmpty()) return super.onTouchEvent(event);
+        
+        if (event.getPointerCount() == 2) {
+            int action = event.getActionMasked();
+            if (action == MotionEvent.ACTION_POINTER_DOWN) {
+                initialSpan = getSpan(event);
+                return true;
+            } else if (action == MotionEvent.ACTION_MOVE) {
+                float span = getSpan(event);
+                if (initialSpan > 0) {
+                    float scale = span / initialSpan;
+                    float centerX = cropRect.centerX();
+                    float centerY = cropRect.centerY();
+                    float newWidth = cropRect.width() * scale;
+                    float newHeight = newWidth / coverRatio;
+                    
+                    newWidth = Math.max(minSize, Math.min(newWidth, canvasBounds.width()));
+                    newHeight = newWidth / coverRatio;
+                    
+                    cropRect.set(centerX - newWidth / 2, centerY - newHeight / 2,
+                               centerX + newWidth / 2, centerY + newHeight / 2);
+                    
+                    initialSpan = span;
+                    invalidate();
+                }
+                return true;
+            }
+        }
+        
+        float x = event.getX();
+        float y = event.getY();
+        
+        if (colorPickMode) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                pickX = x;
+                pickY = y;
+                int color = getColorAt(x, y);
+                setBackgroundColor(color);
+                return true;
+            }
+            return true;
+        }
+        
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                lastX = x;
+                lastY = y;
+                activeCorner = getActiveCorner(x, y);
+                return true;
+                
+            case MotionEvent.ACTION_MOVE:
+                float dx = x - lastX;
+                float dy = y - lastY;
+                
+                if (activeCorner == CORNER_CENTER) {
+                    float newLeft = cropRect.left + dx;
+                    float newTop = cropRect.top + dy;
+                    float newRight = cropRect.right + dx;
+                    float newBottom = cropRect.bottom + dy;
+                    
+                    if (newLeft >= canvasBounds.left && newRight <= canvasBounds.right) {
+                        cropRect.left = newLeft;
+                        cropRect.right = newRight;
+                    }
+                    if (newTop >= canvasBounds.top && newBottom <= canvasBounds.bottom) {
+                        cropRect.top = newTop;
+                        cropRect.bottom = newBottom;
+                    }
+                } else if (activeCorner == CORNER_TOP_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.top + dy, true, true);
+                } else if (activeCorner == CORNER_TOP_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.top + dy, false, true);
+                } else if (activeCorner == CORNER_BOTTOM_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.bottom + dy, true, false);
+                } else if (activeCorner == CORNER_BOTTOM_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.bottom + dy, false, false);
+                }
+                
+                lastX = x;
+                lastY = y;
+                invalidate();
+                return true;
+                
+            case MotionEvent.ACTION_UP:
+                activeCorner = -1;
+                return true;
+        }
+        return super.onTouchEvent(event);
+    }
+    
+    private void adjustCorner(float nx, float ny, boolean left, boolean top) {
+        float newWidth;
+        float newLeft = cropRect.left;
+        float newTop = cropRect.top;
+        float newRight = cropRect.right;
+        float newBottom = cropRect.bottom;
+        
+        if (left) {
+            newWidth = cropRect.width() - (nx - cropRect.left);
+            newLeft = Math.max(canvasBounds.left, Math.min(nx, cropRect.right - minSize));
+        } else {
+            newWidth = nx - cropRect.left;
+            newRight = Math.min(canvasBounds.right, Math.max(nx, cropRect.left + minSize));
+            newLeft = cropRect.left;
+        }
+        
+        float newHeight = newWidth / coverRatio;
+        
+        if (top) {
+            newTop = Math.max(canvasBounds.top, Math.min(cropRect.bottom - minSize, cropRect.bottom - newHeight));
+            newBottom = newTop + newHeight;
+        } else {
+            newBottom = Math.min(canvasBounds.bottom, Math.max(cropRect.top + minSize, cropRect.top + newHeight));
+            newTop = newBottom - newHeight;
+        }
+        
+        if (left) {
+            cropRect.left = newLeft;
+            cropRect.right = newLeft + newWidth;
+        } else {
+            cropRect.right = newRight;
+            cropRect.left = newRight - newWidth;
+        }
+        
+        if (top) {
+            cropRect.top = newTop;
+            cropRect.bottom = newTop + newHeight;
+        } else {
+            cropRect.bottom = newBottom;
+            cropRect.top = newBottom - newHeight;
+        }
+    }
+    
+    private int getActiveCorner(float x, float y) {
+        float dx = Math.abs(x - cropRect.left);
+        float dy = Math.abs(y - cropRect.top);
+        float dx2 = Math.abs(x - cropRect.right);
+        float dy2 = Math.abs(y - cropRect.bottom);
+        
+        if (dx <= touchArea && dy <= touchArea) {
+            return CORNER_TOP_LEFT;
+        }
+        if (dx2 <= touchArea && dy <= touchArea) {
+            return CORNER_TOP_RIGHT;
+        }
+        if (dx <= touchArea && dy2 <= touchArea) {
+            return CORNER_BOTTOM_LEFT;
+        }
+        if (dx2 <= touchArea && dy2 <= touchArea) {
+            return CORNER_BOTTOM_RIGHT;
+        }
+        if (x > cropRect.left && x < cropRect.right && y > cropRect.top && y < cropRect.bottom) {
+            return CORNER_CENTER;
+        }
+        return -1;
+    }
+    
+    private float getSpan(MotionEvent event) {
+        float x0 = event.getX(0);
+        float y0 = event.getY(0);
+        float x1 = event.getX(1);
+        float y1 = event.getY(1);
+        return (float) Math.sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0));
+    }
+    
+    public int getColorAt(float x, float y) {
+        if (canvasBitmap != null && !canvasBitmap.isRecycled()) {
+            int bitmapX = (int) x;
+            int bitmapY = (int) y;
+            if (bitmapX >= 0 && bitmapX < canvasBitmap.getWidth() && 
+                bitmapY >= 0 && bitmapY < canvasBitmap.getHeight()) {
+                return canvasBitmap.getPixel(bitmapX, bitmapY);
+            }
+        }
+        return Color.TRANSPARENT;
+    }
+}

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

@@ -0,0 +1,224 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class CropOverlayView extends View {
+    public interface OnCanvasSizeChangedListener {
+        void onCanvasSizeChanged(RectF canvasBounds);
+    }
+    
+    private OnCanvasSizeChangedListener canvasSizeChangedListener;
+    
+    private Paint borderPaint;
+    private Paint cornerPaint;
+    private RectF cropRect;
+    private int touchArea = 50;
+    
+    private float lastX, lastY;
+    private int activeCorner = -1;
+    private static final int CORNER_TOP_LEFT = 0;
+    private static final int CORNER_TOP_RIGHT = 1;
+    private static final int CORNER_BOTTOM_LEFT = 2;
+    private static final int CORNER_BOTTOM_RIGHT = 3;
+    private static final int CORNER_CENTER = 4;
+    
+    private float targetRatio = 2.0f;
+    private RectF canvasBounds = new RectF();
+    private float minSize = 50;
+    
+    public CropOverlayView(Context context) {
+        super(context);
+        initPaints();
+    }
+    
+    public CropOverlayView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initPaints();
+    }
+    
+    public CropOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initPaints();
+    }
+    
+    private void initPaints() {
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.parseColor("#CCAA00"));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(3);
+        
+        cornerPaint = new Paint();
+        cornerPaint.setColor(Color.WHITE);
+        cornerPaint.setStyle(Paint.Style.FILL);
+    }
+    
+    public void setTargetRatio(float ratio) {
+        this.targetRatio = ratio;
+    }
+    
+    public float getTargetRatio() {
+        return targetRatio;
+    }
+    
+    public void setOnCanvasSizeChangedListener(OnCanvasSizeChangedListener listener) {
+        this.canvasSizeChangedListener = listener;
+    }
+    
+    public void initCanvas(int canvasW, int canvasH) {
+        canvasBounds.set(0, 0, canvasW, canvasH);
+        
+        cropRect = new RectF(0, 0, canvasW, canvasH);
+        
+        if (canvasSizeChangedListener != null) {
+            canvasSizeChangedListener.onCanvasSizeChanged(new RectF(canvasBounds));
+        }
+        invalidate();
+    }
+    
+    public RectF getCropRect() {
+        return new RectF(cropRect);
+    }
+    
+    public RectF getCanvasBounds() {
+        return new RectF(canvasBounds);
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        
+        canvas.drawColor(Color.TRANSPARENT);
+        
+        if (cropRect != null) {
+            canvas.drawRect(cropRect, borderPaint);
+            
+            canvas.drawCircle(cropRect.left, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.left, cropRect.bottom, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.bottom, 12, cornerPaint);
+        }
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (cropRect == null || canvasBounds.isEmpty()) return false;
+        
+        float x = event.getX();
+        float y = event.getY();
+        
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                lastX = x;
+                lastY = y;
+                activeCorner = getActiveCorner(x, y);
+                return true;
+                
+            case MotionEvent.ACTION_MOVE:
+                float dx = x - lastX;
+                float dy = y - lastY;
+                
+                if (activeCorner == CORNER_CENTER) {
+                    float newLeft = cropRect.left + dx;
+                    float newTop = cropRect.top + dy;
+                    float newRight = cropRect.right + dx;
+                    float newBottom = cropRect.bottom + dy;
+                    
+                    if (newLeft >= canvasBounds.left && newRight <= canvasBounds.right) {
+                        cropRect.left = newLeft;
+                        cropRect.right = newRight;
+                    }
+                    if (newTop >= canvasBounds.top && newBottom <= canvasBounds.bottom) {
+                        cropRect.top = newTop;
+                        cropRect.bottom = newBottom;
+                    }
+                } else if (activeCorner == CORNER_TOP_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.top + dy, true, true);
+                } else if (activeCorner == CORNER_TOP_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.top + dy, false, true);
+                } else if (activeCorner == CORNER_BOTTOM_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.bottom + dy, true, false);
+                } else if (activeCorner == CORNER_BOTTOM_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.bottom + dy, false, false);
+                }
+                
+                lastX = x;
+                lastY = y;
+                invalidate();
+                return true;
+                
+            case MotionEvent.ACTION_UP:
+                activeCorner = -1;
+                return true;
+        }
+        return super.onTouchEvent(event);
+    }
+    
+    private void adjustCorner(float nx, float ny, boolean left, boolean top) {
+        float newWidth;
+        float newLeft = cropRect.left;
+        float newTop = cropRect.top;
+        float newRight = cropRect.right;
+        float newBottom = cropRect.bottom;
+        
+        if (left) {
+            newWidth = cropRect.width() - (nx - cropRect.left);
+            newLeft = Math.max(canvasBounds.left, Math.min(nx, cropRect.right - minSize));
+        } else {
+            newWidth = nx - cropRect.left;
+            newRight = Math.min(canvasBounds.right, Math.max(nx, cropRect.left + minSize));
+            newLeft = cropRect.left;
+        }
+        
+        float newHeight = newWidth / targetRatio;
+        
+        if (top) {
+            newTop = Math.max(canvasBounds.top, Math.min(cropRect.bottom - minSize, cropRect.bottom - newHeight));
+            newBottom = newTop + newHeight;
+        } else {
+            newBottom = Math.min(canvasBounds.bottom, Math.max(cropRect.top + minSize, cropRect.top + newHeight));
+            newTop = newBottom - newHeight;
+        }
+        
+        if (left) {
+            cropRect.left = newLeft;
+            cropRect.right = newLeft + newWidth;
+        } else {
+            cropRect.right = newRight;
+            cropRect.left = newRight - newWidth;
+        }
+        
+        if (top) {
+            cropRect.top = newTop;
+            cropRect.bottom = newTop + newHeight;
+        } else {
+            cropRect.bottom = newBottom;
+            cropRect.top = newBottom - newHeight;
+        }
+    }
+    
+    private int getActiveCorner(float x, float y) {
+        if (Math.abs(x - cropRect.left) <= touchArea && Math.abs(y - cropRect.top) <= touchArea) {
+            return CORNER_TOP_LEFT;
+        }
+        if (Math.abs(x - cropRect.right) <= touchArea && Math.abs(y - cropRect.top) <= touchArea) {
+            return CORNER_TOP_RIGHT;
+        }
+        if (Math.abs(x - cropRect.left) <= touchArea && Math.abs(y - cropRect.bottom) <= touchArea) {
+            return CORNER_BOTTOM_LEFT;
+        }
+        if (Math.abs(x - cropRect.right) <= touchArea && Math.abs(y - cropRect.bottom) <= touchArea) {
+            return CORNER_BOTTOM_RIGHT;
+        }
+        if (cropRect.contains(x, y)) {
+            return CORNER_CENTER;
+        }
+        return -1;
+    }
+}

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

@@ -1,5 +1,7 @@
 package cc.winboll.studio.gallery;
 
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,6 +12,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 import cc.winboll.studio.libappbase.LogUtils;
 
@@ -18,6 +22,24 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
     private ArrayList<Uri> imageUrls = new ArrayList<>();
     private ArrayList<String> imagePaths = new ArrayList<>();
     private OnImageClickListener listener;
+    private int bgType = 0;
+    private Preferences prefs;
+    private PinnedImageDbHelper pinnedDbHelper;
+    private AlbumCoverDbHelper coverDbHelper;
+    private String albumPath;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
 
     public interface OnImageClickListener {
         void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths);
@@ -30,10 +52,133 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
     public void setData(ArrayList<Uri> urls, ArrayList<String> paths) {
         this.imageUrls = urls;
         this.imagePaths = paths;
+        sortPinnedFirst();
         LogUtils.d(TAG, "setData: " + urls.size() + " images");
         notifyDataSetChanged();
     }
-
+    
+    private void sortPinnedFirst() {
+        if (pinnedDbHelper == null || imagePaths.isEmpty()) {
+            return;
+        }
+        ArrayList<Uri> pinnedUrls = new ArrayList<>();
+        ArrayList<String> pinnedPaths = new ArrayList<>();
+        ArrayList<Uri> unpinnedUrls = new ArrayList<>();
+        ArrayList<String> unpinnedPaths = new ArrayList<>();
+        for (int i = 0; i < imagePaths.size(); i++) {
+            String path = imagePaths.get(i);
+            if (pinnedDbHelper.isPinned(path)) {
+                pinnedUrls.add(imageUrls.get(i));
+                pinnedPaths.add(path);
+            } else {
+                unpinnedUrls.add(imageUrls.get(i));
+                unpinnedPaths.add(path);
+            }
+        }
+        
+        imageUrls.clear();
+        imagePaths.clear();
+        imageUrls.addAll(pinnedUrls);
+        imageUrls.addAll(unpinnedUrls);
+        imagePaths.addAll(pinnedPaths);
+        imagePaths.addAll(unpinnedPaths);
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+        pinnedDbHelper = PinnedImageDbHelper.getInstance(context);
+        coverDbHelper = AlbumCoverDbHelper.getInstance(context);
+    }
+    
+    public void setAlbumPath(String albumPath) {
+        this.albumPath = albumPath;
+    }
+    
+    public int getCropWidth() {
+        return prefs != null ? prefs.getCoverWidth() : 240;
+    }
+    
+    public int getCropHeight() {
+        return prefs != null ? prefs.getCoverHeight() : 120;
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+            notifyDataSetChanged();
+        }
+    }
+    
+    public void refreshPinned() {
+        if (pinnedDbHelper == null || imagePaths.isEmpty()) {
+            return;
+        }
+        sortPinnedFirst();
+        notifyDataSetChanged();
+    }
+    
+    private void showContextMenu(View view, final int position) {
+        final String imagePath = imagePaths.get(position);
+        final Uri imageUri = imageUrls.get(position);
+        final boolean[] isPinned = {pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath)};
+        final boolean[] isCover = {false};
+        if (coverDbHelper != null && albumPath != null) {
+            String originalPath = coverDbHelper.getOriginalImagePath(albumPath);
+            isCover[0] = originalPath != null && originalPath.equals(imagePath);
+        }
+        
+        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(view.getContext());
+        builder.setTitle("Image");
+        
+        String[] items;
+        if (isPinned[0]) {
+            if (isCover[0]) {
+                items = new String[]{"取消置顶", "调整封面", "取消封面"};
+            } else {
+                items = new String[]{"取消置顶", "设置为封面"};
+            }
+        } else {
+            if (isCover[0]) {
+                items = new String[]{"置顶", "调整封面", "取消封面"};
+            } else {
+                items = new String[]{"置顶", "设置为封面"};
+            }
+        }
+        
+        builder.setItems(items, new android.content.DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(android.content.DialogInterface dialog, int which) {
+                if (which == 0) {
+                    if (pinnedDbHelper != null) {
+                        if (isPinned[0]) {
+                            pinnedDbHelper.unpinImage(imagePath);
+                        } else {
+                            pinnedDbHelper.pinImage(imagePath);
+                        }
+                        refreshPinned();
+                    }
+                } else if (which == 1) {
+                    if (coverDbHelper != null && albumPath != null) {
+                        Intent cropIntent = new Intent(view.getContext(), CropActivity.class);
+                        cropIntent.putExtra(CropActivity.EXTRA_IMAGE_URI, imageUri);
+                        cropIntent.putExtra(CropActivity.EXTRA_IMAGE_PATH, imagePath);
+                        cropIntent.putExtra(CropActivity.EXTRA_ALBUM_PATH, albumPath);
+                        cropIntent.putExtra(CropActivity.EXTRA_CROP_WIDTH, getCropWidth());
+                        cropIntent.putExtra(CropActivity.EXTRA_CROP_HEIGHT, getCropHeight());
+                        ((AlbumActivity) view.getContext()).startActivityForResult(cropIntent, 100);
+                    }
+                } else if (which == 2) {
+                    if (coverDbHelper != null && albumPath != null && isCover[0]) {
+                        coverDbHelper.deleteCover(albumPath);
+                        notifyDataSetChanged();
+                    }
+                }
+            }
+        });
+        builder.show();
+    }
+    
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -44,6 +189,8 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        holder.imageView.setBackgroundResource(getBgRes());
+        
         Glide.with(holder.imageView.getContext())
             .load(imageUrls.get(position))
             .centerCrop()
@@ -51,7 +198,19 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
         
         final ArrayList<Uri> urls = imageUrls;
         final ArrayList<String> paths = imagePaths;
-        holder.imageView.setOnClickListener(new OnClickListener() {
+        final String imagePath = imagePaths.get(position);
+        
+        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath);
+        holder.pinIcon.setVisibility(isPinned ? View.VISIBLE : View.GONE);
+        
+        boolean isCover = false;
+        if (coverDbHelper != null && albumPath != null) {
+            String originalPath = coverDbHelper.getOriginalImagePath(albumPath);
+            isCover = originalPath != null && originalPath.equals(imagePath);
+        }
+        holder.coverIcon.setVisibility(isCover ? View.VISIBLE : View.GONE);
+        
+        holder.itemView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (listener != null) {
@@ -59,6 +218,14 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
                 }
             }
         });
+        
+        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showContextMenu(holder.itemView, position);
+                return true;
+            }
+        });
     }
 
     @Override
@@ -68,9 +235,13 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
 
     static class ViewHolder extends RecyclerView.ViewHolder {
         ImageView imageView;
+        ImageView pinIcon;
+        ImageView coverIcon;
         ViewHolder(View itemView) {
             super(itemView);
             imageView = itemView.findViewById(R.id.image);
+            pinIcon = itemView.findViewById(R.id.pin_icon);
+            coverIcon = itemView.findViewById(R.id.cover_icon);
         }
     }
 }

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

@@ -16,10 +16,25 @@ import cc.winboll.studio.libappbase.LogUtils;
 public class ImagePagerAdapter extends PagerAdapter {
     public static final String TAG = "ImagePagerAdapter";
     private ArrayList<Uri> imageUrls;
+    private int bgType;
 
-    public ImagePagerAdapter(ArrayList<Uri> imageUrls) {
+    public ImagePagerAdapter(ArrayList<Uri> imageUrls, int bgType) {
         this.imageUrls = imageUrls;
-        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images");
+        this.bgType = bgType;
+        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images, bgType=" + bgType);
+    }
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
     }
 
     @Override
@@ -32,6 +47,7 @@ public class ImagePagerAdapter extends PagerAdapter {
     public Object instantiateItem(@NonNull ViewGroup container, int position) {
         View view = LayoutInflater.from(container.getContext())
             .inflate(R.layout.item_image_pager, container, false);
+        view.setBackgroundResource(getBgRes());
         ImageView imageView = view.findViewById(R.id.image);
         
         Glide.with(imageView.getContext())

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

@@ -32,8 +32,12 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
     private ImageButton btnBack;
     private ImageButton btnDelete;
     private ImageButton btnShare;
+    private ImageButton btnInfo;
+    private ImageButton btnBg;
+    private int bgType = 0;
     private GestureDetector gestureDetector;
     private TrashManager trashManager;
+    private Preferences prefs;
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,14 +52,20 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
         currentPosition = getIntent().getIntExtra(EXTRA_POSITION, 0);
         
         trashManager = new TrashManager(this);
+        prefs = new Preferences(this);
+        bgType = prefs.getBgType();
         
         viewPager = findViewById(R.id.view_pager);
         toolbar = findViewById(R.id.toolbar);
         btnBack = findViewById(R.id.btn_back);
         btnDelete = findViewById(R.id.btn_delete);
         btnShare = findViewById(R.id.btn_share);
+        btnInfo = findViewById(R.id.btn_info);
+        btnBg = findViewById(R.id.btn_bg);
         
-        ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls);
+        applyBg();
+        
+        ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls, bgType);
         viewPager.setAdapter(adapter);
         viewPager.setCurrentItem(currentPosition);
         viewPager.addOnPageChangeListener(this);
@@ -95,6 +105,20 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
                 shareCurrentImage();
             }
         });
+        
+        btnInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showImageInfo();
+            }
+        });
+        
+        btnBg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                switchBg();
+            }
+        });
     }
     
     private void toggleToolbar() {
@@ -105,6 +129,52 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
         }
     }
     
+    private void applyBg() {
+        int bgRes;
+        switch (bgType) {
+            case 0:
+                bgRes = R.drawable.bg_checkerboard;
+                break;
+            case 1:
+                bgRes = R.drawable.bg_white;
+                break;
+            case 2:
+                bgRes = R.drawable.bg_black;
+                break;
+            default:
+                bgRes = R.drawable.bg_checkerboard;
+        }
+        View container = findViewById(R.id.container);
+        if (container != null) {
+            container.setBackgroundResource(bgRes);
+        }
+    }
+    
+    private void switchBg() {
+        final String[] bgNames = {"灰白相间", "全白", "全黑"};
+        final int[] bgResources = {R.drawable.bg_checkerboard, R.drawable.bg_white, R.drawable.bg_black};
+        
+        new AlertDialog.Builder(this)
+            .setTitle("选择背景")
+            .setSingleChoiceItems(bgNames, bgType, new android.content.DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(android.content.DialogInterface dialog, int which) {
+                    bgType = which;
+                    prefs.setBgType(which);
+                    int currentItem = viewPager.getCurrentItem();
+                    View container = findViewById(R.id.container);
+                    if (container != null) {
+                        container.setBackgroundResource(bgResources[which]);
+                    }
+                    viewPager.setAdapter(new ImagePagerAdapter(imageUrls, bgType));
+                    viewPager.setCurrentItem(currentItem);
+                    dialog.dismiss();
+                }
+            })
+            .setNegativeButton("取消", null)
+            .show();
+    }
+    
     private void showDeleteDialog() {
         new AlertDialog.Builder(this)
             .setMessage("Delete to trash?")
@@ -169,7 +239,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
             if (currentPosition >= imageUrls.size()) {
                 currentPosition = imageUrls.size() - 1;
             }
-            viewPager.setAdapter(new ImagePagerAdapter(imageUrls));
+            viewPager.setAdapter(new ImagePagerAdapter(imageUrls, bgType));
             viewPager.setCurrentItem(currentPosition);
         }
     }
@@ -201,6 +271,155 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
         }
     }
     
+    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;

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

@@ -14,6 +14,7 @@ import android.provider.MediaStore;
 import android.provider.Settings;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -22,6 +23,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import cc.winboll.studio.gallery.AlbumAdapter.OnAlbumClickListener;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogActivity;
@@ -37,6 +39,7 @@ public class MainActivity extends AppCompatActivity {
     private RecyclerView recyclerView;
     private AlbumAdapter adapter;
     private Preferences prefs;
+    private FloatingActionButton fabScrollTop;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,8 +55,33 @@ public class MainActivity extends AppCompatActivity {
         recyclerView = findViewById(R.id.recycler_view);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
         adapter = new AlbumAdapter();
+        adapter.setContext(this);
         recyclerView.setAdapter(adapter);
         
+        fabScrollTop = findViewById(R.id.fab_scroll_top);
+        fabScrollTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                recyclerView.scrollToPosition(0);
+            }
+        });
+        
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                GridLayoutManager layoutManager = (GridLayoutManager) recyclerView.getLayoutManager();
+                if (layoutManager != null) {
+                    int firstVisible = layoutManager.findFirstVisibleItemPosition();
+                    if (firstVisible > 0) {
+                        fabScrollTop.setVisibility(View.VISIBLE);
+                    } else {
+                        fabScrollTop.setVisibility(View.GONE);
+                    }
+                }
+            }
+        });
+        
         adapter.setOnAlbumClickListener(new OnAlbumClickListener() {
             @Override
             public void onAlbumClick(Album album) {
@@ -131,16 +159,16 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    private void loadAlbums() {
+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 = Environment.getExternalStorageDirectory() + "/DCIM";
+            folderPath = Preferences.getDefaultPath();
             baseFolder = new File(folderPath);
-            LogUtils.d(TAG, "try DCIM: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+            LogUtils.d(TAG, "try default: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
             if (!baseFolder.exists()) {
                 folderPath = Environment.getExternalStorageDirectory() + "/Pictures";
                 baseFolder = new File(folderPath);
@@ -148,6 +176,7 @@ public class MainActivity extends AppCompatActivity {
             }
         }
         
+        AlbumCoverDbHelper coverDbHelper = AlbumCoverDbHelper.getInstance(this);
         ArrayList<Album> albums = new ArrayList<>();
         
         FileFilter directoryFilter = new FileFilter() {
@@ -161,11 +190,31 @@ public class MainActivity extends AppCompatActivity {
         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");
+                String albumPath = subfolder.getAbsolutePath();
+                String coverPath = coverDbHelper.getCover(albumPath);
+                Uri coverUri = null;
+                if (coverPath != null) {
+                    File coverFile = new File(coverPath);
+                    if (coverFile.exists()) {
+                        coverUri = Uri.fromFile(coverFile);
+                    } else {
+                        coverUri = getUriFromPath(coverPath);
+                    }
+                }
+                if (coverUri == null) {
+                    ArrayList<Uri> images = getImagesInFolder(albumPath);
+                    if (!images.isEmpty()) {
+                        coverUri = images.get(0);
+                    }
+                }
+                ArrayList<Uri> allImages = getImagesInFolder(albumPath);
+                if (coverUri != null || !allImages.isEmpty()) {
+                    if (coverUri == null && !allImages.isEmpty()) {
+                        coverUri = allImages.get(0);
+                    }
+                    int imageCount = allImages.size();
+                    albums.add(new Album(subfolder.getName(), albumPath, coverUri, imageCount));
+                    LogUtils.d(TAG, "album added: " + subfolder.getName() + ", " + imageCount + " images");
                 }
             }
         }
@@ -177,7 +226,24 @@ public class MainActivity extends AppCompatActivity {
         adapter.setData(albums);
         LogUtils.d(TAG, "Loaded " + albums.size() + " albums");
     }
-
+    
+    private Uri getUriFromPath(String path) {
+        String[] projection = { MediaStore.Images.Media._ID };
+        String selection = MediaStore.Images.Media.DATA + " = ?";
+        String[] selectionArgs = { path };
+        try (Cursor cursor = getContentResolver().query(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                projection, selection, selectionArgs, null)) {
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID));
+                    return Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, String.valueOf(id));
+                }
+            }
+        }
+        return null;
+    }
+    
     private ArrayList<Uri> getImagesInFolder(String folderPath) {
         ArrayList<Uri> imageUrls = new ArrayList<>();
         ContentResolver contentResolver = getContentResolver();
@@ -220,18 +286,14 @@ public class MainActivity extends AppCompatActivity {
         if (id == R.id.action_settings) {
             startActivity(new Intent(this, SettingsActivity.class));
             return true;
+        } else if (id == R.id.action_about) {
+            startActivity(new Intent(this, AboutActivity.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();
+            LogActivity.startLogActivity(this);
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -244,6 +306,11 @@ public class MainActivity extends AppCompatActivity {
             scanMediaStore();
             loadAlbums();
         }
+        if (adapter != null) {
+            adapter.refreshBg();
+            adapter.refreshPinned();
+            adapter.refreshCover();
+        }
     }
     
     private void scanMediaStore() {

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

@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class PinnedAlbumDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "PinnedAlbumDbHelper";
+    private static final String DB_NAME = "pinned_album.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "pinned_albums";
+    private static final String COLUMN_PATH = "album_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_PATH + " TEXT PRIMARY KEY)";
+    
+    private static PinnedAlbumDbHelper dbHelper;
+    
+    public static PinnedAlbumDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new PinnedAlbumDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public PinnedAlbumDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public void pinAlbum(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_PATH, albumPath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+        LogUtils.d(TAG, "pinAlbum: " + albumPath);
+    }
+    
+    public void unpinAlbum(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "unpinAlbum: " + albumPath);
+    }
+    
+    public boolean isPinned(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, null, COLUMN_PATH + " = ?", 
+            new String[]{albumPath}, null, null, null);
+        boolean pinned = cursor.getCount() > 0;
+        cursor.close();
+        return pinned;
+    }
+    
+    public String[] getPinnedPaths() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_PATH}, null, null, null, null, null);
+        String[] paths = new String[cursor.getCount()];
+        int i = 0;
+        while (cursor.moveToNext()) {
+            paths[i++] = cursor.getString(0);
+        }
+        cursor.close();
+        return paths;
+    }
+}

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

@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class PinnedImageDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "PinnedImageDbHelper";
+    private static final String DB_NAME = "pinned_image.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "pinned_images";
+    private static final String COLUMN_PATH = "image_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_PATH + " TEXT PRIMARY KEY)";
+    
+    private static PinnedImageDbHelper dbHelper;
+    
+    public static PinnedImageDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new PinnedImageDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public PinnedImageDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public void pinImage(String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_PATH, imagePath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+        LogUtils.d(TAG, "pinImage: " + imagePath);
+    }
+    
+    public void unpinImage(String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_PATH + " = ?", new String[]{imagePath});
+        LogUtils.d(TAG, "unpinImage: " + imagePath);
+    }
+    
+    public boolean isPinned(String imagePath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, null, COLUMN_PATH + " = ?", 
+            new String[]{imagePath}, null, null, null);
+        boolean pinned = cursor.getCount() > 0;
+        cursor.close();
+        return pinned;
+    }
+    
+    public String[] getPinnedPaths() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_PATH}, null, null, null, null, null);
+        String[] paths = new String[cursor.getCount()];
+        int i = 0;
+        while (cursor.moveToNext()) {
+            paths[i++] = cursor.getString(0);
+        }
+        cursor.close();
+        return paths;
+    }
+}

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

@@ -8,7 +8,22 @@ 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/DCIM";
+    private static final String KEY_BG_TYPE = "bg_type";
+    private static final String KEY_ALBUM_SORT_MODE = "album_sort_mode";
+    private static final String KEY_COVER_WIDTH = "cover_width";
+    private static final String KEY_COVER_HEIGHT = "cover_height";
+    private static final String KEY_COVER_RATIO = "cover_ratio";
+    private static final int DEFAULT_BG_TYPE = 0;
+    private static final int DEFAULT_SORT_MODE = 0;
+    private static final int DEFAULT_COVER_WIDTH = 240;
+    private static final int DEFAULT_COVER_HEIGHT = 120;
+    private static final float DEFAULT_COVER_RATIO = 2.0f;
+    private static final String DEFAULT_PATH = "/storage/emulated/0/Pictures/Gallery/owner";
+    
+    public static final int SORT_TIME_DESC = 0;
+    public static final int SORT_TIME_ASC = 1;
+    public static final int SORT_NAME_DESC = 2;
+    public static final int SORT_NAME_ASC = 3;
     
     public static String getDefaultPath() {
         return DEFAULT_PATH;
@@ -30,4 +45,46 @@ public class Preferences {
         LogUtils.d(TAG, "setFolderPath: " + path);
         prefs.edit().putString(KEY_FOLDER_PATH, path).apply();
     }
+    
+    public int getBgType() {
+        return prefs.getInt(KEY_BG_TYPE, DEFAULT_BG_TYPE);
+    }
+    
+    public void setBgType(int type) {
+        LogUtils.d(TAG, "setBgType: " + type);
+        prefs.edit().putInt(KEY_BG_TYPE, type).apply();
+    }
+    
+    public int getAlbumSortMode() {
+        return prefs.getInt(KEY_ALBUM_SORT_MODE, DEFAULT_SORT_MODE);
+    }
+    
+    public void setAlbumSortMode(int mode) {
+        LogUtils.d(TAG, "setAlbumSortMode: " + mode);
+        prefs.edit().putInt(KEY_ALBUM_SORT_MODE, mode).apply();
+    }
+    
+    public int getCoverWidth() {
+        return prefs.getInt(KEY_COVER_WIDTH, DEFAULT_COVER_WIDTH);
+    }
+    
+    public void setCoverWidth(int width) {
+        prefs.edit().putInt(KEY_COVER_WIDTH, width).apply();
+    }
+    
+    public int getCoverHeight() {
+        return prefs.getInt(KEY_COVER_HEIGHT, DEFAULT_COVER_HEIGHT);
+    }
+    
+    public void setCoverHeight(int height) {
+        prefs.edit().putInt(KEY_COVER_HEIGHT, height).apply();
+    }
+    
+    public float getCoverRatio() {
+        return prefs.getFloat(KEY_COVER_RATIO, DEFAULT_COVER_RATIO);
+    }
+    
+    public void setCoverRatio(float ratio) {
+        prefs.edit().putFloat(KEY_COVER_RATIO, ratio).apply();
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+<?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="#FFFFFF"
+        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>

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

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

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

@@ -0,0 +1,10 @@
+<?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="#FFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?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="#FFFFFF"
+        android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3,16.25V21h4.75l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,-0.4 0.4,-1.03 0.01,-1.42zM6.92,19H5v-1.92l8.06,-8.06 1.92,1.92L6.92,19z"/>
+</vector>

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

@@ -0,0 +1,13 @@
+<?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"/>
+</vector>

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

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

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,12V4H17V2H7V4H8V12L6,14V16H11.5V22H12.5V16H18V14L16,12Z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?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="#FFFFFF"
+        android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zM3,13h12v-2H3v2z"/>
+</vector>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    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">
+
+    <LinearLayout
+        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>
+
+        <cc.winboll.studio.libappbase.views.AboutView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/aboutview"/>
+
+    </LinearLayout>
+
+</FrameLayout>

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

@@ -0,0 +1,56 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@color/colorPrimary"
+        android:paddingHorizontal="16dp">
+
+        <ImageView
+            android:id="@+id/btn_close"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:padding="12dp"
+            android:src="@drawable/ic_close"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+        <ImageView
+            android:id="@+id/btn_color_pick"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:padding="12dp"
+            android:src="@drawable/ic_color_pick"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <TextView
+            android:id="@+id/btn_done"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:text="完成"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:paddingHorizontal="16dp"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+    </LinearLayout>
+
+    <cc.winboll.studio.gallery.CropCanvasView
+        android:id="@+id/crop_canvas_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"/>
+
+</FrameLayout>

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

@@ -44,6 +44,22 @@
             android:src="@drawable/ic_share"
             android:contentDescription="Share"/>
 
+        <ImageButton
+            android:id="@+id/btn_info"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_info"
+            android:contentDescription="Info"/>
+
+        <ImageButton
+            android:id="@+id/btn_bg"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_bg"
+            android:contentDescription="Background"/>
+
         <ImageButton
             android:id="@+id/btn_delete"
             android:layout_width="48dp"

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

@@ -1,28 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     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:layout_height="match_parent">
 
-    <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"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/black"/>
+        android:orientation="vertical">
 
-</LinearLayout>
+        <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>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_scroll_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_arrow_up"
+        android:visibility="gone"
+        app:backgroundTint="@color/colorAccent"
+        app:tint="@color/white"/>
+
+</FrameLayout>

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

@@ -9,8 +9,8 @@
         android:id="@+id/album_cover"
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:scaleType="centerCrop"
-        android:background="@color/black"/>
+        android:layout_margin="2dp"
+        android:scaleType="centerCrop"/>
 
     <TextView
         android:id="@+id/album_name"
@@ -24,6 +24,17 @@
         android:maxLines="1"
         android:ellipsize="end"/>
 
+    <ImageView
+        android:id="@+id/pin_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="6dp"
+        android:background="@android:color/transparent"
+        android:padding="3dp"
+        android:src="@drawable/ic_pin"
+        android:visibility="gone"/>
+
     <TextView
         android:id="@+id/image_count"
         android:layout_width="wrap_content"

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

@@ -12,4 +12,30 @@
         android:scaleType="centerCrop"
         android:background="@color/black"/>
 
+<ImageView
+        android:id="@+id/pin_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_circle_white"
+        android:padding="4dp"
+        android:src="@drawable/ic_pin"
+        android:visibility="gone"
+        app:tint="@color/black"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
+
+    <ImageView
+        android:id="@+id/cover_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_circle_white"
+        android:padding="4dp"
+        android:src="@drawable/ic_cover"
+        android:visibility="gone"
+        app:tint="@color/black"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
+
 </FrameLayout>

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

@@ -2,8 +2,7 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/image"

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

@@ -0,0 +1,26 @@
+<?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_sort"
+        android:icon="@drawable/ic_sort"
+        android:title="排序"
+        app:showAsAction="ifRoom">
+        <menu>
+            <group android:checkableBehavior="single">
+                <item
+                    android:id="@+id/sort_time_desc"
+                    android:title="时间倒序"/>
+                <item
+                    android:id="@+id/sort_time_asc"
+                    android:title="时间正序"/>
+                <item
+                    android:id="@+id/sort_name_desc"
+                    android:title="名称倒序"/>
+                <item
+                    android:id="@+id/sort_name_asc"
+                    android:title="名称正序"/>
+            </group>
+        </menu>
+    </item>
+</menu>

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

@@ -0,0 +1,8 @@
+<?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_done"
+        android:title="完成"
+        app:showAsAction="always"/>
+</menu>

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

@@ -13,8 +13,8 @@
         app:showAsAction="never"/>
     
     <item
-        android:id="@+id/action_refresh"
-        android:title="@string/refresh"
+        android:id="@+id/action_about"
+        android:title="@string/about"
         app:showAsAction="never"/>
     
     <item

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

@@ -1,8 +1,10 @@
 <resources>
     <string name="app_name">Gallery</string>
+    <string name="app_description">WinBoLL Album App</string>
     <string name="refresh">Refresh</string>
     <string name="settings">Settings</string>
     <string name="settings_title">Settings</string>
+    <string name="about">About</string>
     <string name="folder_path">Folder Path</string>
     <string name="enter_folder_path">Enter folder path</string>
     <string name="save">Save</string>
@@ -16,4 +18,4 @@
     <string name="no">No</string>
     <string name="debug_log">Debug Log</string>
     <string name="debug_message">Debug log message</string>
-</resources>
+</resources>