优化

app/src/main/java/io/legado/app/ui/association/ImportBookSourceActivity.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -26,6 +25,7 @@ import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.okButton
 import io.legado.app.ui.widget.text.AutoCompleteTextView
 import io.legado.app.utils.applyTint
+import io.legado.app.utils.getSize
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.activity_translucence.*
@@ -122,8 +122,7 @@ class ImportBookSourceActivity : VMBaseActivity<ImportBookSourceViewModel>(
 
         override fun onStart() {
             super.onStart()
-            val dm = DisplayMetrics()
+            val dm = requireActivity().getSize()
-            activity?.windowManager?.defaultDisplay?.getMetrics(dm)
             dialog?.window?.setLayout(
                 (dm.widthPixels * 0.9).toInt(),
                 ViewGroup.LayoutParams.WRAP_CONTENT

app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.association
 import android.content.Context
 import android.content.DialogInterface
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -22,6 +21,7 @@ import io.legado.app.help.SourceHelp
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.okButton
 import io.legado.app.utils.applyTint
+import io.legado.app.utils.getSize
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.activity_translucence.*
@@ -115,8 +115,7 @@ class ImportRssSourceActivity : VMBaseActivity<ImportRssSourceViewModel>(
 
         override fun onStart() {
             super.onStart()
-            val dm = DisplayMetrics()
+            val dm = requireActivity().getSize()
-            activity?.windowManager?.defaultDisplay?.getMetrics(dm)
             dialog?.window?.setLayout(
                 (dm.widthPixels * 0.9).toInt(),
                 ViewGroup.LayoutParams.WRAP_CONTENT

app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.book.changecover
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -15,6 +14,7 @@ import io.legado.app.base.BaseDialogFragment
 import io.legado.app.constant.Theme
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.utils.applyTint
+import io.legado.app.utils.getSize
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.dialog_change_source.*
 
@@ -44,8 +44,7 @@ class ChangeCoverDialog : BaseDialogFragment(),
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.book.changesource
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -19,10 +18,7 @@ import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.SearchBook
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.applyTint
+import io.legado.app.utils.*
-import io.legado.app.utils.getPrefBoolean
-import io.legado.app.utils.getViewModel
-import io.legado.app.utils.putPrefBoolean
 import kotlinx.android.synthetic.main.dialog_change_source.*
 
 
@@ -51,8 +47,7 @@ class ChangeSourceDialog : BaseDialogFragment(),
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.book.group
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -27,10 +26,7 @@ import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.ItemTouchCallback
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.applyTint
+import io.legado.app.utils.*
-import io.legado.app.utils.getViewModel
-import io.legado.app.utils.requestInputMethod
-import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_group_manage.view.*
@@ -44,8 +40,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.book.group
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -30,6 +29,7 @@ import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.ItemTouchCallback
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.applyTint
+import io.legado.app.utils.getSize
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.requestInputMethod
 import kotlinx.android.synthetic.main.dialog_book_group_picker.*
@@ -63,8 +63,7 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt

@@ -2,7 +2,6 @@ package io.legado.app.ui.book.read.config
 
 import android.content.DialogInterface
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,6 +10,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.constant.EventBus
 import io.legado.app.help.ReadBookConfig
+import io.legado.app.utils.getSize
 import io.legado.app.utils.postEvent
 import kotlinx.android.synthetic.main.dialog_read_padding.*
 
@@ -18,10 +18,7 @@ class PaddingConfigDialog : BaseDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.let {
-            it.windowManager?.defaultDisplay?.getMetrics(dm)
-        }
         dialog?.window?.let {
             it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
             val attr = it.attributes

app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt

@@ -2,7 +2,6 @@ package io.legado.app.ui.book.read.config
 
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,6 +19,7 @@ import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.service.help.ReadAloud
 import io.legado.app.utils.getPrefLong
+import io.legado.app.utils.getSize
 import io.legado.app.utils.postEvent
 
 class ReadAloudConfigDialog : DialogFragment() {
@@ -27,10 +27,7 @@ class ReadAloudConfigDialog : DialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.let {
-            it.windowManager?.defaultDisplay?.getMetrics(dm)
-        }
         dialog?.window?.let {
             it.setBackgroundDrawableResource(R.color.transparent)
             it.setLayout((dm.widthPixels * 0.9).toInt(), ViewGroup.LayoutParams.WRAP_CONTENT)

app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.book.read.config
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -36,8 +35,7 @@ class SpeakEngineDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.book.read.config
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -51,8 +50,7 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.8).toInt())
     }
 

app/src/main/java/io/legado/app/ui/book/source/manage/GroupManageDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.book.source.manage
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -24,10 +23,7 @@ import io.legado.app.lib.dialogs.yesButton
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.applyTint
+import io.legado.app.utils.*
-import io.legado.app.utils.getViewModelOfActivity
-import io.legado.app.utils.requestInputMethod
-import io.legado.app.utils.splitNotBlank
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_group_manage.view.*
@@ -39,8 +35,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.config
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -18,10 +17,7 @@ import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.okButton
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.GSON
+import io.legado.app.utils.*
-import io.legado.app.utils.applyTint
-import io.legado.app.utils.getClipText
-import io.legado.app.utils.toast
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_theme_config.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
@@ -33,8 +29,7 @@ class ThemeListDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/filechooser/FileChooserDialog.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.filechooser
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -75,8 +74,7 @@ class FileChooserDialog : DialogFragment(),
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.8).toInt())
     }
 

app/src/main/java/io/legado/app/ui/replace/GroupManageDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.replace
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -24,10 +23,7 @@ import io.legado.app.lib.dialogs.yesButton
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.applyTint
+import io.legado.app.utils.*
-import io.legado.app.utils.getViewModelOfActivity
-import io.legado.app.utils.requestInputMethod
-import io.legado.app.utils.splitNotBlank
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_group_manage.view.*
@@ -39,8 +35,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt

@@ -3,7 +3,6 @@ package io.legado.app.ui.rss.source.manage
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -36,8 +35,7 @@ class GroupManageDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/widget/dialog/PhotoDialog.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.widget.dialog
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,8 +33,6 @@ class PhotoDialog : BaseDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout(
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT

app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt

@@ -1,13 +1,13 @@
 package io.legado.app.ui.widget.dialog
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
+import io.legado.app.utils.getSize
 import io.noties.markwon.Markwon
 import io.noties.markwon.image.glide.GlideImagesPlugin
 import kotlinx.android.synthetic.main.dialog_text_view.*
@@ -46,8 +46,7 @@ class TextDialog : BaseDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/widget/dialog/TextListDialog.kt

@@ -2,7 +2,6 @@ package io.legado.app.ui.widget.dialog
 
 import android.content.Context
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,6 +11,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
+import io.legado.app.utils.getSize
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_log.view.*
 
@@ -33,8 +33,7 @@ class TextListDialog : BaseDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt

@@ -4,7 +4,6 @@ import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -43,8 +42,7 @@ class FontSelectDialog : BaseDialogFragment(),
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        val dm = requireActivity().getSize()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), (dm.heightPixels * 0.9).toInt())
     }
 

app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt

@@ -5,7 +5,6 @@ import android.content.ContextWrapper
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.AttributeSet
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,6 +19,7 @@ import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.utils.getCompatDrawable
+import io.legado.app.utils.getSize
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_icon_preference.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
@@ -120,8 +120,7 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
 
         override fun onStart() {
             super.onStart()
-            val dm = DisplayMetrics()
+            val dm = requireActivity().getSize()
-            activity?.windowManager?.defaultDisplay?.getMetrics(dm)
             dialog?.window?.setLayout(
                 (dm.widthPixels * 0.8).toInt(),
                 ViewGroup.LayoutParams.WRAP_CONTENT

app/src/main/java/io/legado/app/utils/ActivityExtensions.kt

@@ -1,2 +1,23 @@
 package io.legado.app.utils
 
+import android.app.Activity
+import android.os.Build
+import android.util.DisplayMetrics
+import android.view.WindowInsets
+import android.view.WindowMetrics
+
+
+fun Activity.getSize(): DisplayMetrics {
+    val displayMetrics = DisplayMetrics()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        val windowMetrics: WindowMetrics = windowManager.currentWindowMetrics
+        val insets = windowMetrics.windowInsets
+            .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+        displayMetrics.widthPixels = windowMetrics.bounds.width() - insets.left - insets.right
+        displayMetrics.heightPixels = windowMetrics.bounds.height() - insets.top - insets.bottom
+    } else {
+        @Suppress("DEPRECATION")
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+    }
+    return displayMetrics
+}