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

add changelog, checks/tests

This commit is contained in:
David Langley 2021-07-14 11:49:16 +01:00
parent baab726df2
commit 5044b21545
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3646.feature Normal file
View File

@ -0,0 +1 @@
Reorganise Advanced Notifications in to Global Notifications, Keywords and Mentions, Other (This feature is hidden in the release ui until a future release date.)

1
vector/build.gradle
View File

@ -142,6 +142,7 @@ android {
resValue "bool", "useLoginV1", "true" resValue "bool", "useLoginV1", "true"
resValue "bool", "useLoginV2", "false" resValue "bool", "useLoginV2", "false"
// NotificationSettingsV2 is disabled. To be released in conjunction with iOS/Web
resValue "bool", "useNotificationSettingsV1", "true" resValue "bool", "useNotificationSettingsV1", "true"
resValue "bool", "useNotificationSettingsV2", "false" resValue "bool", "useNotificationSettingsV2", "false"

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

@ -34,4 +34,3 @@ class VectorSettingsGlobalNotificationPreferenceFragment
"SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
) )
} }

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

@ -19,7 +19,6 @@ package im.vector.app.features.settings
import im.vector.app.R import im.vector.app.R
import org.matrix.android.sdk.api.pushrules.RuleIds import org.matrix.android.sdk.api.pushrules.RuleIds
class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
: VectorSettingsPushRuleNotificationPreferenceFragment() { : VectorSettingsPushRuleNotificationPreferenceFragment() {

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

@ -138,5 +138,4 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
} }
abstract val prefKeyToPushRuleId: Map<String, String> abstract val prefKeyToPushRuleId: Map<String, String>
} }

4
vector/src/main/res/xml/vector_settings_notification_global.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_OTHER" android:key="SETTINGS_OTHER"
android:title="@string/settings_notification_notify_me_for"> android:title="@string/settings_notification_notify_me_for">
@ -25,4 +25,4 @@
android:title="@string/settings_encrypted_group_messages" /> android:title="@string/settings_encrypted_group_messages" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
</PreferenceScreen> </androidx.preference.PreferenceScreen>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_KEYWORDS_AND_MENTIONS" android:key="SETTINGS_KEYWORDS_AND_MENTIONS"
android:title="@string/settings_notification_notify_me_for"> android:title="@string/settings_notification_notify_me_for">
@ -20,4 +20,4 @@
android:title="@string/settings_messages_at_room" /> android:title="@string/settings_messages_at_room" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
</PreferenceScreen> </androidx.preference.PreferenceScreen>

4
vector/src/main/res/xml/vector_settings_notification_other.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_OTHER" android:key="SETTINGS_OTHER"
android:title="@string/settings_notification_notify_me_for"> android:title="@string/settings_notification_notify_me_for">
@ -24,4 +24,4 @@
android:persistent="false" android:persistent="false"
android:title="@string/settings_room_upgrades" /> android:title="@string/settings_room_upgrades" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
</PreferenceScreen> </androidx.preference.PreferenceScreen>