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 954ae0b7d..6eef2cd6a 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 @@ -35,11 +35,11 @@ public class SiteAdapter extends RecyclerView.Adapter { } public void selectAll() { - setEnable(true); + setEnable(type != 3); } public void cancelAll() { - setEnable(false); + setEnable(type == 3); } @Override diff --git a/app/src/leanback/res/drawable/ic_site_block.xml b/app/src/leanback/res/drawable/ic_site_block.xml deleted file mode 100644 index e5e96029f..000000000 --- a/app/src/leanback/res/drawable/ic_site_block.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/leanback/res/drawable/ic_site_cancel.xml b/app/src/leanback/res/drawable/ic_site_cancel.xml new file mode 100644 index 000000000..71f27e893 --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_cancel.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/drawable/ic_site_record.xml b/app/src/leanback/res/drawable/ic_site_record.xml new file mode 100644 index 000000000..3d4080ab6 --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_record.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/drawable/ic_site_select.xml b/app/src/leanback/res/drawable/ic_site_select.xml new file mode 100644 index 000000000..502b7ae4c --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_select.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/layout/dialog_site.xml b/app/src/leanback/res/layout/dialog_site.xml index 214381ca1..fd237729a 100644 --- a/app/src/leanback/res/layout/dialog_site.xml +++ b/app/src/leanback/res/layout/dialog_site.xml @@ -25,69 +25,62 @@ android:visibility="gone" tools:visibility="visible"> - + android:padding="8dp" + android:src="@drawable/ic_site_search" + app:tint="@color/text" /> - + android:padding="8dp" + android:src="@drawable/ic_site_change" + app:tint="@color/text" /> - + android:padding="8dp" + android:src="@drawable/ic_site_record" + app:tint="@color/text" /> - + android:padding="8dp" + android:src="@drawable/ic_site_select" /> - + android:padding="8dp" + android:src="@drawable/ic_site_cancel" /> \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index 343fe3cbd..317856664 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -6,7 +6,6 @@ import androidx.annotation.NonNull; import androidx.room.Entity; import androidx.room.PrimaryKey; -import com.fongmi.android.tv.R; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.gson.StringAdapter; import com.google.gson.JsonElement; @@ -197,14 +196,6 @@ public class Site { return this; } - public int getSearchIcon() { - return isSearchable() ? R.drawable.ic_site_search : R.drawable.ic_site_block; - } - - public int getChangeIcon() { - return isChangeable() ? R.drawable.ic_site_change : R.drawable.ic_site_block; - } - public static Site find(String key) { return AppDatabase.get().getSiteDao().find(key); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cafa5419f..6b3a574e7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -90,11 +90,6 @@ 确定 取消 - 搜索 - 换源 - 无痕 - 全选 - 反选 请输入接口… 请输入地址… diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8eac134cc..a94b3dfde 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -90,11 +90,6 @@ 確定 取消 - 搜尋 - 換源 - 無痕 - 全選 - 反選 請輸入接口… 請輸入網址… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 126e6187d..ab740751a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,11 +90,6 @@ OK Cancel - 搜尋 - 換源 - 無痕 - 全選 - 反選 Please enter the config… Please enter the url…