letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Fix: hide call notification settings until calls are available (#1709)

Browse Source
This commit is contained in:
Nicolas Mauri
2023-09-14 09:46:16 +02:00
committed by GitHub
parent 1a438c176f
commit 756758c715
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX/Sources/Screens/Settings/NotificationSettingsScreen/NotificationSettingsScreenModels.swift
View File

@@ -29,6 +29,8 @@ struct NotificationSettingsScreenViewState: BindableState {
var isUserPermissionGranted: Bool?
var allowedNotificationModes: [RoomNotificationModeProxy] = [.allMessages, .mentionsAndKeywordsOnly]
var fixingConfigurationMismatch = false
// Hide calls settings until calls are available in El-X
let showCallsSettings = false
var showSystemNotificationsAlert: Bool {
bindings.enableNotifications && isUserPermissionGranted == false

2
ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
View File

@@ -34,7 +34,7 @@ struct NotificationSettingsScreen: View {
if context.viewState.settings?.roomMentionsEnabled != nil {
mentionsSection
}
if context.viewState.settings?.callsEnabled != nil {
if context.viewState.showCallsSettings, context.viewState.settings?.callsEnabled != nil {
callsSection
}
}

4
UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreen.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba5e1710d50a76d3581f946c77e0736ca8274e2198e28b69794a3b4851fdc2c3
size 115177
oid sha256:9704334caaadde07dcdf78efa200853d9315bf630296adfae54963fc5ec5d989
size 103239

4
UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreen.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79c131aa3127ebfa5737ef286e550925c601f493368083ba3c034763d3cd4ab7
size 145299
oid sha256:b3d623d6e0ddd1ec3387a38461a58e1381494ee21c45344e31ad3b708604ca2a
size 126931

4
UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreen.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c92c4baf77cb2ad25f07aeea790075400dc2ecd57a6e44b523193bd616f6190b
size 134108
oid sha256:d2162569e78dffee8d4095998dc31a3672ff3dbb43f0b1f58a44850a18c4c5f6
size 117932

4
UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreen.png
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8934a3a49936e50c84427e6347d34bf2d15663a23756b9e071734258b0dec3c3
size 191190
oid sha256:ba9fd9cbc5f49630dd1853f2d49611f1d4bb47166ae7ddff79319e0c1d0088bf
size 165797