Przeglądaj źródła

improve UI of home root view...put glucose between infoPanel and header

polscm32 2 lat temu
rodzic
commit
63760e620a

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift

@@ -54,7 +54,7 @@ struct CurrentGlucoseView: View {
                                 .string(from: Double(units == .mmolL ? $0.asMmolL : Decimal($0)) as NSNumber)! }
                         ?? "--"
                 )
-                .font(.largeTitle).fontWeight(.bold)
+                .font(.system(size: 60, weight: .bold))
                 .foregroundColor(alarm == nil ? colorOfGlucose : .loopRed)
 
                 image

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/Header/LoopView.swift

@@ -21,7 +21,7 @@ struct LoopView: View {
         return formatter
     }
 
-    private let rect = CGRect(x: 0, y: 0, width: 28, height: 28)
+    private let rect = CGRect(x: 0, y: 0, width: 35, height: 35)
     var body: some View {
         VStack(alignment: .center) {
             ZStack {

+ 12 - 7
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -101,24 +101,25 @@ extension Home {
             let colour: Color = colorScheme == .dark ? .gray.opacity(0.1) : .white
             RoundedRectangle(cornerRadius: 15)
                 .fill(colour)
+                .shadow(radius: 3)
 //                .frame(height: UIScreen.main.bounds.height / 6)
                 .overlay(
                     HStack(alignment: .bottom) {
                         Spacer()
                         cobIobView
                         Spacer()
-                        glucoseView
+//                        glucoseView
+//                        Spacer()
+                        loopView
                         Spacer()
                         pumpView
                         Spacer()
-                        loopView
-                        Spacer()
                     }
 //                    .frame(maxWidth: .infinity)
 //                    .padding(.top, 10 + geo.safeAreaInsets.top)
 //                    .padding(.bottom, 10)
                 )
-                .frame(height: UIScreen.main.bounds.height / 7)
+                .frame(height: UIScreen.main.bounds.height / 10)
                 .padding([.leading, .trailing], 10)
         }
 
@@ -532,6 +533,7 @@ extension Home {
                     .fill(colourRectangle)
                     .frame(height: 50 + geo.safeAreaInsets.bottom)
                     .cornerRadius(15)
+                    .shadow(radius: 3)
                     .padding([.leading, .trailing], 10)
 
                 HStack {
@@ -647,6 +649,9 @@ extension Home {
                     header(geo)
                         .padding(.top, 60)
 
+                    glucoseView
+                        .padding(.vertical)
+
                     infoPanel
                         .padding(.vertical, 3)
 
@@ -658,15 +663,15 @@ extension Home {
                         .frame(height: UIScreen.main.bounds.height / 2)
 
                     pickerPanel(geo)
-                        .padding(.top, 15)
+                        .padding(.top, 5)
                     legendPanel
-                        .padding(.top, 15)
+                        .padding(.top, 5)
 
 //                    profiles(geo)
 //                        .padding(.top, 2)
 
                     bottomPanel(geo)
-                        .padding(.top, 40)
+                        .padding(.top, 2)
                 }
                 .edgesIgnoringSafeArea(.vertical)
             }