[FileManager] Remove List component

Author: Programistich

Flipper/iOS/UI/FileManager/Components/EmptyFolder.swift

@@ -25,7 +25,10 @@ extension FileManagerView.FileManagerListing {
 
                 Spacer()
             }
-            .frame(maxWidth: .infinity)
         }
     }
 }
+
+#Preview {
+    FileManagerView.FileManagerListing.EmptyFolder(onUpload: {})
+}

Flipper/iOS/UI/FileManager/Components/FileListingOptions.swift

@@ -74,12 +74,10 @@ fileprivate extension FileManagerView.FileManagerListing.FileListingOptions {
         @Binding var settings: FileManagerSettings
 
         var body: some View {
-            Button(
-                action: {
-                    settings.isHiddenFilesShow.toggle()
-                    isPresented = false
-                }
-            ) {
+            Button(action: {
+                settings.isHiddenFilesShow.toggle()
+                isPresented = false
+            }, label: {
                 HStack(spacing: 8) {
                     ZStack {
                         Circle()
@@ -99,7 +97,7 @@ fileprivate extension FileManagerView.FileManagerListing.FileListingOptions {
                         .foregroundColor(.primary)
                     Spacer()
                 }
-            }
+            })
             .padding(12)
         }
     }

Flipper/iOS/UI/FileManager/Components/FileManagerElements.swift

@@ -9,54 +9,35 @@ extension FileManagerView.FileManagerListing {
 
         let onTap: (ExtendedElement) -> Void
         let onDelete: (ExtendedElement) -> Void
-        let onAction: (ExtendedElement) -> Void
+        let onSelect: (ExtendedElement) -> Void
 
         private let columns = [GridItem(.flexible()), GridItem(.flexible())]
 
         var body: some View {
-            Group {
-                switch displayType {
-                case .list:
+            switch displayType {
+            case .list:
+                LazyVStack(spacing: 12) {
                     ForEach(elements) { element in
                         ElementRow(
                             element: element,
                             type: displayType,
-                            onAction: { onAction(element) }
+                            onAction: { onSelect(element) }
                         )
                         .onTapGesture { onTap(element) }
-                        .swipeActions {
-                            Button(role: .destructive) {
-                                onDelete(element)
-                            } label: {
-                                Image("Delete")
-                                    .foregroundColor(.red)
-                            }
-                            .tint(.red.opacity(0.1))
-                        }
                     }
-                case .grid:
-                    LazyVGrid(columns: columns, spacing: 12) {
-                        ForEach(elements) { element in
-                            ElementRow(
-                                element: element,
-                                type: displayType,
-                                onAction: { onAction(element) }
-                            )
-                            .onTapGesture { onTap(element) }
-                        }
+                }
+            case .grid:
+                LazyVGrid(columns: columns, spacing: 12) {
+                    ForEach(elements) { element in
+                        ElementRow(
+                            element: element,
+                            type: displayType,
+                            onAction: { onSelect(element) }
+                        )
+                        .onTapGesture { onTap(element) }
                     }
                 }
             }
-            .listRowSeparator(.hidden)
-            .listRowInsets(
-                .init(
-                    top: 0,
-                    leading: 0,
-                    bottom: 0,
-                    trailing: 0
-                )
-            )
-            .listRowBackground(Color.clear)
         }
     }
 }

Flipper/iOS/UI/FileManager/Components/NavigationPathView.swift

@@ -20,7 +20,7 @@ extension FileManagerView {
                 gradient: Gradient(
                     stops: [
                         Gradient.Stop(color: .background, location: 0.2),
-                        Gradient.Stop(color: .clear, location: 1),
+                        Gradient.Stop(color: .clear, location: 1)
                     ]
                 ),
                 startPoint: .leading,
@@ -69,6 +69,7 @@ extension FileManagerView {
                         .frame(width: 8, height: 24)
                 }
             }
+            .padding(4)
         }
 
         private func navigate(to index: Int) {

Flipper/iOS/UI/FileManager/FileManagerListing.swift

@@ -43,32 +43,37 @@ extension FileManagerView {
         }
 
         var body: some View {
-            VStack {
+            Group {
                 if let error = error {
                     Text(error)
                 } else if isLoading {
                     ProgressView()
                 } else {
-                    List {
-                        if path.isRoot {
-                            SDCardInfo(storage: storage)
-                        } else {
-                            NavigationPathView(path: path)
+                    FixedScrollView(showsIndicators: false) {
+                        Group {
+                            if path.isRoot {
+                                SDCardInfo(storage: storage)
+                            } else {
+                                NavigationPathView(path: path)
+                            }
                         }
+                        .padding([.horizontal, .top], 14)
 
-                        if elements.isEmpty {
-                            EmptyFolder(onUpload: showUpload)
-                        } else {
-                            FileManagerElements(
-                                elements: elements,
-                                displayType: settings.displayType,
-                                onTap: navigate,
-                                onDelete: { deleteFile($0) },
-                                onAction: { selectedElement = $0 }
-                            )
+                        Group {
+                            if elements.isEmpty {
+                                EmptyFolder(onUpload: showUpload)
+                            } else {
+                                FileManagerElements(
+                                    elements: elements,
+                                    displayType: settings.displayType,
+                                    onTap: navigate,
+                                    onDelete: { deleteFile($0) },
+                                    onSelect: { selectedElement = $0 }
+                                )
+                            }
                         }
+                        .padding(14)
                     }
-                    .listRowSpacing(12)
                 }
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -232,3 +237,29 @@ fileprivate extension Peripheral.Path {
         self == "/ext"
     }
 }
+
+private struct FixedScrollView<Content: View>: View {
+    let showsIndicators: Bool
+    let content: () -> Content
+
+    init(
+        showsIndicators: Bool,
+        @ViewBuilder content: @escaping () -> Content
+    ) {
+        self.showsIndicators = showsIndicators
+        self.content = content
+    }
+
+    var body: some View {
+        GeometryReader { geometry in
+            ScrollView(showsIndicators: showsIndicators) {
+                VStack(spacing: 0) {
+                    content()
+                    Spacer()
+                }
+                .frame(minHeight: geometry.size.height)
+            }
+            .frame(width: geometry.size.width)
+        }
+    }
+}