k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
pull/1660/head
kunfei 3 years ago
parent 651d501ff4
commit 161f928463
17 changed files with 54 additions and 76 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
  2. 2
      app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
  3. 2
      app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
  4. 5
      app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
  5. 10
      app/src/main/java/io/legado/app/ui/book/read/PhotoDialog.kt
  6. 14
      app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt
  7. 14
      app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
  8. 6
      app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt
  9. 14
      app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
  10. 8
      app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt
  11. 14
      app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
  12. 14
      app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt
  13. 5
      app/src/main/java/io/legado/app/ui/book/toc/BookmarkDialog.kt
  14. 5
      app/src/main/java/io/legado/app/ui/config/CheckSourceConfig.kt
  15. 5
      app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt
  16. 5
      app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt
  17. 5
      app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt

2
app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
Unescape View File

@ -42,7 +42,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover),
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 0.96f) setLayout(0.98f, ViewGroup.LayoutParams.MATCH_PARENT)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
Unescape View File

@ -57,7 +57,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 0.96f) setLayout(0.98f, ViewGroup.LayoutParams.MATCH_PARENT)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
Unescape View File

@ -81,7 +81,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 0.96f) setLayout(0.98f, ViewGroup.LayoutParams.MATCH_PARENT)
dialog?.setOnKeyListener(this) dialog?.setOnKeyListener(this)
} }

5
app/src/main/java/io/legado/app/ui/book/group/GroupEditDialog.kt
Unescape View File

@ -36,10 +36,7 @@ class GroupEditDialog() : BaseDialogFragment(R.layout.dialog_book_group_edit) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(0.9f, ViewGroup.LayoutParams.WRAP_CONTENT)
0.9f,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

10
app/src/main/java/io/legado/app/ui/book/read/PhotoDialog.kt
Unescape View File

@ -2,7 +2,6 @@ package io.legado.app.ui.book.read
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.view.ViewGroup
import io.legado.app.R import io.legado.app.R
import io.legado.app.base.BaseDialogFragment import io.legado.app.base.BaseDialogFragment
import io.legado.app.databinding.DialogPhotoViewBinding import io.legado.app.databinding.DialogPhotoViewBinding
@ -11,7 +10,9 @@ import io.legado.app.ui.book.read.page.provider.ImageProvider
import io.legado.app.utils.setLayout import io.legado.app.utils.setLayout
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
/**
* 显示图片
*/
class PhotoDialog() : BaseDialogFragment(R.layout.dialog_photo_view) { class PhotoDialog() : BaseDialogFragment(R.layout.dialog_photo_view) {
constructor(chapterIndex: Int, src: String) : this() { constructor(chapterIndex: Int, src: String) : this() {
@ -25,10 +26,7 @@ class PhotoDialog() : BaseDialogFragment(R.layout.dialog_photo_view) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(0.98f, 0.98f)
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

14
app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt
Unescape View File

@ -30,15 +30,15 @@ class AutoReadDialog : BaseDialogFragment(R.layout.dialog_auto_read) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
it.setBackgroundDrawableResource(R.color.background) setBackgroundDrawableResource(R.color.background)
it.decorView.setPadding(0, 0, 0, 0) decorView.setPadding(0, 0, 0, 0)
val attr = it.attributes val attr = attributes
attr.dimAmount = 0.0f attr.dimAmount = 0.0f
attr.gravity = Gravity.BOTTOM attr.gravity = Gravity.BOTTOM
it.attributes = attr attributes = attr
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
} }
} }

14
app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
Unescape View File

@ -71,15 +71,15 @@ class BgTextConfigDialog : BaseDialogFragment(R.layout.dialog_read_bg_text) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
it.setBackgroundDrawableResource(R.color.background) setBackgroundDrawableResource(R.color.background)
it.decorView.setPadding(0, 0, 0, 0) decorView.setPadding(0, 0, 0, 0)
val attr = it.attributes val attr = attributes
attr.dimAmount = 0.0f attr.dimAmount = 0.0f
attr.gravity = Gravity.BOTTOM attr.gravity = Gravity.BOTTOM
it.attributes = attr attributes = attr
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
} }
} }

6
app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt
Unescape View File

@ -34,9 +34,9 @@ class ClickActionConfigDialog : BaseDialogFragment(R.layout.dialog_click_action_
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.setBackgroundDrawableResource(R.color.transparent) setBackgroundDrawableResource(R.color.transparent)
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
} }
} }

14
app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
Unescape View File

