Add androidx.preference:preference
This commit is contained in:
parent
2fce9533e3
commit
843fea01d6
|
@ -168,6 +168,7 @@ dependencies {
|
||||||
implementation 'androidx.core:core:1.2.0'
|
implementation 'androidx.core:core:1.2.0'
|
||||||
implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01'
|
implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01'
|
||||||
implementation 'androidx.exifinterface:exifinterface:1.1.0'
|
implementation 'androidx.exifinterface:exifinterface:1.1.0'
|
||||||
|
implementation "androidx.preference:preference:1.1.1"
|
||||||
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
|
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
|
||||||
implementation 'androidx.multidex:multidex:2.0.1'
|
implementation 'androidx.multidex:multidex:2.0.1'
|
||||||
implementation 'androidx.palette:palette:1.0.0'
|
implementation 'androidx.palette:palette:1.0.0'
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
package org.mariotaku.twidere.fragment
|
package org.mariotaku.twidere.fragment
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import androidx.preference.Preference
|
||||||
import org.mariotaku.twidere.R
|
import org.mariotaku.twidere.R
|
||||||
import org.mariotaku.twidere.constant.SharedPreferenceConstants.*
|
import org.mariotaku.twidere.constant.SharedPreferenceConstants.*
|
||||||
import org.mariotaku.twidere.preference.notification.AccountNotificationChannelsPreference
|
import org.mariotaku.twidere.preference.notification.AccountNotificationChannelsPreference
|
||||||
|
@ -38,7 +39,7 @@ class AccountNotificationSettingsFragment : BaseAccountPreferenceFragment() {
|
||||||
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
||||||
super.onActivityCreated(savedInstanceState)
|
super.onActivityCreated(savedInstanceState)
|
||||||
val account = this.account
|
val account = this.account
|
||||||
findPreference(KEY_NOTIFICATION_LIGHT_COLOR)?.let {
|
findPreference<Preference>(KEY_NOTIFICATION_LIGHT_COLOR)?.let {
|
||||||
if (account != null) {
|
if (account != null) {
|
||||||
it.setDefaultValue(account.color)
|
it.setDefaultValue(account.color)
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,11 +93,10 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(), IBaseFragmen
|
||||||
REQUEST_PICK_RINGTONE -> {
|
REQUEST_PICK_RINGTONE -> {
|
||||||
if (resultCode == Activity.RESULT_OK && data != null) {
|
if (resultCode == Activity.RESULT_OK && data != null) {
|
||||||
val ringtone = data.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
|
val ringtone = data.getParcelableExtra<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
|
||||||
if (ringtonePreferenceKey != null) {
|
ringtonePreferenceKey?.let {
|
||||||
val ringtonePreference = findPreference(ringtonePreferenceKey) as RingtonePreference?
|
findPreference<RingtonePreference>(it)
|
||||||
if (ringtonePreference != null) {
|
}?.let {
|
||||||
ringtonePreference.value = ringtone?.toString()
|
it.value = ringtone?.toString()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
ringtonePreferenceKey = null
|
ringtonePreferenceKey = null
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,10 @@ package org.mariotaku.twidere.fragment
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
|
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.core.view.ViewCompat
|
|
||||||
import androidx.preference.PreferenceScreen
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import androidx.core.view.ViewCompat
|
||||||
|
import androidx.preference.Preference
|
||||||
|
import androidx.preference.PreferenceScreen
|
||||||
import org.mariotaku.twidere.Constants.*
|
import org.mariotaku.twidere.Constants.*
|
||||||
import org.mariotaku.twidere.activity.SettingsActivity
|
import org.mariotaku.twidere.activity.SettingsActivity
|
||||||
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_SHOULD_TERMINATE
|
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_SHOULD_TERMINATE
|
||||||
|
@ -76,7 +77,7 @@ class SettingsDetailsFragment : BasePreferenceFragment(), OnSharedPreferenceChan
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSharedPreferenceChanged(preferences: SharedPreferences, key: String) {
|
override fun onSharedPreferenceChanged(preferences: SharedPreferences, key: String) {
|
||||||
val preference = findPreference(key) ?: return
|
val preference = findPreference<Preference>(key) ?: return
|
||||||
val currentActivity = activity ?: return
|
val currentActivity = activity ?: return
|
||||||
val extras = preference.extras
|
val extras = preference.extras
|
||||||
if (extras != null) {
|
if (extras != null) {
|
||||||
|
|
Loading…
Reference in New Issue