Skip to content

SUI refactoring facets screen #501

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

Merged
merged 18 commits into from
Nov 19, 2024
Merged

SUI refactoring facets screen #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ffb321b
add feed preview
FuzzzzyBoy Nov 5, 2024
aa7be26
add OPDSFacetView
FuzzzzyBoy Nov 5, 2024
7f4f462
add navigation bar
FuzzzzyBoy Nov 5, 2024
bbec8b3
add dismiss button
FuzzzzyBoy Nov 5, 2024
c42acc6
refactoring
FuzzzzyBoy Nov 5, 2024
24a284d
add OPDSFacetLInkView
FuzzzzyBoy Nov 5, 2024
16da49e
add facetsList
FuzzzzyBoy Nov 5, 2024
d611b36
add tap handler
FuzzzzyBoy Nov 5, 2024
fc6e1de
setup for debug
FuzzzzyBoy Nov 5, 2024
ac8d6b9
use OPDSFacetsView
FuzzzzyBoy Nov 5, 2024
76cd665
remove unused
FuzzzzyBoy Nov 5, 2024
d95aac9
create view controller without factory
FuzzzzyBoy Nov 5, 2024
b27685e
remove unused
FuzzzzyBoy Nov 5, 2024
6232c51
use @Observable
FuzzzzyBoy Nov 5, 2024
e9d280a
restore
FuzzzzyBoy Nov 5, 2024
1dbc8a2
swiftlink fixes
FuzzzzyBoy Nov 5, 2024
32a69de
Merge branch 'develop' into SUI-refactoring-facets-screen
mickael-menu Nov 19, 2024
4ea891c
Various changes
mickael-menu Nov 19, 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
61 changes: 29 additions & 32 deletions TestApp/Sources/OPDS/Base.lproj/OPDS.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions TestApp/Sources/OPDS/OPDSCatalogs/OPDSCatalogsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import SwiftUI

