mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-10-23 04:17:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
jmir1 2022-01-07 18:18:25 +01:00
commit 81fafd4c56
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -249,7 +249,7 @@ dependencies {
val conductorVersion = "3.1.1"
implementation("com.bluelinelabs:conductor:$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
val flowbindingVersion = "1.2.0"

17
app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
View file

@ -5,7 +5,6 @@ import androidx.appcompat.content.res.AppCompatResources
import androidx.biometric.BiometricPrompt
import androidx.fragment.app.FragmentActivity
import androidx.preference.CheckBoxPreference
import androidx.preference.DialogPreference
import androidx.preference.EditTextPreference
import androidx.preference.ListPreference
import androidx.preference.MultiSelectListPreference
@ -66,19 +65,19 @@ inline fun PreferenceGroup.checkBoxPreference(block: (@DSL CheckBoxPreference).(
}
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 {
return initThenAdd(ListPreference(context), block).also(::initDialog)
return initThenAdd(ListPreference(context), block)
}
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 {
return initThenAdd(MultiSelectListPreference(context), block).also(::initDialog)
return initThenAdd(MultiSelectListPreference(context), block)
}
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)
}
fun initDialog(dialogPreference: DialogPreference) {
with(dialogPreference) {
if (dialogTitle == null) {
dialogTitle = title
}
}
}
inline fun <P : Preference> PreferenceGroup.add(p: P): P {
return p.apply {
this.isIconSpaceReserved = false

2
app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorExtensions.kt → app/src/main/java/eu/kanade/tachiyomi/util/view/BottomSheetBehaviorExtensions.kt
View file

@ -1,3 +1,5 @@
@file:Suppress("PackageDirectoryMismatch")
package com.google.android.material.bottomsheet
import android.view.View

2
app/src/main/java/androidx/preference/EditTextPreferenceExtensions.kt → app/src/main/java/eu/kanade/tachiyomi/util/view/EditTextPreferenceExtensions.kt
View file

@ -1,3 +1,5 @@
@file:Suppress("PackageDirectoryMismatch")
package androidx.preference
/**

2
app/src/main/java/com/google/android/material/appbar/TachiyomiAppBarLayout.kt → app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
View file

@ -1,3 +1,5 @@
@file:Suppress("PackageDirectoryMismatch")
package com.google.android.material.appbar
import android.animation.AnimatorSet

2
app/src/main/res/values/strings.xml
View file

@ -522,7 +522,7 @@
<!-- Advanced section -->
<string name="label_network">Network</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="cookies_cleared">Cookies cleared</string>
<string name="label_data">Data</string>