This commit is contained in:
Horis
2025-02-18 18:06:53 +08:00
parent 44fa1358e0
commit 7f588cf1bb
@@ -2,11 +2,13 @@ package io.legado.app.ui.book.manga
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Looper import android.os.Looper
import android.view.KeyEvent import android.view.KeyEvent
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.WindowManager
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.view.isGone import androidx.core.view.isGone
@@ -118,6 +120,11 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, MangaViewModel>()
override val binding by viewBinding(ActivityMangaBinding::inflate) override val binding by viewBinding(ActivityMangaBinding::inflate)
override val viewModel by viewModels<MangaViewModel>() override val viewModel by viewModels<MangaViewModel>()
override fun onCreate(savedInstanceState: Bundle?) {
upLayoutInDisplayCutoutMode()
super.onCreate(savedInstanceState)
}
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
ReadManga.register(this) ReadManga.register(this)
disableMangaScaling(mDisableMangaScaling) disableMangaScaling(mDisableMangaScaling)
@@ -453,8 +460,8 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, MangaViewModel>()
@SuppressLint("StringFormatMatches") @SuppressLint("StringFormatMatches")
private fun upMenu(menu: Menu) { private fun upMenu(menu: Menu) {
menu.findItem(R.id.menu_pre_manga_number) menu.findItem(R.id.menu_pre_manga_number).title =
.setTitle(getString(R.string.pre_download_m, mPreDownloadNum)) getString(R.string.pre_download_m, mPreDownloadNum)
menu.findItem(R.id.menu_scroller_page).isChecked = mSinglePageScroller menu.findItem(R.id.menu_scroller_page).isChecked = mSinglePageScroller
menu.findItem(R.id.menu_disable_manga_scaling).isChecked = mDisableMangaScaling menu.findItem(R.id.menu_disable_manga_scaling).isChecked = mDisableMangaScaling
} }
@@ -467,4 +474,12 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, MangaViewModel>()
} }
} }
private fun upLayoutInDisplayCutoutMode() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
window.attributes = window.attributes.apply {
layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
}
}
} }