filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ordering of chips and align left for notification screens.

This commit is contained in:
David Langley 2021-08-24 15:46:41 +01:00
parent 2598a67525
commit be19f759f6
8 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
View File

@ -34,23 +34,24 @@ class KeywordPreference : VectorPreference {
fun didRemoveKeyword(keyword: String)
}
private var keywordsEnabled = true
private var _keywords: LinkedHashSet<String> = linkedSetOf()
var keywords: Set<String>
get() {
return _keywords
}
set(value) {
val newLinkedSet:LinkedHashSet<String> = linkedSetOf()
newLinkedSet.addAll(value.sorted())
_keywords = newLinkedSet
// Updates existing `LinkedHashSet` vs assign a new set.
// This preserves the order added while on the screen (avoids keywords jumping around).
_keywords.removeAll(_keywords.filter { !value.contains(it) })
_keywords.addAll(value.sorted())
notifyChanged()
}
var listener: Listener? = null
var keywordsEnabled = true
private var _keywords: LinkedHashSet<String> = linkedSetOf()
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)

9
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
View File

@ -16,7 +16,10 @@
package im.vector.app.features.settings.notifications
import androidx.preference.PreferenceCategory
import im.vector.app.R
import im.vector.app.core.preference.VectorCheckboxPreference
import im.vector.app.core.preference.VectorPreferenceCategory
import org.matrix.android.sdk.api.pushrules.RuleIds
class VectorSettingsDefaultNotificationPreferenceFragment
@ -32,4 +35,10 @@ class VectorSettingsDefaultNotificationPreferenceFragment
"SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ENCRYPTED_ROOM,
"SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
)
override fun bindPref() {
super.bindPref()
val category = findPreference<VectorPreferenceCategory>("SETTINGS_DEFAULT")!!
category.isIconSpaceReserved = false
}
}

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

@ -24,6 +24,7 @@ import androidx.preference.Preference
import im.vector.app.R
import im.vector.app.core.preference.KeywordPreference
import im.vector.app.core.preference.VectorCheckboxPreference
import im.vector.app.core.preference.VectorPreferenceCategory
import im.vector.app.core.utils.toast
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@ -31,9 +32,7 @@ import kotlinx.coroutines.withContext
import org.matrix.android.sdk.api.pushrules.RuleIds
import org.matrix.android.sdk.api.pushrules.RuleKind
import org.matrix.android.sdk.api.pushrules.rest.PushRule
import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
import org.matrix.android.sdk.api.pushrules.toJson
import org.matrix.android.sdk.rx.rx
class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
: VectorSettingsPushRuleNotificationPreferenceFragment() {
@ -49,10 +48,14 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
override fun bindPref() {
super.bindPref()
val mentionCategory = findPreference<VectorPreferenceCategory>("SETTINGS_KEYWORDS_AND_MENTIONS")!!
mentionCategory.isIconSpaceReserved = false
val yourKeywordsCategory = findPreference<VectorPreferenceCategory>("SETTINGS_YOUR_KEYWORDS")!!
yourKeywordsCategory.isIconSpaceReserved = false
val keywordRules = session.getPushRules().content?.filter { !it.ruleId.startsWith(".") }.orEmpty()
val editKeywordPreference = findPreference<KeywordPreference>("SETTINGS_KEYWORD_EDIT")!!
val keywordPreference = findPreference<VectorCheckboxPreference>("SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_KEYWORDS_PREFERENCE_KEY")!!
keywordPreference.isIconSpaceReserved = false
val anyEnabledKeywords = keywordRules.any(PushRule::enabled)
keywordPreference.isChecked = anyEnabledKeywords
editKeywordPreference.isEnabled = anyEnabledKeywords

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

@ -17,6 +17,7 @@
package im.vector.app.features.settings.notifications
import im.vector.app.R
import im.vector.app.core.preference.VectorPreferenceCategory
import org.matrix.android.sdk.api.pushrules.RuleIds
class VectorSettingsOtherNotificationPreferenceFragment
@ -32,4 +33,10 @@ class VectorSettingsOtherNotificationPreferenceFragment
"SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
"SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to RuleIds.RULE_ID_TOMBSTONE
)
override fun bindPref() {
super.bindPref()
val category = findPreference<VectorPreferenceCategory>("SETTINGS_OTHER")!!
category.isIconSpaceReserved = false
}
}

1
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
View File

@ -96,6 +96,7 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
override fun bindPref() {
for (preferenceKey in prefKeyToPushRuleId.keys) {
val preference = findPreference<VectorCheckboxPreference>(preferenceKey)!!
preference.isIconSpaceReserved = false
val ruleAndKind: PushRuleAndKind? = session.getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
if (ruleAndKind == null) {
// The rule is not defined, hide the preference

7
vector/src/main/res/layout/vector_preference_chip_group.xml
View File

@ -14,12 +14,11 @@
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
app:errorEnabled="false"
app:hintEnabled="true"
app:hintEnabled="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderText="@string/settings_notification_new_keyword">
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/chipEditText"
@ -28,7 +27,7 @@
android:singleLine="true"
android:inputType="text"
android:imeOptions="actionDone"
android:hint="@string/settings_notification_your_keywords" />
android:hint="@string/settings_notification_new_keyword" />
</com.google.android.material.textfield.TextInputLayout>

11
vector/src/main/res/values/strings.xml
View File

@ -1093,7 +1093,7 @@
<string name="settings_notification_notify_me_for">Notify me for</string>
<string name="settings_notification_your_keywords">Your keywords</string>
<string name="settings_notification_new_keyword">New keyword</string>
<string name="settings_notification_new_keyword">Add new keyword</string>
<string name="settings_notification_privacy">Notification privacy</string>
<string name="settings_notification_troubleshoot">Troubleshoot Notifications</string>
@ -1212,15 +1212,16 @@
<string name="settings_messages_in_group_chat">Msgs in group chats</string>
<string name="settings_invited_to_room">When I’m invited to a room</string>
<string name="settings_messages_sent_by_bot">Messages sent by bot</string>
<string name="settings_messages_at_room">Messages containing @room</string>
<string name="settings_messages_containing_display_name">Messages containing my display name</string>
<string name="settings_messages_containing_username">Messages containing my username</string>
<string name="settings_messages_containing_display_name">My display name</string>
<string name="settings_messages_containing_username">My username</string>
<string name="settings_messages_direct_messages">Direct messages</string>
<string name="settings_encrypted_direct_messages">Encrypted direct messages</string>
<string name="settings_group_messages">Group messages</string>
<string name="settings_encrypted_group_messages">Encrypted group messages</string>
<string name="settings_messages_at_room">Messages containing @room</string>
<string name="settings_messages_containing_keywords">Messages containing keywords</string>
<string name="settings_mentions_at_room">\@room</string>
<string name="settings_messages_containing_keywords">Keywords</string>
<string name="settings_room_invitations">Room invitations</string>
<string name="settings_call_invitations">Call invitations</string>
<string name="settings_messages_by_bot">Messages by bot</string>

6
vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
View File

@ -14,12 +14,16 @@
<im.vector.app.core.preference.VectorCheckboxPreference
android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY"
android:title="@string/settings_messages_at_room" />
android:title="@string/settings_mentions_at_room" />
<im.vector.app.core.preference.VectorCheckboxPreference
android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_KEYWORDS_PREFERENCE_KEY"
android:title="@string/settings_messages_containing_keywords" />
</im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_YOUR_KEYWORDS"
android:title="@string/settings_notification_your_keywords">
<im.vector.app.core.preference.KeywordPreference
android:key="SETTINGS_KEYWORD_EDIT"
/>