Merge pull request #9 from smartdevelopers-ir/changes_for_android_11

smartdevelopers-ir · web-flow · commit 9c23c6ad15c5 · 2022-03-08T15:57:13.000+03:30
2022/03/08
diff --git a/SmartFileBrowser/build.gradle b/SmartFileBrowser/build.gradle
@@ -31,7 +31,7 @@ android {
     }
 }
 group = 'ir.smartdevelopers'
-version = '1.4.7'
+version = '1.4.8'
 task sourcesJar(type: Jar) {
     archiveClassifier.set("sources")
     from android.sourceSets.main.java.srcDirs
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/acitivties/FileBrowserMainActivity.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/acitivties/FileBrowserMainActivity.java
@@ -14,6 +14,7 @@
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/FileBrowserAdapter.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/FileBrowserAdapter.java
@@ -9,13 +9,15 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import ir.smartdevelopers.smartfilebrowser.R;
 import ir.smartdevelopers.smartfilebrowser.customClasses.FileUtil;
@@ -47,12 +49,48 @@ public FileBrowserAdapter(List<File> selectedFiles) {
         mSelectedFiles=selectedFiles;
     }
 
+    class DiffCallback extends DiffUtil.Callback{
+        List<FileBrowserModel> oldList;
+        List<FileBrowserModel> newList;
+
+        public DiffCallback(List<FileBrowserModel> oldList, List<FileBrowserModel> newList) {
+            this.oldList = oldList;
+            this.newList = newList;
+        }
+
+        @Override
+        public int getOldListSize() {
+            return oldList.size();
+        }
+
+        @Override
+        public int getNewListSize() {
+            return newList.size();
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            if (oldList.get(oldItemPosition).getId()==FileBrowserModel.ID_RECENT_FILES ||
+                    newList.get(newItemPosition).getId() == FileBrowserModel.ID_RECENT_FILES){
+                return false;
+            }
+            return Objects.equals(oldList.get(oldItemPosition),newList.get(newItemPosition));
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return Objects.equals(oldList.get(oldItemPosition),newList.get(newItemPosition));
+        }
+    }
     public void setList(List<FileBrowserModel> fileBrowserModels) {
 //        notifyItemRangeRemoved(0,mFileBrowserModelsCopy.size());
+
+//        notifyItemRangeInserted(0,mFileBrowserModelsCopy.size());
+        DiffUtil.DiffResult result=DiffUtil.calculateDiff(new DiffCallback(mFileBrowserModelsCopy,fileBrowserModels),false);
         mFileBrowserModels = fileBrowserModels;
         mFileBrowserModelsCopy = fileBrowserModels;
-//        notifyItemRangeInserted(0,mFileBrowserModelsCopy.size());
-        notifyDataSetChanged();
+        result.dispatchUpdatesTo(this);
+        //notifyDataSetChanged();
     }
 
     @Override
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/GalleryAdapter.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/GalleryAdapter.java
@@ -19,6 +19,7 @@
 import com.bumptech.glide.GlideBuilder;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.engine.executor.GlideExecutor;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -303,8 +304,9 @@ void bindView(GalleryModel model){
                     .override(THUMBNAIL_SIZE,THUMBNAIL_SIZE)
                     //.dontAnimate()
                     //.thumbnail(0.2f)
-                    .encodeQuality(30)
+                    .encodeQuality(50)
                     .priority(Priority.LOW)
+                    .transition(DrawableTransitionOptions.withCrossFade())
                     .into(mImageView);
 
 
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/customClasses/Utils.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/customClasses/Utils.java
@@ -58,7 +58,7 @@ public static List<FileBrowserModel> generateFirstPageList(Context context,List<
         fileBrowserModels.add(downloadFolder);
 
         /*Recent file*/
-        FileBrowserModel recent=new FileBrowserModel(-4,context.getString(R.string.recent),"",FileBrowserModel.MODEL_TYPE_ALL_FILE_TITLE,
+        FileBrowserModel recent=new FileBrowserModel(FileBrowserModel.ID_RECENT_FILES,context.getString(R.string.recent),"",FileBrowserModel.MODEL_TYPE_ALL_FILE_TITLE,
                 null,"",null);
         fileBrowserModels.add(recent);
 
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/models/FileBrowserModel.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/models/FileBrowserModel.java
@@ -3,25 +3,27 @@
 import android.text.TextUtils;
 
 import java.io.File;
+import java.util.Objects;
 
 import ir.smartdevelopers.smartfilebrowser.customClasses.FileUtil;
 import ir.smartdevelopers.smartfilebrowser.customClasses.Utils;
 
 public class FileBrowserModel implements FileModel {
-    public static final int MODEL_TYPE_FOLDER=0;
-    public static final int MODEL_TYPE_INTERNAL_STORAGE=1;
-    public static final int MODEL_TYPE_EXTERNAL_STORAGE=2;
-    public static final int MODEL_TYPE_DOWNLOAD_FOLDER=3;
-    public static final int MODEL_TYPE_VIDEO=4;
-    public static final int MODEL_TYPE_IMAGE=5;
-    public static final int MODEL_TYPE_AUDIO=6;
-    public static final int MODEL_TYPE_PDF=7;
-    public static final int MODEL_TYPE_FILE=8;
-    public static final int MODEL_TYPE_ALL_FILE_TITLE = 9;
-    public static final int MODEL_TYPE_GO_BACK = 10;
+    public static final int MODEL_TYPE_FOLDER=1;
+    public static final int MODEL_TYPE_INTERNAL_STORAGE=2;
+    public static final int MODEL_TYPE_EXTERNAL_STORAGE=3;
+    public static final int MODEL_TYPE_DOWNLOAD_FOLDER=4;
+    public static final int MODEL_TYPE_VIDEO=5;
+    public static final int MODEL_TYPE_IMAGE=6;
+    public static final int MODEL_TYPE_AUDIO=7;
+    public static final int MODEL_TYPE_PDF=8;
+    public static final int MODEL_TYPE_FILE=9;
+    public static final int MODEL_TYPE_ALL_FILE_TITLE = 10;
+    public static final int MODEL_TYPE_GO_BACK = 11;
     public static final int ID_EXTERNAL_STORAGE = -2;
     public static final int ID_INTERNAL_STORAGE = -1;
     public static final int ID_DOWNLOAD_FOLDER = -3;
+    public static final int ID_RECENT_FILES = -4;
 
 
     private long id;
@@ -168,4 +170,17 @@ public boolean isSelected() {
     public void setSelected(boolean selected) {
         mSelected = selected;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FileBrowserModel model = (FileBrowserModel) o;
+        return id == model.id && Objects.equals(mTitle, model.mTitle) && Objects.equals(mPath, model.mPath);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, mTitle, mPath);
+    }
 }
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/viewModel/FilesViewModel.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/viewModel/FilesViewModel.java
@@ -54,7 +54,7 @@ public void getFirstPagePdfLiveData(FileFilter fileFilter) {
             String selection= MediaStore.Files.FileColumns.MIME_TYPE+" LIKE ?";
             String[] selectionArgs=new String[]{"%pdf%"};
             mRepository.getFirstBrowserPageList(selection, selectionArgs,
-                    FileBrowserModel.MODEL_TYPE_FILE, fileFilter, mFilesLiveData);
+                    FileBrowserModel.MODEL_TYPE_PDF, fileFilter, mFilesLiveData);
 //            mAllLiveData.put("pdf", mFirstPagePdfLiveData);
 //        }
 
@@ -65,7 +65,7 @@ public void getFirstPageAudiosLiveData(FileFilter fileFilter) {
             String selection= MediaStore.Files.FileColumns.MIME_TYPE+" LIKE ?";
             String[] selectionArgs=new String[]{"%audio%"};
            mRepository.getFirstBrowserPageList(selection,selectionArgs,
-                    FileBrowserModel.MODEL_TYPE_FILE,fileFilter, mFilesLiveData);
+                    FileBrowserModel.MODEL_TYPE_AUDIO,fileFilter, mFilesLiveData);
 //            mAllLiveData.put("audio", mFirstPageAudiosLiveData);
 //        }
 
@@ -76,7 +76,7 @@ public void getFirstPageVideosLiveData(FileFilter fileFilter) {
             String selection= MediaStore.Files.FileColumns.MIME_TYPE+" LIKE ?";
             String[] selectionArgs=new String[]{"%video%"};
             mRepository.getFirstBrowserPageList(selection,selectionArgs,
-                    FileBrowserModel.MODEL_TYPE_FILE,fileFilter, mFilesLiveData);
+                    FileBrowserModel.MODEL_TYPE_VIDEO,fileFilter, mFilesLiveData);
 //            mAllLiveData.put("video", mFirstPageVideosLiveData);
 //        }
 
diff --git a/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/viewModel/Repository.java b/SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/viewModel/Repository.java
@@ -42,6 +42,8 @@ public class Repository {
     private final ContentResolver mContentResolver;
     private final WeakReference<Context> wContext;
     private final MutableLiveData<List<GalleryModel>> galleryList;
+    private List<FileBrowserModel> mCurrentFirstFiles;
+    private int mCurrentModelType;
     public Repository(Application application) {
         mExecutorService= Executors.newCachedThreadPool();
         mContentResolver=application.getContentResolver();
@@ -195,8 +197,14 @@ private List<GalleryModel> getGalleryModel(Cursor cursor,String[] projection){
     public void getFirstBrowserPageList(String selection,String[] selectionArgs, int modelType,
                                                          FileFilter fileFilter,
                                                          MutableLiveData<List<FileBrowserModel>> filesLiveData){
-
-
+        if (mCurrentFirstFiles==null){
+            filesLiveData.setValue(Utils.generateFirstPageList(wContext.get(),Collections.emptyList()));
+        }else {
+            if (mCurrentModelType == modelType){
+                filesLiveData.setValue(mCurrentFirstFiles);
+                return;
+            }
+        }
         String extraQuery=MediaStore.Files.FileColumns.MIME_TYPE+" IS NOT NULL AND " +
                 MediaStore.Files.FileColumns.DATA+" NOT LIKE '%.thumbnail%' AND "+
                 MediaStore.Files.FileColumns.DATA+" NOT LIKE '%Android/%' ";
@@ -259,7 +267,8 @@ public void getFirstBrowserPageList(String selection,String[] selectionArgs, int
             }
             cursor.close();
             if (wContext.get()==null){return;}
-            filesLiveData.postValue(Utils.generateFirstPageList(wContext.get(),fileBrowserModels));
+            mCurrentFirstFiles=Utils.generateFirstPageList(wContext.get(),fileBrowserModels);
+            filesLiveData.postValue(mCurrentFirstFiles);
 
         });
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`group = 'ir.smartdevelopers'`
`34`		`-version = '1.4.7'`
	`34`	`+version = '1.4.8'`
`35`	`35`	`task sourcesJar(type: Jar) {`
`36`	`36`	`archiveClassifier.set("sources")`
`37`	`37`	`from android.sourceSets.main.java.srcDirs`