Fixed some problems

Scroll position and file loading
Aemi-Studio · Mar 6, 2024 · 4a129e5 · 4a129e5
1 parent 18eebd2
commit 4a129e5
Show file tree

Hide file tree

Showing 29 changed files with 518 additions and 306 deletions.
diff --git a/Bilbary for iPad/Bilbary.swift b/Bilbary for iPad/Bilbary.swift
@@ -17,7 +17,7 @@ struct Bilbary: App {
 
     init() {
         do {
-            dataModel.container = try ModelContainer(for: Book.self, BookProgress.self)
+            dataModel.container = try ModelContainer(for: Book.self, BookSession.self)
         } catch {
             fatalError(
                 "Something happened when creating the model container."

diff --git a/Bilbary for iPad/Views/Components/BlurTransition.swift b/Bilbary for iPad/Views/Components/BlurTransition.swift
@@ -0,0 +1,26 @@
+//
+//  BlurTransition.swift
+//  Bilbary
+//
+//  Created by Guillaume Coquard on 06/03/24.
+//
+
+import SwiftUI
+
+struct BlurTransition: ViewModifier {
+    let blurValue: CGFloat
+
+    func body(content: Content) -> some View {
+        content
+            .blur(radius: blurValue)
+    }
+}
+
+extension AnyTransition {
+    static var blur: AnyTransition {
+        .modifier(
+            active: BlurTransition(blurValue: 20),
+            identity: BlurTransition(blurValue: 0)
+        )
+    }
+}
diff --git a/Bilbary for iPad/Views/EPUB/EPUBScrollableContent.swift b/Bilbary for iPad/Views/EPUB/EPUBScrollableContent.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import OSLog
 
 struct EPUBScrollableContent: View {
 
@@ -16,36 +17,82 @@ struct EPUBScrollableContent: View {
 
     var book: Book
 
-    private var session: BookProgress? {
+    private var session: BookSession? {
         read.currentSession
     }
 
     var body: some View {
         VStack {
-            ScrollView {
-                VStack {
-                    ForEach(book.content.strings.prefix(10), id: \.self) { paragraph in
-                        VStack(alignment: .leading, spacing: 0) {
-                            Text(
-                                cust.style.present(
-                                    paragraph
-                                )
-                            )
-                            .lineSpacing( cust.lineHeight )
-                            .padding(.bottom, cust.paragraphSpacing)
+            VStack(alignment: .leading) {
+                if read.selectedBook != nil {
+                    ScrollView(.vertical) {
+                        LazyVStack(alignment: .leading, spacing: cust.paragraphSpacing) {
+                            ForEach(book.content.formatted, id: \.id) { paragraph in
+                                HStack {
+                                    Text(
+                                        cust.style.present(
+                                            paragraph.content
+                                        )
+                                    )
+                                    .lineSpacing( cust.lineHeight )
+                                    .multilineTextAlignment(.leading)
+
+                                    Spacer()
+                                }
+                                .padding(.horizontal, 80)
+                                .frame(width: view.screenWidth)
+                                .scrollTransition(axis: .vertical, transition: {
+                                    $0
+                                        .blur(radius: $1.isIdentity ? 0 : 10)
+                                        .opacity( $1.isIdentity ? 1 : 0.5 )
+                                })
+                                .tag(paragraph.id)
+                                .id(paragraph.id)
+                            }
+                        }
+                        .scrollTargetLayout()
+                    }
+                    .overlay {
+                        ZStack {
+                            VStack {
+                                LinearGradient(colors: [
+                                    Color.userDefinedBackground,
+                                    Color.clear,
+                                    Color.clear,
+                                    Color.clear
+                                ], startPoint: .top, endPoint: .center)
+                                Spacer()
+                            }
+                            .frame(maxWidth: .infinity)
+
+                            VStack {
+                                Spacer()
+                                LinearGradient(colors: [
+                                    Color.userDefinedBackground,
+                                    Color.clear,
+                                    Color.clear
+                                ], startPoint: .bottom, endPoint: .center)
+                            }
+                            .frame(maxWidth: .infinity)
                         }
-                        .frame(maxWidth: .infinity)
-                        .padding(.vertical)
+                        .allowsHitTesting(false)
                     }
+                    .defaultScrollAnchor(.top)
+                    .scrollPosition(id: $read.currentParagraphId, anchor: .center)
+                    .scrollIndicators(.never)
+                    .frame(minHeight: 200)
+                    .padding(0)
+                    .padding(.vertical)
+                } else {
+                    Spacer()
+                    EmptyView()
+                    Spacer()
                 }
-                .frame(minHeight: 200)
-                .frame(maxWidth: .infinity)
-                .padding(0)
             }
             .padding(0)
         }
+        .defersSystemGestures(on: .horizontal)
         .padding(.vertical, 0)
-        .padding(.horizontal, 80)
         .frame(width: view.screenWidth)
         .onAppear {
             if let session = self.session {

diff --git a/Bilbary for iPad/Views/EPUB/EPUBSwipeView.swift b/Bilbary for iPad/Views/EPUB/EPUBSwipeView.swift
@@ -26,7 +26,7 @@ struct EPUBSwipeView: View {
             .scrollTargetLayout()
         }
         .scrollDisabled(view.isAnyPopoverDisplayed)
-        .scrollPosition(id: $readModel.selectedBookHashValue, anchor: .center)
+        .scrollPosition(id: $readModel.selectedBookHashValue, anchor: .trailing)
         .scrollClipDisabled()
         .scrollTargetBehavior(.paging)
         .scrollIndicators(.never)

diff --git a/Bilbary for iPad/Views/Library/Book/BBookInfoCardStyle.swift b/Bilbary for iPad/Views/Library/Book/BBookInfoCardStyle.swift
@@ -14,6 +14,12 @@ struct BBookInfoCardStyle: ViewModifier {
             .frame(maxWidth: .infinity)
             .background(.regularMaterial)
             .clipShape(.rect(cornerRadius: 12))
+            .overlay {
+                RoundedRectangle(cornerRadius: 12)
+                    .stroke(Color.black.opacity(0.1), lineWidth: 0.1)
+                    .foregroundStyle(.clear)
+            }
+            .shadow(color: Color.black.opacity(0.2), radius: 12, y: 4)
     }
 }
 

diff --git a/Bilbary for iPad/Views/Library/LibraryContentView.swift b/Bilbary for iPad/Views/Library/LibraryContentView.swift
@@ -32,6 +32,7 @@ struct LibraryContentView: View {
             }
             Spacer()
         }
+        .scrollClipDisabled()
         .padding(.horizontal)
         .navigationTitle("Library")
         .navigationBarTitleDisplayMode(.automatic)

diff --git a/Bilbary for iPad/Views/Streak/BStreakValidation.swift b/Bilbary for iPad/Views/Streak/BStreakValidation.swift
@@ -49,7 +49,7 @@ struct BStreakValidation: View {
             if !goalModel.isStreakValidated {
                 DispatchQueue.main.async {
                     withAnimation(.linear(duration: BReadModel.timerIncrement)) {
-                        goalModel.streakValidationProgressRemaining = goalModel.streakValidationProgressRemaining - BReadModel.timerIncrement
+                        goalModel.streakValidationProgressRemaining -= BReadModel.timerIncrement
                     }
                 }
             }