mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-10-23 04:17:16 +03:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
81fafd4c56
6 changed files with 12 additions and 15 deletions
|
@ -249,7 +249,7 @@ dependencies {
|
||||||
val conductorVersion = "3.1.1"
|
val conductorVersion = "3.1.1"
|
||||||
implementation("com.bluelinelabs:conductor:$conductorVersion")
|
implementation("com.bluelinelabs:conductor:$conductorVersion")
|
||||||
implementation("com.bluelinelabs:conductor-viewpager:$conductorVersion")
|
implementation("com.bluelinelabs:conductor-viewpager:$conductorVersion")
|
||||||
implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion")
|
implementation("com.github.tachiyomiorg:conductor-support-preference:3.1.2")
|
||||||
|
|
||||||
// FlowBinding
|
// FlowBinding
|
||||||
val flowbindingVersion = "1.2.0"
|
val flowbindingVersion = "1.2.0"
|
||||||
|
|
|
@ -5,7 +5,6 @@ import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.biometric.BiometricPrompt
|
import androidx.biometric.BiometricPrompt
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import androidx.preference.CheckBoxPreference
|
import androidx.preference.CheckBoxPreference
|
||||||
import androidx.preference.DialogPreference
|
|
||||||
import androidx.preference.EditTextPreference
|
import androidx.preference.EditTextPreference
|
||||||
import androidx.preference.ListPreference
|
import androidx.preference.ListPreference
|
||||||
import androidx.preference.MultiSelectListPreference
|
import androidx.preference.MultiSelectListPreference
|
||||||
|
@ -66,19 +65,19 @@ inline fun PreferenceGroup.checkBoxPreference(block: (@DSL CheckBoxPreference).(
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun PreferenceGroup.editTextPreference(block: (@DSL EditTextPreference).() -> Unit): EditTextPreference {
|
inline fun PreferenceGroup.editTextPreference(block: (@DSL EditTextPreference).() -> Unit): EditTextPreference {
|
||||||
return initThenAdd(EditTextPreference(context), block).also(::initDialog)
|
return initThenAdd(EditTextPreference(context), block)
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun PreferenceGroup.listPreference(block: (@DSL ListPreference).() -> Unit): ListPreference {
|
inline fun PreferenceGroup.listPreference(block: (@DSL ListPreference).() -> Unit): ListPreference {
|
||||||
return initThenAdd(ListPreference(context), block).also(::initDialog)
|
return initThenAdd(ListPreference(context), block)
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun PreferenceGroup.intListPreference(block: (@DSL IntListPreference).() -> Unit): IntListPreference {
|
inline fun PreferenceGroup.intListPreference(block: (@DSL IntListPreference).() -> Unit): IntListPreference {
|
||||||
return initThenAdd(IntListPreference(context), block).also(::initDialog)
|
return initThenAdd(IntListPreference(context), block)
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun PreferenceGroup.multiSelectListPreference(block: (@DSL MultiSelectListPreference).() -> Unit): MultiSelectListPreference {
|
inline fun PreferenceGroup.multiSelectListPreference(block: (@DSL MultiSelectListPreference).() -> Unit): MultiSelectListPreference {
|
||||||
return initThenAdd(MultiSelectListPreference(context), block).also(::initDialog)
|
return initThenAdd(MultiSelectListPreference(context), block)
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fun PreferenceScreen.preferenceCategory(block: (@DSL PreferenceCategory).() -> Unit): PreferenceCategory {
|
inline fun PreferenceScreen.preferenceCategory(block: (@DSL PreferenceCategory).() -> Unit): PreferenceCategory {
|
||||||
|
@ -89,14 +88,6 @@ inline fun PreferenceScreen.preferenceScreen(block: (@DSL PreferenceScreen).() -
|
||||||
return addThenInit(preferenceManager.createPreferenceScreen(context), block)
|
return addThenInit(preferenceManager.createPreferenceScreen(context), block)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun initDialog(dialogPreference: DialogPreference) {
|
|
||||||
with(dialogPreference) {
|
|
||||||
if (dialogTitle == null) {
|
|
||||||
dialogTitle = title
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun <P : Preference> PreferenceGroup.add(p: P): P {
|
inline fun <P : Preference> PreferenceGroup.add(p: P): P {
|
||||||
return p.apply {
|
return p.apply {
|
||||||
this.isIconSpaceReserved = false
|
this.isIconSpaceReserved = false
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
@file:Suppress("PackageDirectoryMismatch")
|
||||||
|
|
||||||
package com.google.android.material.bottomsheet
|
package com.google.android.material.bottomsheet
|
||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
|
@ -1,3 +1,5 @@
|
||||||
|
@file:Suppress("PackageDirectoryMismatch")
|
||||||
|
|
||||||
package androidx.preference
|
package androidx.preference
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -1,3 +1,5 @@
|
||||||
|
@file:Suppress("PackageDirectoryMismatch")
|
||||||
|
|
||||||
package com.google.android.material.appbar
|
package com.google.android.material.appbar
|
||||||
|
|
||||||
import android.animation.AnimatorSet
|
import android.animation.AnimatorSet
|
|
@ -522,7 +522,7 @@
|
||||||
<!-- Advanced section -->
|
<!-- Advanced section -->
|
||||||
<string name="label_network">Network</string>
|
<string name="label_network">Network</string>
|
||||||
<string name="pref_clear_cookies">Clear cookies</string>
|
<string name="pref_clear_cookies">Clear cookies</string>
|
||||||
<string name="pref_dns_over_https">DNS over HTTPS</string>
|
<string name="pref_dns_over_https">DNS over HTTPS (DoH)</string>
|
||||||
<string name="requires_app_restart">Requires app restart to take effect</string>
|
<string name="requires_app_restart">Requires app restart to take effect</string>
|
||||||
<string name="cookies_cleared">Cookies cleared</string>
|
<string name="cookies_cleared">Cookies cleared</string>
|
||||||
<string name="label_data">Data</string>
|
<string name="label_data">Data</string>
|
||||||
|
|
Loading…
Reference in a new issue