From 6668034984565f973c498cbb43c575d9d0bd616d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E7=A9=BA?=
 <70465933+YuKongA@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20targetSdk=2035=20=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=96=87=E6=9C=AC=E4=B8=8A=E7=A7=BB=E5=8F=8A?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=20(#4343)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/lib/theme/view/ThemeEditText.kt   | 4 ++++
 app/src/main/java/io/legado/app/ui/widget/SearchView.kt       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt
index b9e2b891c..b7607f51a 100644
--- a/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt
@@ -1,6 +1,7 @@
 package io.legado.app.lib.theme.view
 
 import android.content.Context
+import android.os.Build
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatEditText
 import io.legado.app.lib.theme.accentColor
@@ -15,5 +16,8 @@ class ThemeEditText @JvmOverloads constructor(
         if (!isInEditMode) {
             applyTint(context.accentColor)
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            isLocalePreferredLineHeightForMinimumUsed = false
+        }
     }
 }
diff --git a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt
index 7e97591f8..24eeca7d5 100644
--- a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.ImageSpan
@@ -42,6 +43,9 @@ class SearchView @JvmOverloads constructor(
             // 改变字体
             textView!!.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
             textView!!.gravity = Gravity.CENTER_VERTICAL
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                textView!!.isLocalePreferredLineHeightForMinimumUsed = false
+            }
             updateQueryHint()
         } catch (e: Exception) {
             e.printOnDebug()