Skip to content

Commit 97e9a80

Browse files
fix album media not reload with appcompat 1.3.x by zhihu#851
1 parent 21591ae commit 97e9a80

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

matisse/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
dependencies {
3838
implementation fileTree(dir: 'libs', include: ['*.jar'])
3939

40-
implementation "androidx.appcompat:appcompat:1.1.0"
40+
implementation "androidx.appcompat:appcompat:1.3.1"
4141
implementation "androidx.annotation:annotation:1.1.0"
4242
implementation "androidx.recyclerview:recyclerview:1.0.0"
4343
implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'

matisse/src/main/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.os.Bundle;
2222
import androidx.annotation.NonNull;
2323
import androidx.annotation.Nullable;
24+
import androidx.fragment.app.Fragment;
2425
import androidx.fragment.app.FragmentActivity;
2526
import androidx.loader.app.LoaderManager;
2627
import androidx.loader.content.Loader;
@@ -76,7 +77,13 @@ public void onLoaderReset(Loader<Cursor> loader) {
7677

7778
public void onCreate(@NonNull FragmentActivity context, @NonNull AlbumMediaCallbacks callbacks) {
7879
mContext = new WeakReference<Context>(context);
79-
mLoaderManager = context.getSupportLoaderManager();
80+
mLoaderManager = LoaderManager.getInstance(context);
81+
mCallbacks = callbacks;
82+
}
83+
84+
public void onCreate(@NonNull Fragment fragment, @NonNull AlbumMediaCallbacks callbacks) {
85+
mContext = new WeakReference<>(fragment.getContext());
86+
mLoaderManager = LoaderManager.getInstance(fragment);
8087
mCallbacks = callbacks;
8188
}
8289

matisse/src/main/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
109109
int spacing = getResources().getDimensionPixelSize(R.dimen.media_grid_spacing);
110110
mRecyclerView.addItemDecoration(new MediaGridInset(spanCount, spacing, false));
111111
mRecyclerView.setAdapter(mAdapter);
112-
mAlbumMediaCollection.onCreate(getActivity(), this);
112+
mAlbumMediaCollection.onCreate(this, this);
113113
mAlbumMediaCollection.load(album, selectionSpec.capture);
114114
}
115115

sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies {
4141
// implementation 'com.zhihu.android:matisse:0.5.2'
4242
implementation fileTree(dir: 'libs', include: ['*.jar'])
4343

44-
implementation "androidx.appcompat:appcompat:1.1.0"
44+
implementation "androidx.appcompat:appcompat:1.3.1"
4545
implementation "androidx.recyclerview:recyclerview:1.0.0"
4646
implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
4747
implementation 'io.reactivex.rxjava2:rxjava:2.2.12'

0 commit comments

Comments
 (0)