mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
Merge the room thread list flag into the threads flag
This commit is contained in:
@@ -420,9 +420,6 @@ final nonisolated class AppSettings: @unchecked Sendable {
|
||||
@UserPreference(defaultValue: false)
|
||||
var threadsEnabled: Bool
|
||||
|
||||
@UserPreference(defaultValue: false)
|
||||
var roomThreadListEnabled: Bool
|
||||
|
||||
@UserPreference(defaultValue: ProcessInfo().isiOSAppOnMac)
|
||||
var globalSearchEnabled: Bool
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
||||
// MARK: - Private
|
||||
|
||||
private func setupSubscriptions(ongoingCallRoomIDPublisher: CurrentValuePublisher<String?, Never>) {
|
||||
appSettings.roomThreadListEnabledPublisher
|
||||
appSettings.threadsEnabledPublisher
|
||||
.weakAssign(to: \.state.roomThreadListEnabled, on: self)
|
||||
.store(in: &cancellables)
|
||||
|
||||
|
||||
-2
@@ -71,8 +71,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
|
||||
|
||||
var linkNewDeviceEnabled: Bool { get set }
|
||||
|
||||
var roomThreadListEnabled: Bool { get set }
|
||||
|
||||
var globalSearchEnabled: Bool { get set }
|
||||
}
|
||||
|
||||
|
||||
-4
@@ -86,10 +86,6 @@ struct DeveloperOptionsScreen: View {
|
||||
}
|
||||
|
||||
Section("Room") {
|
||||
Toggle(isOn: $context.roomThreadListEnabled) {
|
||||
Text("Room thread list")
|
||||
}
|
||||
|
||||
Toggle(isOn: $context.linkPreviewsEnabled) {
|
||||
Text("Link previews")
|
||||
Text("Follows the timeline media visibility settings.")
|
||||
|
||||
Reference in New Issue
Block a user