Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix window undimming when reader custom filter settings are open

Browse Source 
(cherry picked from commit 5467104b955fc854285f22f9be56083a1d503144)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
This commit is contained in:
arkon 2023-07-15 13:23:25 -04:00 committed by Jobobby04
parent 8062cb8f6f
commit 917434a838
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/kanade/presentation/reader/settings/ReaderSettingsDialog.kt
View File

@ -23,9 +23,6 @@ fun ReaderSettingsDialog(
onHideMenus: () -> Unit, onHideMenus: () -> Unit,
screenModel: ReaderSettingsScreenModel, screenModel: ReaderSettingsScreenModel,
) { ) {
// TODO: undimming doesn't seem to work
val window = (LocalView.current.parent as? DialogWindowProvider)?.window
val tabTitles = listOf( val tabTitles = listOf(
stringResource(R.string.pref_category_reading_mode), stringResource(R.string.pref_category_reading_mode),
stringResource(R.string.pref_category_general), stringResource(R.string.pref_category_general),
@ -33,16 +30,6 @@ fun ReaderSettingsDialog(
) )
val pagerState = rememberPagerState { tabTitles.size } val pagerState = rememberPagerState { tabTitles.size }
LaunchedEffect(pagerState.currentPage) {
if (pagerState.currentPage == 2) {
window?.setDimAmount(0f)
onHideMenus()
} else {
window?.setDimAmount(0.75f)
onShowMenus()
}
}
TabbedDialog( TabbedDialog(
onDismissRequest = { onDismissRequest = {
onDismissRequest() onDismissRequest()
@ -51,6 +38,18 @@ fun ReaderSettingsDialog(
tabTitles = tabTitles, tabTitles = tabTitles,
pagerState = pagerState, pagerState = pagerState,
) { page -> ) { page ->
val window = (LocalView.current.parent as? DialogWindowProvider)?.window
LaunchedEffect(pagerState.currentPage) {
if (pagerState.currentPage == 2) {
window?.setDimAmount(0f)
onHideMenus()
} else {
window?.setDimAmount(0.5f)
onShowMenus()
}
}
Column( Column(
modifier = Modifier modifier = Modifier
.padding(vertical = TabbedDialogPaddings.Vertical) .padding(vertical = TabbedDialogPaddings.Vertical)

8
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -125,6 +125,10 @@ class MainActivity : BaseActivity() {
private var navigator: Navigator? = null private var navigator: Navigator? = null
init {
registerSecureActivity(this)
}
// SY --> // SY -->
// Idle-until-urgent // Idle-until-urgent
private var firstPaint = false private var firstPaint = false
@ -493,10 +497,6 @@ class MainActivity : BaseActivity() {
return true return true
} }
init {
registerSecureActivity(this)
}
// SY --> // SY -->
private fun addAnalytics() { private fun addAnalytics() {
if (!BuildConfig.DEBUG && isPreviewBuildType) { if (!BuildConfig.DEBUG && isPreviewBuildType) {

6
core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
View File

@ -18,10 +18,10 @@ open /* SY <-- */ class NetworkHelper(
) { ) {
/* SY --> */ /* SY --> */
open /* SY <-- */val cookieJar by lazy { AndroidCookieJar() } open /* SY <-- */val cookieJar = AndroidCookieJar()
/* SY --> */ /* SY --> */
open /* SY <-- */val client by lazy { open /* SY <-- */val client: OkHttpClient = run {
val builder = OkHttpClient.Builder() val builder = OkHttpClient.Builder()
.cookieJar(cookieJar) .cookieJar(cookieJar)
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(30, TimeUnit.SECONDS)
@ -69,7 +69,7 @@ open /* SY <-- */ class NetworkHelper(
@Deprecated("The regular client handles Cloudflare by default") @Deprecated("The regular client handles Cloudflare by default")
@Suppress("UNUSED") @Suppress("UNUSED")
/* SY --> */ /* SY --> */
open /* SY <-- */val cloudflareClient by lazy { client } open /* SY <-- */val cloudflareClient: OkHttpClient = client
fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim() fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()
} }