Remove the RoomDirectorySearch feature flag and enable the feature by default.
This commit is contained in:
@@ -71,7 +71,6 @@ final class AppSettings {
|
|||||||
case liveLocationDisclaimerDisplayed
|
case liveLocationDisclaimerDisplayed
|
||||||
|
|
||||||
// Feature flags
|
// Feature flags
|
||||||
case publicSearchEnabled
|
|
||||||
case fuzzyRoomListSearchEnabled
|
case fuzzyRoomListSearchEnabled
|
||||||
case lowPriorityFilterEnabled
|
case lowPriorityFilterEnabled
|
||||||
case enableOnlySignedDeviceIsolationMode
|
case enableOnlySignedDeviceIsolationMode
|
||||||
@@ -418,9 +417,6 @@ final class AppSettings {
|
|||||||
// MARK: - Feature Flags
|
// MARK: - Feature Flags
|
||||||
|
|
||||||
/// Others
|
/// Others
|
||||||
@UserPreference(key: UserDefaultsKeys.publicSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
|
|
||||||
var publicSearchEnabled
|
|
||||||
|
|
||||||
@UserPreference(key: UserDefaultsKeys.fuzzyRoomListSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
|
@UserPreference(key: UserDefaultsKeys.fuzzyRoomListSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
|
||||||
var fuzzyRoomListSearchEnabled
|
var fuzzyRoomListSearchEnabled
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
|
|||||||
var roomListActivityVisibility: RoomListActivityVisibility { get set }
|
var roomListActivityVisibility: RoomListActivityVisibility { get set }
|
||||||
var elementCallBaseURLOverride: URL? { get set }
|
var elementCallBaseURLOverride: URL? { get set }
|
||||||
|
|
||||||
var publicSearchEnabled: Bool { get set }
|
|
||||||
var fuzzyRoomListSearchEnabled: Bool { get set }
|
var fuzzyRoomListSearchEnabled: Bool { get set }
|
||||||
var lowPriorityFilterEnabled: Bool { get set }
|
var lowPriorityFilterEnabled: Bool { get set }
|
||||||
var knockingEnabled: Bool { get set }
|
var knockingEnabled: Bool { get set }
|
||||||
|
|||||||
@@ -54,10 +54,6 @@ struct DeveloperOptionsScreen: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Section("Room List") {
|
Section("Room List") {
|
||||||
Toggle(isOn: $context.publicSearchEnabled) {
|
|
||||||
Text("Public search")
|
|
||||||
}
|
|
||||||
|
|
||||||
Picker("Room list activity visibility", selection: $context.roomListActivityVisibility) {
|
Picker("Room list activity visibility", selection: $context.roomListActivityVisibility) {
|
||||||
ForEach(RoomListActivityVisibility.allCases, id: \.self) { visibility in
|
ForEach(RoomListActivityVisibility.allCases, id: \.self) { visibility in
|
||||||
Text(visibility.rawValue.capitalized)
|
Text(visibility.rawValue.capitalized)
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ struct StartChatScreenViewState: BindableState {
|
|||||||
let userID: String
|
let userID: String
|
||||||
var bindings = StartChatScreenViewStateBindings()
|
var bindings = StartChatScreenViewStateBindings()
|
||||||
var usersSection: UserDiscoverySection = .init(type: .suggestions, users: [])
|
var usersSection: UserDiscoverySection = .init(type: .suggestions, users: [])
|
||||||
var isRoomDirectoryEnabled = false
|
|
||||||
|
|
||||||
var isSearching: Bool {
|
var isSearching: Bool {
|
||||||
!bindings.searchQuery.isEmpty
|
!bindings.searchQuery.isEmpty
|
||||||
|
|||||||
@@ -97,10 +97,6 @@ class StartChatScreenViewModel: StartChatScreenViewModelType, StartChatScreenVie
|
|||||||
private var internalRoomAddressState: JoinByAddressState = .example
|
private var internalRoomAddressState: JoinByAddressState = .example
|
||||||
|
|
||||||
private func setupBindings() {
|
private func setupBindings() {
|
||||||
appSettings.$publicSearchEnabled
|
|
||||||
.weakAssign(to: \.state.isRoomDirectoryEnabled, on: self)
|
|
||||||
.store(in: &cancellables)
|
|
||||||
|
|
||||||
context.$viewState
|
context.$viewState
|
||||||
.map(\.bindings.searchQuery)
|
.map(\.bindings.searchQuery)
|
||||||
.debounceTextQueriesAndRemoveDuplicates()
|
.debounceTextQueriesAndRemoveDuplicates()
|
||||||
|
|||||||
@@ -51,9 +51,7 @@ struct StartChatScreen: View {
|
|||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var mainContent: some View {
|
private var mainContent: some View {
|
||||||
createRoomSection
|
createRoomSection
|
||||||
if context.viewState.isRoomDirectoryEnabled {
|
roomDirectorySearch
|
||||||
roomDirectorySearch
|
|
||||||
}
|
|
||||||
inviteFriendsSection
|
inviteFriendsSection
|
||||||
joinRoomByAddressSection
|
joinRoomByAddressSection
|
||||||
usersSection
|
usersSection
|
||||||
@@ -157,7 +155,6 @@ struct StartChatScreen: View {
|
|||||||
struct StartChatScreen_Previews: PreviewProvider, TestablePreview {
|
struct StartChatScreen_Previews: PreviewProvider, TestablePreview {
|
||||||
static let viewModel = {
|
static let viewModel = {
|
||||||
let appSettings = AppSettings()
|
let appSettings = AppSettings()
|
||||||
appSettings.publicSearchEnabled = true
|
|
||||||
let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "@userid:example.com"))))
|
let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "@userid:example.com"))))
|
||||||
let userDiscoveryService = UserDiscoveryServiceMock()
|
let userDiscoveryService = UserDiscoveryServiceMock()
|
||||||
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
|
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
|
||||||
|
|||||||
Reference in New Issue
Block a user