Procházet zdrojové kódy

remove padding and replace it with spacer()

polscm32 před 2 roky
rodič
revize
01c3de7a5b

+ 11 - 0
FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift

@@ -169,3 +169,14 @@ struct PumpView: View {
         }
     }
 }
+
+struct Hairline: View {
+    let color: Color
+
+    var body: some View {
+        Rectangle()
+            .fill(color)
+            .frame(width: UIScreen.main.bounds.width / 1.3, height: 1)
+            .opacity(0.5)
+    }
+}

+ 17 - 9
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -640,32 +640,40 @@ extension Home {
                             /// circles width is 110, loops width is 35 -> (110/2) - (35/2) = 55 - 17.5 = 37.5
                             .offset(x: UIScreen.main.bounds.width * 0.43, y: -37.5)
                             .padding(.top, 75)
+                            .padding(.trailing, 10)
                     }
 
+                    Spacer()
+
                     header(geo)
-                        .padding(.top, 40)
-                        .padding([.leading, .trailing], 10)
+                        .padding(.top, 15)
+                        .padding(.horizontal, 10)
+
+                    Spacer()
 
                     infoPanel
-                        .padding([.leading, .trailing], 10)
-                        .padding(.top, 25)
+                        .padding(.horizontal, 10)
 
                     RoundedRectangle(cornerRadius: 15)
                         .fill(colourChart)
                         .overlay(mainChart)
                         .clipShape(RoundedRectangle(cornerRadius: 15))
                         .shadow(radius: 3)
-                        .padding([.leading, .trailing], 10)
-                        .padding(.top, 5)
+                        .padding(.horizontal, 10)
                         .frame(maxHeight: UIScreen.main.bounds.height / 2.2)
 
+                    Spacer()
+
                     pickerPanel(geo)
-                        .padding(.top, 13)
+//
+                    Spacer()
+
                     legendPanel
-                        .padding(.top, 10)
+//
+                    Spacer()
 
                     bottomPanel(geo)
-                        .padding(.top, 3)
+//
                 }
                 .edgesIgnoringSafeArea(.vertical)
             }