In proccess to migrate to Rainfall model

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

@@ -98,7 +98,7 @@ class SettingsCellFactory: CellFactory {
         }
         }
         
         
         array.append(contentsOf: [
         array.append(contentsOf: [
-                        SettingsDataSource(section: .units, rows: [.temperature, .wind, .pressure, .distance]),
+            SettingsDataSource(section: .units, rows: [.temperature, .wind, .pressure, .distance, .rainfall]),
 //                        SettingsDataSource(section: .language, rows: [.language]),
 //                        SettingsDataSource(section: .language, rows: [.language]),
                         SettingsDataSource(section: .other, rows: [
                         SettingsDataSource(section: .other, rows: [
 //                                            .manageNotifications,
 //                                            .manageNotifications,
@@ -153,8 +153,8 @@ class SettingsCellFactory: CellFactory {
                 name = viewModel.settings.distanceType.name
                 name = viewModel.settings.distanceType.name
                 symbol = viewModel.settings.distanceType.symbol
                 symbol = viewModel.settings.distanceType.symbol
             case .rainfall:
             case .rainfall:
-                name = "mm"
-                symbol = "mm/h"
+                name = viewModel.settings.rainfallType.name
+                symbol = viewModel.settings.rainfallType.symbol
             default:
             default:
                 break
                 break
             }
             }

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

@@ -32,6 +32,8 @@ class SettingsDetailsCellFactory: CellFactory {
             return viewModel.pressures.count
             return viewModel.pressures.count
         case .distance:
         case .distance:
             return viewModel.distances.count
             return viewModel.distances.count
+        case .rainfall:
+            return viewModel.rainFalls.count
         case .language:
         case .language:
             return viewModel.languages.count
             return viewModel.languages.count
         default:
         default:
@@ -77,6 +79,10 @@ class SettingsDetailsCellFactory: CellFactory {
             cell.configure(item: viewModel.distances[indexPath.row].name,
             cell.configure(item: viewModel.distances[indexPath.row].name,
                            isSelected: indexPath.row == viewModel.selectedDistanceIndex,
                            isSelected: indexPath.row == viewModel.selectedDistanceIndex,
                            roundedConrers: mask)
                            roundedConrers: mask)
+        case .rainfall:
+            cell.configure(item: viewModel.rainFalls[indexPath.row].name,
+                           isSelected: indexPath.row == viewModel.selectedRainfallIndex,
+                           roundedConrers: mask)
         case .language:
         case .language:
             cell.configure(item: Localize.displayNameForLanguage(viewModel.languages[indexPath.row]),
             cell.configure(item: Localize.displayNameForLanguage(viewModel.languages[indexPath.row]),
                            isSelected: indexPath.row == viewModel.selectedLanguageIndex,
                            isSelected: indexPath.row == viewModel.selectedLanguageIndex,

1Weather/ViewModels/SettingsDetailsViewModel.swift

@@ -26,6 +26,9 @@ class SettingsDetailsViewModel: ViewModelProtocol {
     public var distances:[UnitLength] {
     public var distances:[UnitLength] {
         return [.miles, .kilometers]
         return [.miles, .kilometers]
     }
     }
+    public var rainFalls: [UnitRainfall] {
+        return [.millimetersPerHour, .inchesPerHour]
+    }
     public var languages:[String] {
     public var languages:[String] {
         return Localize.availableLanguages()
         return Localize.availableLanguages()
     }
     }
@@ -37,12 +40,15 @@ class SettingsDetailsViewModel: ViewModelProtocol {
     public var selectedWindIndex: Int {
     public var selectedWindIndex: Int {
         return winds.firstIndex{ $0 == Settings.shared.windSpeedType } ?? -1
         return winds.firstIndex{ $0 == Settings.shared.windSpeedType } ?? -1
     }
     }
-    public var selectedPressureIndex:Int {
+    public var selectedPressureIndex: Int {
         return pressures.firstIndex{ $0 == Settings.shared.pressureType } ?? -1
         return pressures.firstIndex{ $0 == Settings.shared.pressureType } ?? -1
     }
     }
-    public var selectedDistanceIndex:Int {
+    public var selectedDistanceIndex: Int {
         return distances.firstIndex{ $0 == Settings.shared.distanceType } ?? -1
         return distances.firstIndex{ $0 == Settings.shared.distanceType } ?? -1
     }
     }
+    public var selectedRainfallIndex: Int {
+        return rainFalls.firstIndex{ $0 == Settings.shared.rainfallType} ?? -1
+    }
     public var selectedLanguageIndex:Int {
     public var selectedLanguageIndex:Int {
         return Localize.availableLanguages().firstIndex{ $0 == Localize.currentLanguage() } ?? -1
         return Localize.availableLanguages().firstIndex{ $0 == Localize.currentLanguage() } ?? -1
     }
     }

BlendMinutelySource/BlendMinutelySource/BlendMinutelySource.swift

@@ -139,7 +139,7 @@ public class BlendMinutelySource: MinutelyForecastSource {
     private func covnertToAppModel(itemToConvert: BlendMinutelyForecast) -> MinutelyForecast {
     private func covnertToAppModel(itemToConvert: BlendMinutelyForecast) -> MinutelyForecast {
         let items = itemToConvert.forecast.map { MinutelyItem(time: $0.time,
         let items = itemToConvert.forecast.map { MinutelyItem(time: $0.time,
                                                               temp: .init(value: Double($0.temp), unit: .fahrenheit),
                                                               temp: .init(value: Double($0.temp), unit: .fahrenheit),
-                                                              precipitation: $0.precipitation,
+                                                              precipitation: .init(value: $0.precipitation, unit: .inchesPerHour),
                                                               windSpeed: .init(value: Double($0.windSpeed), unit: .milesPerHour),
                                                               windSpeed: .init(value: Double($0.windSpeed), unit: .milesPerHour),
                                                               pressure: .init(value: Double($0.pressure), unit: .inchesOfMercury)) }
                                                               pressure: .init(value: Double($0.pressure), unit: .inchesOfMercury)) }
         let minutelyForecast = MinutelyForecast(lastUpdateTime: Date(),
         let minutelyForecast = MinutelyForecast(lastUpdateTime: Date(),

OneWeatherCore/OneWeatherCore/Extensions/Dimension+Name.swift

@@ -14,7 +14,18 @@ public extension Dimension {
         return fmt
         return fmt
     }
     }
     
     
-    var name:String {
+    var name: String {
+        if let unitRainfall = self as? UnitRainfall {
+            switch unitRainfall {
+            case .inchesPerHour:
+                return "inches per hour"
+            case .millimetersPerHour:
+                return "millimeters per hour"
+            default:
+                return Dimension.fmt.string(from: self)
+            }
+        }
+        
         return Dimension.fmt.string(from: self)
         return Dimension.fmt.string(from: self)
     }
     }
 }
 }

OneWeatherCore/OneWeatherCore/HelperTypes.swift

@@ -343,6 +343,13 @@ public enum MoonPhase: String, Codable {
     }
     }
 }
 }
 
 
+public class UnitRainfall: Dimension {
+    public static let inchesPerHour = UnitRainfall(symbol: "in/h", converter: UnitConverterLinear(coefficient: 1.0))
+    public static let millimetersPerHour = UnitRainfall(symbol: "mm/h", converter: UnitConverterLinear(coefficient: 25.4))
+    
+    public static let baseUnit = UnitRainfall.inchesPerHour
+}
+
 public struct Time: CustomStringConvertible, Codable {
 public struct Time: CustomStringConvertible, Codable {
     public let hours: UInt8
     public let hours: UInt8
     public let minutes: UInt8
     public let minutes: UInt8
@@ -433,6 +440,7 @@ public typealias WindSpeed = Measurement<UnitSpeed>
 public typealias Percent = UInt
 public typealias Percent = UInt
 public typealias Visibility = Measurement<UnitLength>
 public typealias Visibility = Measurement<UnitLength>
 public typealias Pressure = Measurement<UnitPressure>
 public typealias Pressure = Measurement<UnitPressure>
+public typealias Rainfall = Measurement<UnitRainfall>
 
 
 extension Measurement {
 extension Measurement {
     public init?(valueString: String?, unit: UnitType) {
     public init?(valueString: String?, unit: UnitType) {

OneWeatherCore/OneWeatherCore/ModelObjects/Minutely/MinutelyItem.swift

@@ -11,12 +11,12 @@ import UIKit
 public struct MinutelyItem {
 public struct MinutelyItem {
     public let time: Date
     public let time: Date
     public let temp: Temperature
     public let temp: Temperature
-    public let precipitation: Double
+    public let precipitation: Rainfall
     public let windSpeed: WindSpeed
     public let windSpeed: WindSpeed
     public let pressure: Pressure
     public let pressure: Pressure
     public var weatherTypeImage: UIImage?
     public var weatherTypeImage: UIImage?
     
     
-    public init(time: Date, temp: Temperature, precipitation: Double, windSpeed: WindSpeed, pressure: Pressure) {
+    public init(time: Date, temp: Temperature, precipitation: Rainfall, windSpeed: WindSpeed, pressure: Pressure) {
         self.time = time
         self.time = time
         self.temp = temp
         self.temp = temp
         self.precipitation = precipitation
         self.precipitation = precipitation

OneWeatherCore/OneWeatherCore/Settings/DefaultSettings/DefaultSettings.swift

@@ -12,6 +12,7 @@ public protocol DefaultSettings {
     var windSpeedType: UnitSpeed { get }
     var windSpeedType: UnitSpeed { get }
     var pressureType: UnitPressure { get }
     var pressureType: UnitPressure { get }
     var distanceType: UnitLength { get }
     var distanceType: UnitLength { get }
+    var rainfallType: UnitRainfall { get }
     var pinnedLayerIds: [String] { get }
     var pinnedLayerIds: [String] { get }
     var selectedLayerId: String { get }
     var selectedLayerId: String { get }
 }
 }

OneWeatherCore/OneWeatherCore/Settings/DefaultSettings/DefaultSettingsImperial.swift

@@ -12,6 +12,7 @@ struct DefaultSettingsImperial: DefaultSettings {
     let windSpeedType: UnitSpeed = .milesPerHour
     let windSpeedType: UnitSpeed = .milesPerHour
     let pressureType: UnitPressure = .inchesOfMercury
     let pressureType: UnitPressure = .inchesOfMercury
     let distanceType: UnitLength = .miles
     let distanceType: UnitLength = .miles
+    let rainfallType: UnitRainfall = .inchesPerHour
     let pinnedLayerIds: [String] = []
     let pinnedLayerIds: [String] = []
     let selectedLayerId: String = WeatherLayerType.surfaceTemp.rawValue
     let selectedLayerId: String = WeatherLayerType.surfaceTemp.rawValue
 }
 }

OneWeatherCore/OneWeatherCore/Settings/DefaultSettings/DefaultSettingsMetric.swift

@@ -12,6 +12,7 @@ struct DefaultSettingsMetric: DefaultSettings {
     let windSpeedType: UnitSpeed = .metersPerSecond
     let windSpeedType: UnitSpeed = .metersPerSecond
     let pressureType: UnitPressure = .millimetersOfMercury
     let pressureType: UnitPressure = .millimetersOfMercury
     let distanceType: UnitLength = .kilometers
     let distanceType: UnitLength = .kilometers
+    let rainfallType: UnitRainfall = .millimetersPerHour
     let pinnedLayerIds: [String] = []
     let pinnedLayerIds: [String] = []
     let selectedLayerId: String = WeatherLayerType.surfaceTemp.rawValue
     let selectedLayerId: String = WeatherLayerType.surfaceTemp.rawValue
 }
 }

OneWeatherCore/OneWeatherCore/Settings/Settings.swift

@@ -67,6 +67,9 @@ public class Settings {
     @UserDefaultsUnitValue(key: "distance_type", userDefaults: UserDefaults.appDefaults)
     @UserDefaultsUnitValue(key: "distance_type", userDefaults: UserDefaults.appDefaults)
     public var distanceType = DefaultSettingsFactory().getSettings().distanceType
     public var distanceType = DefaultSettingsFactory().getSettings().distanceType
     
     
+    @UserDefaultsUnitValue(key: "rainfall_type", userDefaults: UserDefaults.appDefaults)
+    public var rainfallType = DefaultSettingsFactory().getSettings().rainfallType
+    
     public var locale:Locale {
     public var locale:Locale {
         return Locale(identifier: Localize.currentLanguage())
         return Locale(identifier: Localize.currentLanguage())
     }
     }