From c4d4f71d61fe3edfea22bff955faba3168300eae Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 2 Sep 2022 00:19:07 +0800
Subject: [PATCH] Update Search UI

---
 .../tv/ui/activity/SearchActivity.java        | 26 ++++--
 .../tv/ui/adapter/KeyboardAdapter.java        | 12 ++-
 .../android/tv/ui/custom/CustomKeyboard.java  | 30 ++++++-
 app/src/leanback/res/drawable/ic_history.xml  |  4 +-
 .../res/drawable/ic_keyboard_back.xml         |  2 +-
 .../res/drawable/ic_keyboard_left.xml         |  2 +-
 .../res/drawable/ic_keyboard_remote.xml       | 10 +++
 .../res/drawable/ic_keyboard_right.xml        |  2 +-
 .../res/drawable/ic_keyboard_search.xml       | 10 +++
 .../res/drawable/ic_keyboard_space.xml        |  6 +-
 app/src/leanback/res/drawable/ic_voice.xml    |  2 +-
 .../leanback/res/layout/activity_search.xml   | 89 +++----------------
 app/src/leanback/res/layout/adapter_word.xml  |  1 -
 app/src/main/res/drawable/ic_delete.xml       |  2 +-
 app/src/main/res/drawable/ic_filter_off.xml   |  4 +-
 .../main/res/drawable/ic_filter_off_small.xml |  4 +-
 app/src/main/res/drawable/ic_filter_on.xml    |  2 +-
 .../main/res/drawable/ic_filter_on_small.xml  |  2 +-
 app/src/main/res/drawable/ic_forward.xml      |  2 +-
 app/src/main/res/drawable/ic_pause.xml        |  2 +-
 app/src/main/res/drawable/ic_play.xml         |  2 +-
 app/src/main/res/drawable/ic_rewind.xml       |  2 +-
 app/src/main/res/drawable/ic_search_off.xml   |  2 +-
 app/src/main/res/drawable/ic_search_on.xml    |  2 +-
 24 files changed, 108 insertions(+), 114 deletions(-)
 create mode 100644 app/src/leanback/res/drawable/ic_keyboard_remote.xml
 create mode 100644 app/src/leanback/res/drawable/ic_keyboard_search.xml

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java
index c7e35d44d..33a0f63ed 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java
@@ -1,6 +1,7 @@
 package com.fongmi.android.tv.ui.activity;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -11,6 +12,7 @@ import android.speech.SpeechRecognizer;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.inputmethod.EditorInfo;
 
@@ -19,6 +21,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.leanback.widget.ArrayObjectAdapter;
+import androidx.leanback.widget.HorizontalGridView;
 import androidx.leanback.widget.ItemBridgeAdapter;
 import androidx.viewbinding.ViewBinding;
 
@@ -40,7 +43,7 @@ import java.util.List;
 import okhttp3.Call;
 import okhttp3.Response;
 
-public class SearchActivity extends BaseActivity implements WordPresenter.OnClickListener {
+public class SearchActivity extends BaseActivity implements WordPresenter.OnClickListener, CustomKeyboard.Callback {
 
     private final ActivityResultLauncher<String> launcherString = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> onVoice());
 
@@ -69,8 +72,8 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
         mHandler = new Handler(Looper.getMainLooper());
         mRecognizer = SpeechRecognizer.createSpeechRecognizer(this);
         mBinding.voice.setVisibility(hasVoice() ? View.VISIBLE : View.GONE);
+        CustomKeyboard.init(this, mBinding);
         mBinding.keyword.requestFocus();
-        CustomKeyboard.init(mBinding);
         setRecyclerView();
         getHot();
     }
