diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java index 85cda6931..0d117cfdf 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java @@ -20,7 +20,7 @@ public class KeyboardAdapter extends RecyclerView.Adapter mItems; public KeyboardAdapter(OnClickListener listener) { - this.mItems = Arrays.asList(R.drawable.ic_keyboard_remote, R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back, R.drawable.ic_keyboard_search, R.drawable.ic_site_search_on, "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); + this.mItems = Arrays.asList(R.drawable.ic_keyboard_remote, R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back, R.drawable.ic_keyboard_search, R.drawable.ic_setting_home, "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); this.mListener = listener; } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java index 8e6329e86..35f3a1f83 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java @@ -42,7 +42,7 @@ public class CustomKeyboard implements KeyboardAdapter.OnClickListener { StringBuilder sb = new StringBuilder(binding.keyword.getText().toString()); int cursor = binding.keyword.getSelectionStart(); switch (resId) { - case R.drawable.ic_site_search_on: + case R.drawable.ic_setting_home: callback.showDialog(); break; case R.drawable.ic_keyboard_left: diff --git a/app/src/leanback/res/drawable/ic_keyboard_search.xml b/app/src/leanback/res/drawable/ic_keyboard_search.xml index 2b0ad0259..5023dc87e 100644 --- a/app/src/leanback/res/drawable/ic_keyboard_search.xml +++ b/app/src/leanback/res/drawable/ic_keyboard_search.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="48" - android:viewportHeight="48"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> diff --git a/app/src/leanback/res/drawable/ic_site_block.xml b/app/src/leanback/res/drawable/ic_site_block.xml new file mode 100644 index 000000000..e5e96029f --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_block.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/drawable/ic_site_change.xml b/app/src/leanback/res/drawable/ic_site_change.xml new file mode 100644 index 000000000..49e364ba0 --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_change.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/drawable/ic_site_change_off.xml b/app/src/leanback/res/drawable/ic_site_change_off.xml deleted file mode 100644 index 03048044a..000000000 --- a/app/src/leanback/res/drawable/ic_site_change_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/leanback/res/drawable/ic_site_change_on.xml b/app/src/leanback/res/drawable/ic_site_change_on.xml deleted file mode 100644 index 639532079..000000000 --- a/app/src/leanback/res/drawable/ic_site_change_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/leanback/res/drawable/ic_site_search.xml b/app/src/leanback/res/drawable/ic_site_search.xml new file mode 100644 index 000000000..5023dc87e --- /dev/null +++ b/app/src/leanback/res/drawable/ic_site_search.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/leanback/res/drawable/ic_site_search_off.xml b/app/src/leanback/res/drawable/ic_site_search_off.xml deleted file mode 100644 index d5b411af1..000000000 --- a/app/src/leanback/res/drawable/ic_site_search_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/leanback/res/drawable/ic_site_search_on.xml b/app/src/leanback/res/drawable/ic_site_search_on.xml deleted file mode 100644 index 4e093dce6..000000000 --- a/app/src/leanback/res/drawable/ic_site_search_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/leanback/res/layout/adapter_site.xml b/app/src/leanback/res/layout/adapter_site.xml index c880a96cc..eee18564b 100644 --- a/app/src/leanback/res/layout/adapter_site.xml +++ b/app/src/leanback/res/layout/adapter_site.xml @@ -30,7 +30,7 @@ android:focusableInTouchMode="true" android:padding="8dp" android:scaleType="fitCenter" - android:src="@drawable/ic_site_search_on" /> + android:src="@drawable/ic_site_search" /> + android:src="@drawable/ic_site_change" /> \ 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 835f9eb75..5421eb3e9 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 @@ -179,11 +179,11 @@ public class Site { } public int getSearchIcon() { - return isSearchable() ? R.drawable.ic_site_search_on : R.drawable.ic_site_search_off; + return isSearchable() ? R.drawable.ic_site_search : R.drawable.ic_site_block; } public int getChangeIcon() { - return isChangeable() ? R.drawable.ic_site_change_on : R.drawable.ic_site_change_off; + return isChangeable() ? R.drawable.ic_site_change : R.drawable.ic_site_block; } public static Site find(String key) {