stuff

Lrdsnow · Jun 17, 2024 · 438c1fd · 438c1fd
1 parent 97a56de
commit 438c1fd
Show file tree

Hide file tree

Showing 24 changed files with 1,333 additions and 167 deletions.
diff --git a/PurePKG.xcodeproj/project.pbxproj b/PurePKG.xcodeproj/project.pbxproj
diff --git a/PurePKG/Extentions/Compat.swift b/PurePKG/Extentions/Compat.swift
@@ -158,6 +158,15 @@ extension View {
             self
         }
     }
+    @ViewBuilder
+    func setAccentColor() -> some View {
+        if let accent = UserDefaults.standard.string(forKey: "accentColor"),
+           let accent_color = Color(hex: accent) {
+            self.accentColor(accent_color)
+        } else {
+            self
+        }
+    }
 }
 
 struct SectionC<Content: View>: View {
@@ -189,3 +198,82 @@ func openURL(_ url: URL) {
     UIApplication.shared.open(url)
     #endif
 }
+
+#if os(iOS)
+extension View {
+    @ViewBuilder
+    func sheetC<Content: View>(isPresented: Binding<Bool>, @ViewBuilder content: @escaping () -> Content) -> some View {
+        if #available(iOS 16.0, *), UIDevice.current.userInterfaceIdiom == .phone {
+            self.sheet(isPresented: isPresented, content: content)
+        } else {
+           self._sheetC(isPresented: isPresented, content: content)
+        }
+    }
+    @ViewBuilder
+    func purePresentationDetents() -> some View {
+        if #available(iOS 16.0, *), UIDevice.current.userInterfaceIdiom == .phone {
+            self.presentationDetents([.height(UIApplication.shared.windows[0].safeAreaInsets.bottom > 0 ? UIScreen.main.bounds.height/4 : UIScreen.main.bounds.height/3)])
+        } else {
+            self
+        }
+    }
+}
+
+extension View {
+    func _sheetC<Content: View>(isPresented: Binding<Bool>, @ViewBuilder content: @escaping () -> Content) -> some View {
+        self.background(FallbackSheetPresenter(isPresented: isPresented, content: content))
+    }
+}
+
+private struct FallbackSheetPresenter<Content: View>: UIViewControllerRepresentable {
+    @Binding var isPresented: Bool
+    let content: () -> Content
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(isPresented: $isPresented, content: content)
+    }
+
+    func makeUIViewController(context: Context) -> UIViewController {
+        return UIViewController()
+    }
+
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+        log("update")
+        if isPresented && uiViewController.presentedViewController == nil {
+            let hostingController = UIHostingController(rootView: content())
+            hostingController.modalPresentationStyle = .pageSheet
+            // let sheet = hostingController.sheetPresentationController {
+            if let sheet = (hostingController as NSObject).value(forKey: "sheetPresentationController") as? NSObject {
+                let height: CGFloat
+                if UIApplication.shared.windows.first?.safeAreaInsets.bottom ?? 0 > 0 {
+                    height = UIScreen.main.bounds.height / 4
+                } else {
+                    height = UIScreen.main.bounds.height / 3
+                }
+                // let detent = UISheetPresentationController.Detent = ._detent(withIdentifier: "custom_detent", height)
+                // sheet.detents = [detent]
+                sheet.setValue([CustomDetent(constant: height)], forKey: "detents")
+            }
+            uiViewController.present(hostingController, animated: true)
+        } else if !isPresented && uiViewController.presentedViewController != nil {
+            uiViewController.dismiss(animated: true)
+        }
+    }
+
+    class Coordinator: NSObject {
+        @Binding var isPresented: Bool
+        let content: () -> Content
+
+        init(isPresented: Binding<Bool>, content: @escaping () -> Content) {
+            _isPresented = isPresented
+            self.content = content
+        }
+
+        @objc func dismiss() {
+            log("dismissed")
+            isPresented = false
+        }
+    }
+}
+
+#endif
diff --git a/PurePKG/Main.swift b/PurePKG/Main.swift
@@ -96,11 +96,11 @@ struct PurePKGApp: App {
             #if os(watchOS)
             ContentViewWatchOS(tab: $tab, importedPackage: $importedPackage, showPackage: $showPackage)
                 .environmentObject(appData)
-                .accentColor(Color(hex: UserDefaults.standard.string(forKey: "accentColor") ?? "#EBC2FF"))
+                .setAccentColor()
             #else
             ContentView(tab: $tab, importedPackage: $importedPackage, showPackage: $showPackage, preview: false)
                 .environmentObject(appData)
-                .accentColor(Color(hex: UserDefaults.standard.string(forKey: "accentColor") ?? "#EBC2FF"))
+                .setAccentColor()
             #endif
         }
     }
@@ -200,7 +200,7 @@ struct ContentView: View {
                         Text("Search")
                     }
                     .tag(2)
-                if !appData.queued.all.isEmpty {
+                if !appData.queued.all.isEmpty || Device().osString == "tvOS" {
                     QueueView()
                         .tabItem {
                             Image(systemName: "list.bullet")

diff --git a/PurePKG/PurePKG.entitlements b/PurePKG/PurePKG.entitlements
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/PurePKG/Views/QueueView.swift b/PurePKG/Views/QueueView.swift
@@ -28,6 +28,9 @@ struct QueueView: View {
             VStack(alignment: .leading) {
                 if !showLog {
                     List {
+                        if appData.queued.all.isEmpty {
+                            Text("No Queued Tweaks")
+                        } else {
                         if !appData.queued.install.isEmpty {
                             Section(content: {
                                 ForEach(toInstall, id: \.id) { package in
@@ -61,9 +64,9 @@ struct QueueView: View {
                                 }
                             }, header: {
                                 Text("Install/Upgrade").foregroundColor(.accentColor)
-                                #if !os(iOS)
+#if !os(iOS)
                                     .padding(.leading).padding(.top)
-                                #endif
+#endif
                             })
                         }
                         if !appData.queued.uninstall.isEmpty {
@@ -97,12 +100,13 @@ struct QueueView: View {
                                 }
                             }, header: {
                                 Text("Uninstall").foregroundColor(.accentColor)
-                                #if !os(iOS)
+#if !os(iOS)
                                     .padding(.leading).padding(.top)
-                                #endif
+#endif
                             })
                         }
                     }
+                    }
                 } else {
                     Text(installLog).padding()
                 }
@@ -119,11 +123,13 @@ struct QueueView: View {
             #endif
             #if !os(macOS) && !os(watchOS)
                 .navigationBarItems(trailing: HStack {
+                    if !appData.queued.all.isEmpty {
                         Button(action: {
                             editing.toggle()
                         }, label: {
                             Image(systemName: "pencil")
                         })
+                    }
                 })
             #endif
         }
@@ -147,7 +153,7 @@ struct InstallQueuedButton: View {
     var body: some View {
         HStack {
             Spacer()
-            if done && !showLog {
+            if done && !showLog && !appData.queued.all.isEmpty {
                 Button(action: {
                     showLog = true
                 }, label: {
@@ -212,7 +218,7 @@ struct InstallQueuedButton: View {
                     .padding()
 #endif
                 Spacer()
-            }).borderedProminentButtonC().tintC(Color.accentColor.opacity(0.7))
+            }).borderedProminentButtonC().tintC(Color.accentColor.opacity(0.7)).disabled(appData.queued.all.isEmpty || installingQueue)
             Spacer()
         }
     }