Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iOS-2683 DI | Migrate object actions #1210

Merged
merged 3 commits into from
Apr 15, 2024
Merged

iOS-2683 DI | Migrate object actions #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c792df5
IOS-2683 Migrate dismiss
mgolovko Apr 12, 2024
064019f
IOS-2683 Update document subscription
mgolovko Apr 12, 2024
e061d56
IOS-2683 Update di
mgolovko Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Anytype.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9669,19 +9669,11 @@
path = Audioplayer;
sourceTree = "<group>";
};
53FF7CB626FCDB1600A5A592 /* ObjectActionsViews */ = {
53FF7CBA26FDD33400A5A592 /* ObjectActions */ = {
isa = PBXGroup;
children = (
53FF7CB426FCCDE800A5A592 /* ObjectActionRow.swift */,
53FF7CB726FCDB4B00A5A592 /* ObjectActionsView.swift */,
);
path = ObjectActionsViews;
sourceTree = "<group>";
};
53FF7CBA26FDD33400A5A592 /* ObjectActions */ = {
isa = PBXGroup;
children = (
53FF7CB626FCDB1600A5A592 /* ObjectActionsViews */,
53FF7CBB26FDD36200A5A592 /* ObjectActionsViewModel.swift */,
53FF7CBD26FDD37D00A5A592 /* ObjectAction.swift */,
);
Expand Down
7 changes: 4 additions & 3 deletions .../ObjectActionsViews/ObjectActionRow.swift → ...tings/ObjectActions/ObjectActionRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import SwiftUI

struct ObjectActionRow: View {
let setting: ObjectAction
let onTap: () -> Void
let onTap: () async throws -> Void

var body: some View {
Button {
onTap()
AsyncButton {
try await onTap()
UISelectionFeedbackGenerator().selectionChanged()
}
label: {
Expand All @@ -30,6 +30,7 @@ struct ObjectActionRow: View {
}
}
}
.frame(height: 108)
}

private enum Constants {
Expand Down
32 changes: 15 additions & 17 deletions ...bjectActionsViews/ObjectActionsView.swift → ...ngs/ObjectActions/ObjectActionsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,47 @@ import SwiftUI
struct ObjectActionsView: View {

@ObservedObject var viewModel: ObjectActionsViewModel

var body: some View {
if viewModel.objectActions.isEmpty {
EmptyView()
} else {
content
}
}
@Environment(\.dismiss) private var dismiss

var content: some View {
var body: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 20) {
ForEach(viewModel.objectActions) { setting in
ObjectActionRow(setting: setting) {
switch setting {
case .archive:
viewModel.changeArchiveState()
try await viewModel.changeArchiveState()
case .favorite:
viewModel.changeFavoriteSate()
try await viewModel.changeFavoriteSate()
case .locked:
viewModel.changeLockState()
try await viewModel.changeLockState()
case .undoRedo:
viewModel.undoRedoAction()
case .duplicate:
viewModel.duplicateAction()
try await viewModel.duplicateAction()
case .linkItself:
viewModel.linkItselfAction()
case .makeAsTemplate:
viewModel.makeAsTempalte()
try await viewModel.makeAsTempalte()
case .templateSetAsDefault:
viewModel.makeTemplateAsDefault()
case .delete:
viewModel.deleteAction()
try await viewModel.deleteAction()
case .createWidget:
viewModel.createWidget()
try await viewModel.createWidget()
case .copyLink:
viewModel.copyLinkAction()
}
}
}
}.padding(.horizontal, 16)
}
.frame(height: 108)
.snackbar(toastBarData: $viewModel.toastData)
.onChange(of: viewModel.dismiss) { _ in
dismiss()
}
.task {
await viewModel.startDocumentTask()
}
}
}
Loading
Loading