Library Refactoring (#9)

* Tidying things again * Library Refactoring A lot has been going on
Aemi-Studio · Mar 4, 2024 · 9107d2d · 9107d2d
1 parent bc74d5c
commit 9107d2d
Show file tree

Hide file tree

Showing 75 changed files with 1,918 additions and 1,164 deletions.
diff --git a/Bilbary for iPad/BilbaryApp.swift → Bilbary for iPad/Bilbary.swift b/Bilbary for iPad/BilbaryApp.swift → Bilbary for iPad/Bilbary.swift
@@ -1,5 +1,5 @@
 //
-//  BilbaryApp.swift
+//  Bilbary.swift
 //  iits
 //
 //  Created by Guillaume Coquard on 13/02/24.
@@ -8,10 +8,10 @@
 import SwiftUI
 
 @main
-struct BilbaryApp: App {
+struct Bilbary: App {
     var body: some Scene {
         WindowGroup {
-            MainView()
+            BilbaryView()
         }
     }
 }
diff --git a/Bilbary for iPad/BilbaryView.swift b/Bilbary for iPad/BilbaryView.swift
@@ -0,0 +1,36 @@
+//
+//  BilbaryView.swift
+//  iits
+//
+//  Created by Guillaume Coquard on 13/02/24.
+//
+
+import SwiftUI
+import OSLog
+
+struct BilbaryView: View {
+
+    @State
+    private var view: RViewModel = .shared
+
+    var body: some View {
+        HStack(spacing: 0) {
+            LibraryView()
+            Divider()
+                .padding(0)
+                .opacity(view.isLibraryOpen ? 1 : 0)
+            ContentView()
+        }
+        .padding(0)
+        .ignoresSafeArea()
+        .orientationUpdatesScreen()
+        .sheet(isPresented: $view.displayOnboarding) {
+            OnboardingView()
+        }
+
+    }
+}
+
+#Preview {
+    BilbaryView()
+}
diff --git a/Bilbary for iPad/MainView.swift b/Bilbary for iPad/MainView.swift
diff --git a/Bilbary for iPad/Views/BookInformationView.swift b/Bilbary for iPad/Views/BookInformationView.swift
diff --git a/Bilbary for iPad/Views/BookPlaceholder.swift b/Bilbary for iPad/Views/BookPlaceholder.swift
diff --git a/Bilbary for iPad/Views/Components/RButton.swift b/Bilbary for iPad/Views/Components/RButton.swift
@@ -139,5 +139,6 @@ struct RButton<L>: RActionable, View {
         .onRelease {
             self.isActive = false
         }
+        .disabled(!isShown)
     }
 }
diff --git a/Bilbary for iPad/Views/Components/RPopover.swift b/Bilbary for iPad/Views/Components/RPopover.swift
@@ -80,11 +80,11 @@ struct RPopover<L, P>: RActionable, View {
         switch view.isTogglable(self.type) {
         case 0:
             self.isPresented.toggle()
-            view.setPopover(to: self.type)
+            view.updatePopover(to: self.type)
         case 1:
             self.isPresented.toggle()
         default:
-            view.setPopover(to: .none)
+            view.updatePopover(to: .none)
         }
     }
 
@@ -135,12 +135,13 @@ struct RPopover<L, P>: RActionable, View {
                 ) {
                     self.popover
                         .onAppear {
-                            view.setPopover(to: self.type)
+                            view.updatePopover(to: self.type)
                         }
                         .onDisappear {
-                            view.setPopover(to: .none)
+                            view.updatePopover(to: .none)
                         }
                 }
         )
+        .disabled(!view.isInterfaceVisible)
     }
 }
