Fixed IconDialog calling Integer.compare

Author: maltaisn

icondialog/src/main/java/com/maltaisn/icondialog/BaseIconFilter.java

@@ -24,15 +24,15 @@
 
 import android.util.SparseArray;
 
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Comparator;
 import java.util.List;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Base class used to search icons by label
  * Can be subclassed to customize the search algorithm
@@ -120,7 +120,7 @@ public int compare(@NonNull Icon icon1, @NonNull Icon icon2) {
         return result;
     }
 
-    private int compareIntegers(int x, int y) {
+    static int compareIntegers(int x, int y) {
         return (x < y) ? -1 : ((x == y) ? 0 : 1);
     }
 

icondialog/src/main/java/com/maltaisn/icondialog/IconDialog.java

@@ -50,13 +50,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -66,6 +59,13 @@
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 @SuppressWarnings({"unused", "WeakerAccess", "UnusedReturnValue", "SameParameterValue"})
 public class IconDialog extends DialogFragment {
 
@@ -554,7 +554,7 @@ private List<Item> getListItems(@Nullable String search) {
                 @Override
                 public int compare(Item i1, Item i2) {
                     //noinspection ConstantConditions
-                    return Integer.compare(i1.icon.id, i2.icon.id);
+                    return BaseIconFilter.compareIntegers(i1.icon.id, i2.icon.id);
                 }
             });
             List<Item> newSel = new ArrayList<>(selectedItems);