mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-19 08:03:50 +02:00
Implement new space selector bottom sheet (#6518)
* Delight: Edit layout experiment #6079
This commit is contained in:
+92
@@ -0,0 +1,92 @@
|
||||
//
|
||||
// Copyright 2021 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import MatrixSDK
|
||||
|
||||
class SpaceSelectorService: SpaceSelectorServiceProtocol {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
// MARK: Private
|
||||
|
||||
private let session: MXSession
|
||||
private let parentSpaceId: String?
|
||||
private let showHomeSpace: Bool
|
||||
|
||||
private var spaceList: [SpaceSelectorListItemData] {
|
||||
var itemList = showHomeSpace && parentSpaceId == nil ? [SpaceSelectorListItemData(id: SpaceSelectorConstants.homeSpaceId, icon: Asset.Images.sideMenuActionIconFeedback.image, displayName: VectorL10n.allChatsTitle)] : []
|
||||
|
||||
let notificationCounter = session.spaceService.notificationCounter
|
||||
|
||||
if let parentSpaceId = parentSpaceId, let parentSpace = session.spaceService.getSpace(withId: parentSpaceId) {
|
||||
itemList.append(contentsOf: parentSpace.childSpaces.compactMap { space in
|
||||
SpaceSelectorListItemData.itemData(with: space, notificationCounter: notificationCounter)
|
||||
})
|
||||
} else {
|
||||
itemList.append(contentsOf: session.spaceService.rootSpaces.compactMap { space in
|
||||
SpaceSelectorListItemData.itemData(with: space, notificationCounter: notificationCounter)
|
||||
})
|
||||
}
|
||||
return itemList
|
||||
}
|
||||
|
||||
private var parentSpaceName: String? {
|
||||
guard let parentSpaceId = parentSpaceId, let summary = session.roomSummary(withRoomId: parentSpaceId) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
return summary.displayname
|
||||
}
|
||||
|
||||
// MARK: Public
|
||||
|
||||
private(set) var spaceListSubject: CurrentValueSubject<[SpaceSelectorListItemData], Never>
|
||||
private(set) var parentSpaceNameSubject: CurrentValueSubject<String?, Never>
|
||||
private(set) var selectedSpaceId: String?
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
init(session: MXSession, parentSpaceId: String?, showHomeSpace: Bool, selectedSpaceId: String?) {
|
||||
self.session = session
|
||||
self.parentSpaceId = parentSpaceId
|
||||
self.showHomeSpace = showHomeSpace
|
||||
self.spaceListSubject = CurrentValueSubject([])
|
||||
self.parentSpaceNameSubject = CurrentValueSubject(nil)
|
||||
self.selectedSpaceId = selectedSpaceId
|
||||
|
||||
spaceListSubject.send(spaceList)
|
||||
parentSpaceNameSubject.send(parentSpaceName)
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate extension SpaceSelectorListItemData {
|
||||
static func itemData(with space: MXSpace, notificationCounter: MXSpaceNotificationCounter) -> SpaceSelectorListItemData? {
|
||||
guard let summary = space.summary else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let notificationState = notificationCounter.notificationState(forSpaceWithId: space.spaceId)
|
||||
|
||||
return SpaceSelectorListItemData(id:summary.roomId,
|
||||
avatar: summary.room.avatarData,
|
||||
displayName: summary.displayname,
|
||||
notificationCount: notificationState?.groupMissedDiscussionsCount ?? 0,
|
||||
highlightedNotificationCount: notificationState?.groupMissedDiscussionsHighlightedCount ?? 0,
|
||||
hasSubItems: !space.childSpaces.isEmpty)
|
||||
}
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
//
|
||||
// Copyright 2021 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import UIKit
|
||||
|
||||
class MockSpaceSelectorService: SpaceSelectorServiceProtocol {
|
||||
|
||||
static let homeItem = SpaceSelectorListItemData(id: SpaceSelectorConstants.homeSpaceId, avatar: nil, icon: UIImage(systemName: "house"), displayName: "All Chats", notificationCount: 0, highlightedNotificationCount: 0, hasSubItems: false)
|
||||
static let defaultSpaceList = [
|
||||
homeItem,
|
||||
SpaceSelectorListItemData(id: "!aaabaa:matrix.org", avatar: nil, icon: UIImage(systemName: "number"), displayName: "Default Space", notificationCount: 0, highlightedNotificationCount: 0, hasSubItems: false),
|
||||
SpaceSelectorListItemData(id: "!zzasds:matrix.org", avatar: nil, icon: UIImage(systemName: "number"), displayName: "Space with sub items", notificationCount: 0, highlightedNotificationCount: 0, hasSubItems: true),
|
||||
SpaceSelectorListItemData(id: "!scthve:matrix.org", avatar: nil, icon: UIImage(systemName: "number"), displayName: "Space with notifications", notificationCount: 55, highlightedNotificationCount: 0, hasSubItems: true),
|
||||
SpaceSelectorListItemData(id: "!ferggs:matrix.org", avatar: nil, icon: UIImage(systemName: "number"), displayName: "Space with highlight", notificationCount: 99, highlightedNotificationCount: 50, hasSubItems: false)
|
||||
]
|
||||
|
||||
var spaceListSubject: CurrentValueSubject<[SpaceSelectorListItemData], Never>
|
||||
var parentSpaceNameSubject: CurrentValueSubject<String?, Never>
|
||||
var selectedSpaceId: String?
|
||||
|
||||
init(spaceList: [SpaceSelectorListItemData] = defaultSpaceList, parentSpaceName: String? = nil, selectedSpaceId: String = SpaceSelectorConstants.homeSpaceId) {
|
||||
self.spaceListSubject = CurrentValueSubject(spaceList)
|
||||
self.parentSpaceNameSubject = CurrentValueSubject(parentSpaceName)
|
||||
self.selectedSpaceId = selectedSpaceId
|
||||
}
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
//
|
||||
// Copyright 2021 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
|
||||
protocol SpaceSelectorServiceProtocol {
|
||||
var spaceListSubject: CurrentValueSubject<[SpaceSelectorListItemData], Never> { get }
|
||||
var parentSpaceNameSubject: CurrentValueSubject<String?, Never> { get }
|
||||
var selectedSpaceId: String? { get }
|
||||
}
|
||||
Reference in New Issue
Block a user