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

Hide timeline style selection (#2968)

Browse Source
This commit is contained in:
Mauro
2024-06-26 12:42:12 +02:00
committed by GitHub
parent 82823c94ce
commit 342cfc0d3f
9 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/AppSettings.swift
-3
View File
@@ -236,9 +236,6 @@ final class AppSettings {
// MARK: - Room Screen // MARK: - Room Screen
@UserPreference(key: UserDefaultsKeys.timelineStyle, defaultValue: TimelineStyle.bubbles, storageType: .volatile)
var timelineStyle
@UserPreference(key: UserDefaultsKeys.viewSourceEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store)) @UserPreference(key: UserDefaultsKeys.viewSourceEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store))
var viewSourceEnabled var viewSourceEnabled
ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+1 -1
View File
@@ -149,7 +149,7 @@ struct RoomScreenViewState: BindableState {
var typingMembers: [String] = [] var typingMembers: [String] = []
var showLoading = false var showLoading = false
var showReadReceipts = false var showReadReceipts = false
var timelineStyle: TimelineStyle let timelineStyle = TimelineStyle.bubbles
var isEncryptedOneToOneRoom = false var isEncryptedOneToOneRoom = false
var timelineViewState: TimelineViewState // check the doc before changing this var timelineViewState: TimelineViewState // check the doc before changing this
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
-5
View File
@@ -83,7 +83,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
super.init(initialViewState: RoomScreenViewState(roomID: roomProxy.id, super.init(initialViewState: RoomScreenViewState(roomID: roomProxy.id,
roomTitle: roomProxy.roomTitle, roomTitle: roomProxy.roomTitle,
roomAvatar: roomProxy.avatar, roomAvatar: roomProxy.avatar,
timelineStyle: appSettings.timelineStyle,
isEncryptedOneToOneRoom: roomProxy.isEncryptedOneToOneRoom, isEncryptedOneToOneRoom: roomProxy.isEncryptedOneToOneRoom,
timelineViewState: TimelineViewState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }), timelineViewState: TimelineViewState(focussedEvent: focussedEventID.map { .init(eventID: $0, appearance: .immediate) }),
ownUserID: roomProxy.ownUserID, ownUserID: roomProxy.ownUserID,
@@ -392,10 +391,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
} }
.store(in: &cancellables) .store(in: &cancellables)
appSettings.$timelineStyle
.weakAssign(to: \.state.timelineStyle, on: self)
.store(in: &cancellables)
appSettings.$sharePresence appSettings.$sharePresence
.weakAssign(to: \.state.showReadReceipts, on: self) .weakAssign(to: \.state.showReadReceipts, on: self)
.store(in: &cancellables) .store(in: &cancellables)
ElementX/Sources/Screens/Settings/AvancedOptionsScreen/AdvancedSettingsScreenModels.swift
-1
View File
@@ -38,7 +38,6 @@ struct AdvancedSettingsScreenViewStateBindings {
enum AdvancedSettingsScreenViewAction { } enum AdvancedSettingsScreenViewAction { }
protocol AdvancedSettingsProtocol: AnyObject { protocol AdvancedSettingsProtocol: AnyObject {
var timelineStyle: TimelineStyle { get set }
var viewSourceEnabled: Bool { get set } var viewSourceEnabled: Bool { get set }
var appAppearance: AppAppearance { get set } var appAppearance: AppAppearance { get set }
var sharePresence: Bool { get set } var sharePresence: Bool { get set }
ElementX/Sources/Screens/Settings/AvancedOptionsScreen/View/AdvancedSettingsScreen.swift
-4
View File
@@ -27,10 +27,6 @@ struct AdvancedSettingsScreen: View {
kind: .picker(selection: $context.appAppearance, kind: .picker(selection: $context.appAppearance,
items: AppAppearance.allCases.map { (title: $0.name, tag: $0) })) items: AppAppearance.allCases.map { (title: $0.name, tag: $0) }))
ListRow(label: .plain(title: L10n.commonMessageLayout),
kind: .picker(selection: $context.timelineStyle,
items: TimelineStyle.allCases.map { (title: $0.name, tag: $0) }))
ListRow(label: .plain(title: L10n.actionViewSource), ListRow(label: .plain(title: L10n.actionViewSource),
kind: .toggle($context.viewSourceEnabled)) kind: .toggle($context.viewSourceEnabled))
PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPad-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f85f8897cd79b5d4d2df216679ffcdc45da409e9fc1bce42cbb434512e7d5053 oid sha256:6986a441d9719d8c2a5254ed06c51cb845ef940ba5a70eae3e7fec464a8dec88
size 156848 size 143354
PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPad-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:af072c34f22fa7757d3a7f48e318c20f78bfc0b6dda2ca976edea2985d8e4706 oid sha256:61ba569506684af18eefc8e06d01c1c337659e452db9bb226118bd0609e4c51f
size 218093 size 193251
PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPhone-15-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4c88a64b71907671ad6ba30275a58efb4c8131533d983c4ad3c341dd1d6d9a74 oid sha256:a51e193e49f96c000fc42881316d42d81a6f5f8bd0babad557d587f1ae6f22bc
size 104849 size 93116
PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen-iPhone-15-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dcdf67bedffc6d677cbb292986dfe3270ce04afeb51611fc62bc1d8d77b1c936 oid sha256:1a5404c61f662f6bb93316f2d917fefef7e486f526b22b985253322c5a9bd2cb
size 166288 size 138400