Restart SwiftUI rewrite

TestApp/Integrations/Carthage/project+lcp.yml

@@ -15,8 +15,8 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
- sources: 
+ deploymentTarget: "16.0"
+ sources:
  - path: Sources
  excludes:
  - Resources/Fonts

TestApp/Integrations/Carthage/project.yml

@@ -15,7 +15,7 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
+ deploymentTarget: "16.0"
  sources: 
  - path: Sources
  excludes:

TestApp/Integrations/CocoaPods/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '14.0'
+platform :ios, '16.0'
 
 target 'TestApp' do
  # Comment the next line if you don't want to use dynamic frameworks
@@ -23,7 +23,7 @@ end
 post_install do |installer|
  installer.pods_project.targets.each do |target|
  target.build_configurations.each do |config|
- config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
  config.build_settings['ENABLE_BITCODE'] = 'NO'
  end
  end

TestApp/Integrations/CocoaPods/Podfile+lcp

@@ -1,4 +1,4 @@
-platform :ios, '14.0'
+platform :ios, '16.0'
 
 target 'TestApp' do
  # Comment the next line if you don't want to use dynamic frameworks
@@ -26,7 +26,7 @@ end
 post_install do |installer|
  installer.pods_project.targets.each do |target|
  target.build_configurations.each do |config|
- config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
  config.build_settings['ENABLE_BITCODE'] = 'NO'
  end
  end

TestApp/Integrations/CocoaPods/project+lcp.yml

@@ -5,7 +5,7 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
+ deploymentTarget: "16.0"
  sources: 
  - path: Sources
  excludes:

TestApp/Integrations/CocoaPods/project.yml

@@ -5,7 +5,7 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
+ deploymentTarget: "16.0"
  sources: 
  - path: Sources
  excludes:

TestApp/Integrations/Local/project+lcp.yml

@@ -31,7 +31,7 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
+ deploymentTarget: "16.0"
  sources: 
  - path: Sources
  excludes:

TestApp/Integrations/Local/project.yml

@@ -29,8 +29,8 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
- sources: 
+ deploymentTarget: "16.0"
+ sources:
  - path: Sources
  excludes:
  - Resources/Fonts

TestApp/Integrations/SPM/project+lcp.yml

@@ -23,7 +23,7 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
+ deploymentTarget: "16.0"
  sources: 
  - path: Sources
  excludes:

TestApp/Integrations/SPM/project.yml

@@ -21,8 +21,8 @@ targets:
  TestApp:
  type: application
  platform: iOS
- deploymentTarget: "14.0"
- sources: 
+ deploymentTarget: "16.0"
+ sources:
  - path: Sources
  excludes:
  - Resources/Fonts

TestApp/README.md

