From e33769eebcbebd6f06833e84a740cb6591830486 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 14 Aug 2022 18:58:58 +0800
Subject: [PATCH] Clean code

---
 app/src/leanback/AndroidManifest.xml                   |  6 ++++++
 .../fongmi/android/tv/ui/activity/SettingActivity.java |  6 +++---
 app/src/leanback/res/drawable/ic_mic.xml               |  5 -----
 app/src/leanback/res/drawable/ic_voice.xml             | 10 ++++++++++
 app/src/leanback/res/layout/activity_search.xml        |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 app/src/leanback/res/drawable/ic_mic.xml
 create mode 100644 app/src/leanback/res/drawable/ic_voice.xml

diff --git a/app/src/leanback/AndroidManifest.xml b/app/src/leanback/AndroidManifest.xml
index 6682ee4b9..7d6980614 100644
--- a/app/src/leanback/AndroidManifest.xml
+++ b/app/src/leanback/AndroidManifest.xml
@@ -10,6 +10,12 @@
         android:name="android.software.leanback"
         android:required="false" />
 
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <application
         android:name=".App"
         android:banner="@drawable/banner"
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
index 37f42e74d..644fcfa2a 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
@@ -35,15 +35,15 @@ import org.greenrobot.eventbus.EventBus;
 
 public class SettingActivity extends BaseActivity implements ConfigDialog.Callback {
 
+    private final ActivityResultLauncher<String> launcherString = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> loadConfig());
+    private final ActivityResultLauncher<Intent> launcherIntent = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> loadConfig());
+
     private ActivitySettingBinding mBinding;
 
     public static void start(Activity activity) {
         activity.startActivity(new Intent(activity, SettingActivity.class));
     }
 
-    private final ActivityResultLauncher<String> launcherString = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> loadConfig());
-    private final ActivityResultLauncher<Intent> launcherIntent = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> loadConfig());
-
     @Override
     protected ViewBinding getBinding() {
         return mBinding = ActivitySettingBinding.inflate(getLayoutInflater());
diff --git a/app/src/leanback/res/drawable/ic_mic.xml b/app/src/leanback/res/drawable/ic_mic.xml
deleted file mode 100644
index 05ab75366..000000000
--- a/app/src/leanback/res/drawable/ic_mic.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android: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/drawable/ic_voice.xml b/app/src/leanback/res/drawable/ic_voice.xml
new file mode 100644
index 000000000..e10455752
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_voice.xml
@@ -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,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 60cf87fb9..8f90c5aa7 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -69,7 +69,7 @@
             android:orientation="horizontal">
 
             <ImageView
-                android:id="@+id/mic"
+                android:id="@+id/voice"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
@@ -78,7 +78,7 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:scaleType="center"
-                android:src="@drawable/ic_mic" />
+                android:src="@drawable/ic_voice" />
 
             <TextView
                 android:id="@+id/search"