Merge pull request #44 from fassko/1.15

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Build and test Weather Latvia
 on: [push, pull_request]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_12.app
+  DEVELOPER_DIR: /Applications/Xcode_12.1.app
 
 jobs:
   build:
@@ -17,5 +17,5 @@ jobs:
       run: brew install swiftlint
 
     - name: Run tests
-      run: set -o pipefail && xcodebuild -project MeteoLV.xcodeproj -scheme MeteoLV -destination 'platform=iOS Simulator,name=iPhone 11 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean test build | xcpretty
+      run: set -o pipefail && xcodebuild -project MeteoLV.xcodeproj -scheme MeteoLV -destination 'platform=iOS Simulator,name=iPhone 12 Pro' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean test build | xcpretty
 

MeteoLV.xcodeproj/project.pbxproj

@@ -25,6 +25,10 @@
 		631E462A21BC0D93000CC546 /* meteoLVStation.json in Resources */ = {isa = PBXBuildFile; fileRef = 631E462921BC0D93000CC546 /* meteoLVStation.json */; };
 		631E462C21BC0DB1000CC546 /* roadLVStation.json in Resources */ = {isa = PBXBuildFile; fileRef = 631E462B21BC0DB1000CC546 /* roadLVStation.json */; };
 		631E462E21BC0DD6000CC546 /* ObservationsViewController+UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631E462D21BC0DD6000CC546 /* ObservationsViewController+UITests.swift */; };
+		6348ECF4254DBD060096386D /* ObservationsStation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635524EE205E56A700EC0E23 /* ObservationsStation.swift */; };
+		6348ED02254DBD9A0096386D /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631E462521BBF287000CC546 /* Constants.swift */; };
+		6348ED0F254DBE530096386D /* ObservationsStation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635524EE205E56A700EC0E23 /* ObservationsStation.swift */; };
+		6348ED16254DBE590096386D /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631E462521BBF287000CC546 /* Constants.swift */; };
 		635524EF205E56A700EC0E23 /* ObservationsStation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635524EE205E56A700EC0E23 /* ObservationsStation.swift */; };
 		635524F4205E5E6700EC0E23 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635524F3205E5E6700EC0E23 /* InfoViewController.swift */; };
 		6368AE7C253E115600CB8EF1 /* Station+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 639BC073253CA93800B0E66B /* Station+Extension.swift */; };
@@ -730,7 +734,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				639BC074253CA93800B0E66B /* Station+Extension.swift in Sources */,
+				6348ED0F254DBE530096386D /* ObservationsStation.swift in Sources */,
 				639BC030253C990100B0E66B /* MeteoLVWidget.swift in Sources */,
+				6348ED16254DBE590096386D /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -739,8 +745,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				6368AE7C253E115600CB8EF1 /* Station+Extension.swift in Sources */,
+				6348ECF4254DBD060096386D /* ObservationsStation.swift in Sources */,
 				63DF76BF253E0C0200907EC8 /* Intents.intentdefinition in Sources */,
 				63DF769B253E0AB900907EC8 /* IntentHandler.swift in Sources */,
+				6348ED02254DBD9A0096386D /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -863,7 +871,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.14.201019.2343;
+				CURRENT_PROJECT_VERSION = 1.15.201031.1814;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -925,7 +933,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.14.201019.2343;
+				CURRENT_PROJECT_VERSION = 1.15.201031.1814;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -954,7 +962,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = MeteoLV/MeteoLV.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.14.201019.2343;
+				CURRENT_PROJECT_VERSION = 1.15.201031.1814;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				INFOPLIST_FILE = MeteoLV/Info.plist;
@@ -981,7 +989,7 @@
 				CODE_SIGN_ENTITLEMENTS = MeteoLV/MeteoLV.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.14.201019.2343;
+				CURRENT_PROJECT_VERSION = 1.15.201031.1814;
 				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				INFOPLIST_FILE = MeteoLV/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.1;

MeteoLV.xcodeproj/xcuserdata/kristaps.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -28,17 +28,17 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 		<key>MeteoLVShare.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>2</integer>
 		</dict>
 		<key>MeteoLVSiri.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>MeteoLVSiriUI.xcscheme_^#shared#^_</key>
 		<dict>
@@ -48,12 +48,12 @@
 		<key>MeteoLVTodayNotification.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>1</integer>
 		</dict>
 		<key>MeteoLVWidgetExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

MeteoLV/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

MeteoLV/Core/AppDelegate.swift

