hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[leanback] update icon

Browse Source
pull/137/head
FongMi 3 years ago
parent 82dbe92b42
commit 8170a8fb8e
12 changed files with 40 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java
  2. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java
  3. 8
      app/src/leanback/res/drawable/ic_keyboard_search.xml
  4. 10
      app/src/leanback/res/drawable/ic_site_block.xml
  5. 10
      app/src/leanback/res/drawable/ic_site_change.xml
  6. 10
      app/src/leanback/res/drawable/ic_site_change_off.xml
  7. 10
      app/src/leanback/res/drawable/ic_site_change_on.xml
  8. 10
      app/src/leanback/res/drawable/ic_site_search.xml
  9. 10
      app/src/leanback/res/drawable/ic_site_search_off.xml
  10. 10
      app/src/leanback/res/drawable/ic_site_search_on.xml
  11. 4
      app/src/leanback/res/layout/adapter_site.xml
  12. 4
      app/src/main/java/com/fongmi/android/tv/bean/Site.java

2
app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java
Unescape View File

@ -20,7 +20,7 @@ public class KeyboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
private final List<Object> 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;
}

2
app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java
Unescape View File

@ -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:

8
app/src/leanback/res/drawable/ic_keyboard_search.xml
Unescape View File

@ -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">
<path
android:fillColor="#FFFFFF"
android:pathData="M39.8,41.95 L26.65,28.8Q25.15,30.1 23.15,30.825Q21.15,31.55 18.9,31.55Q13.5,31.55 9.75,27.8Q6,24.05 6,18.75Q6,13.45 9.75,9.7Q13.5,5.95 18.85,5.95Q24.15,5.95 27.875,9.7Q31.6,13.45 31.6,18.75Q31.6,20.9 30.9,22.9Q30.2,24.9 28.8,26.65L42,39.75ZM18.85,28.55Q22.9,28.55 25.75,25.675Q28.6,22.8 28.6,18.75Q28.6,14.7 25.75,11.825Q22.9,8.95 18.85,8.95Q14.75,8.95 11.875,11.825Q9,14.7 9,18.75Q9,22.8 11.875,25.675Q14.75,28.55 18.85,28.55Z" />
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" />
</vector>

10
app/src/leanback/res/drawable/ic_site_block.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_change.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_change_off.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="#FFFFFF"
android:pathData="M40.45,45.2 L32.65,37.4Q31.65,38.05 30.7,38.475Q29.75,38.9 28.7,39.25V36.1Q29.15,35.95 29.6,35.725Q30.05,35.5 30.5,35.25L12.8,17.55Q11.85,19.1 11.425,20.825Q11,22.55 11,24.15Q11,27.05 12.075,29.425Q13.15,31.8 15.35,33.65L16.85,34.7V28.5H19.85V40H8.35V37H14.85L14.1,36.4Q10.7,33.7 9.325,30.65Q7.95,27.6 8,24.15Q8.05,21.45 8.75,19.3Q9.45,17.15 10.65,15.4L2.85,7.6L4.9,5.55L42.5,43.15ZM36.85,33.4 L34.75,31.3Q35.8,29.65 36.4,27.8Q37,25.95 37,23.85Q37,21.55 35.875,19.075Q34.75,16.6 32.75,14.6L31.3,13.3V19.5H28.3V8H39.8V11H33.25L34,11.7Q37.2,14.7 38.6,17.9Q40,21.1 40,23.85Q40,26.55 39.225,28.9Q38.45,31.25 36.85,33.4ZM16.7,13.25 L14.65,11.2Q15.75,10.35 16.925,9.775Q18.1,9.2 19.35,8.8V11.9Q18.7,12.15 18.025,12.5Q17.35,12.85 16.7,13.25Z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_change_on.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="#FFFFFF"
android:pathData="M8.35,40V37H14.85L14.1,36.4Q10.9,33.85 9.45,30.85Q8,27.85 8,24.15Q8,18.85 11.125,14.625Q14.25,10.4 19.35,8.8V11.9Q15.6,13.35 13.3,16.725Q11,20.1 11,24.15Q11,27.3 12.175,29.625Q13.35,31.95 15.35,33.65L16.85,34.7V28.5H19.85V40ZM28.7,39.25V36.1Q32.5,34.65 34.75,31.275Q37,27.9 37,23.85Q37,21.45 35.825,18.975Q34.65,16.5 32.75,14.6L31.3,13.3V19.5H28.3V8H39.8V11H33.25L34,11.7Q37,14.5 38.5,17.7Q40,20.9 40,23.85Q40,29.15 36.9,33.4Q33.8,37.65 28.7,39.25Z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_search.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
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" />
</vector>

10
app/src/leanback/res/drawable/ic_site_search_off.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_search_on.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5C19.17,14.87 15.79,17 12,17s-7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6m0,-2C7,4 2.73,7.11 1,11.5 2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,9c1.38,0 2.5,1.12 2.5,2.5S13.38,14 12,14s-2.5,-1.12 -2.5,-2.5S10.62,9 12,9m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5S9.52,16 12,16s4.5,-2.02 4.5,-4.5S14.48,7 12,7z" />
</vector>

4
app/src/leanback/res/layout/adapter_site.xml
Unescape View File

@ -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" />
<ImageView
android:id="@+id/change"
@ -42,6 +42,6 @@
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_site_change_on" />
android:src="@drawable/ic_site_change" />
</LinearLayout>

4
app/src/main/java/com/fongmi/android/tv/bean/Site.java
Unescape View File

@ -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) {

Write Preview
Loading…
Cancel
Save