From 1ee518b204b2b21f6c98b41a0db621b4ee431058 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 14 Jul 2024 22:20:33 +0800
Subject: [PATCH] Add device sorter

---
 .../java/com/fongmi/android/tv/bean/Device.java   | 15 +++++++++++++++
 .../android/tv/ui/adapter/DeviceAdapter.java      |  1 +
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Device.java b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
index 3bd5a7b4f..d1eaacc74 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Device.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
@@ -15,6 +15,8 @@ import com.fongmi.android.tv.utils.UrlUtil;
 import com.fongmi.android.tv.utils.Util;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 @Entity(indices = @Index(value = {"uuid", "name"}, unique = true))
@@ -139,4 +141,17 @@ public class Device {
     public String toString() {
         return App.gson().toJson(this);
     }
+
+    public static class Sorter implements Comparator<Device> {
+
+        public static void sort(List<Device> items) {
+            if (items.size() > 1) Collections.sort(items, new Sorter());
+        }
+
+        @Override
+        public int compare(Device o1, Device o2) {
+            int comp = Integer.compare(o1.getType(), o2.getType());
+            return comp != 0 ? comp : o1.getName().compareTo(o2.getName());
+        }
+    }
 }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
index 86fc23dfd..7be64f17f 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/DeviceAdapter.java
@@ -34,6 +34,7 @@ public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.ViewHolder
         if (items == null) return;
         mItems.removeAll(items);
         mItems.addAll(items);
+        Device.Sorter.sort(mItems);
         notifyDataSetChanged();
     }