@@ -78,11 +81,8 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
     @Override
     protected void initEvent() {
         mBinding.voice.setOnClickListener(view -> onVoice());
-        mBinding.search.setOnClickListener(view -> onSearch());
-        mBinding.clear.setOnClickListener(view -> mBinding.keyword.setText(""));
-        mBinding.remote.setOnClickListener(view -> PushActivity.start(this));
         mBinding.keyword.setOnEditorActionListener((textView, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE) mBinding.search.performClick();
+            if (actionId == EditorInfo.IME_ACTION_DONE) onSearch();
             return true;
         });
         mBinding.keyword.addTextChangedListener(new CustomListener() {
@@ -95,7 +95,6 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
         mRecognizer.setRecognitionListener(new CustomListener() {
             @Override
             public void onResults(String result) {
-                mBinding.search.requestFocus();
                 mBinding.voice.clearAnimation();
                 mBinding.keyword.setText(result);
                 mBinding.keyword.setSelection(mBinding.keyword.length());
@@ -103,8 +102,11 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
         });
     }
 
+    @SuppressLint("RestrictedApi")
     private void setRecyclerView() {
-        mBinding.word.setVerticalSpacing(ResUtil.dp2px(16));
+        mBinding.word.setHorizontalSpacing(ResUtil.dp2px(16));
+        mBinding.word.setRowHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mBinding.word.setFocusScrollStrategy(HorizontalGridView.FOCUS_SCROLL_ITEM);
         mBinding.word.setAdapter(new ItemBridgeAdapter(mWordAdapter = new ArrayObjectAdapter(new WordPresenter(this))));
     }
 
@@ -119,7 +121,8 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
         }
     }
 
-    private void onSearch() {
+    @Override
+    public void onSearch() {
         String keyword = mBinding.keyword.getText().toString().trim();
         mBinding.keyword.setSelection(mBinding.keyword.length());
         Utils.hideKeyboard(mBinding.keyword);
@@ -127,6 +130,11 @@ public class SearchActivity extends BaseActivity implements WordPresenter.OnClic
         CollectActivity.start(this, keyword);
     }
 
+    @Override
+    public void onRemote() {
+        PushActivity.start(this);
+    }
+
     @Override
     public void onItemClick(String text) {
         mBinding.keyword.setText(text);
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 38e92983b..8ac181209 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<RecyclerView.ViewHolde
     private final List<Object> mItems;
 
     public KeyboardAdapter(OnClickListener listener) {
-        this.mItems = Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "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", R.drawable.ic_keyboard_space, R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back);
+        this.mItems = Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "，", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "。", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", R.drawable.ic_keyboard_remote, "U", "V", "W", "X", "Y", "Z", R.drawable.ic_keyboard_space, R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back, R.drawable.ic_keyboard_search);
         this.mListener = listener;
     }
 
@@ -29,6 +29,8 @@ public class KeyboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         void onTextClick(String text);
 
         void onIconClick(int resId);
+
+        boolean onLongClick(int resId);
     }
 
     class TextHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -47,7 +49,7 @@ public class KeyboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
-    class IconHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    class IconHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         private final AdapterKeyboardIconBinding binding;
 
@@ -55,12 +57,18 @@ public class KeyboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             super(binding.getRoot());
             this.binding = binding;
             itemView.setOnClickListener(this);
+            itemView.setOnLongClickListener(this);
         }
 
         @Override
         public void onClick(View view) {
             mListener.onIconClick((int) mItems.get(getLayoutPosition()));
         }
