From 131906031159a9384686f04818ec38c485f82cd9 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 19 Jun 2023 22:59:30 +0800
Subject: [PATCH] Drop some ViewUtils methods

---
 .../ui/legacy/ListCheckBoxDialogBuilder.kt    | 27 ++++++----------
 .../hippo/ehviewer/yorozuya/ViewUtils.java    | 31 -------------------
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
index 2427421ce..04d89d43b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt
@@ -17,14 +17,11 @@ package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import android.widget.CheckBox
-import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.ViewUtils
+import com.hippo.ehviewer.databinding.DialogListCheckboxBuilderBinding
 
 class ListCheckBoxDialogBuilder(
     context: Context,
@@ -35,10 +32,10 @@ class ListCheckBoxDialogBuilder(
 ) : BaseDialogBuilder(
     context,
 ) {
-    private val mCheckBox: CheckBox
+    private val binding =
+        DialogListCheckboxBuilderBinding.inflate(LayoutInflater.from(getContext()))
     private var mDialog: AlertDialog? = null
-    val isChecked: Boolean
-        get() = mCheckBox.isChecked
+    val isChecked get() = binding.checkbox.isChecked
 
     override fun create(): AlertDialog {
         mDialog = super.create()
@@ -46,18 +43,14 @@ class ListCheckBoxDialogBuilder(
     }
 
     init {
-        val view =
-            LayoutInflater.from(getContext()).inflate(R.layout.dialog_list_checkbox_builder, null)
-        setView(view)
-        val listView = ViewUtils.`$$`(view, R.id.list_view) as ListView
-        mCheckBox = ViewUtils.`$$`(view, R.id.checkbox) as CheckBox
-        listView.adapter = ArrayAdapter(getContext(), R.layout.item_select_dialog, items)
-        listView.onItemClickListener =
-            AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, position: Int, _: Long ->
+        setView(binding.root)
+        binding.listView.adapter = ArrayAdapter(getContext(), R.layout.item_select_dialog, items)
+        binding.listView.onItemClickListener =
+            AdapterView.OnItemClickListener { _, _, position, _ ->
                 listener(this@ListCheckBoxDialogBuilder, mDialog, position)
                 mDialog?.dismiss()
             }
-        mCheckBox.text = checkText
-        mCheckBox.isChecked = checked
+        binding.checkbox.text = checkText
+        binding.checkbox.isChecked = checked
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java b/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
index 8d17e49b9..00195fe6b 100644
--- a/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
+++ b/app/src/main/java/com/hippo/ehviewer/yorozuya/ViewUtils.java
@@ -16,15 +16,10 @@
 
 package com.hippo.ehviewer.yorozuya;
 
-import android.app.Activity;
-import android.app.Dialog;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-
 import java.util.concurrent.atomic.AtomicInteger;
 
 public final class ViewUtils {
@@ -63,30 +58,4 @@ public final class ViewUtils {
         }
     }
 
-    @NonNull
-    public static View $$(Activity activity, @IdRes int id) {
-        View result = activity.findViewById(id);
-        if (null == result) {
-            throw new NullPointerException("Can't find view with id: " + id);
-        }
-        return result;
-    }
-
-    @NonNull
-    public static View $$(Dialog dialog, @IdRes int id) {
-        View result = dialog.findViewById(id);
-        if (null == result) {
-            throw new NullPointerException("Can't find view with id: " + id);
-        }
-        return result;
-    }
-
-    @NonNull
-    public static View $$(View view, @IdRes int id) {
-        View result = view.findViewById(id);
-        if (null == result) {
-            throw new NullPointerException("Can't find view with id: " + id);
-        }
-        return result;
-    }
 }