struct OPDSCatalogsView: View {
@StateObject private var viewModel: OPDSCatalogsViewModel
@State private var viewModel: OPDSCatalogsViewModel

init(viewModel: OPDSCatalogsViewModel) {
_viewModel = StateObject(wrappedValue: viewModel)
self.viewModel = viewModel
}

var body: some View {
Expand Down
7 changes: 4 additions & 3 deletions TestApp/Sources/OPDS/OPDSCatalogs/OPDSCatalogsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

import Foundation

final class OPDSCatalogsViewModel: ObservableObject {
@Published var catalogs: [OPDSCatalog] = [] {
@Observable
final class OPDSCatalogsViewModel {
var catalogs: [OPDSCatalog] = [] {
didSet {
UserDefaults.standard.set(
catalogs.map(\.toDictionary),
Expand All @@ -16,7 +17,7 @@ final class OPDSCatalogsViewModel: ObservableObject {
}
}

@Published var editingCatalog: OPDSCatalog?
var editingCatalog: OPDSCatalog?

var openCatalog: ((URL, IndexPath) -> Void)?

Expand Down
77 changes: 0 additions & 77 deletions TestApp/Sources/OPDS/OPDSFacetViewController.swift
View file
Open in desktop

This file was deleted.

222 changes: 222 additions & 0 deletions TestApp/Sources/OPDS/OPDSFacets/Feed+preview.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
//
// Copyright 2024 Readium Foundation. All rights reserved.
// Use of this source code is governed by the BSD-style license
// available in the top-level LICENSE file of the project.
//

import Foundation
import ReadiumOPDS
import ReadiumShared

extension Feed {
static var preview: Feed {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mickael-menu Perhaps we should move these mocks to the swift-toolkit package?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to keep them here as it's out of scope for the toolkit itself.

try! OPDS2Parser.parse(
jsonData: .preview,
url: URL(string: "http://opds-spec.org/opds.json")!,
response: URLResponse()
).feed!
}
}

private extension Data {
static var preview: Data {
let jsonString = """
{
"@context": "http://opds-spec.org/opds.json",
"metadata": {
"title": "Example Library",
"modified": "2024-11-05T12:00:00Z",
"numberOfItems": 5000,
"itemsPerPage": 30
},
"links": [
{
"rel": "self",
"href": "/opds",
"type": "application/opds+json"
}
],
"facets": [
{
"metadata": {
"title": "Genre"
},
"links": [
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?genre=fiction",
"title": "Fiction",
"type": "application/opds+json",
"properties": {
"numberOfItems": 1250
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?genre=mystery",
"title": "Mystery & Detective",
"type": "application/opds+json",
"properties": {
"numberOfItems": 850
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?genre=scifi",
"title": "Science Fiction",
"type": "application/opds+json",
"properties": {
"numberOfItems": 725
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?genre=non-fiction",
"title": "Non-Fiction",
"type": "application/opds+json",
"properties": {
"numberOfItems": 2175
}
}
]
},
{
"metadata": {
"title": "Language"
},
"links": [
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?language=en",
"title": "English",
"type": "application/opds+json",
"properties": {
"numberOfItems": 3000
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?language=es",
"title": "Spanish",
"type": "application/opds+json",
"properties": {
"numberOfItems": 1000
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?language=ru",
"title": "Russian",
"type": "application/opds+json",
"properties": {
"numberOfItems": 800
}
}
]
},
{
"metadata": {
"title": "Availability"
},
"links": [
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?availability=free",
"title": "Free",
"type": "application/opds+json",
"properties": {
"numberOfItems": 1500
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?availability=subscription",
"title": "Subscription",
"type": "application/opds+json",
"properties": {
"numberOfItems": 2500
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?availability=buy",
"title": "Purchase Required",
"type": "application/opds+json",
"properties": {
"numberOfItems": 1000
}
}
]
},
{
"metadata": {
"title": "Reading Age"
},
"links": [
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?age=children",
"title": "Children (0-11)",
"type": "application/opds+json",
"properties": {
"numberOfItems": 800
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?age=teen",
"title": "Teen (12-18)",
"type": "application/opds+json",
"properties": {
"numberOfItems": 1200
}
},
{
"rel": "http://opds-spec.org/facet",
"href": "/opds/books/new?age=adult",
"title": "Adult (18+)",
"type": "application/opds+json",
"properties": {
"numberOfItems": 3000
}
}
]
}
],
"publications": [
{
"metadata": {
"title": "Sample Book",
"identifier": "urn:uuid:6409a00b-7bf2-405e-826c-3fdff0fd0734",
"modified": "2024-11-05T12:00:00Z",
"language": ["en"],
"published": "2024",
"author": [
{
"name": "Sample Author"
}
],
"subject": [
{
"name": "Fiction",
"code": "fiction"
}
]
},
"links": [
{
"rel": "http://opds-spec.org/acquisition",
"href": "/books/sample.epub",
"type": "application/epub+zip"
}
]
}
]
}
"""
guard let data = jsonString.data(using: .utf8) else {
return Data()
}
return data
}
}
39 changes: 39 additions & 0 deletions TestApp/Sources/OPDS/OPDSFacets/OPDSFacetLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
//
// Copyright 2024 Readium Foundation. All rights reserved.
// Use of this source code is governed by the BSD-style license
// available in the top-level LICENSE file of the project.
//

import ReadiumShared
import SwiftUI

struct OPDSFacetLink: View {
let link: ReadiumShared.Link

var body: some View {
HStack {
if let title = link.title {
Text(title)
.foregroundStyle(Color.primary)
}

Spacer()

if let count = link.properties.numberOfItems {
Text("\(count)")
.foregroundStyle(Color.secondary)
.font(.subheadline)
}

Image(systemName: "chevron.right")
}
.font(.body)
}
}

#Preview {
OPDSFacetLink(
link: Feed.preview.facets[0].links[0]
)
.padding()
}
Loading
Loading