From 6ed257be83ec0308f5dd4ebca6d4fabf5f3f1954 Mon Sep 17 00:00:00 2001 From: Darragh Rogan Date: Fri, 30 Jul 2021 09:35:31 +0100 Subject: [PATCH] - updated PurpleAir RegEx to accept 6 digit IDs - updated text on Menu to say Tomorrow.io in lieu of ClimaCell - clarified Tomorrow.io's temperate forecast is Apparent --- Miasma.xcodeproj/project.pbxproj | 8 ++++---- .../xcshareddata/xcschemes/Miasma.xcscheme | 2 +- .../xcdebugger/Breakpoints_v2.xcbkptlist | 8 ++++---- .../xcschemes/xcschememanagement.plist | 4 ++-- Miasma/Extensions.swift | 2 +- Miasma/Menu.swift | 12 ++++++------ Pods/Pods.xcodeproj/project.pbxproj | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Miasma.xcodeproj/project.pbxproj b/Miasma.xcodeproj/project.pbxproj index 1e88394..fbc4859 100644 --- a/Miasma.xcodeproj/project.pbxproj +++ b/Miasma.xcodeproj/project.pbxproj @@ -973,7 +973,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = VDLCQ62KZH; ENABLE_HARDENED_RUNTIME = YES; EXCLUDED_ARCHS = ""; @@ -983,7 +983,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.19; + MARKETING_VERSION = 1.20; PRODUCT_BUNDLE_IDENTIFIER = "Darragh-Rogan.Miasma"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -999,7 +999,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = VDLCQ62KZH; ENABLE_HARDENED_RUNTIME = YES; EXCLUDED_ARCHS = ""; @@ -1009,7 +1009,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.19; + MARKETING_VERSION = 1.20; PRODUCT_BUNDLE_IDENTIFIER = "Darragh-Rogan.Miasma"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/Miasma.xcodeproj/xcshareddata/xcschemes/Miasma.xcscheme b/Miasma.xcodeproj/xcshareddata/xcschemes/Miasma.xcscheme index df7388a..dddf020 100644 --- a/Miasma.xcodeproj/xcshareddata/xcschemes/Miasma.xcscheme +++ b/Miasma.xcodeproj/xcshareddata/xcschemes/Miasma.xcscheme @@ -1,6 +1,6 @@ + landmarkName = "unknown" + landmarkType = "0"> + landmarkName = "unknown" + landmarkType = "0"> Miasma iOS.xcscheme_^#shared#^_ orderHint - 9 + 8 Miasma.xcscheme_^#shared#^_ @@ -24,7 +24,7 @@ MiasmaLauncher.xcscheme_^#shared#^_ orderHint - 8 + 9 MiasmaLauncherApplication.xcscheme_^#shared#^_ diff --git a/Miasma/Extensions.swift b/Miasma/Extensions.swift index bef420d..dfff61b 100644 --- a/Miasma/Extensions.swift +++ b/Miasma/Extensions.swift @@ -24,7 +24,7 @@ extension String { } enum Regex: String { - case purpleAirID = "[0-9]{4,5}" + case purpleAirID = "[0-9]{4,6}" case smartCitizenStationID = "[0-9]{3,5}" case telraamSegmentID = "[0-9]{5,10}" case wAQICity = "^[a-zA-Z]*$" diff --git a/Miasma/Menu.swift b/Miasma/Menu.swift index 79b9816..7bc5bdb 100644 --- a/Miasma/Menu.swift +++ b/Miasma/Menu.swift @@ -328,7 +328,7 @@ class menuFunctions: NSObject { menu.addItem(NSMenuItem.separator()) let OpenClimaCell = NSMenuItem( - title: "1 Hour Forecast (ClimaCell Timeline)...", + title: "1 Hour Forecast (Tomorrow.io Timeline)...", action: #selector(menuFunctions.openClimaCell(_:)), keyEquivalent: "c" ) @@ -792,7 +792,7 @@ class menuFunctions: NSObject { solarGHI_visual = "[🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚]" } - self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉, with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" + self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉ (Apparent), with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" self.climaCellAirQuality.title = "☁️: Air Quality will be \(round(Double(climaCellData.data?.timelines?[0].intervals?[1].values?.epaIndex ?? 0))) US EPA AQI PM₂.₅, with primary pollutant of \(ClimaCellPrimaryPollutantText)" @@ -862,7 +862,7 @@ class menuFunctions: NSObject { menu.addItem(NSMenuItem.separator()) let OpenClimaCell = NSMenuItem( - title: "1 Hour Forecast (ClimaCell Timeline)...", + title: "1 Hour Forecast (Tomorrow.io Timeline)...", action: #selector(menuFunctions.openClimaCell(_:)), keyEquivalent: "c" ) @@ -1267,7 +1267,7 @@ class menuFunctions: NSObject { solarGHI_visual = "[🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚]" } - self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉, with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" + self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉ (Apparent), with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" self.climaCellAirQuality.title = "☁️: Air Quality will be \(round(Double(climaCellData.data?.timelines?[0].intervals?[1].values?.epaIndex ?? 0))) US EPA AQI PM₂.₅, with primary pollutant of \(ClimaCellPrimaryPollutantText)" @@ -1339,7 +1339,7 @@ class menuFunctions: NSObject { menu.addItem(NSMenuItem.separator()) let OpenClimaCell = NSMenuItem( - title: "1 Hour Forecast (ClimaCell Timeline)...", + title: "1 Hour Forecast (Tomorrow.io Timeline)...", action: #selector(menuFunctions.openClimaCell(_:)), keyEquivalent: "c" ) @@ -1797,7 +1797,7 @@ class menuFunctions: NSObject { solarGHI_visual = "[🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚🌚]" } - self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉, with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" + self.climaCellWeather.title = "🌦: Will be \(ClimaCellWeatherCodeText), \(String(format: "%.1f", locale: Locale.current, climaCellData.data?.timelines?[0].intervals?[1].values?.temperatureApparent ?? 0))℃ / \(calculateFahrenheit(celcius: Double(ClimaCellCelcius)))℉ (Apparent), with wind from \(windDirection_acronymn) @ \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)))m/s / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*3.6))km/h / \(String(format: "%.1f", locale: Locale.current, Double(climaCellData.data?.timelines?[0].intervals?[1].values?.windSpeed ?? 0)*2.23694))mph" self.climaCellAirQuality.title = "☁️: Air Quality will be \(round(Double(climaCellData.data?.timelines?[0].intervals?[1].values?.epaIndex ?? 0))) US EPA AQI PM₂.₅, with primary pollutant of \(ClimaCellPrimaryPollutantText)" diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 5f922d2..c2e861d 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -382,7 +382,7 @@ 917E4C67D27C529C80ACB22828774D61 /* Pods-Miasma iOS-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Miasma iOS-Info.plist"; sourceTree = ""; }; 926F569BE31F9AF2209F305F44528A0D /* GoogleUserMessagingPlatform.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GoogleUserMessagingPlatform.release.xcconfig; sourceTree = ""; }; 9C1245BE61FFAEF154C0F86A1FBA053B /* FBLPromise+Validate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBLPromise+Validate.h"; path = "Sources/FBLPromises/include/FBLPromise+Validate.h"; sourceTree = ""; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9DC8159837ADA3BE7F3C1315CD540FF0 /* GoogleAppMeasurement.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GoogleAppMeasurement.debug.xcconfig; sourceTree = ""; }; 9E8CEAF250EF87AFA85CDA2B9E472B01 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; A019ECE04D44F0F1B387C38ED02C81AF /* FBLPromise+Async.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "FBLPromise+Async.m"; path = "Sources/FBLPromises/FBLPromise+Async.m"; sourceTree = ""; }; @@ -1036,7 +1036,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1250; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 11.0";