Merge pull request #33 from Mraulio/dev

Removed Guava library and adapted sorting method
Mraulio · Apr 18, 2024 · 4f66d3b · 4f66d3b
2 parents 0440486 + c272713
commit 4f66d3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,7 +42,6 @@ dependencies {
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
     implementation 'com.google.android.material:material:1.10.0'
-    implementation 'com.google.guava:guava:33.1.0-android'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.27'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.github.mik3y:usb-serial-for-android:3.7.0'

diff --git a/app/src/main/java/com/mraulio/gbcameramanager/ui/gallery/GalleryUtils.java b/app/src/main/java/com/mraulio/gbcameramanager/ui/gallery/GalleryUtils.java
@@ -72,8 +72,7 @@
 import androidx.core.content.FileProvider;
 
 import com.google.android.material.datepicker.MaterialDatePicker;
-import com.google.common.base.Function;
-import com.google.common.collect.Ordering;
+
 import com.google.gson.Gson;
 import com.mraulio.gbcameramanager.R;
 import com.mraulio.gbcameramanager.db.ImageDao;
@@ -898,26 +897,16 @@ public static void updateSelectedTagsText(TextView selectedTagsTv, TextView hidd
     }
 
     public static void sortByDate(List<GbcImage> gbcImagesList, boolean descending) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { //If it's android api 23
-            Ordering<GbcImage> ordering = Ordering.natural().onResultOf(new Function<GbcImage, Comparable>() {
-                @Override
-                public Comparable apply(GbcImage input) {
-                    return input.getCreationDate();
-                }
-            });
-            if (descending) {
-                ordering = ordering.reverse();
-            }
-            Collections.sort(gbcImagesList, ordering);
-        } else {
-            Comparator<GbcImage> comparator = Comparator.comparing(GbcImage::getCreationDate);
-            if (descending) {
-                comparator = comparator.reversed();
-            }
-            Collections.sort(gbcImagesList, comparator);
+        Comparator<GbcImage> comparator = (image1, image2) -> image1.getCreationDate().compareTo(image2.getCreationDate());
+
+        if (descending) {
+            comparator = Collections.reverseOrder(comparator);
         }
+
+        Collections.sort(gbcImagesList, comparator);
     }
 
+
     public static void sortByTitle(List<GbcImage> gbcImagesList, boolean descending) {
         Comparator<GbcImage> comparator = (image1, image2) -> {
             int titleComparison = image1.getName().compareTo(image2.getName());