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

Remove unnecessary iOS 26+ search screen restriction.

Browse Source
This commit is contained in:
Stefan Ceriu
2026-10-13 18:39:38 +03:00
parent 95fc43f4fc
commit 900b24bc5e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/AppCoordinator.swift
+1 -1
View File
@@ -1421,7 +1421,7 @@ private extension AppCoordinator {
} }
func scheduleSearchBackfill() { func scheduleSearchBackfill() {
guard let userSession, userSession.userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) else { guard let userSession, userSession.userSettings.app.globalSearchEnabled else {
return return
} }
ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+2 -2
View File
@@ -99,7 +99,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
spacesTabDetails = .init(tag: HomeTab.spaces, title: L10n.screenHomeTabSpaces, icon: \.space, selectedIcon: \.spaceSolid) spacesTabDetails = .init(tag: HomeTab.spaces, title: L10n.screenHomeTabSpaces, icon: \.space, selectedIcon: \.spaceSolid)
spacesTabDetails.navigationSplitCoordinator = spacesSplitCoordinator spacesTabDetails.navigationSplitCoordinator = spacesSplitCoordinator
if flowParameters.userSession.userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) { if flowParameters.userSession.userSettings.app.globalSearchEnabled {
let searchCoordinator = SearchScreenCoordinator(parameters: .init(roomSummaryProvider: flowParameters.userSession.clientProxy.alternateRoomSummaryProvider, let searchCoordinator = SearchScreenCoordinator(parameters: .init(roomSummaryProvider: flowParameters.userSession.clientProxy.alternateRoomSummaryProvider,
userSession: flowParameters.userSession, userSession: flowParameters.userSession,
userIndicatorController: flowParameters.userIndicatorController)) userIndicatorController: flowParameters.userIndicatorController))
@@ -171,7 +171,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
navigationTabCoordinator.selectedTab = .chats navigationTabCoordinator.selectedTab = .chats
} }
case .search: case .search:
// Switch to the dedicated search tab when it's available (iOS 26 + flag), otherwise ignore. // Switch to the dedicated search tab when it's available (flag enabled), otherwise ignore.
if searchTabNavigationStackCoordinator != nil { if searchTabNavigationStackCoordinator != nil {
navigationTabCoordinator.selectedTab = .search navigationTabCoordinator.selectedTab = .search
} }
ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+1 -1
View File
@@ -54,7 +54,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
bindings: .init(filtersState: .init(userSettings: userSession.userSettings))), bindings: .init(filtersState: .init(userSettings: userSession.userSettings))),
mediaProvider: userSession.mediaProvider) mediaProvider: userSession.mediaProvider)
if userSettings.app.globalSearchEnabled, #available(iOS 26.0, *) { if userSettings.app.globalSearchEnabled {
state.isRoomListSearchEnabled = false state.isRoomListSearchEnabled = false
} }