Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD: 增加对 HEIF 和 HEIC 的支持 #831

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ADD: 增加对 HEIF 和 HEIC 的支持 #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfa20ff
ADD: 增加对heif和heic的支持
SwordBearer Sep 15, 2020
ac7b7c1
FIX: 将相册排序，改为 DATE_MODIFIED，尝试解决部分机型（三星S10）截屏后无法立即看到图片问题
litang0908 Nov 17, 2020
5551a4b
FIX: https://github.com/zhihu/Matisse/issues/812
litang0908 Feb 9, 2022
b37a2dd
release 0.5.3-beta4
litang0908 Jun 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion matisse/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
}
Expand Down
11 changes: 8 additions & 3 deletions matisse/src/main/java/com/zhihu/matisse/MimeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -109,7 +114,7 @@ public static Set<MimeType> of(MimeType type, MimeType... rest) {
}

public static Set<MimeType> ofImage() {
return EnumSet.of(JPEG, PNG, GIF, BMP, WEBP);
return EnumSet.of(JPEG, PNG, GIF, BMP, WEBP, HEIC, HEIF);
}

public static Set<MimeType> ofImage(boolean onlyGif) {
Expand Down
2 changes: 1 addition & 1 deletion matisse/src/main/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 10 additions & 2 deletions matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,17 +386,25 @@ public void onAlbumReset() {
mAlbumsAdapter.swapCursor(null);
}

private Fragment fragment;

private void onAlbumSelected(Album album) {
if (album.isAll() && album.isEmpty()) {
mContainer.setVisibility(View.GONE);
mEmptyView.setVisibility(View.VISIBLE);
} 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();
}
}
Expand Down