소스 검색

small UI improvements

polscm32 2 년 전
부모
커밋
4cadf08fd4

+ 4 - 4
FreeAPS/Resources/Info.plist

@@ -44,6 +44,8 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>gcm-ciq</string>
@@ -70,6 +72,8 @@
 	<string>Bluetooth is used to communicate with insulin pump and continuous glucose monitor devices</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>Bluetooth is used to communicate with insulin pump and continuous glucose monitor devices</string>
+	<key>NSCalendarsFullAccessUsageDescription</key>
+	<string>To create events with BG reading values, so that they can be viewed on Apple Watch and CarPlay</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>Calendar is used to create a new glucose events.</string>
 	<key>NSFaceIDUsageDescription</key>
@@ -108,10 +112,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>NSCalendarsFullAccessUsageDescription</key>
-	<string>To create events with BG reading values, so that they can be viewed on Apple Watch and CarPlay</string>
-	<key>LSApplicationCategoryType</key>
-	<string></string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

+ 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(.system(size: 60, weight: .bold))
+                .font(.system(size: 45, weight: .bold))
                 .foregroundColor(alarm == nil ? colorOfGlucose : .loopRed)
 
                 image

+ 4 - 5
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -119,7 +119,7 @@ extension Home {
 //                    .padding(.top, 10 + geo.safeAreaInsets.top)
 //                    .padding(.bottom, 10)
                 )
-                .frame(height: UIScreen.main.bounds.height / 10)
+                .frame(height: UIScreen.main.bounds.height / 12)
                 .padding([.leading, .trailing], 10)
         }
 
@@ -525,13 +525,13 @@ extension Home {
             return (name: profileString, isOn: display)
         }
 
-        @ViewBuilder private func bottomPanel(_ geo: GeometryProxy) -> some View {
+        @ViewBuilder private func bottomPanel(_: GeometryProxy) -> some View {
             let colourRectangle: Color = colorScheme == .dark ? .gray.opacity(0.1) : .white
 
             ZStack {
                 Rectangle()
                     .fill(colourRectangle)
-                    .frame(height: 50 + geo.safeAreaInsets.bottom)
+                    .frame(height: UIScreen.main.bounds.height / 12)
                     .cornerRadius(15)
                     .shadow(radius: 3)
                     .padding([.leading, .trailing], 10)
@@ -647,13 +647,12 @@ extension Home {
             GeometryReader { geo in
                 VStack(spacing: 0) {
                     header(geo)
-                        .padding(.top, 60)
+                        .padding(.top, 55)
 
                     glucoseView
                         .padding(.vertical)
 
                     infoPanel
-                        .padding(.vertical, 3)
 
                     RoundedRectangle(cornerRadius: 15)
                         .fill(colourChart)