Reduce number of warnings in MasterSwitchPreference

This commit is contained in:
Rafael Caetano 2023-11-11 18:44:37 +00:00
parent b3c0ff100e
commit 26db59c2be

View File

@ -5,6 +5,8 @@ import android.os.Parcel
import android.os.Parcelable
import android.util.AttributeSet
import androidx.annotation.Keep
import androidx.core.os.BundleCompat
import androidx.core.os.ParcelCompat
import androidx.preference.Preference
import java.io.File
@ -58,14 +60,14 @@ open class MasterSwitchPreference : Preference {
}
private val attrs: MasterSwitchPreferenceAttrs
get() = extras.getParcelable(ATTRS_KEY_NAME)!!
get() = BundleCompat.getParcelable(extras, ATTRS_KEY_NAME, MasterSwitchPreferenceAttrs::class.java)!!
internal class SavedState : BaseSavedState {
var attrs: MasterSwitchPreferenceAttrs? = null
constructor(source: Parcel) : super(source) {
attrs = source.readParcelable(javaClass.classLoader)
attrs = ParcelCompat.readParcelable(source, javaClass.classLoader, MasterSwitchPreferenceAttrs::class.java)
}
constructor(superState: Parcelable?) : super(superState) {}
@ -96,7 +98,7 @@ open class MasterSwitchPreference : Preference {
R.styleable.MasterSwitchPreference,
0,
0
) ?: return
)
with(resAttrs) {
val libraryAttrs =
@ -116,7 +118,7 @@ open class MasterSwitchPreference : Preference {
val def = MasterSwitchPreferenceAttrs()
val attrs = MasterSwitchPreferenceAttrs(
val prefAttrs = MasterSwitchPreferenceAttrs(
switchThumbColor = getColor(
R.styleable.MasterSwitchPreference_ms_switchThumbColor,
def.switchThumbColor
@ -183,10 +185,10 @@ open class MasterSwitchPreference : Preference {
MasterSwitchPreferenceFragment::class.qualifiedName
}
}
setDefaultValue(attrs.defaultValue)
key = attrs.key
setDefaultValue(prefAttrs.defaultValue)
key = prefAttrs.key
fragment = fragName
extras.putParcelable(ATTRS_KEY_NAME, attrs)
extras.putParcelable(ATTRS_KEY_NAME, prefAttrs)
recycle()
libraryAttrs.recycle()