Add scroll to deleted & import views

Pinball3D · Nov 5, 2022 · 6720cae · 6720cae
1 parent aa46696
commit 6720cae
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 36 deletions.
diff --git a/Flipper/Packages/UI/Sources/Archive/Import/ImportView.swift b/Flipper/Packages/UI/Sources/Archive/Import/ImportView.swift
@@ -18,25 +18,29 @@ struct ImportView: View {
                 }
             }
 
-            CardView(
-                item: $viewModel.item,
-                isEditing: $viewModel.isEditing,
-                kind: .imported
-            )
-            .padding(.top, 6)
-            .padding(.horizontal, 24)
+            ScrollView {
+                VStack(alignment: .leading, spacing: 0) {
+                    CardView(
+                        item: $viewModel.item,
+                        isEditing: $viewModel.isEditing,
+                        kind: .imported
+                    )
+                    .padding(.top, 6)
+                    .padding(.horizontal, 24)
 
-            Button {
-                viewModel.add()
-            } label: {
-                Text("Save to Archive")
-                    .roundedButtonStyle(maxWidth: .infinity)
-            }
-            .padding(.top, 18)
-            .padding(.horizontal, 24)
-            .opacity(viewModel.isEditing ? 0 : 1)
+                    Button {
+                        viewModel.add()
+                    } label: {
+                        Text("Save to Archive")
+                            .roundedButtonStyle(maxWidth: .infinity)
+                    }
+                    .padding(.top, 18)
+                    .padding(.horizontal, 24)
+                    .opacity(viewModel.isEditing ? 0 : 1)
 
-            Spacer()
+                    Spacer()
+                }
+            }
         }
         .alert(isPresented: $viewModel.isError) {
             Alert(title: Text(viewModel.error))

diff --git a/Flipper/Packages/UI/Sources/Archive/Info/Deleted/DeletedInfoView.swift b/Flipper/Packages/UI/Sources/Archive/Info/Deleted/DeletedInfoView.swift
@@ -14,28 +14,38 @@ struct DeletedInfoView: View {
                 viewModel.dismiss()
             }
 
-            CardView(
-                item: $viewModel.item,
-                isEditing: $viewModel.isEditing,
-                kind: .deleted
-            )
-            .padding(.top, 6)
-            .padding(.horizontal, 24)
+            ScrollView {
+                VStack(alignment: .leading, spacing: 0) {
+                    CardView(
+                        item: $viewModel.item,
+                        isEditing: $viewModel.isEditing,
+                        kind: .deleted
+                    )
+                    .padding(.top, 6)
+                    .padding(.horizontal, 24)
 
-            VStack(alignment: .leading, spacing: 20) {
-                InfoButton(image: .init("Restore"), title: "Restore") {
-                    viewModel.restore()
-                }
-                .foregroundColor(.primary)
-                InfoButton(image: .init("Delete"), title: "Delete Permanently") {
-                    viewModel.delete()
+                    VStack(alignment: .leading, spacing: 20) {
+                        InfoButton(
+                            image: .init("Restore"),
+                            title: "Restore"
+                        ) {
+                            viewModel.restore()
+                        }
+                        .foregroundColor(.primary)
+                        InfoButton(
+                            image: .init("Delete"),
+                            title: "Delete Permanently"
+                        ) {
+                            viewModel.delete()
+                        }
+                        .foregroundColor(.sRed)
+                    }
+                    .padding(.top, 24)
+                    .padding(.horizontal, 24)
+
+                    Spacer()
                 }
-                .foregroundColor(.sRed)
             }
-            .padding(.top, 24)
-            .padding(.horizontal, 24)
-
-            Spacer()
         }
         .alert(isPresented: $viewModel.isError) {
             Alert(title: Text(viewModel.error))