Fixed spacings and layout on TableListScreen

DatepollSystems · Feb 25, 2024 · 99e7837 · 99e7837
1 parent 797ea6b
commit 99e7837
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/WaiterRobot/Ui/TableList/TableListFilterRow.swift b/WaiterRobot/Ui/TableList/TableListFilterRow.swift
@@ -20,8 +20,11 @@ struct TableListFilterRow: View {
                         .buttonStyle(.bordered)
                         .tint(group.hidden ? .primary : .blue)
                     }
-                }.padding(.horizontal)
+                }
+                .padding(.horizontal)
             }
+            .padding(.bottom, 4)
+
             Button {
                 onUnselectAll()
             } label: {

diff --git a/WaiterRobot/Ui/TableList/TableListScreen.swift b/WaiterRobot/Ui/TableList/TableListScreen.swift
@@ -14,7 +14,7 @@ struct TableListScreen: View {
     var body: some View {
         content()
             .navigationTitle(CommonApp.shared.settings.eventName)
-            .navigationBarTitleDisplayMode(.large)
+            .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .navigationBarTrailing) {
                     Button {
@@ -65,14 +65,19 @@ struct TableListScreen: View {
     private func tableList(data: KotlinArray<TableGroup>) -> some View {
         let tableGroups = Array(data)
 
-        VStack {
+        VStack(spacing: 0) {
             if tableGroups.count > 1 {
-                TableListFilterRow(
-                    tableGroups: tableGroups,
-                    onToggleFilter: { viewModel.actual.toggleFilter(tableGroup: $0) },
-                    onSelectAll: { viewModel.actual.showAll() },
-                    onUnselectAll: { viewModel.actual.hideAll() }
-                )
+                VStack {
+                    TableListFilterRow(
+                        tableGroups: tableGroups,
+                        onToggleFilter: { viewModel.actual.toggleFilter(tableGroup: $0) },
+                        onSelectAll: { viewModel.actual.showAll() },
+                        onUnselectAll: { viewModel.actual.hideAll() }
+                    )
+
+                    Divider()
+                }
+                .background(Color(UIColor.systemBackground))
             }
 
             if tableGroups.isEmpty {