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

Feature/update tag #410

Merged
merged 5 commits into from
Feb 8, 2024
Merged

Feature/update tag #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
279624d
Adopt concurrency
bourvill Jan 29, 2024
e972656
Targeted concurrency
bourvill Jan 30, 2024
1639f1f
Update tag
bourvill Jan 30, 2024
8851be4
Add tag in entries list
bourvill Feb 8, 2024
e6e4c3b
resolve merge
bourvill Feb 8, 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
6 changes: 6 additions & 0 deletions App/Entity/Tag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ extension Tag {
@NSManaged dynamic var label: String
@NSManaged dynamic var slug: String
}

extension Tag: Comparable {
static func < (lhs: Tag, rhs: Tag) -> Bool {
lhs.label < rhs.label
}
}
19 changes: 19 additions & 0 deletions App/Features/Entry/EntryRowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,25 @@ struct EntryRowView: View {
.font(.footnote)
Spacer()
}
ScrollView(.horizontal) {
HStack {
ForEach(entry.tags.sorted(by: >)) { tag in
HStack(spacing: 2) {
Image(systemName: "tag")
Text(tag.label)
}
.foregroundStyle(Color.primary)
.padding(4)
.background(
Capsule()
.fill(Color.gray.quaternary)
.clipped()
)
.clipShape(Capsule())
.font(.footnote)
}
}
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions App/Features/Entry/EntryView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ struct EntryView: View {
)
}
.sheet(isPresented: $showTag) {
TagListFor(tagsForEntry: TagsForEntryPublisher(entry: entry))
.environment(\.managedObjectContext, context)
TagListFor(entry: entry)
.presentationDetents([.medium, .large])
}
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
Expand Down
3 changes: 2 additions & 1 deletion App/Features/Sync/AppSync.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ final class AppSync {
progress = 0
entriesSynced = []
Task.detached(priority: .userInitiated) { [unowned self] in
await synchronizeEntries()
await synchronizeTags()
await synchronizeEntries()
purge()
await MainActor.run {
self.inProgress = false
Expand Down Expand Up @@ -141,6 +141,7 @@ extension AppSync {
tags[wallabagTag.id] = tag
}
}
try backgroundContext.save()
} catch _ {}
}
}
59 changes: 46 additions & 13 deletions App/Features/Tag/TagListFor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,57 @@ import SwiftUI
struct TagListFor: View {
@EnvironmentObject var appState: AppState
@State private var tagLabel: String = ""
@ObservedObject var entry: Entry

@ObservedObject var tagsForEntry: TagsForEntryPublisher
@State var viewModel = TagsForEntryViewModel()

var body: some View {
VStack(alignment: .leading) {
Text("Tag").font(.largeTitle).bold().padding()
HStack {
TextField("New tag", text: $tagLabel)
Button(action: {
Task {
await tagsForEntry.add(tag: tagLabel)
tagLabel = ""
NavigationStack {
Form {
Section("New tag") {
TextField("Tag name", text: $tagLabel)
Button(action: {
Task {
await viewModel.add(tag: tagLabel, for: entry)
tagLabel = ""
}
}, label: {
if viewModel.isLoading {
ProgressView()
} else {
Text("Add")
}
})
.disabled(viewModel.isLoading)
}
Section("Tags list") {
List(viewModel.tags) { tag in
Button(action: {
Task {
await viewModel.toggle(tag: tag, for: entry)
}
}, label: {
HStack {
Text(tag.label)
Spacer()
if viewModel.isLoading {
ProgressView()
} else {
Image(systemName: tag.isChecked ? "checkmark.circle" : "circle")
}
}
.contentShape(Rectangle())
})
.buttonStyle(.plain)
.disabled(viewModel.isLoading)
}
}, label: { Text("Add") })
}.padding(.horizontal)
List(tagsForEntry.tags) { tag in
TagRow(tag: tag, tagsForEntry: tagsForEntry)
}
}
.task {
await viewModel.load(for: entry)
}
.navigationTitle("Tag")
.navigationBarTitleDisplayMode(.large)
}
}
}
Expand Down
32 changes: 0 additions & 32 deletions App/Features/Tag/TagRow.swift
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions App/Features/Tag/TagsForEntryPublisher.swift
View file
Open in desktop

This file was deleted.

55 changes: 55 additions & 0 deletions App/Features/Tag/TagsForEntryViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import CoreData
import Factory
import Foundation

@Observable
final class TagsForEntryViewModel {
@ObservationIgnored
@Injected(\.wallabagSession) private var session

var tags: [Tag] = []
var entry: Entry?
var isLoading = false

@ObservationIgnored
@CoreDataViewContext var coreDataContext: NSManagedObjectContext

@MainActor
func load(for entry: Entry) async {
tags = (try? coreDataContext.fetch(Tag.fetchRequestSorted())) ?? []
tags.filter { tag in
entry.tags.contains(tag)
}.forEach {
$0.isChecked = true
}
}

func toggle(tag: Tag, for entry: Entry) async {
defer {
isLoading = false
}
isLoading = true
if tag.isChecked {
await delete(tag: tag, for: entry)
} else {
await add(tag: tag, for: entry)
}

await load(for: entry)
}

func add(tag: String, for entry: Entry) async {
try? await session.add(tag: tag, for: entry)
await load(for: entry)
}

private func add(tag: Tag, for entry: Entry) async {
await add(tag: tag.label, for: entry)
tag.isChecked = true
}

private func delete(tag: Tag, for entry: Entry) async {
tag.isChecked = false
try? await session.delete(tag: tag, for: entry)
}
}
1 change: 0 additions & 1 deletion App/WallabagApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ struct WallabagApp: App {
#if os(iOS)
@State private var playerPublisher = Container.shared.playerPublisher()
#endif

@InjectedObject(\.appSetting) private var appSetting
@Injected(\.coreDataSync) private var coreDataSync
@Injected(\.coreData) private var coreData
Expand Down
16 changes: 6 additions & 10 deletions wallabag.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
09644CF225C986EE000FFDA1 /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CF025C986EE000FFDA1 /* SearchViewModel.swift */; };
09644CF325C986EE000FFDA1 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CF125C986EE000FFDA1 /* SearchView.swift */; };
09644CFD25C9870C000FFDA1 /* TagListFor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CFA25C9870C000FFDA1 /* TagListFor.swift */; };
09644CFE25C9870C000FFDA1 /* TagRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CFB25C9870C000FFDA1 /* TagRow.swift */; };
09644CFF25C9870C000FFDA1 /* TagsForEntryPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CFC25C9870C000FFDA1 /* TagsForEntryPublisher.swift */; };
09644CFF25C9870C000FFDA1 /* TagsForEntryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644CFC25C9870C000FFDA1 /* TagsForEntryViewModel.swift */; };
09644D0825C9871A000FFDA1 /* TipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644D0625C9871A000FFDA1 /* TipView.swift */; };
09644D0925C9871A000FFDA1 /* TipViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644D0725C9871A000FFDA1 /* TipViewModel.swift */; };
09644D1025C9872F000FFDA1 /* BundleKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644D0F25C9872F000FFDA1 /* BundleKey.swift */; };
Expand Down Expand Up @@ -220,8 +219,7 @@
09644CF025C986EE000FFDA1 /* SearchViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewModel.swift; sourceTree = "<group>"; };
09644CF125C986EE000FFDA1 /* SearchView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
09644CFA25C9870C000FFDA1 /* TagListFor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagListFor.swift; sourceTree = "<group>"; };
09644CFB25C9870C000FFDA1 /* TagRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagRow.swift; sourceTree = "<group>"; };
09644CFC25C9870C000FFDA1 /* TagsForEntryPublisher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagsForEntryPublisher.swift; sourceTree = "<group>"; };
09644CFC25C9870C000FFDA1 /* TagsForEntryViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagsForEntryViewModel.swift; sourceTree = "<group>"; };
09644D0625C9871A000FFDA1 /* TipView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TipView.swift; sourceTree = "<group>"; };
09644D0725C9871A000FFDA1 /* TipViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TipViewModel.swift; sourceTree = "<group>"; };
09644D0F25C9872F000FFDA1 /* BundleKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BundleKey.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -611,8 +609,7 @@
isa = PBXGroup;
children = (
09644CFA25C9870C000FFDA1 /* TagListFor.swift */,
09644CFB25C9870C000FFDA1 /* TagRow.swift */,
09644CFC25C9870C000FFDA1 /* TagsForEntryPublisher.swift */,
09644CFC25C9870C000FFDA1 /* TagsForEntryViewModel.swift */,
);
path = Tag;
sourceTree = "<group>";
Expand Down Expand Up @@ -1034,7 +1031,6 @@
099CD1312B501D950029E94A /* WallabagPlusStore.swift in Sources */,
09644CD725C986C0000FFDA1 /* ClientIdClientSecretViewModel.swift in Sources */,
09644CCB25C9869D000FFDA1 /* RegistrationView.swift in Sources */,
09644CFE25C9870C000FFDA1 /* TagRow.swift in Sources */,
09644BFC25C983F8000FFDA1 /* Entry.swift in Sources */,
097F81EB25CB18BA006C85F6 /* Router.swift in Sources */,
81505C5D2B5DC23C003B5CDE /* AddEntryIntent.swift in Sources */,
Expand Down Expand Up @@ -1062,7 +1058,7 @@
09644CDF25C986C6000FFDA1 /* LoginViewModel.swift in Sources */,
09644C5D25C98596000FFDA1 /* AddEntryView.swift in Sources */,
09644C6025C98596000FFDA1 /* EntryView.swift in Sources */,
09644CFF25C9870C000FFDA1 /* TagsForEntryPublisher.swift in Sources */,
09644CFF25C9870C000FFDA1 /* TagsForEntryViewModel.swift in Sources */,
09644D1025C9872F000FFDA1 /* BundleKey.swift in Sources */,
81505C5B2B5DC21F003B5CDE /* WallabagIntent.swift in Sources */,
09644BAF25C98213000FFDA1 /* RefreshButton.swift in Sources */,
Expand Down Expand Up @@ -1281,7 +1277,7 @@
ONLY_ACTIVE_ARCH = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_STRICT_CONCURRENCY = targeted;
};
name = Debug;
};
Expand Down Expand Up @@ -1339,7 +1335,7 @@
MTL_FAST_MATH = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_STRICT_CONCURRENCY = targeted;
};
name = Release;
};
Expand Down
Loading