@@ -27,21 +27,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let mapNavigationController = UINavigationController()
     mapCoordinator = MapViewCooordinator(navigationController: mapNavigationController)
     mapCoordinator?.start()
-    let mapTabBarItem = UITabBarItem(title: "Map".localized, image: UIImage(named: "map"), tag: 0)
+    let mapTabBarItem = UITabBarItem(title: "Map".localized, image: UIImage(systemName: "map"), tag: 0)
     mapTabBarItem.accessibilityLabel = "Map"
     mapNavigationController.tabBarItem = mapTabBarItem
 
     let favoritesNavigationController = UINavigationController()
     favoritesCoordinator = FavoritesViewCoordinator(navigationController: favoritesNavigationController)
     favoritesCoordinator?.start()
-    let favoritesTabBarItem = UITabBarItem(title: "Favorites".localized, image: UIImage(named: "favorites"), tag: 0)
+    let favoritesTabBarItem = UITabBarItem(title: "Favorites".localized, image: UIImage(systemName: "star"), tag: 0)
     favoritesTabBarItem.accessibilityLabel = "Favorites"
     favoritesNavigationController.tabBarItem = favoritesTabBarItem
 
     let listNavigationController = UINavigationController()
     listCoordinator = ListCoordinator(navigationController: listNavigationController)
     listCoordinator?.start()
-    let listTabBarItem = UITabBarItem(title: "List".localized, image: UIImage(named: "list"), tag: 0)
+    let listTabBarItem = UITabBarItem(title: "List".localized, image: UIImage(systemName: "list.dash"), tag: 0)
     listTabBarItem.accessibilityLabel = "List"
     listNavigationController.tabBarItem = listTabBarItem
 

MeteoLV/Core/Constants.swift

@@ -24,8 +24,8 @@ public extension UserDefaults {
 }
 
 extension UIImage {
-  static let favoritesFull = UIImage(named: "favorites-full")
-  static let favorites = UIImage(named: "favorites")
-  static let homeFull = UIImage(named: "home-full")
-  static let home = UIImage(named: "home")
+  static let favoritesFull = UIImage(systemName: "star.fill")
+  static let favorites = UIImage(systemName: "star")
+  static let homeFull = UIImage(systemName: "house.fill")
+  static let home = UIImage(systemName: "house")
 }

MeteoLV/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.14</string>
+	<string>1.15</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.14.201019.2343</string>
+	<string>1.15.201031.1814</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

MeteoLV/Map/ObservationsViewController.swift

@@ -73,7 +73,7 @@ class ObservationsViewController: UIViewController, Storyboarded {
           let annotation = StationAnnotation(station: station)
           annotation.coordinate = CLLocationCoordinate2D(latitude: station.latitude, longitude: station.longitude)
           annotation.title = station.title
-          annotation.subtitle = station.temperature
+          annotation.subtitle = station.temperatureWithUnits
           annotation.accessibilityLabel = station.name
           annotation.accessibilityIdentifier = station.name
 

MeteoLV/Models/ObservationsStation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Intents
 
 #if canImport(WidgetKit)
   import WidgetKit
@@ -18,12 +17,21 @@ import MeteoLVProvider
 /// Observation station
 extension ObservationStation {
 
-  var title: String {
+  var temperatureWithUnits: String {
     guard let temperature = temperature else {
-      return name
+      return ""
     }
 
-    return "\(name) \n \(temperature)"
+    switch self {
+    case .meteo:
+      return "\(temperature)°C"
+    case .road:
+      return temperature
+    }
+  }
+
+  var title: String {
+    "\(name) \n \(temperatureWithUnits)"
   }
 
   var isFavorited: Bool {
@@ -53,27 +61,9 @@ extension ObservationStation {
       WidgetCenter.shared.reloadAllTimelines()
     }
 
-    donateIntent()
-
     completion()
   }
 
-  private func donateIntent() {
-    let intent = CurrentConditionsIntent()
-    intent.suggestedInvocationPhrase = "Current Temperature"
-    let interaction = INInteraction(intent: intent, response: nil)
-
-    interaction.donate { (error) in
-      if error != nil {
-        if let error = error as NSError? {
-          print("Interaction donation failed: \(error.description)")
-        } else {
-          print("Successfully donated interaction")
-        }
-      }
-    }
-  }
-
   func toggleFavorite(_ completion: @escaping () -> Void) {
     let favoritesArray = defaults.favorites
     var favorites = Set(favoritesArray)