ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Compound ListRow instead of Compound form styles. (#1484)

Browse Source 
* Adopt ListRow Component.

* Update snapshots.

To check in future PR:
- Pseudo Bug Report Attach Screenshot label
- Bug Report screenshot padding (Use ListRow .custom?)
- De-bold Analytics & Notification Settings footer links
- Inline picker alignment perhaps?

* Changelog

* Update Compound.

* Use the label on the login screen.
This commit is contained in:
Doug
2023-08-16 16:08:30 +01:00
committed by GitHub
parent 7c69012667
commit c64fb44c96
98 changed files with 499 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomNotificationSettingsScreen/RoomNotificationSettingsScreenModels.swift
+1 -1
View File
@@ -54,7 +54,7 @@ struct RoomNotificationSettingsScreenViewState: BindableState {
let strings = RoomNotificationSettingsScreenStrings()
var notificationSettingsState: RoomNotificationSettingsState = .loading
var availableCustomRoomNotificationModes: [RoomNotificationModeProxy] = [.allMessages, .mentionsAndKeywordsOnly, .mute]
var isRestoringDefautSetting = false
var isRestoringDefaultSetting = false
var pendingCustomMode: RoomNotificationModeProxy?
}
ElementX/Sources/Screens/RoomNotificationSettingsScreen/RoomNotificationSettingsScreenViewModel.swift
+3 -3
View File
@@ -82,7 +82,7 @@ class RoomNotificationSettingsScreenViewModel: RoomNotificationSettingsScreenVie
isOneToOne: roomProxy.activeMembersCount == 2)
guard !Task.isCancelled else { return }
state.notificationSettingsState = .loaded(settings: settings)
if !state.isRestoringDefautSetting {
if !state.isRestoringDefaultSetting {
state.bindings.allowCustomSetting = !settings.isDefault
}
if state.pendingCustomMode == nil {
@@ -106,14 +106,14 @@ class RoomNotificationSettingsScreenViewModel: RoomNotificationSettingsScreenVie
}
private func restoreDefaultSetting() {
state.isRestoringDefautSetting = true
state.isRestoringDefaultSetting = true
Task {
do {
try await notificationSettingsProxy.restoreDefaultNotificationMode(roomId: roomProxy.id)
} catch {
displayError(.restoreDefaultFailed)
}
state.isRestoringDefautSetting = false
state.isRestoringDefaultSetting = false
}
}
ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift
+24 -35
View File
@@ -14,6 +14,7 @@
// limitations under the License.
//
import Compound
import SwiftUI
struct RoomNotificationSettingsScreen: View {
@@ -29,7 +30,7 @@ struct RoomNotificationSettingsScreen: View {
customSettingsSection
}
}
.compoundForm()
.compoundList()
.navigationTitle(L10n.screenRoomDetailsNotificationTitle)
.alert(item: $context.alertInfo)
.track(screen: .roomNotifications)
@@ -40,35 +41,28 @@ struct RoomNotificationSettingsScreen: View {
@ViewBuilder
private var allowCustomSettingSection: some View {
Section {
Toggle(isOn: $context.allowCustomSetting) {
Text(L10n.screenRoomNotificationSettingsAllowCustom)
}
.toggleStyle(.compoundForm)
.accessibilityIdentifier(A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting)
.disabled(context.viewState.notificationSettingsState.isLoading)
.onChange(of: context.allowCustomSetting) { _ in
context.send(viewAction: .changedAllowCustomSettings)
}
ListRow(label: .plain(title: L10n.screenRoomNotificationSettingsAllowCustom),
kind: .toggle($context.allowCustomSetting))
.accessibilityIdentifier(A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting)
.disabled(context.viewState.notificationSettingsState.isLoading)
.onChange(of: context.allowCustomSetting) { _ in
context.send(viewAction: .changedAllowCustomSettings)
}
} footer: {
Text(L10n.screenRoomNotificationSettingsAllowCustomFootnote)
.compoundFormSectionFooter()
.compoundListSectionFooter()
}
.compoundFormSection()
}
@ViewBuilder
private var defaultSettingSection: some View {
Section {
if context.viewState.isRestoringDefautSetting {
Text(L10n.commonLoading)
.foregroundColor(.compound.textPlaceholder)
} else {
Text(context.viewState.strings.string(for: context.viewState.notificationSettingsState))
.foregroundColor(.compound.textPrimary)
}
ListRow(label: .plain(title: context.viewState.isRestoringDefaultSetting ? L10n.commonLoading : context.viewState.strings.string(for: context.viewState.notificationSettingsState)),
kind: .label)
.disabled(context.viewState.isRestoringDefaultSetting)
} header: {
Text(L10n.screenRoomNotificationSettingsDefaultSettingTitle)
.compoundFormSectionHeader()
.compoundListSectionHeader()
} footer: {
Text(context.viewState.strings.customSettingFootnote)
.environment(\.openURL, OpenURLAction { url in
@@ -76,30 +70,25 @@ struct RoomNotificationSettingsScreen: View {
context.send(viewAction: .customSettingFootnoteLinkTapped)
return .handled
})
.compoundFormSectionFooter()
.compoundListSectionFooter()
}
.compoundFormSection()
}
@ViewBuilder
private var customSettingsSection: some View {
Section {
Picker("", selection: $context.customMode) {
ForEach(context.viewState.availableCustomRoomNotificationModes, id: \.self) { mode in
Text(context.viewState.strings.string(for: mode))
.tag(mode)
}
}
.onChange(of: context.customMode) { mode in
context.send(viewAction: .setCustomMode(mode))
}
.labelsHidden()
.pickerStyle(.inline)
ListRow(label: .plain(title: L10n.screenRoomNotificationSettingsCustomSettingsTitle),
kind: .inlinePicker(selection: $context.customMode,
items: context.viewState.availableCustomRoomNotificationModes.map {
(title: context.viewState.strings.string(for: $0), tag: $0)
}))
.onChange(of: context.customMode) { mode in
context.send(viewAction: .setCustomMode(mode))
}
} header: {
Text(L10n.screenRoomNotificationSettingsCustomSettingsTitle)
.compoundFormSectionHeader()
.compoundListSectionHeader()
}
.compoundFormSection()
}
}