IOS-75: Merge branch 'modules' into develop

# Conflicts:
#	DelayedSaveStorage/DelayedSaveStorage/DelayedSaveStorage.swift

1Weather.xcodeproj/xcshareddata/xcschemes/1Weather.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>OneWeatherNotificationServiceExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>41</integer>
+			<integer>55</integer>
 		</dict>
 		<key>PG (Playground) 1.xcscheme</key>
 		<dict>

1Weather.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,24 @@
 <Workspace
    version = "1.0">
    <FileRef
+      location = "group:DelayedSaveStorage/DelayedSaveStorage.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:CoreDataStorage/CoreDataStorage.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:BlendFIPS/BlendFIPSSource.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:BlendHealthSource/BlendHealthSource.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:WDTWeatherSource/WDTWeatherSource.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:OneWeatherCore/OneWeatherCore.xcodeproj">
+   </FileRef>
+   <FileRef
       location = "group:1Weather.xcodeproj">
    </FileRef>
    <FileRef

1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,49 +9,49 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>56</integer>
 		</dict>
 		<key>PG (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>57</integer>
 		</dict>
 		<key>PG (Playground) 3.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>58</integer>
 		</dict>
 		<key>PG (Playground) 4.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>46</integer>
 		</dict>
 		<key>PG (Playground) 5.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>47</integer>
 		</dict>
 		<key>PG (Playground) 6.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>48</integer>
 		</dict>
 		<key>PG (Playground).xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>54</integer>
 		</dict>
 	</dict>
 </dict>

1Weather/Ads/AdCacheManager.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import FBAudienceNetwork
+import OneWeatherCore
 
 class AdCacheManager: NSObject {
 

1Weather/Ads/AdManager.swift

@@ -13,6 +13,7 @@ import FBAudienceNetwork
 import GoogleMobileAds
 import IASDKCore
 import Flurry_iOS_SDK
+import OneWeatherCore
 
 public class AdManager {
     

1Weather/Analytics/AppAnalytics.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 public class AppAnalytics {
     private let services: [AnalyticsService]

1Weather/AppDelegate.swift

@@ -13,6 +13,7 @@ import MoEngage
 import GoogleMobileAds
 import Swarm
 import DTBiOSSDK
+import OneWeatherCore
 import AppsFlyerLib
 
 @main

1Weather/Coordinators/AppCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class AppCoordinator: Coordinator {
     //Private

1Weather/Coordinators/DeeplinksRouter.swift

@@ -8,6 +8,8 @@
 
 import UIKit
 import AppsFlyerLib
+import Foundation
+import OneWeatherCore
 
 class DeeplinksRouter {
     static let urlScheme = "oneweather"

1Weather/Coordinators/NWSAlertCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NWSAlertCoordinator: Coordinator {
     private let parentViewController:UIViewController

1Weather/Coordinators/NotificationsCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NotificationsCoordinator: Coordinator {
     private let parentViewController:UIViewController

1Weather/InApps/OLInAppStoreManager.swift

@@ -9,9 +9,9 @@
 import UIKit
 import StoreKit
 import AppsFlyerLib
+import OneWeatherCore
 
 // Ported from ObjC
-
 protocol OLInAppStoreManagerUIDelegate: AnyObject {
     func viewControllerForPresentation() -> UIViewController
 }

1Weather/Model/CCPA/CCPAHelper.swift

@@ -20,6 +20,7 @@ import FBAudienceNetwork
 import PSMLocationSDK
 import DTBiOSSDK
 import AppsFlyerLib
+import OneWeatherCore
 
 fileprivate let APP_NAME = "ONE_WEATHER"
 fileprivate let DEVICE_TYPE = "IOS"

1Weather/Model/DeviceLocationMonitor.swift

@@ -7,6 +7,7 @@
 import Foundation
 import CoreLocation
 import UIKit
+import OneWeatherCore
 
 internal protocol DeviceLocationMonitorDelegate: AnyObject {
     func deviceLocationMonitor(_ monitor: DeviceLocationMonitor,  didUpdateLocation newLocation: PartialLocation)

1Weather/Model/LocationManager.swift

@@ -9,6 +9,12 @@ import Foundation
 import CoreLocation
 import UIKit
 import MoEngage
+import OneWeatherCore
+import WDTWeatherSource
+import BlendHealthSource
+import BlendFIPSSource
+import CoreDataStorage
+import DelayedSaveStorage
 
 public protocol LocationManagerDelegate: AnyObject {
     func locationManager(_ locationManager: LocationManager, changedSelectedLocation newLocation: Location?)

1Weather/Model/SmartTextProvider.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 private enum Macro: String {
     case feelsLikeTemp = "#FEELS_LIKE_TEMP#"

1Weather/Model/WeatherImageProvider.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class WeatherImageProvider {
     private enum DefaultImage: String {

1Weather/Network/ConfigManager.swift

@@ -9,6 +9,7 @@
 import Foundation
 import Firebase
 import FirebaseRemoteConfig
+import OneWeatherCore
 
 public struct AppConfig: Codable {
     let popularCities: [GeoNamesPlace]?

1Weather/Network/Notifications/Model/NWSCurrentEventsReponse.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 struct NWSCurrentEventsReponse: Codable {
     struct Wrapper: Codable {

1Weather/Network/Notifications/NWSAlertInfoParser.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 class NWSAlertInfoParser {
     private var strongSelfReference: NWSAlertInfoParser?

1Weather/Network/Notifications/NWSAlertsManager.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 public enum NWSError: Error {
     case insufficientLocationInfo

1Weather/Network/PopularCitiesManager.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Firebase
 import FirebaseRemoteConfig
+import OneWeatherCore
 
 class PopularCitiesManager {
     public static let shared = PopularCitiesManager()

1Weather/Network/PushNotificationsManager.swift

@@ -9,6 +9,7 @@
 import Foundation
 import MoEngage
 import AppsFlyerLib
+import OneWeatherCore
 
 public class PushNotificationsManager: NSObject {
     // MARK: - Private

1Weather/Network/Weather/WdtWeatherSource.swift

@@ -8,6 +8,7 @@
 import Foundation
 import CoreLocation
 import XMLCoder
+import OneWeatherCore
 
 public enum WdtWeatherSourceError: Error {
     case insufficientLocationInfo

1Weather/Storage/LegacyMigrationManager.swift

@@ -6,10 +6,9 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 class LegacyMigrationManager {
-
-    
     typealias Completion = ([PartialLocation]?, MigrationError?) -> ()
     
     private enum MigrationResult: String {

1Weather/Storage/LegacySettings.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 // Used in Settings and Widget
 enum LegacyTempUnits: Int {

1Weather/Storage/Storage.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 /// locations list, selectedIndex, error
 public typealias StorageCompletion = ([Location]?, Int?, Error?) -> ()

1Weather/UI/Buttons/NavigationCityButton.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NavigationCityButton: UIControl {
     //Private

1Weather/UI/Helpers/ForecastTimePeriod/Buttons/ForecastDetailPeriodButton.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 class ForecastDetailPeriodButton: UIControl, PeriodButtonProtocol {
     private let kGraphInset:CGFloat = 10

1Weather/UI/Helpers/ForecastTimePeriod/Buttons/ForecastPeriodButton.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastPeriodButton: UIControl, PeriodButtonProtocol {
     //Private

1Weather/UI/Helpers/ForecastTimePeriod/Buttons/ForecastWindButton.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastWindButton: UIControl, PeriodButtonProtocol {
     //Private

1Weather/UI/Helpers/ForecastTimePeriod/Buttons/PeriodButtonProtocol.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 public protocol PeriodButtonProtocol: UIControl {
     init()

1Weather/UI/Helpers/ForecastTimePeriod/ForecastTimePeriodView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 private struct DailyGraphPoints {
     let maxTempPoints: [CGPoint]

1Weather/UI/Helpers/ThemeManager.swift

@@ -6,23 +6,7 @@
 //
 
 import UIKit
-
-public enum AppTheme: Int {
-    case light = 0
-    case dark
-    case system
-    
-    var nameForEvent: String {
-        switch self {
-        case .light:
-            return "light"
-        case .dark:
-            return "dark"
-        case .system:
-            return "system"
-        }
-    }
-}
+import OneWeatherCore
 
 public struct ThemeManager {
     public struct Colors {

1Weather/UI/SharedCells/MoonPhaseCell/MoonPhaseCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class MoonPhaseCell: UITableViewCell {
     //Private

1Weather/UI/SharedCells/PrecipCell/PrecipButton.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class PrecipButton: UIControl {
     //Private

1Weather/UI/SharedCells/PrecipCell/PrecipitationCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class PrecipitationCell: UITableViewCell {
     //Private

1Weather/UI/SharedCells/SunPhaseCell/SunPhaseCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 private struct CircleSegment {
     let chord:CGFloat

1Weather/UI/View controllers/Forecast/Cells/ForecastDailyCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 protocol ForecastDailyCellDelegate: AnyObject {
     func timePeriodCell(cell:ForecastDailyCell, didSelectButtonAt index:Int)

1Weather/UI/View controllers/Forecast/Cells/ForecastDayCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastDayCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Forecast/Cells/ForecastHourlyCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastHourlyCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Forecast/Cells/ForecastInfoCell/ForecastConditionView.swift

@@ -6,6 +6,8 @@
 //
 
 import UIKit
+import OneWeatherCore
+import Localize_Swift
 
 class ForecastConditionView: UIView {
     //Private

1Weather/UI/View controllers/Forecast/Cells/ForecastInfoCell/ForecastInfoCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastInfoCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Forecast/Cells/ForecastWindSpeedCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class ForecastWindSpeedCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Forecast/DaysControlView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 protocol DaysControlViewDelegate: AnyObject {
     func didSelectButtonAt(index:Int)

1Weather/UI/View controllers/Locations/Cells/CityCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 protocol CityCellDelegate: AnyObject {
     func didSelect(location:PartialLocation)

1Weather/UI/View controllers/Locations/Cells/LocationCellFactory.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class LocationCellFactory: CellFactoryProtocol {
     //Private

1Weather/UI/View controllers/Locations/LocationViewController.swift

@@ -6,6 +6,8 @@
 //
 
 import UIKit
+import OneWeatherCore
+
 //MARK:- Cities View Controller
 class LocationViewController:UIViewController {
     //Private

1Weather/UI/View controllers/Locations/LocationsViewModel.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import AlgoliaSearchClient
+import OneWeatherCore
 
 public protocol LocationsViewModelDelegate: AnyObject {
     func viewModelDidChange(model:LocationsViewModel)

1Weather/UI/View controllers/Menu/MenuViewController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SafariServices
+import OneWeatherCore
 
 class MenuViewController: UIViewController {
     //Private

1Weather/UI/View controllers/NWSAlert/Cells/NWSAlertCellFactory.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 fileprivate enum NWSAlertCellType: Int {
     case header = 0

1Weather/UI/View controllers/NWSAlert/Cells/NWSAlertInfoBlockTableViewCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NWSAlertInfoBlockTableViewCell: UITableViewCell {
     let titleLabel = UILabel()

1Weather/UI/View controllers/NWSAlert/Cells/NWSForecastOfficeTableViewCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 class NWSForecastOfficeTableViewCell: UITableViewCell {
     var alert: NWSAlert?

1Weather/UI/View controllers/Notifications/Cells/NWSAlertCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NWSAlertCell: UITableViewCell {
 //    TODO: we don't have an image for this one?

1Weather/UI/View controllers/Notifications/NotificationsViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class NotificationsViewController: UIViewController {
     private let coordinator: NotificationsCoordinator

1Weather/UI/View controllers/Onboarding/OnboardingViewController.swift

@@ -6,7 +6,7 @@
 //
 
 import UIKit
-
+import OneWeatherCore
 
 class OnboardingViewController: UIViewController {
     private let coordinator: OnboardingCoordinator

1Weather/UI/View controllers/Radar/Cells/RadarLayerCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 protocol RadarLayerCellDelegate: AnyObject {
     func cellPinButtonTouched(atLayer:RadarLayer)

1Weather/UI/View controllers/Radar/Cells/RadarLayersCellFactory.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 private enum Section {
     case weather

1Weather/UI/View controllers/Radar/Controls/MapLegendSevereView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class MapLegendSevereView: UIView {
     //Private

1Weather/UI/View controllers/Radar/Controls/MapLegendView.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 private enum LegendType {
     case weather

1Weather/UI/View controllers/Radar/Controls/MapLegendWeatherView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class MapLegendWeatherView: UIView {
     //Private

1Weather/UI/View controllers/Radar/MapTimeControl/MapPinnedLayersView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 protocol MapPinnedLayersViewDelegate: AnyObject {
     func didSelectLayer(layerId:String)

1Weather/UI/View controllers/Radar/RadarViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 import MapKit
 import Swarm
+import OneWeatherCore
 
 class RadarViewController: UIViewController {
     //Private

1Weather/UI/View controllers/Settings/Cells/SettingsCellFactory.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Localize_Swift
 import CoreLocation
+import OneWeatherCore
 
 public enum SettingsRow {
     case theme

1Weather/UI/View controllers/Settings/Cells/SettingsDetailsCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class SettingsDetailsCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Settings/Cells/SettingsDetailsCellFactory.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Localize_Swift
+import OneWeatherCore
 
 class SettingsDetailsCellFactory: CellFactoryProtocol {
     //Private

1Weather/UI/View controllers/Settings/Cells/SettingsThemeCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class SettingsThemeCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/SplashAnimation/SplashAnimationViewController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Lottie
+import OneWeatherCore
 
 class SplashAnimationViewController: UIViewController {
     private let appCoordinator:AppCoordinator

1Weather/UI/View controllers/Today/Cells/TodayAirQualityCell/PollutantView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class PollutantView: UIView {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayAirQualityCell/TodayAirQualityCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Cirque
+import OneWeatherCore
 
 private struct AirQualityDataType: CirqueDataType {
     var color: UIColor

1Weather/UI/View controllers/Today/Cells/TodayAlertCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class TodayAlertCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayCellFactory.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 public enum TodayCellType:Int {
     case alert = 0

1Weather/UI/View controllers/Today/Cells/TodayConditions/TodayConditionButton.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class TodayConditionButton: UIControl {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayConditions/TodayConditionsCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 class TodayConditionsCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayDayTimesCell/DayTimeView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class DayTimeView: UIView {
     private let dayTimeLabel = UILabel()

1Weather/UI/View controllers/Today/Cells/TodayDayTimesCell/TodayDayTimesCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class TodayDayTimesCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayForecastCell.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import SnapKit
+import OneWeatherCore
 
 class TodayForecastCell: UITableViewCell {
     //Private

1Weather/UI/View controllers/Today/Cells/TodayForecastTimePeriodCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 class TodayForecastTimePeriodCell: UITableViewCell {
     //Private

1Weather/ViewModels/ForecastViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import OneWeatherCore
 
 protocol ForecastViewModelDelegate:ViewModelDelegate {
     func selectedWeatherDidChange()

1Weather/ViewModels/MenuViewModel.swift

@@ -9,6 +9,8 @@ import UIKit
 import StoreKit
 import MessageUI
 import PKHUD
+import OneWeatherCore
+import BlendHealthSource
 
 protocol MenuViewModelDelegate: ViewModelDelegate {
     func viewControllerForPresentation() -> UIViewController

1Weather/ViewModels/NWSAlertViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 class NWSAlertViewModel: ViewModelProtocol {
     public weak var delegate: ViewModelDelegate?

1Weather/ViewModels/NotificationsViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OneWeatherCore
 
 protocol NotificationsViewModelDelegate: ViewModelDelegate {
     func viewModel(_ viewModel: NotificationsViewModel, didSelect alert: NWSAlert)

1Weather/ViewModels/RadarViewModel.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Swarm
 import CoreLocation
+import OneWeatherCore
 
 protocol RadarViewModelDelegate: ViewModelDelegate {
     func viewModel(model:RadarViewModel, didSelectLayer layer:RadarLayer)

1Weather/ViewModels/SettingsDetailsViewModel.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Localize_Swift
+import OneWeatherCore
 
 class SettingsDetailsViewModel: ViewModelProtocol {
     //Public

1Weather/ViewModels/SettingsViewModel.swift

@@ -6,7 +6,7 @@
 //
 
 import UIKit
-
+import OneWeatherCore
 
 class SettingsViewModel: ViewModelProtocol {
     let settings = Settings.shared

1Weather/ViewModels/TodayViewModel.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import PSMLocationSDK
+import OneWeatherCore
 
 protocol TodayViewModelDelegate: ViewModelDelegate {
     func showOnboarding(viewModel: TodayViewModel)

BlendFIPS/BlendFIPS/BlendFIPS.h

+//
+//  BlendFIPS.h
+//  BlendFIPS
+//
+//  Created by Dmitry Stepanets on 21.05.2021.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for BlendFIPS.
+FOUNDATION_EXPORT double BlendFIPSVersionNumber;
+
+//! Project version string for BlendFIPS.
+FOUNDATION_EXPORT const unsigned char BlendFIPSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <BlendFIPS/PublicHeader.h>
+
+

1Weather/Network/Notifications/BlendFIPSSource.swift → BlendFIPS/BlendFIPS/BlendFIPSSource.swift

@@ -4,10 +4,10 @@
 //
 //  Created by Demid Merzlyakov on 28.04.2021.
 //
-
 import Foundation
+import OneWeatherCore
 
-class BlendFIPSSource: FIPSSource {
+public class BlendFIPSSource: FIPSSource {
     private let log = Logger(componentName: "BlendFIPSSource")
     
     private let baseUrlProduction = "https://nwsalert.onelouder.com"
@@ -34,6 +34,8 @@ class BlendFIPSSource: FIPSSource {
     
     private var locationsBeingUpdated = Set<Location>()
     
+    public init() {}
+    
     public func getFipsCode(for location: Location, completion: @escaping FIPSSourceeCompletion) {
         internalQueue.addOperation { [weak self] in
             let extendedCompletion: FIPSSourceeCompletion = { [weak self] (fipsCode) in

BlendFIPS/BlendFIPS/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

BlendFIPS/BlendFIPSTests/BlendFIPSTests.swift

+//
+//  BlendFIPSTests.swift
+//  BlendFIPSTests
+//
+//  Created by Dmitry Stepanets on 21.05.2021.
+//
+
+import XCTest
+@testable import BlendFIPS
+
+class BlendFIPSTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}

BlendFIPS/BlendFIPSTests/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

BlendHealthSource/BlendHealthSource/BlendHealthSource.h

+//
+//  BlendHealthSource.h
+//  BlendHealthSource
+//
+//  Created by Dmitry Stepanets on 21.05.2021.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for BlendHealthSource.
+FOUNDATION_EXPORT double BlendHealthSourceVersionNumber;
+
+//! Project version string for BlendHealthSource.
+FOUNDATION_EXPORT const unsigned char BlendHealthSourceVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <BlendHealthSource/PublicHeader.h>
+
+

1Weather/Network/Health/BlendHealthSource.swift → BlendHealthSource/BlendHealthSource/BlendHealthSource.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-
+import OneWeatherCore
 
 public enum BlendHealthSourceError: Error {
     case insufficientLocationInfo
@@ -43,6 +43,8 @@ public class BlendHealthSource: HealthSource {
     
     private var locationsBeingUpdated = Set<Location>()
     
+    public init() {}
+    
     public func updateHelath(for location: Location, completion: @escaping HealthSourceCompletion) {
         internalQueue.addOperation { [weak self] in
             let extendedCompletion: HealthSourceCompletion = { [weak self] (health, error) in

BlendHealthSource/BlendHealthSource/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

1Weather/Network/Health/Model/BlendHealthModels.swift → BlendHealthSource/BlendHealthSource/Model/BlendHealthModels.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import UIKit
+import OneWeatherCore
 
 // MARK: - HealthCenter
 struct BlendHealthCenter: Codable {

BlendHealthSource/BlendHealthSourceTests/BlendHealthSourceTests.swift

+//
+//  BlendHealthSourceTests.swift
+//  BlendHealthSourceTests
+//
+//  Created by Dmitry Stepanets on 21.05.2021.
+//
+
+import XCTest
+@testable import BlendHealthSource
+
+class BlendHealthSourceTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}