null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes to targeting SDK 34

Browse source
This commit is contained in:
Jays2Kings 2023-09-25 18:53:57 -07:00
parent 97a418ede7
commit ee90967e15
3 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -17,6 +17,7 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<!-- For managing extensions --> <!-- For managing extensions -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

4
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt
View file

@ -4,11 +4,13 @@ import android.annotation.SuppressLint
import android.app.DownloadManager import android.app.DownloadManager
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Context.RECEIVER_EXPORTED
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Environment import android.os.Environment
import androidx.core.content.ContextCompat
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.data.preference.PreferenceKeys
@ -375,7 +377,7 @@ internal class ExtensionInstaller(private val context: Context) {
isRegistered = true isRegistered = true
val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE) val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
context.registerReceiver(this, filter) ContextCompat.registerReceiver(context, this, filter, ContextCompat.RECEIVER_EXPORTED)
} }
/** /**

23
app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
View file

@ -26,12 +26,6 @@ import androidx.core.view.marginBottom
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.webkit.WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
import androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF
import androidx.webkit.WebSettingsCompat.FORCE_DARK_ON
import androidx.webkit.WebSettingsCompat.setForceDark
import androidx.webkit.WebSettingsCompat.setForceDarkStrategy
import androidx.webkit.WebViewFeature
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.asImmediateFlowIn import eu.kanade.tachiyomi.data.preference.asImmediateFlowIn
import eu.kanade.tachiyomi.databinding.WebviewActivityBinding import eu.kanade.tachiyomi.databinding.WebviewActivityBinding
@ -121,7 +115,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
insets insets
} }
setWebDarkMode()
binding.swipeRefresh.isEnabled = false binding.swipeRefresh.isEnabled = false
if (bundle == null) { if (bundle == null) {
@ -163,21 +156,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
} }
} }
private fun setWebDarkMode() {
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
setForceDarkStrategy(
binding.webview.settings,
DARK_STRATEGY_WEB_THEME_DARKENING_ONLY,
)
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
setForceDark(
binding.webview.settings,
if (isInNightMode()) FORCE_DARK_ON else FORCE_DARK_OFF,
)
}
}
}
override fun onProvideAssistContent(outContent: AssistContent?) { override fun onProvideAssistContent(outContent: AssistContent?) {
super.onProvideAssistContent(outContent) super.onProvideAssistContent(outContent)
binding.webview.url?.let { outContent?.webUri = it.toUri() } binding.webview.url?.let { outContent?.webUri = it.toUri() }
@ -211,7 +189,6 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
R.attr.colorPrimaryVariant, R.attr.colorPrimaryVariant,
), ),
) )
setWebDarkMode()
val colorSurface = attrs.getColor(0, 0) val colorSurface = attrs.getColor(0, 0)
val actionBarTintColor = attrs.getColor(1, 0) val actionBarTintColor = attrs.getColor(1, 0)
val colorPrimaryVariant = attrs.getColor(2, 0) val colorPrimaryVariant = attrs.getColor(2, 0)