diff --git a/app/src/main/java/io/legado/app/ui/widget/text/EditText.kt b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt similarity index 72% rename from app/src/main/java/io/legado/app/ui/widget/text/EditText.kt rename to app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt index c1d0676bb..997ddb871 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/EditText.kt +++ b/app/src/main/java/io/legado/app/lib/theme/view/ThemeEditText.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.widget.text +package io.legado.app.lib.theme.view import android.content.Context import android.util.AttributeSet @@ -9,7 +9,7 @@ import io.legado.app.utils.applyTint /** * @author Aidan Follestad (afollestad) */ -class EditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) { +class ThemeEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) { init { if (!isInEditMode) { diff --git a/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt b/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt index 415e8cefa..e77a34e1d 100644 --- a/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt +++ b/app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt @@ -73,6 +73,8 @@ class WebViewActivity : VMBaseActivity() { mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW domStorageEnabled = true allowContentAccess = true + useWideViewPort = true + loadWithOverviewMode = true } binding.webView.addJavascriptInterface(this, "app") upWebViewTheme() diff --git a/app/src/main/java/io/legado/app/ui/login/RuleUiLoginDialog.kt b/app/src/main/java/io/legado/app/ui/login/RuleUiLoginDialog.kt index 3e5ccf948..c3cf79da9 100644 --- a/app/src/main/java/io/legado/app/ui/login/RuleUiLoginDialog.kt +++ b/app/src/main/java/io/legado/app/ui/login/RuleUiLoginDialog.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.text.InputType import android.view.View import android.view.ViewGroup +import android.widget.EditText import android.widget.TextView import androidx.core.view.setPadding import androidx.fragment.app.activityViewModels @@ -14,7 +15,6 @@ import io.legado.app.constant.AppLog import io.legado.app.data.entities.BaseSource import io.legado.app.databinding.DialogLoginBinding import io.legado.app.lib.theme.primaryColor -import io.legado.app.ui.widget.text.EditText import io.legado.app.ui.widget.text.TextInputLayout import io.legado.app.utils.* import io.legado.app.utils.viewbindingdelegate.viewBinding diff --git a/app/src/main/res/layout/activity_book_info_edit.xml b/app/src/main/res/layout/activity_book_info_edit.xml index 0301bcfb6..8b685b653 100644 --- a/app/src/main/res/layout/activity_book_info_edit.xml +++ b/app/src/main/res/layout/activity_book_info_edit.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:hint="@string/book_name"> - - - @@ -125,7 +125,7 @@ android:layout_marginTop="10dp" android:hint="@string/book_intro"> - diff --git a/app/src/main/res/layout/activity_replace_edit.xml b/app/src/main/res/layout/activity_replace_edit.xml index 348c6eb2e..2a4370beb 100644 --- a/app/src/main/res/layout/activity_replace_edit.xml +++ b/app/src/main/res/layout/activity_replace_edit.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:hint="@string/replace_rule_summary"> - - - - - - - - - - - - - - - @@ -47,7 +47,7 @@ android:hint="Url" tools:ignore="HardcodedText"> - diff --git a/app/src/main/res/layout/dialog_toc_regex_edit.xml b/app/src/main/res/layout/dialog_toc_regex_edit.xml index 71ea57fb7..52f152187 100644 --- a/app/src/main/res/layout/dialog_toc_regex_edit.xml +++ b/app/src/main/res/layout/dialog_toc_regex_edit.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:hint="@string/name"> - -