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

chore(settings/advanced): Allow any users to set Display Color Profile

Browse source 
Not sure why I gate this out for only Android 8+ previously
This commit is contained in:
Ahmad Ansori Palembani 2024-08-08 07:19:12 +07:00
parent 9b46c6a763
commit 97417d175f
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -1028,7 +1028,6 @@ open class MainActivity : BaseActivity<MainActivityBinding>() {
) )
fun showColourProfilePicker() { fun showColourProfilePicker() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
requestColourProfile.launch(arrayOf("*/*")) requestColourProfile.launch(arrayOf("*/*"))
} }

33
app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt
View file

@ -18,9 +18,6 @@ import co.touchlab.kermit.Logger
import com.hippo.unifile.UniFile import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import yokai.i18n.MR
import yokai.util.lang.getString
import dev.icerock.moko.resources.compose.stringResource
import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.data.download.DownloadProvider import eu.kanade.tachiyomi.data.download.DownloadProvider
@ -54,9 +51,7 @@ import eu.kanade.tachiyomi.ui.setting.onChange
import eu.kanade.tachiyomi.ui.setting.onClick import eu.kanade.tachiyomi.ui.setting.onClick
import eu.kanade.tachiyomi.ui.setting.preference import eu.kanade.tachiyomi.ui.setting.preference
import eu.kanade.tachiyomi.ui.setting.preferenceCategory import eu.kanade.tachiyomi.ui.setting.preferenceCategory
import eu.kanade.tachiyomi.ui.setting.summaryMRes as summaryRes
import eu.kanade.tachiyomi.ui.setting.switchPreference import eu.kanade.tachiyomi.ui.setting.switchPreference
import eu.kanade.tachiyomi.ui.setting.titleMRes as titleRes
import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.CrashLogUtil
import eu.kanade.tachiyomi.util.system.disableItems import eu.kanade.tachiyomi.util.system.disableItems
import eu.kanade.tachiyomi.util.system.e import eu.kanade.tachiyomi.util.system.e
@ -86,8 +81,12 @@ import uy.kohesive.injekt.injectLazy
import yokai.domain.base.BasePreferences.ExtensionInstaller import yokai.domain.base.BasePreferences.ExtensionInstaller
import yokai.domain.extension.interactor.TrustExtension import yokai.domain.extension.interactor.TrustExtension
import yokai.domain.manga.interactor.GetManga import yokai.domain.manga.interactor.GetManga
import yokai.i18n.MR
import yokai.util.lang.getString
import java.io.File import java.io.File
import android.R as AR import android.R as AR
import eu.kanade.tachiyomi.ui.setting.summaryMRes as summaryRes
import eu.kanade.tachiyomi.ui.setting.titleMRes as titleRes
class SettingsAdvancedController : SettingsLegacyController() { class SettingsAdvancedController : SettingsLegacyController() {
@ -376,21 +375,19 @@ class SettingsAdvancedController : SettingsLegacyController() {
} }
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { preferenceCategory {
preferenceCategory { titleRes = MR.strings.reader
titleRes = MR.strings.reader
preference { preference {
key = "pref_display_profile" key = "pref_display_profile"
titleRes = MR.strings.pref_display_profile titleRes = MR.strings.pref_display_profile
onClick { onClick {
(activity as? MainActivity)?.showColourProfilePicker() (activity as? MainActivity)?.showColourProfilePicker()
} }
basePreferences.displayProfile().changesIn(viewScope) { path -> basePreferences.displayProfile().changesIn(viewScope) { path ->
val actualPath = UniFile.fromUri(context, path.toUri())?.filePath ?: path val actualPath = UniFile.fromUri(context, path.toUri())?.filePath ?: path
if (actualPath.isNotEmpty()) summary = actualPath if (actualPath.isNotEmpty()) summary = actualPath
}
} }
} }
} }