@@ -2,7 +2,7 @@
 
 This sample application demonstrates how to integrate the Readium Swift toolkit in your own reading app. Stable versions are [published on TestFlight](https://testflight.apple.com/join/lYEMEfBr).
 
-:warning: The Readium toolkit itself supports down to iOS 11, but the Test App requires iOS 14 and Xcode 13.2.
+:warning: The Readium toolkit itself supports down to iOS 13, but the Test App requires iOS 16 and Xcode 13.2.
 
 ## Features
 

TestApp/Sources/About/Views/About.swift

@@ -0,0 +1,40 @@
+//
+// 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 SwiftUI
+
+struct About: View {
+ var body: some View {
+ VStack(alignment: .leading, spacing: 20) {
+ Text("Version")
+ .font(.title2)
+ HStack(spacing: 10) {
+ Text("Version").frame(width: 170.0, alignment: .leading)
+ Text("2.3.0")
+ }
+ HStack(spacing: 10) {
+ Text("Build").frame(width: 170.0, alignment: .leading)
+ Text("1")
+ }
+ Text("Copyright").font(.title2)
+ Link("© 2022 European Digital Reading Lab",
+ destination: URL(string: "https://www.edrlab.org/")!)
+ Link("[BSD-3 License]",
+ destination: URL(string: "https://opensource.org/licenses/BSD-3-Clause")!)
+ Text("Acknowledgements").font(.title2)
+ Text("R2 Reader wouldn't have been developed without the financial help of the French State.")
+ Image("rf")
+ }
+ .padding()
+ .navigationTitle("About")
+ }
+}
+
+struct About_Previews: PreviewProvider {
+ static var previews: some View {
+ About()
+ }
+}

TestApp/Sources/App/AppModule.swift

@@ -28,7 +28,7 @@ final class AppModule {
 
  init() throws {
  let file = Paths.library.appendingPath("database.db", isDirectory: false)
- let db = try Database(file: file.url)
+ let db = try Database(file: file.url, migrations: [InitialMigration()])
  print("Created database at \(file.path)")
 
  let books = BookRepository(db: db)

TestApp/Sources/Bookshelf/Views/AddBookSheet.swift

@@ -0,0 +1,48 @@
+//
+// 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 SwiftUI
+
+struct AddBookSheet: View {
+ @Environment(\.dismiss) private var dismiss
+ var action: (String) -> Void
+
+ @State var url: String = ""
+
+ var body: some View {
+ NavigationStack {
+ Form {
+ TextField("URL", text: $url)
+ .keyboardType(.URL)
+ .autocapitalization(.none)
+ }
+ .navigationTitle("Add a Book")
+ .toolbar(content: toolbarContent)
+ }
+ }
+
+ @ToolbarContentBuilder
+ private func toolbarContent() -> some ToolbarContent {
+ ToolbarItem(placement: .navigationBarLeading) {
+ Button(.cancel) {
+ dismiss()
+ }
+ }
+ ToolbarItem(placement: .navigationBarTrailing) {
+ Button(.save) {
+ action(url)
+ dismiss()
+ }
+ .disabled(url.isEmpty)
+ }
+ }
+}
+
+// struct AddBookSheet_Previews: PreviewProvider {
+// static var previews: some View {
+// AddBookSheet(showingSheet: true)
+// }
+// }

TestApp/Sources/Bookshelf/Views/Bookshelf.swift

@@ -0,0 +1,62 @@
+//
+// 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 Bookshelf: View {
+ let bookRepository: BookRepository
+ let reader: (Book) -> Reader
+
+ @State private var showingSheet = false
+ @State private var books: [Book] = []
+
+ var body: some View {
+ NavigationStack {
+ VStack {
+ // TODO: figure out what the best column layout is for phones and tablets
+ let columns: [GridItem] = [GridItem(.adaptive(minimum: Constant.bookCoverWidth + Constant.adaptiveGridDelta))]
+ ScrollView {
+ LazyVGrid(columns: columns, spacing: 20) {
+ ForEach(books, id: \.self) { book in
+ NavigationLink(value: book) {
+ BookCover(title: book.title, authors: book.authors, url: book.cover?.url)
+ }
+ .buttonStyle(.plain)
+ }
+ }
+ // TODO: handle error
+ .onReceive(bookRepository.all()
+ .replaceError(with: [])
+ ) { books in
+ self.books = books
+ }
+ }
+ }
+ .navigationTitle("Bookshelf")
+ .navigationDestination(for: Book.self) { book in
+ reader(book)
+ }
+ .toolbar(content: toolbarContent)
+ }
+ .sheet(isPresented: $showingSheet) {
+ AddBookSheet { url in
+ // TODO: validate the URL and import the book
+ }
+ }
+ }
+}
+
+extension Bookshelf {
+ @ToolbarContentBuilder
+ private func toolbarContent() -> some ToolbarContent {
+ ToolbarItem(placement: .navigationBarTrailing) {
+ Button(.add, action: {
+ showingSheet = true
+ })
+ }
+ }
+}

TestApp/Sources/Catalogs/Views/AddFeedSheet.swift

@@ -0,0 +1,55 @@
+//
+// 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 SwiftUI
+
+/// Sheet to add a new OPDS catalog via a URL
+struct AddFeedSheet: View {
+ typealias ActionCallback = ((title: String, url: String)) -> Void
+
+ @Environment(\.dismiss) private var dismiss
+ var action: ActionCallback
+
+ @State var title: String = ""
+ @State var url: String = ""
+
+ var body: some View {
+ NavigationStack {
+ Form {
+ Section {
+ TextField("Feed Title", text: $title)
+ TextField("URL", text: $url)
+ .keyboardType(.URL)
+ .autocapitalization(.none)
+ }
+ }
+ .navigationBarTitle("Add an OPDS Feed")
+ .toolbar(content: toolbarContent)
+ }
+ }
+
+ @ToolbarContentBuilder
+ private func toolbarContent() -> some ToolbarContent {
+ ToolbarItem(placement: .navigationBarLeading) {
+ Button(.cancel) {
+ dismiss()
+ }
+ }
+ ToolbarItem(placement: .navigationBarTrailing) {
+ Button(.save) {
+ action((title: title, url: url))
+ dismiss()
+ }
+ .disabled(title.isEmpty || url.isEmpty)
+ }
+ }
+}
+
+// struct AddFeedSheet_Previews: PreviewProvider {
+// static var previews: some View {
+// AddFeedSheet()
+// }
+// }