SP2: Adding Rooms to Spaces element-ios#5230

- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
This commit is contained in:
Gil Eluard
2021-12-23 14:08:00 +01:00
parent 9bf1c994cc
commit cfd00fea40
55 changed files with 1621 additions and 613 deletions
@@ -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 SwiftUI
class AddRoomSelectorViewProvider: MatrixItemChooserCoordinatorViewProvider {
@available(iOS 14, *)
func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView {
return AnyView(AddRoomSelector(viewModel: viewModel))
}
}
@@ -0,0 +1,69 @@
//
// 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
class AddRoomItemsProcessor: MatrixItemChooserProcessorProtocol {
// MARK: Private
private let parentSpace: MXSpace
// MARK: Setup
init(parentSpace: MXSpace) {
self.parentSpace = parentSpace
}
// MARK: MatrixItemChooserSelectionProcessorProtocol
var dataType: MatrixItemChooserType {
.room
}
func computeSelection(withIds itemsIds: [String], completion: @escaping (Result<Void, Error>) -> Void) {
addChild(from: itemsIds, at: 0, completion: completion)
}
func isItemIncluded(_ item: (MatrixListItemData)) -> Bool {
return !parentSpace.isRoomAChild(roomId: item.id)
}
// MARK: Private
func addChild(from roomIds: [String], at index: Int, completion: @escaping (Result<Void, Error>) -> Void) {
guard index < roomIds.count else {
completion(Result.success(()))
return
}
let roomId = roomIds[index]
guard !parentSpace.isRoomAChild(roomId: roomId) else {
addChild(from: roomIds, at: index + 1, completion: completion)
return
}
parentSpace.addChild(roomId: roomIds[index]) { [weak self] response in
switch response {
case .success:
self?.addChild(from: roomIds, at: index + 1, completion: completion)
case .failure(let error):
completion(Result.failure(error))
}
}
}
}
@@ -0,0 +1,48 @@
//
// 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 SwiftUI
@available(iOS 14.0, *)
struct AddRoomSelector: View {
// MARK: Properties
@ObservedObject var viewModel: MatrixItemChooserViewModel.Context
// MARK: Private
@Environment(\.theme) private var theme: ThemeSwiftUI
@ViewBuilder
var body: some View {
MatrixItemChooser(viewModel: viewModel)
.background(theme.colors.background)
.navigationBarItems(leading: Button(VectorL10n.cancel, action: {
viewModel.send(viewAction: .cancel)
})
.font(theme.fonts.body)
.foregroundColor(theme.colors.accent),
trailing: Button(VectorL10n.add, action: {
viewModel.send(viewAction: .done)
})
.font(theme.fonts.body)
.foregroundColor(viewModel.viewState.selectedItemIds.isEmpty ? theme.colors.quarterlyContent : theme.colors.accent)
.opacity(viewModel.viewState.selectedItemIds.isEmpty ? 0.7 : 1)
.disabled(viewModel.viewState.selectedItemIds.isEmpty))
}
}