view is created and responsive, I need now to implement the result processing of the actions

This commit is contained in:
Mauro Romito
2022-12-12 17:34:06 +01:00
parent 8d41c5a5e2
commit 27c4ba45fd
6 changed files with 168 additions and 66 deletions

View File

@@ -32,7 +32,7 @@ final class ComposerLinkActionCoordinator: NSObject, Coordinator, Presentable {
init(linkAction: LinkAction) {
viewModel = ComposerLinkActionViewModel(from: linkAction)
hostingController = VectorHostingController(rootView: ComposerLinkActionView(viewModel: viewModel.context))
hostingController = VectorHostingController(rootView: ComposerLinkAction(viewModel: viewModel.context))
super.init()
hostingController.presentationController?.delegate = self
}

View File

@@ -22,7 +22,7 @@ enum MockComposerLinkActionScreenState: MockScreenState, CaseIterable {
case create
var screenType: Any.Type {
ComposerLinkActionView.self
ComposerLinkAction.self
}
var screenView: ([Any], AnyView) {
@@ -37,7 +37,7 @@ enum MockComposerLinkActionScreenState: MockScreenState, CaseIterable {
}
return (
[viewModel],
AnyView(ComposerLinkActionView(viewModel: viewModel.context))
AnyView(ComposerLinkAction(viewModel: viewModel.context))
)
}
}

View File

@@ -1,4 +1,4 @@
//
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,12 @@
//
import Foundation
import WysiwygComposer
enum ComposerLinkActionViewAction: Equatable {
case cancel
case save
case remove
}
enum ComposerLinkActionViewModelResult: Equatable {
@@ -27,5 +30,50 @@ enum ComposerLinkActionViewModelResult: Equatable {
// MARK: View
struct ComposerLinkActionViewState: BindableState {
let title: String
let linkAction: LinkAction
var bindings: ComposerLinkActionBindings
}
extension ComposerLinkActionViewState {
var title: String {
// TODO: Add translations
switch linkAction {
case .createWithText, .create: return "Create a link"
case .edit: return "Edit link"
}
}
var shouldDisplayTextField: Bool {
switch linkAction {
case .createWithText: return true
default: return false
}
}
var shouldDisplayRemoveButton: Bool {
switch linkAction {
case .edit: return true
default: return false
}
}
var isSaveButtonDisabled: Bool {
guard isValidLink else { return true }
switch linkAction {
case .create: return false
case .createWithText: return bindings.text.isEmpty
case let .edit(originalLink): return bindings.linkUrl == originalLink
}
}
private var isValidLink: Bool {
guard let url = URL(string: bindings.linkUrl) else { return false }
return UIApplication.shared.canOpenURL(url)
}
}
struct ComposerLinkActionBindings {
var text: String
var linkUrl: String
}

View File

@@ -0,0 +1,100 @@
//
// Copyright 2022 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
struct ComposerLinkAction: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
@ObservedObject private var viewModel: ComposerLinkActionViewModel.Context
var body: some View {
NavigationView {
VStack(alignment: .leading, spacing: 0) {
VStack(alignment: .leading, spacing: 24) {
if viewModel.viewState.shouldDisplayTextField {
VStack(alignment: .leading, spacing: 8.0) {
// TODO: Add Translation
Text("Text")
.font(theme.fonts.subheadline)
.foregroundColor(theme.colors.secondaryContent)
TextField("", text: $viewModel.text)
.textFieldStyle(BorderedInputFieldStyle())
}
}
VStack(alignment: .leading, spacing: 8.0) {
// TODO: Add Translation
Text("Link")
.font(theme.fonts.subheadline)
.foregroundColor(theme.colors.secondaryContent)
TextField("", text: $viewModel.linkUrl)
.keyboardType(.URL)
.textFieldStyle(BorderedInputFieldStyle())
}
}
Spacer()
VStack(spacing: 16) {
Button(VectorL10n.save) {
viewModel.send(viewAction: .save)
}
.buttonStyle(PrimaryActionButtonStyle())
.disabled(viewModel.viewState.isSaveButtonDisabled)
if viewModel.viewState.shouldDisplayRemoveButton {
Button(VectorL10n.remove) {
viewModel.send(viewAction: .remove)
}
.buttonStyle(PrimaryActionButtonStyle(customColor: theme.colors.alert))
}
Button(VectorL10n.cancel) {
viewModel.send(viewAction: .cancel)
}
.buttonStyle(SecondaryActionButtonStyle())
}
}
.padding(.top, 40.0)
.padding(.bottom, 12.0)
.padding(.horizontal, 16.0)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(VectorL10n.cancel, action: {
viewModel.send(viewAction: .cancel)
})
}
ToolbarItem(placement: .principal) {
Text(viewModel.viewState.title)
.font(.headline)
.foregroundColor(theme.colors.primaryContent)
}
}
.navigationBarTitleDisplayMode(.inline)
.introspectNavigationController { navigationController in
ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
}
.accentColor(theme.colors.accent)
.navigationViewStyle(StackNavigationViewStyle())
}
}
init(viewModel: ComposerLinkActionViewModel.Context) {
self.viewModel = viewModel
}
}
struct ComposerLinkActionView_Previews: PreviewProvider {
static let stateRenderer = MockComposerLinkActionScreenState.stateRenderer
static var previews: some View {
stateRenderer.screenGroup()
}
}