diff --git a/Bilbary for iPad/Views/Components/RReadingTimeMenu.swift b/Bilbary for iPad/Views/Components/RReadingTimeMenu.swift
@@ -20,7 +20,7 @@ struct RReadingTimeMenu: View {
 
     var body: some View {
         RButton(
-            isShown: $viewModel.interfaceVisibility,
+            isShown: $viewModel.isInterfaceVisible,
             linkedTo: .readingTime
         ) {
             logger.log("sds")

diff --git a/Bilbary for iPad/Views/ContentView/BottomBar.swift b/Bilbary for iPad/Views/ContentView/BottomBar.swift
@@ -18,7 +18,7 @@ struct BottomBar: View {
     var body: some View {
         RBarRow {
             RPopover(
-                isShown: $view.interfaceVisibility,
+                isShown: $view.isInterfaceVisible,
                 title: NSLocalizedString(
                     "Informations",
                     comment: "Information about the current open book"
@@ -41,7 +41,7 @@ struct BottomBar: View {
             }
         } trailing: {
             RPopover(
-                isShown: $view.interfaceVisibility,
+                isShown: $view.isInterfaceVisible,
                 title: NSLocalizedString("Text Customization", comment: ""),
                 systemImage: "textformat.size",
                 type: .customization

diff --git a/Bilbary for iPad/Views/ContentView/ContentView.swift b/Bilbary for iPad/Views/ContentView/ContentView.swift
@@ -18,37 +18,43 @@ struct ContentView: View {
     private let logger: Logger = .views
 
     var body: some View {
-        NavigationStack(path: $view.contentPath) {
-            ScrollView(.horizontal) {
+        ScrollView(.horizontal) {
+            NavigationStack(path: $view.contentPath) {
                 VStack(spacing: 0) {
                     TopBar()
+                        .padding(.horizontal, 74)
                     EPUBView()
                     BottomBar()
+                        .padding(.horizontal, 74)
                 }
-                .padding(100)
+                .padding(.vertical, 64)
                 .safeAreaPadding()
-                .frame(minWidth: view.proxy?.size.width ?? UIWindow.current?.screen.bounds.width)
-                .frame(maxWidth: view.proxy?.size.width ?? UIWindow.current?.screen.bounds.width)
+                .frame(minWidth: view.screenWidth)
+                .frame(maxWidth: view.screenWidth)
+                .toolbar(.hidden, for: .navigationBar)
+                .toolbar(.hidden, for: .tabBar)
+                .toolbar(.hidden, for: .bottomBar)
             }
-            .scrollDisabled(true)
-            .onTapGesture {
-                withAnimation {
-                    if !view.libraryVisibility {
-                        logger.info("\(String(describing: view.isAnyPopoverDisplayed))")
-                        logger.info("\(String(describing: view.activePopover))")
-                        if !view.isAnyPopoverDisplayed {
-                            view.interfaceVisibility.toggle()
-                        }
-                    } else {
-                        view.libraryVisibility.toggle()
-                    }
+            .frame(minWidth: view.screenWidth)
+            .frame(maxWidth: view.screenWidth)
+            .fixedSize(horizontal: true, vertical: false)
+        }
+        .safeAreaPadding()
+        .scrollDisabled(true)
+        .contentShape(Rectangle())
+        .onTapGesture {
+            withAnimation {
+                if !view.isAnyPopoverDisplayed {
+                    view.isInterfaceVisible.toggle()
+                } else
+                if view.isLibraryOpen {
+                    view.toggleLibrary()
                 }
             }
-            .contentShape(Rectangle())
-            .toolbar(.hidden, for: .navigationBar)
         }
     }
 }
+
 #Preview {
     ContentView(book: nil)
 }
diff --git a/Bilbary for iPad/Views/ContentView/TopBar.swift b/Bilbary for iPad/Views/ContentView/TopBar.swift
@@ -16,19 +16,22 @@ struct TopBar: View {
 
         RBarRow {
             RButton(
-                isShown: $view.interfaceVisibility,
-                title: NSLocalizedString("Library", comment: "Library"),
+                isShown: $view.isInterfaceVisible,
+                title: NSLocalizedString(
+                    "Library",
+                    comment: "Library"
+                ),
                 systemImage: "books.vertical",
                 systemImageActive: "books.vertical.fill",
                 linkedTo: .library
             ) {
-                view.libraryVisibility.toggle()
+                view.toggleLibrary()
             }
         } center: {
             RReadingTimeMenu()
         } trailing: {
             RPopover(
-                isShown: $view.interfaceVisibility,
+                isShown: $view.isInterfaceVisible,
                 title: NSLocalizedString("Streak", comment: ""),
                 systemImage: "timer",
                 type: .goalStreak

diff --git a/Bilbary for iPad/Views/EPUB/EPUBScrollableContent.swift b/Bilbary for iPad/Views/EPUB/EPUBScrollableContent.swift
@@ -0,0 +1,49 @@
+//
+//  EPUBScrollableContent.swift
+//  Bilbary
+//
+//  Created by Guillaume Coquard on 03/03/24.
+//
+
+import SwiftUI
+
+struct EPUBScrollableContent: View {
+
+    @State
+    private var view: RViewModel = .shared
+
+    var book: Book
+
+    var body: some View {
+        VStack {
+            ScrollView {
+                VStack {
+                    ForEach((book.content?.strings ?? []).prefix(10), id: \.self) { paragraph in
+                        VStack {
+                            Text(paragraph)
+                        }
+                        .frame(maxWidth: .infinity)
+                        .padding(.vertical)
+                    }
+                }
+                .font(.title2)
+                .fontDesign(.serif)
+                .frame(minHeight: 200)
+                .frame(maxWidth: .infinity)
+                .padding(0)
+            }
+            .padding(0)
+        }
+        .padding(.vertical, 0)
+        .padding(.horizontal, 64)
+        //        .frame(minWidth: view.screenWidth - 128)
+        //        .frame(width: view.screenWidth - 128)
+        //        .frame(maxWidth: view.screenWidth - 128)
+        .containerRelativeFrame(
+            .horizontal,
+            count: 1,
+            spacing: 128,
+            alignment: .center
+        )
+    }
+}