FINALLY fixed scrolling

c22dev · Dec 21, 2023 · 2873de3 · 2873de3
1 parent c74be5f
commit 2873de3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/Geranium/GeraniumApp.swift b/Geranium/GeraniumApp.swift
@@ -36,7 +36,10 @@ struct GeraniumApp: App {
                         }
                         task.resume()
                     }
+                    #if targetEnvironment(simulator)
+                    #else
                     sendLog(RootHelper.loadMCM())
+                    #endif
                 }
                 .sheet(isPresented: $isFirstRun) {
                     if #available(iOS 16.0, *) {

diff --git a/Geranium/HomeView.swift b/Geranium/HomeView.swift
@@ -45,11 +45,6 @@ struct HomeView: View {
                     respring()
                 })
                 .padding()
-                Button("Reboot", action: {
-                    killall("com.apple.launchd")
-                    killall("launchd")
-                })
-                .padding()
                 Button("Rebuild Icon Cache", action: {
                     UIApplication.shared.alert(title:"Rebuilding Icon Cache...", body:"Please wait, your phone until your phone repsrings.", withButton: false)
                     let output = RootHelper.rebuildIconCache()
@@ -67,16 +62,18 @@ struct HomeView: View {
                         .ignoresSafeArea()
                 }
                 Text("")
-                List {
+                List() {
                     Section (header: Text("Credits")) {
                         LinkCell(imageLink: "https://cdn.discordapp.com/avatars/470637062870269952/67eb5d0a0501a96ab0a014ae89027e32.webp?size=160", url: "https://github.com/bomberfish", title: "BomberFish")
                         LinkCell(imageLink: "https://cdn.discordapp.com/avatars/396496265430695947/0904860dfb31d8b1f39f0e7dc4832b1e.webp?size=160", url: "https://github.com/donato-fiore", title: "fiore")
                         LinkCell(imageLink: "https://cdn.discordapp.com/avatars/412187004407775242/1df69ac879b9e5f98396553eeac80cec.webp?size=160", url: "https://github.com/sourcelocation", title: "sourcelocation")
                         LinkCell(imageLink: "https://avatars.githubusercontent.com/u/85764897?s=160&v=4", url: "https://github.com/haxi0", title: "haxi0")
                     }
                 }
-                // https://stackoverflow.com/a/75516471
-                .simultaneousGesture(DragGesture(minimumDistance: 0), including: .all)
+                .disableListScroll()
+                .onAppear {
+                    UITableView.appearance().isScrollEnabled = false
+                }
             }
         }
         .toolbar{

diff --git a/Geranium/Libs/Addon.swift b/Geranium/Libs/Addon.swift
@@ -312,3 +312,16 @@ func SuccessfulOrWhat(_ inputBoolean: Bool) -> String {
         return "Error"
     }
 }
+
+// https://stackoverflow.com/a/76762126
+extension View {
+@ViewBuilder
+func disableListScroll() -> some View {
+    if #available(iOS 16.0, *) {
+        self
+        .scrollDisabled(true)
+    } else {
+        self
+        .simultaneousGesture(DragGesture(minimumDistance: 0), including: .all)
+    }
+}}