filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-01 11:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add checkbox preference, remove PushRulePreference, Split adavanced fragment to new 3 new fragments and inherit common function

Browse Source
This commit is contained in:
langleyd 2021-07-12 14:08:35 +01:00
parent d6f1f276c2
commit 7e156d372f
6 changed files with 16 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
View File

@ -389,11 +389,6 @@ interface FragmentModule {
@FragmentKey(VectorSettingsNotificationsTroubleshootFragment::class)
fun bindVectorSettingsNotificationsTroubleshootFragment(fragment: VectorSettingsNotificationsTroubleshootFragment): Fragment
// @Binds
// @IntoMap
// @FragmentKey(VectorSettingsAdvancedNotificationPreferenceFragment::class)
// fun bindVectorSettingsAdvancedNotificationPreferenceFragment(fragment: VectorSettingsAdvancedNotificationPreferenceFragment): Fragment
@Binds
@IntoMap
@FragmentKey(VectorSettingsNotificationPreferenceFragment::class)

47
vector/src/main/java/im/vector/app/core/preference/VectorCheckboxPreference.kt
View File

@ -16,18 +16,11 @@
package im.vector.app.core.preference
import android.animation.Animator
import android.animation.ArgbEvaluator
import android.animation.ValueAnimator
import android.content.Context
import android.graphics.Color
import android.util.AttributeSet
import android.widget.TextView
import androidx.core.animation.doOnEnd
import androidx.preference.CheckBoxPreference
import androidx.preference.PreferenceViewHolder
import im.vector.app.R
import im.vector.app.features.themes.ThemeUtils
open class VectorCheckboxPreference : CheckBoxPreference {
// Note: @JvmOverload does not work here...
@ -44,49 +37,9 @@ open class VectorCheckboxPreference : CheckBoxPreference {
isIconSpaceReserved = true
}
var isHighlighted = false
set(value) {
field = value
notifyChanged()
}
var currentHighlightAnimator: Animator? = null
override fun onBindViewHolder(holder: PreferenceViewHolder) {
// display the title in multi-line to avoid ellipsis.
(holder.findViewById(android.R.id.title) as? TextView)?.isSingleLine = false
// cancel existing animation (find a way to resume if happens during anim?)
currentHighlightAnimator?.cancel()
val itemView = holder.itemView
if (isHighlighted) {
val colorFrom = Color.TRANSPARENT
val colorTo = ThemeUtils.getColor(itemView.context, R.attr.colorControlHighlight)
currentHighlightAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo).apply {
duration = 250 // milliseconds
addUpdateListener { animator ->
itemView.setBackgroundColor(animator.animatedValue as Int)
}
doOnEnd {
currentHighlightAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorTo, colorFrom).apply {
duration = 250 // milliseconds
addUpdateListener { animator ->
itemView.setBackgroundColor(animator.animatedValue as Int)
}
doOnEnd {
isHighlighted = false
}
start()
}
}
startDelay = 200
start()
}
} else {
itemView.setBackgroundColor(Color.TRANSPARENT)
}
super.onBindViewHolder(holder)
}
}

3
vector/src/main/java/im/vector/app/features/settings/VectorSettingsGlobalNotificationPreferenceFragment.kt
View File

@ -18,9 +18,8 @@ package im.vector.app.features.settings
import im.vector.app.R
import org.matrix.android.sdk.api.pushrules.RuleIds
import javax.inject.Inject
class VectorSettingsGlobalNotificationPreferenceFragment @Inject constructor()
class VectorSettingsGlobalNotificationPreferenceFragment
: VectorSettingsPushRuleNotificationPreferenceFragment() {
override var titleRes: Int = R.string.settings_notification_global

4
vector/src/main/java/im/vector/app/features/settings/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
View File

@ -18,9 +18,9 @@ package im.vector.app.features.settings
import im.vector.app.R
import org.matrix.android.sdk.api.pushrules.RuleIds
import javax.inject.Inject
class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment @Inject constructor()
class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
: VectorSettingsPushRuleNotificationPreferenceFragment() {
override var titleRes: Int = R.string.settings_notification_mentions_and_keywords

3
vector/src/main/java/im/vector/app/features/settings/VectorSettingsOtherNotificationPreferenceFragment.kt
View File

@ -18,9 +18,8 @@ package im.vector.app.features.settings
import im.vector.app.R
import org.matrix.android.sdk.api.pushrules.RuleIds
import javax.inject.Inject
class VectorSettingsOtherNotificationPreferenceFragment @Inject constructor()
class VectorSettingsOtherNotificationPreferenceFragment
: VectorSettingsPushRuleNotificationPreferenceFragment() {
override var titleRes: Int = R.string.settings_notification_other

24
vector/src/main/res/xml/vector_settings_notifications.xml
View File

@ -27,19 +27,19 @@
android:title="@string/settings_notification_global"
app:fragment="im.vector.app.features.settings.VectorSettingsGlobalNotificationPreferenceFragment" />
<!-- <im.vector.app.core.preference.VectorPreference-->
<!-- android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"-->
<!-- android:key="SETTINGS_NOTIFICATION_KEYWORD_AND_MENTIONS_PREFERENCE_KEY"-->
<!-- android:persistent="false"-->
<!-- android:title="@string/settings_notification_mentions_and_keywords"-->
<!-- app:fragment="im.vector.app.features.settings.VectorSettingsKeywordAndMentionsNotificationPreferenceFragment" />-->
<im.vector.app.core.preference.VectorPreference
android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:key="SETTINGS_NOTIFICATION_KEYWORD_AND_MENTIONS_PREFERENCE_KEY"
android:persistent="false"
android:title="@string/settings_notification_mentions_and_keywords"
app:fragment="im.vector.app.features.settings.VectorSettingsKeywordAndMentionsNotificationPreferenceFragment" />
<!-- <im.vector.app.core.preference.VectorPreference-->
<!-- android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"-->
<!-- android:key="SETTINGS_NOTIFICATION_OTHER_PREFERENCE_KEY"-->
<!-- android:persistent="false"-->
<!-- android:title="@string/settings_notification_other"-->
<!-- app:fragment="im.vector.app.features.settings.VectorSettingsOtherNotificationPreferenceFragment" />-->
<im.vector.app.core.preference.VectorPreference
android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:key="SETTINGS_NOTIFICATION_OTHER_PREFERENCE_KEY"
android:persistent="false"
android:title="@string/settings_notification_other"
app:fragment="im.vector.app.features.settings.VectorSettingsOtherNotificationPreferenceFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory>