优化 targetSdk 35 导致的文本上移及错位 (gedoor#4343)

mgz0227 · Nov 9, 2024 · 5a83207 · 5a83207
1 parent 5f8d448
commit 5a83207
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
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
@@ -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
@@ -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()