View File

@@ -1,57 +0,0 @@
//
// Copyright 2022 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
struct ComposerLinkActionView: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
@ObservedObject private var viewModel: ComposerLinkActionViewModel.Context
var body: some View {
NavigationView {
VStack {}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(VectorL10n.cancel, action: {
viewModel.send(viewAction: .cancel)
})
}
ToolbarItem(placement: .principal) {
Text(viewModel.viewState.title)
.font(.headline)
.foregroundColor(theme.colors.primaryContent)
}
}
.navigationBarTitleDisplayMode(.inline)
.introspectNavigationController { navigationController in
ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
}
}
.accentColor(theme.colors.accent)
.navigationViewStyle(StackNavigationViewStyle())
}
init(viewModel: ComposerLinkActionViewModel.Context) {
self.viewModel = viewModel
}
}
struct ComposerLinkActionView_Previews: PreviewProvider {
static let stateRenderer = MockComposerLinkActionScreenState.stateRenderer
static var previews: some View {
stateRenderer.screenGroup()
}
}

View File

@@ -20,7 +20,6 @@ import WysiwygComposer
typealias ComposerLinkActionViewModelType = StateStoreViewModel<ComposerLinkActionViewState, ComposerLinkActionViewAction>
final class ComposerLinkActionViewModel: ComposerLinkActionViewModelType, ComposerLinkActionViewModelProtocol {
// MARK: - Properties
// MARK: Private
@@ -33,12 +32,22 @@ final class ComposerLinkActionViewModel: ComposerLinkActionViewModelType, Compos
init(from linkAction: LinkAction) {
let initialViewState: ComposerLinkActionViewState
let simpleBindings = ComposerLinkActionBindings(text: "", linkUrl: "")
// TODO: Add translations
switch linkAction {
case .edit:
initialViewState = .init(title: "Edit Link")
case .createWithText, .create:
initialViewState = .init(title: "Create a Link")
let link = "https://element.io"
initialViewState = .init(
linkAction: .edit(link: link),
bindings: .init(
text: "",
linkUrl: link
)
)
case .createWithText:
initialViewState = .init(linkAction: .createWithText, bindings: simpleBindings)
case .create:
initialViewState = .init(linkAction: .create, bindings: simpleBindings)
}
super.init(initialViewState: initialViewState)
@@ -48,6 +57,8 @@ final class ComposerLinkActionViewModel: ComposerLinkActionViewModelType, Compos
switch viewAction {
case .cancel:
callback?(.cancel)
case .save, .remove:
break
}
}
}