Marvin Polscheit 10 месяцев назад
Родитель
Сommit
46de05c187

+ 3 - 3
Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -59538,9 +59538,6 @@
         }
         }
       }
       }
     },
     },
-    "Clear filters" : {
-
-    },
     "Click to Snooze Alerts" : {
     "Click to Snooze Alerts" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {
@@ -178073,6 +178070,9 @@
         }
         }
       }
       }
     },
     },
+    "Select All" : {
+
+    },
     "Select CGM Model" : {
     "Select CGM Model" : {
       "localizations" : {
       "localizations" : {
         "bg" : {
         "bg" : {

+ 13 - 8
Trio/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -191,17 +191,19 @@ extension DataTable {
                 }
                 }
             }
             }
             .popover(isPresented: $showTreatmentTypeFilter, arrowEdge: .top) {
             .popover(isPresented: $showTreatmentTypeFilter, arrowEdge: .top) {
-                VStack(alignment: .leading, spacing: 10) {
+                VStack(alignment: .leading, spacing: 20) {
                     Button(action: {
                     Button(action: {
                         selectedTreatmentTypes = ["Bolus", "External Bolus", "SMB", "Temp Basal", "Suspend", "Other"]
                         selectedTreatmentTypes = ["Bolus", "External Bolus", "SMB", "Temp Basal", "Suspend", "Other"]
                     }) {
                     }) {
-                        HStack {
+                        HStack(spacing: 20) {
                             Image(systemName: selectedTreatmentTypes.count == 6 ? "checkmark.circle.fill" : "circle")
                             Image(systemName: selectedTreatmentTypes.count == 6 ? "checkmark.circle.fill" : "circle")
                                 .frame(width: 20)
                                 .frame(width: 20)
+                                .foregroundColor(Color.accentColor)
                             Text("Select All")
                             Text("Select All")
-                        }
+                                .foregroundColor(Color.primary)
+                        }.padding(4)
                     }
                     }
-                    .buttonStyle(.plain)
+                    .buttonStyle(.borderless)
 
 
                     Divider()
                     Divider()
 
 
@@ -209,13 +211,15 @@ extension DataTable {
                         Button(action: {
                         Button(action: {
                             toggleTreatmentType(type)
                             toggleTreatmentType(type)
                         }) {
                         }) {
-                            HStack {
+                            HStack(spacing: 20) {
                                 Image(systemName: selectedTreatmentTypes.contains(type) ? "checkmark.circle.fill" : "circle")
                                 Image(systemName: selectedTreatmentTypes.contains(type) ? "checkmark.circle.fill" : "circle")
                                     .frame(width: 20)
                                     .frame(width: 20)
+                                    .foregroundColor(Color.accentColor)
                                 Text(type)
                                 Text(type)
-                            }
+                                    .foregroundColor(Color.primary)
+                            }.padding(4)
                         }
                         }
-                        .buttonStyle(.plain)
+                        .buttonStyle(.borderless)
                     }
                     }
 
 
                     Divider()
                     Divider()
@@ -224,10 +228,11 @@ extension DataTable {
                         showTreatmentTypeFilter = false
                         showTreatmentTypeFilter = false
                     }
                     }
                     .frame(maxWidth: .infinity)
                     .frame(maxWidth: .infinity)
-                    .buttonStyle(.borderedProminent)
+                    .buttonStyle(.borderless)
                 }
                 }
                 .padding()
                 .padding()
                 .presentationCompactAdaptation(.popover)
                 .presentationCompactAdaptation(.popover)
+                .background(Color.chart)
             }
             }
         }
         }