From dfa20ff8653ecbe8e3dabd853d47707404139443 Mon Sep 17 00:00:00 2001 From: jianrentang Date: Wed, 16 Sep 2020 01:05:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ADD:=20=E5=A2=9E=E5=8A=A0=E5=AF=B9heif?= =?UTF-8?q?=E5=92=8Cheic=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- matisse/src/main/java/com/zhihu/matisse/MimeType.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/matisse/src/main/java/com/zhihu/matisse/MimeType.java b/matisse/src/main/java/com/zhihu/matisse/MimeType.java index edbcced9b..6b43d9a5a 100644 --- a/matisse/src/main/java/com/zhihu/matisse/MimeType.java +++ b/matisse/src/main/java/com/zhihu/matisse/MimeType.java @@ -19,11 +19,10 @@ import android.content.ContentResolver; import android.net.Uri; import android.text.TextUtils; +import android.webkit.MimeTypeMap; import androidx.collection.ArraySet; -import android.webkit.MimeTypeMap; - import com.zhihu.matisse.internal.utils.PhotoMetadataUtils; import java.util.Arrays; @@ -58,6 +57,12 @@ public enum MimeType { WEBP("image/webp", arraySetOf( "webp" )), + HEIC("image/heic", arraySetOf( + "heic" + )), + HEIF("image/heif", arraySetOf( + "heif" + )), // ============== videos ============== MPEG("video/mpeg", arraySetOf( @@ -109,7 +114,7 @@ public static Set of(MimeType type, MimeType... rest) { } public static Set ofImage() { - return EnumSet.of(JPEG, PNG, GIF, BMP, WEBP); + return EnumSet.of(JPEG, PNG, GIF, BMP, WEBP, HEIC, HEIF); } public static Set ofImage(boolean onlyGif) { From ac7b7c17d86e2c1388d31dfc69124e8fcafb9b49 Mon Sep 17 00:00:00 2001 From: litang0908 Date: Tue, 17 Nov 2020 23:58:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?FIX:=20=E5=B0=86=E7=9B=B8=E5=86=8C=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E6=94=B9=E4=B8=BA=20DATE=5FMODIFIED=EF=BC=8C?= =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=EF=BC=88=E4=B8=89=E6=98=9FS10=EF=BC=89=E6=88=AA?= =?UTF-8?q?=E5=B1=8F=E5=90=8E=E6=97=A0=E6=B3=95=E7=AB=8B=E5=8D=B3=E7=9C=8B?= =?UTF-8?q?=E5=88=B0=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhihu/matisse/internal/loader/AlbumMediaLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java b/matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java index 7bba0d616..127a02a17 100644 --- a/matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java +++ b/matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java @@ -120,7 +120,7 @@ private static String[] getSelectionAlbumArgsForGifType(int mediaType, String al } // =============================================================== - private static final String ORDER_BY = MediaStore.Images.Media.DATE_TAKEN + " DESC"; + private static final String ORDER_BY = MediaStore.Images.Media.DATE_MODIFIED + " DESC"; private final boolean mEnableCapture; private AlbumMediaLoader(Context context, String selection, String[] selectionArgs, boolean capture) { From 5551a4b11a41aaefd2d8c8d97f21d9b528ec9fc7 Mon Sep 17 00:00:00 2001 From: litang0908 Date: Wed, 9 Feb 2022 23:58:55 +0800 Subject: [PATCH 3/4] FIX: https://github.com/zhihu/Matisse/issues/812 --- .../java/com/zhihu/matisse/ui/MatisseActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java index 662379a2e..1e52a1f45 100644 --- a/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java +++ b/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java @@ -386,6 +386,8 @@ public void onAlbumReset() { mAlbumsAdapter.swapCursor(null); } + private Fragment fragment; + private void onAlbumSelected(Album album) { if (album.isAll() && album.isEmpty()) { mContainer.setVisibility(View.GONE); @@ -393,10 +395,16 @@ private void onAlbumSelected(Album album) { } else { mContainer.setVisibility(View.VISIBLE); mEmptyView.setVisibility(View.GONE); - Fragment fragment = MediaSelectionFragment.newInstance(album); + if (fragment != null) { + getSupportFragmentManager() + .beginTransaction() + .remove(fragment) + .commitAllowingStateLoss(); + } + fragment = MediaSelectionFragment.newInstance(album); getSupportFragmentManager() .beginTransaction() - .replace(R.id.container, fragment, MediaSelectionFragment.class.getSimpleName()) + .add(R.id.container, fragment, MediaSelectionFragment.class.getSimpleName()) .commitAllowingStateLoss(); } } From b37a2dd9bb8447f4c916a66e18ec2d08fccd3611 Mon Sep 17 00:00:00 2001 From: litang0908 Date: Sat, 18 Jun 2022 08:49:47 +0800 Subject: [PATCH 4/4] release 0.5.3-beta4 --- matisse/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matisse/build.gradle b/matisse/build.gradle index 266c5921d..3572a7f83 100644 --- a/matisse/build.gradle +++ b/matisse/build.gradle @@ -52,7 +52,7 @@ publish { userOrg = 'zhihu' groupId = 'com.zhihu.android' artifactId = 'matisse' - publishVersion = '0.5.3-beta3' + publishVersion = '0.5.3-beta4' desc = 'A well-designed local image selector for Android' website = 'https://www.zhihu.com/' }