diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java index 94bab7d9f..9a6d7e474 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java @@ -72,7 +72,7 @@ public class SiteAdapter extends RecyclerView.Adapter { private boolean getChecked(Site item) { if (type == 1) return item.isSearchable(); if (type == 2) return item.isChangeable(); - if (type == 3) return item.isRecordable(); + if (type == 3) return !item.isRecordable(); return false; } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java index f40426de6..ad07e947e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java @@ -40,11 +40,11 @@ public class LiveDialog implements LiveAdapter.OnClickListener { } private int getSpanCount() { - return adapter.getItemCount() >= 8 ? 2 : 1; + return Math.max(1, Math.min(adapter.getItemCount() / 20, 3)); } private float getWidth() { - return getSpanCount() == 2 ? 0.6f : 0.4f; + return 0.4f + (getSpanCount() - 1) * 0.2f; } private void setRecyclerView() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java index 3141e1593..c23315945 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java @@ -59,11 +59,11 @@ public class SiteDialog implements SiteAdapter.OnClickListener { } private int getSpanCount() { - return adapter.getItemCount() >= 10 ? 2 : 1; + return Math.max(1, Math.min(adapter.getItemCount() / 20, 3)); } private float getWidth() { - return getSpanCount() == 2 ? 0.6f : 0.4f; + return 0.4f + (getSpanCount() - 1) * 0.2f; } private void setRecyclerView() { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 07897434b..cafa5419f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -92,7 +92,7 @@ 取消 搜索 换源 - 记忆 + 无痕 全选 反选 请输入接口… diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6f4d5f888..8eac134cc 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -92,7 +92,7 @@ 取消 搜尋 換源 - 記憶 + 無痕 全選 反選 請輸入接口… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index daa36b986..126e6187d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,7 +92,7 @@ Cancel 搜尋 換源 - 記憶 + 無痕 全選 反選 Please enter the config…