diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/LiveAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/LiveAdapter.java index bd178c7a9..2d3222f60 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/LiveAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/LiveAdapter.java @@ -10,7 +10,6 @@ import com.fongmi.android.tv.api.LiveConfig; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.databinding.AdapterLiveBinding; -import java.util.Collections; import java.util.List; public class LiveAdapter extends RecyclerView.Adapter { @@ -21,7 +20,6 @@ public class LiveAdapter extends RecyclerView.Adapter { public LiveAdapter(OnClickListener listener) { this.mListener = listener; this.mItems = LiveConfig.get().getLives(); - Collections.sort(mItems, new Live.Sorter()); } public interface OnClickListener { diff --git a/app/src/leanback/res/layout/adapter_live.xml b/app/src/leanback/res/layout/adapter_live.xml index f423ca28e..fb3bf9a41 100644 --- a/app/src/leanback/res/layout/adapter_live.xml +++ b/app/src/leanback/res/layout/adapter_live.xml @@ -1,22 +1,15 @@ - - - - - \ No newline at end of file + android:background="@drawable/selector_text" + android:ellipsize="middle" + android:focusable="true" + android:focusableInTouchMode="true" + android:gravity="center" + android:singleLine="true" + android:textColor="@color/white" + android:textSize="18sp" + tools:text="https://fongmi.github.io/live.json" /> \ No newline at end of file diff --git a/app/src/leanback/res/layout/dialog_live.xml b/app/src/leanback/res/layout/dialog_live.xml index 1f4d8457d..ec9c8e56f 100644 --- a/app/src/leanback/res/layout/dialog_live.xml +++ b/app/src/leanback/res/layout/dialog_live.xml @@ -1,8 +1,12 @@ - \ No newline at end of file + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:maxHeight="236dp" + tools:itemCount="5" + tools:listitem="@layout/adapter_live" /> \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Live.java b/app/src/main/java/com/fongmi/android/tv/bean/Live.java index 40d75def7..a4d88b2ac 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Live.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Live.java @@ -8,7 +8,6 @@ import com.google.gson.JsonElement; import com.google.gson.annotations.SerializedName; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; public class Live { @@ -129,12 +128,4 @@ public class Live { Live it = (Live) obj; return getName().equals(it.getName()) && getUrl().equals(it.getUrl()); } - - public static class Sorter implements Comparator { - - @Override - public int compare(Live live1, Live live2) { - return Boolean.compare(live2.isActivated(), live1.isActivated()); - } - } }