2021/11/27

before remove gallery fragment and merge into together

Author: ktdynamic

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/adapters/GalleryAdapter.java

@@ -103,16 +103,31 @@ public int getItemCount() {
     }
 
     public void setList(List<GalleryModel> galleryModels) {
-        mGalleryModels=galleryModels;
-        for (GalleryModel model:mGalleryModels){
+
+
+        for (GalleryModel model:galleryModels){
             if (model.getCurrentFile()==null){
                 continue;
             }
             if (mSelectedFiles.contains(model.getCurrentFile())){
                 model.setSelected(true);
             }
         }
-        notifyDataSetChanged();
+        /*if there is just camera item in it*/
+        boolean firstItemIsCamera=false;
+        if (mGalleryModels.size()>0 && mGalleryModels.get(0).getId()==0){
+            notifyItemRangeRemoved(1,mGalleryModels.size()-1);
+            firstItemIsCamera=true;
+        }else if (mGalleryModels.size()>0){
+            notifyItemRangeRemoved(0,mGalleryModels.size());
+        }
+        mGalleryModels=galleryModels;
+        if (firstItemIsCamera){
+            notifyItemRangeInserted(1,galleryModels.size()-1);
+        }else {
+            notifyItemRangeInserted(0,galleryModels.size());
+        }
+
     }
 
     public boolean canSelectMultiple() {

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/fragments/GalleryFragment.java

@@ -7,6 +7,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -132,6 +133,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         allGalleryModels.observe(getViewLifecycleOwner(), new Observer<List<GalleryModel>>() {
             @Override
             public void onChanged(List<GalleryModel> galleryModels) {
+                Log.v("TTT","onChanged");
                 mGalleryAdapter.setList(galleryModels);
             }
         });

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/models/GalleryModel.java

@@ -6,7 +6,7 @@
 
 import ir.smartdevelopers.smartfilebrowser.customClasses.FileUtil;
 
-public  class GalleryModel implements FileModel {
+public  class GalleryModel implements FileModel ,Comparable<GalleryModel>{
 
     public static final int TYPE_CAMERA = -102;
     private long id;
@@ -18,6 +18,8 @@ public  class GalleryModel implements FileModel {
     private int mType;
     private boolean mSelected;
     private int mNumber;
+    private String mThumbnailPath;
+    private String mThumbnailId;
 
 
     public String getPath() {
@@ -93,4 +95,25 @@ public int getNumber() {
     public void setNumber(int number) {
         mNumber = number;
     }
+
+    public String getThumbnailId() {
+        return mThumbnailId;
+    }
+
+    public void setThumbnailId(String thumbnailId) {
+        mThumbnailId = thumbnailId;
+    }
+
+    public String getThumbnailPath() {
+        return mThumbnailPath;
+    }
+
+    public void setThumbnailPath(String thumbnailPath) {
+        mThumbnailPath = thumbnailPath;
+    }
+
+    @Override
+    public int compareTo(GalleryModel o) {
+        return Long.compare(this.mDateAdded,o.mDateAdded)*-1;
+    }
 }

SmartFileBrowser/src/main/java/ir/smartdevelopers/smartfilebrowser/viewModel/Repository.java

@@ -20,6 +20,7 @@
 import java.io.FileFilter;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -49,6 +50,15 @@ public LiveData<List<GalleryModel>> getGalleryMediaList(String selection, String
        if (galleryList==null){
            galleryList=new MutableLiveData<>();
        }
+        List<GalleryModel> galleryModelList=new ArrayList<>();
+        if (addCameraItem){
+            GalleryModel cameraModel=new GalleryModel();
+            cameraModel.setDateAdded(Calendar.getInstance().getTimeInMillis());
+            cameraModel.setType(GalleryModel.TYPE_CAMERA);
+            galleryModelList.add(cameraModel);
+            galleryList.setValue(galleryModelList);
+        }
+
         String extraQuery=MediaStore.Files.FileColumns.DATA+" NOT LIKE '%Android/%' ";
         selection= TextUtils.isEmpty(selection) ? extraQuery
                 : selection+" AND "+extraQuery;
@@ -59,9 +69,10 @@ public LiveData<List<GalleryModel>> getGalleryMediaList(String selection, String
             String[] imageProjection = {MediaStore.Images.Media._ID,
                     MediaStore.Images.Media.DATA, MediaStore.Images.Media.DATE_ADDED,
                     MediaStore.Images.Media.DISPLAY_NAME, MediaStore.Images.Media.MIME_TYPE};
+
             Cursor externalImageCursor = mContentResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, imageProjection,
                     finalSelection, selectionArgs, MediaStore.Images.Media.DATE_ADDED + " DESC");
-            List<GalleryModel> galleryModelList = new ArrayList<>(getGalleryModel(externalImageCursor, imageProjection));
+            galleryModelList.addAll(getGalleryModel(externalImageCursor, imageProjection));
             // </editor-fold>
 
             // <editor-fold defaultstate="collapsed" desc=" Videos ">
@@ -74,11 +85,7 @@ public LiveData<List<GalleryModel>> getGalleryMediaList(String selection, String
                 galleryModelList.addAll(getGalleryModel(externalVideoCursor, videoProjection));
             }
             // </editor-fold>
-            if (addCameraItem){
-                GalleryModel cameraModel=new GalleryModel();
-                cameraModel.setType(GalleryModel.TYPE_CAMERA);
-                galleryModelList.add(0,cameraModel);
-            }
+            Collections.sort(galleryModelList);
             galleryList.postValue(galleryModelList);
 
         });