@ -28,15 +28,15 @@ class MoreConfigDialog : DialogFragment() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
it.setBackgroundDrawableResource(R.color.background) setBackgroundDrawableResource(R.color.background)
it.decorView.setPadding(0, 0, 0, 0) decorView.setPadding(0, 0, 0, 0)
val attr = it.attributes val attr = attributes
attr.dimAmount = 0.0f attr.dimAmount = 0.0f
attr.gravity = Gravity.BOTTOM attr.gravity = Gravity.BOTTOM
it.attributes = attr attributes = attr
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 360.dp) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 360.dp)
} }
} }

8
app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt
Unescape View File

@ -14,7 +14,6 @@ import io.legado.app.base.BasePreferenceFragment
import io.legado.app.constant.EventBus import io.legado.app.constant.EventBus
import io.legado.app.constant.PreferKey import io.legado.app.constant.PreferKey
import io.legado.app.data.appDb import io.legado.app.data.appDb
import io.legado.app.help.AppConfig
import io.legado.app.lib.dialogs.SelectItem import io.legado.app.lib.dialogs.SelectItem
import io.legado.app.lib.theme.backgroundColor import io.legado.app.lib.theme.backgroundColor
import io.legado.app.lib.theme.primaryColor import io.legado.app.lib.theme.primaryColor
@ -27,10 +26,9 @@ class ReadAloudConfigDialog : DialogFragment() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
val dm = requireActivity().windowSize dialog?.window?.run {
dialog?.window?.let { setBackgroundDrawableResource(R.color.transparent)
it.setBackgroundDrawableResource(R.color.transparent) setLayout(0.9f, ViewGroup.LayoutParams.WRAP_CONTENT)
it.setLayout((dm.widthPixels * 0.9).toInt(), ViewGroup.LayoutParams.WRAP_CONTENT)
} }
} }

14
app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
Unescape View File

@ -32,15 +32,15 @@ class ReadAloudDialog : BaseDialogFragment(R.layout.dialog_read_aloud) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
it.setBackgroundDrawableResource(R.color.background) setBackgroundDrawableResource(R.color.background)
it.decorView.setPadding(0, 0, 0, 0) decorView.setPadding(0, 0, 0, 0)
val attr = it.attributes val attr = attributes
attr.dimAmount = 0.0f attr.dimAmount = 0.0f
attr.gravity = Gravity.BOTTOM attr.gravity = Gravity.BOTTOM
it.attributes = attr attributes = attr
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
} }
} }

14
app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt
Unescape View File

@ -35,15 +35,15 @@ class ReadStyleDialog : BaseDialogFragment(R.layout.dialog_read_book_style),
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
dialog?.window?.let { dialog?.window?.run {
it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
it.setBackgroundDrawableResource(R.color.background) setBackgroundDrawableResource(R.color.background)
it.decorView.setPadding(0, 0, 0, 0) decorView.setPadding(0, 0, 0, 0)
val attr = it.attributes val attr = attributes
attr.dimAmount = 0.0f attr.dimAmount = 0.0f
attr.gravity = Gravity.BOTTOM attr.gravity = Gravity.BOTTOM
it.attributes = attr attributes = attr
it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
} }
} }

5
app/src/main/java/io/legado/app/ui/book/toc/BookmarkDialog.kt
Unescape View File

@ -27,10 +27,7 @@ class BookmarkDialog() : BaseDialogFragment(R.layout.dialog_bookmark) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

5
app/src/main/java/io/legado/app/ui/config/CheckSourceConfig.kt
Unescape View File

@ -23,10 +23,7 @@ class CheckSourceConfig : BaseDialogFragment(R.layout.dialog_check_source_config
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(0.9f, ViewGroup.LayoutParams.WRAP_CONTENT)
0.9f,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

5
app/src/main/java/io/legado/app/ui/config/DirectLinkUploadConfig.kt
Unescape View File

@ -19,10 +19,7 @@ class DirectLinkUploadConfig : BaseDialogFragment(R.layout.dialog_direct_link_up
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(0.9f, ViewGroup.LayoutParams.WRAP_CONTENT)
0.9f,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

5
app/src/main/java/io/legado/app/ui/login/SourceLoginDialog.kt
Unescape View File

@ -33,10 +33,7 @@ class SourceLoginDialog : BaseDialogFragment(R.layout.dialog_login) {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

5
app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt
Unescape View File

@ -130,10 +130,7 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
setLayout( setLayout(0.8f, ViewGroup.LayoutParams.WRAP_CONTENT)
0.8f,
ViewGroup.LayoutParams.WRAP_CONTENT
)
} }
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

Write Preview
Loading…
Cancel
Save