+
+        @Override
+        public boolean onLongClick(View view) {
+            return mListener.onLongClick((int) mItems.get(getLayoutPosition()));
+        }
     }
 
     @Override
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 535178c49..62fe3e567 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
@@ -9,18 +9,20 @@ import com.fongmi.android.tv.ui.adapter.KeyboardAdapter;
 public class CustomKeyboard implements KeyboardAdapter.OnClickListener {
 
     private final ActivitySearchBinding binding;
+    private Callback callback;
 
-    public static void init(ActivitySearchBinding binding) {
-        new CustomKeyboard(binding).initView();
+    public static void init(Callback callback, ActivitySearchBinding binding) {
+        new CustomKeyboard(callback, binding).initView();
     }
 
-    public CustomKeyboard(ActivitySearchBinding binding) {
+    public CustomKeyboard(Callback callback, ActivitySearchBinding binding) {
+        this.callback = callback;
         this.binding = binding;
     }
 
     private void initView() {
         binding.keyboard.setHasFixedSize(true);
-        binding.keyboard.addItemDecoration(new SpaceItemDecoration(10, 8));
+        binding.keyboard.addItemDecoration(new SpaceItemDecoration(11, 8));
         binding.keyboard.setAdapter(new KeyboardAdapter(this));
     }
 
@@ -57,6 +59,26 @@ public class CustomKeyboard implements KeyboardAdapter.OnClickListener {
                 binding.keyword.setText(sb.toString());
                 binding.keyword.setSelection(cursor - 1);
                 break;
+            case R.drawable.ic_keyboard_remote:
+                callback.onRemote();
+                break;
+            case R.drawable.ic_keyboard_search:
+                callback.onSearch();
+                break;
         }
     }
+
+    @Override
+    public boolean onLongClick(int resId) {
+        if (resId != R.drawable.ic_keyboard_back) return false;
+        binding.keyword.setText("");
+        return true;
+    }
+
+    public interface Callback {
+
+        void onSearch();
+
+        void onRemote();
+    }
 }
diff --git a/app/src/leanback/res/drawable/ic_history.xml b/app/src/leanback/res/drawable/ic_history.xml
index 8763b73b4..ec6f46828 100644
--- a/app/src/leanback/res/drawable/ic_history.xml
+++ b/app/src/leanback/res/drawable/ic_history.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_back.xml b/app/src/leanback/res/drawable/ic_keyboard_back.xml
index 645e3fa97..a41f5e210 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_back.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_back.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="m22.4,31.7 l5.6,-5.6 5.6,5.6 2.15,-2.15L30.1,24l5.55,-5.55 -2.15,-2.15 -5.5,5.6 -5.6,-5.6 -2.15,2.15L25.9,24l-5.65,5.55ZM6,24l8.45,-11.95q0.65,-0.9 1.55,-1.475 0.9,-0.575 2,-0.575h21q1.25,0 2.125,0.875T42,13v22q0,1.25 -0.875,2.125T39,38L18,38q-1.1,0 -2,-0.575 -0.9,-0.575 -1.55,-1.475ZM9.75,24 L17.45,35L39,35L39,13L17.45,13ZM39,24L39,13v22Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_left.xml b/app/src/leanback/res/drawable/ic_keyboard_left.xml
index 22558233b..78843ed16 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_left.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_left.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="M28.05,36 L16,23.95 28.05,11.9l2.15,2.15 -9.9,9.9 9.9,9.9Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_remote.xml b/app/src/leanback/res/drawable/ic_keyboard_remote.xml
new file mode 100644
index 000000000..e80c9de52
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_remote.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M6,22.5V6H22.5V22.5ZM9,19.5H19.5V9H9ZM6,42V25.5H22.5V42ZM9,39H19.5V28.5H9ZM25.5,22.5V6H42V22.5ZM28.5,19.5H39V9H28.5ZM37.9,42V37.9H42V42ZM25.5,29.65V25.5H29.6V29.65ZM29.6,33.75V29.65H33.75V33.75ZM25.5,37.9V33.75H29.6V37.9ZM29.6,42V37.9H33.75V42ZM33.75,37.9V33.75H37.9V37.9ZM33.75,29.65V25.5H37.9V29.65ZM37.9,33.75V29.65H42V33.75Z" />
+</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_right.xml b/app/src/leanback/res/drawable/ic_keyboard_right.xml
index 944ccdb8a..0bf84e0c6 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_right.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_right.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/white"
         android:pathData="m18.75,36 l-2.15,-2.15 9.9,-9.9 -9.9,-9.9 2.15,-2.15L30.8,23.95Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_search.xml b/app/src/leanback/res/drawable/ic_keyboard_search.xml
new file mode 100644
index 000000000..6b396d368
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/white"
+        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" />
+</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_space.xml b/app/src/leanback/res/drawable/ic_keyboard_space.xml
index b740ef05b..d5ff15172 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_space.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_space.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="@color/white"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M8,30V18H11V27H37V18H40V30Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_voice.xml b/app/src/leanback/res/drawable/ic_voice.xml
index a484594f6..94172d3e5 100644
--- a/app/src/leanback/res/drawable/ic_voice.xml
+++ b/app/src/leanback/res/drawable/ic_voice.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z" />
 </vector>
diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index d639e3a1c..a29a19452 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true">
+    android:gravity="center|bottom"
+    android:keepScreenOn="true"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/bar"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -38,7 +38,6 @@
             android:inputType="textCapCharacters|textAutoCorrect|textAutoComplete"
             android:letterSpacing="0.02"
             android:maxLength="50"
-            android:nextFocusDown="@id/word"
             android:singleLine="true"
             android:textColor="@color/white"
             android:textColorHint="@color/white"
@@ -47,19 +46,14 @@
 
     </LinearLayout>
 
-    <androidx.leanback.widget.VerticalGridView
+    <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
         android:id="@+id/word"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/bar"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_toStartOf="@+id/keyboard"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:nextFocusUp="@id/keyword"
-        android:paddingBottom="24dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
         app:focusOutEnd="true"
         app:focusOutFront="true" />
 
@@ -67,70 +61,13 @@
         android:id="@+id/keyboard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/word"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="24dp"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:nextFocusLeft="@id/word"
-        android:nextFocusUp="@id/keyword"
+        android:padding="24sp"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="10"
-        tools:itemCount="40"
+        app:spanCount="11"
+        tools:itemCount="44"
         tools:listitem="@layout/adapter_keyboard_text" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/keyboard"
-        android:layout_alignStart="@+id/keyboard"
-        android:layout_alignEnd="@+id/keyboard"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/clear"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_weight="1"
-            android:background="@drawable/selector_item"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:gravity="center"
-            android:nextFocusLeft="@id/word"
-            android:text="@string/search_clear"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/search"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_weight="1"
-            android:background="@drawable/selector_item"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:gravity="center"
-            android:text="@string/home_search"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/remote"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selector_item"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:gravity="center"
-            android:text="@string/search_remote"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
 
diff --git a/app/src/leanback/res/layout/adapter_word.xml b/app/src/leanback/res/layout/adapter_word.xml
index ffcedea5e..e433de47e 100644
--- a/app/src/leanback/res/layout/adapter_word.xml
+++ b/app/src/leanback/res/layout/adapter_word.xml
@@ -7,7 +7,6 @@
     android:background="@drawable/selector_item_round"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:nextFocusLeft="@id/word"
     android:singleLine="true"
     android:textColor="@color/white"
     android:textSize="16sp"
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 7f7cf3544..6269d8455 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_off.xml b/app/src/main/res/drawable/ic_filter_off.xml
index f78f8393a..a81aef1c6 100644
--- a/app/src/main/res/drawable/ic_filter_off.xml
+++ b/app/src/main/res/drawable/ic_filter_off.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M19.79,5.61C20.3,4.95 19.83,4 19,4H6.83l7.97,7.97L19.79,5.61z" />
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M2.81,2.81L1.39,4.22L10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-2.17l5.78,5.78l1.41,-1.41L2.81,2.81z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_off_small.xml b/app/src/main/res/drawable/ic_filter_off_small.xml
index 809304495..63fcf796c 100644
--- a/app/src/main/res/drawable/ic_filter_off_small.xml
+++ b/app/src/main/res/drawable/ic_filter_off_small.xml
@@ -5,9 +5,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M19.79,5.61C20.3,4.95 19.83,4 19,4H6.83l7.97,7.97L19.79,5.61z" />
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M2.81,2.81L1.39,4.22L10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-2.17l5.78,5.78l1.41,-1.41L2.81,2.81z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_on.xml b/app/src/main/res/drawable/ic_filter_on.xml
index 047655021..5a44c62c7 100644
--- a/app/src/main/res/drawable/ic_filter_on.xml
+++ b/app/src/main/res/drawable/ic_filter_on.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_on_small.xml b/app/src/main/res/drawable/ic_filter_on_small.xml
index eaff72db5..53cde4f91 100644
--- a/app/src/main/res/drawable/ic_filter_on_small.xml
+++ b/app/src/main/res/drawable/ic_filter_on_small.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml
index 1715efdee..0ff3b874a 100644
--- a/app/src/main/res/drawable/ic_forward.xml
+++ b/app/src/main/res/drawable/ic_forward.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 0a6c16784..834815067 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 3ac4b3c1e..8bbd9202a 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_rewind.xml b/app/src/main/res/drawable/ic_rewind.xml
index b895c2547..e66230d3e 100644
--- a/app/src/main/res/drawable/ic_rewind.xml
+++ b/app/src/main/res/drawable/ic_rewind.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_off.xml b/app/src/main/res/drawable/ic_search_off.xml
index 2863f6a0e..4ca664a2f 100644
--- a/app/src/main/res/drawable/ic_search_off.xml
+++ b/app/src/main/res/drawable/ic_search_off.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         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>
diff --git a/app/src/main/res/drawable/ic_search_on.xml b/app/src/main/res/drawable/ic_search_on.xml
index d9cd13fa2..e8481eaa0 100644
--- a/app/src/main/res/drawable/ic_search_on.xml
+++ b/app/src/main/res/drawable/ic_search_on.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/white"
         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>