version 5.2.1 - build 4199

Merge pull request #536 from paulplant/develop
disabled Address Sanitizer in xDrip Run Scheme
2024-05-06 23:13:56 +02:00 · 2024-05-06 22:28:24 +02:00 · 2024-05-06 14:27:29 +02:00 · 2024-05-05 20:07:13 +02:00 · 2024-05-05 19:51:41 +02:00 · 2024-05-05 12:40:03 +02:00
6 changed files with 13 additions and 10 deletions
--- a/Complication/Texts/es.lproj/WatchComplication.strings
+++ b/Complication/Texts/es.lproj/WatchComplication.strings
@ -5,6 +5,7 @@
  Created by Paul Plant on 26/4/24.
  Copyright © 2024 Johan Degraeve. All rights reserved.
 */
+"liveDataDisabled" = "Datos deshabilitados";
 "goTo" = "Id a";
 "appleWatch" = "Apple Watch";
 "settings" = "Configuración";
--- a/Complication/Views/AccessoryRectangularView.swift
+++ b/Complication/Views/AccessoryRectangularView.swift
@ -67,31 +67,31 @@ extension XDripWatchComplication.EntryView {
                    .padding(0)
                    
                    Text(Texts_WatchComplication.goTo)
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14))
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14))
                        .foregroundStyle(.colorPrimary)
                    
                    + Text(" \(ConstantsHomeView.applicationName)")
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14)).bold()
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14)).bold()
                        .foregroundStyle(.white)
                    
                    + Text(" -> ")
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14))
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14))
                        .foregroundStyle(.colorPrimary)
                    
                    + Text(Texts_WatchComplication.settings)
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14)).bold()
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14)).bold()
                        .foregroundStyle(.white)
                    
                    + Text(" -> ")
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14))
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14))
                        .foregroundStyle(.colorPrimary)
                    
                    + Text(Texts_WatchComplication.appleWatch + " ")
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14)).bold()
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14)).bold()
                        .foregroundStyle(.white)
                    
                    + Text(Texts_WatchComplication.toEnable)
-                        .font(.system(size: entry.widgetState.isSmallScreen() ? 12 : 14))
+                        .font(.system(size: entry.widgetState.isSmallScreen() ? 10 : 14))
                        .foregroundStyle(.colorPrimary)
                }
            }
--- a/xdrip.xcodeproj/xcshareddata/xcschemes/xdrip.xcscheme
+++ b/xdrip.xcodeproj/xcshareddata/xcschemes/xdrip.xcscheme
@ -43,7 +43,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableAddressSanitizer = "YES"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/xdrip/Constants/ConstantsGlucoseChartSwiftUI.swift
+++ b/xdrip/Constants/ConstantsGlucoseChartSwiftUI.swift
@ -76,6 +76,7 @@ enum ConstantsGlucoseChartSwiftUI {
    static let viewHeightWatchAccessoryRectangular: CGFloat = 55
    static let hoursToShowWatchAccessoryRectangular: Double = 5
    static let glucoseCircleDiameterWatchAccessoryRectangular: Double = 14
+    static let backgroundColorWatchAccessoryRectangular: Color = .clear
    
    // watch complication sizes for smaller watches
    static let viewWidthWatchAccessoryRectangularSmall: CGFloat = 160
--- a/xdrip/Managers/Charts/GlucoseChartType.swift
+++ b/xdrip/Managers/Charts/GlucoseChartType.swift
@ -144,6 +144,8 @@ public enum GlucoseChartType: Int, CaseIterable {
        switch self {
        case .siriGlucoseIntent:
            return ConstantsGlucoseChartSwiftUI.backgroundColorSiriGlucoseIntent
+        case .watchAccessoryRectangular:
+            return ConstantsGlucoseChartSwiftUI.backgroundColorWatchAccessoryRectangular
        default:
            return .black
        }
--- a/xdrip/Version.xcconfig
+++ b/xdrip/Version.xcconfig
@ -4,8 +4,8 @@
 //

 // Version [DEFAULT]
-XDRIP_MARKETING_VERSION = 5.2.0
-CURRENT_PROJECT_VERSION = 4198
+XDRIP_MARKETING_VERSION = 5.2.1
+CURRENT_PROJECT_VERSION = 4199

 // Optional override
 #include? "VersionOverride.xcconfig"
Author	SHA1	Message	Date
Johan Degraeve	5f43e5e274	version 5.2.1 - build 4199	2024-05-06 23:13:56 +02:00
Johan Degraeve	517e078a5a	Merge pull request #536 from paulplant/develop disabled Address Sanitizer in xDrip Run Scheme	2024-05-06 22:28:24 +02:00
Paul Plant	5d86d0c6bc	Update XDripWatchComplication+Entry.swift	2024-05-06 14:27:29 +02:00
Paul Plant	d6bd5ba6e4	correction to "data disabled" instructions for smaller Watches - also added missing "Data disabled" string in ES localization	2024-05-05 20:07:13 +02:00
Paul Plant	34493c5ecc	disabled Address Sanitizer in xDrip Run Scheme - this option was causing issues to automatically install the xDrip Widget Extension via Xcode when building the main xDrip target.	2024-05-05 19:51:41 +02:00
Johan Degraeve	6377df1f69	Merge pull request #535 from paulplant/develop update background color for Watch accessoryRegular complication	2024-05-05 12:40:03 +02:00
Paul Plant	e2b4b1b51e	update background color for Watch accessoryRegular complication - the previous/default black background wouldn't render on Watchfaces that had a colour scheme applied	2024-05-05 11:41:22 +02:00