TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-16 11:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Kotlin for Gradle DSL

Browse Source
This commit is contained in:
darken
2022-09-14 18:00:18 +02:00
committed by Matthias Urhahn
parent 61463bc05f
commit e0d44f2f1c
20 changed files with 792 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/common/preferences/PercentSliderPreference.kt
+3 -3
View File
@@ -12,7 +12,7 @@ import eu.darken.capod.R
import eu.darken.capod.common.preferences.PercentSliderPreferenceDialogFragment.Companion.newInstance
import kotlinx.parcelize.Parcelize
class PercentSliderPreference(context: Context?, attrs: AttributeSet?) : DialogPreference(context, attrs) {
class PercentSliderPreference(context: Context, attrs: AttributeSet?) : DialogPreference(context, attrs) {
@get:PluralsRes val sliderTextPluralsResource: Int
val min: Float
@@ -51,7 +51,7 @@ class PercentSliderPreference(context: Context?, attrs: AttributeSet?) : DialogP
value = if (restoreValue) getPersistedFloat(internalValue) else defaultValue as Float
}
override fun onSaveInstanceState(): Parcelable {
override fun onSaveInstanceState(): Parcelable? {
val superState = super.onSaveInstanceState()
// No need to save instance state since it's persistent
if (isPersistent) return superState
@@ -73,7 +73,7 @@ class PercentSliderPreference(context: Context?, attrs: AttributeSet?) : DialogP
@Parcelize
data class SavedState(
val value: Float,
val superState: Parcelable,
val superState: Parcelable?,
) : Parcelable
companion object {
app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
+1 -1
View File
@@ -27,7 +27,7 @@ abstract class PreferenceFragment2
val toolbar: Toolbar
get() = (parentFragment as SettingsFragment).toolbar
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
toolbar.menu.clear()
return super.onCreateView(inflater, container, savedInstanceState)
}
app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt
+2 -2
View File
@@ -83,7 +83,7 @@ class SettingsFragment : Fragment2(R.layout.settings_fragment),
override fun onPreferenceStartFragment(caller: PreferenceFragmentCompat, pref: Preference): Boolean {
val screenInfo = Screen(
fragmentClass = pref.fragment,
fragmentClass = pref.fragment!!,
screenTitle = pref.title?.toString()
)
@@ -93,7 +93,7 @@ class SettingsFragment : Fragment2(R.layout.settings_fragment),
}
val fragment = childFragmentManager.fragmentFactory
.instantiate(this::class.java.classLoader!!, pref.fragment)
.instantiate(this::class.java.classLoader!!, pref.fragment!!)
.apply {
arguments = args
setTargetFragment(caller, 0)