RuuviColor generated enum

.swiftgen.assets.yml

@@ -0,0 +1,19 @@
+xcassets:
+  - inputs: ./Common/RuuviLocalization/Sources/Resources/RuuviColors.xcassets
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/xcassets-swift5.stencil
+        output: ./Common/RuuviLocalization/Sources/RuuviColor.swift
+        params:
+          forceProvidesNamespaces: true 
+          publicAccess: true             
+          enumName: RuuviColor
+
+strings:
+  - inputs: ./Common/RuuviLocalization/Sources/Resources/en.lproj/Localizable.strings
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/strings-swift5.stencil
+        output: ./Common/RuuviLocalization/Sources/RuuviLocalization.swift
+        params:
+          forceProvidesNamespaces: true 
+          publicAccess: true             
+          enumName: RuuviLocalization        

.swiftgen.localizable.yml

@@ -0,0 +1,25 @@
+json:
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_en.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/en.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_sv.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/sv.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_ru.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/ru.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_fi.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/fi.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_fr.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/fr.lproj/Localizable.strings
+  - inputs: ./station.localization/station.localization.json
+    outputs:
+      - templatePath: ./Common/RuuviLocalization/Templates/Localizable_de.strings.stencil
+        output: ./Common/RuuviLocalization/Sources/Resources/de.lproj/Localizable.strings

Apps/RuuviStation/Sources/Classes/Presentation/FLEX/FeatureTogglesViewController.swift

@@ -1,3 +1,4 @@
+import RuuviLocalization
 import UIKit
 
 final class FeatureTogglesViewController: UITableViewController {
@@ -22,7 +23,7 @@ final class FeatureTogglesViewController: UITableViewController {
     private static let featureCellReuseIdentifier = "FeatureCellReuseIdentifier"
 
     private func setupViews() {
-        view.backgroundColor = RuuviColor.ruuviPrimary
+        view.backgroundColor = RuuviColor.primary.color
         headerView.addSubview(sourceSwitch)
         headerView.addSubview(sourceLabel)
         tableView.tableHeaderView = headerView
@@ -44,7 +45,7 @@ final class FeatureTogglesViewController: UITableViewController {
 
         let sourceSwitch = sourceSwitch
         sourceSwitch.onTintColor = .clear
-        sourceSwitch.thumbTintColor = RuuviColor.ruuviTintColor
+        sourceSwitch.thumbTintColor = RuuviColor.tintColor.color
 
         let sourceLabel = sourceLabel
         headerView.translatesAutoresizingMaskIntoConstraints = false
@@ -106,10 +107,10 @@ extension FeatureTogglesViewController {
         let feature = features[indexPath.row]
         cell.textLabel?.text = Self.title(for: feature)
         cell.textLabel?.font = UIFont.Muli(.bold, size: 16)
-        cell.textLabel?.textColor = RuuviColor.ruuviMenuTextColor
+        cell.textLabel?.textColor = RuuviColor.menuTextColor.color
         if featureToggleService.isEnabled(feature) {
             cell.accessoryType = .checkmark
-            cell.tintColor = RuuviColor.ruuviTintColor
+            cell.tintColor = RuuviColor.tintColor.color
         } else {
             cell.accessoryType = .none
         }
@@ -136,7 +137,7 @@ extension FeatureTogglesViewController {
         label.text = "Use local feature toggles"
         label.textAlignment = .right
         label.font = UIFont.Muli(.bold, size: 16)
-        label.textColor = RuuviColor.ruuviMenuTextColor
+        label.textColor = RuuviColor.menuTextColor.color
         return label
     }
 }

Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/Presenter/AboutPresenter.swift

@@ -71,7 +71,7 @@ extension AboutPresenter {
         )
         attrString.addAttribute(
             .foregroundColor,
-            value: RuuviColor.ruuviTintColor ?? UIColor.blue,
+            value: RuuviColor.tintColor.color,
             range: changelogRange
         )
 
@@ -80,7 +80,7 @@ extension AboutPresenter {
             .range(of: versionText)
         attrString.addAttribute(
             .foregroundColor,
-            value: RuuviColor.dashboardIndicatorTextColor ?? UIColor.label,
+            value: RuuviColor.dashboardIndicator.color,
             range: regularRange
         )
 

Apps/RuuviStation/Sources/Classes/Presentation/Modules/About/View/AboutViewController.swift

@@ -155,12 +155,12 @@ extension AboutViewController {
         // make text color white
         attrString.addAttribute(
             .foregroundColor,
-            value: RuuviColor.ruuviTextColor ?? UIColor.label,
+            value: RuuviColor.textColor.color,
             range: NSRange(location: 0, length: attrString.length)
         )
 
         aboutTextView.attributedText = attrString
-        aboutTextView.textColor = RuuviColor.ruuviTextColor
+        aboutTextView.textColor = RuuviColor.textColor.color
     }
 
     private func setUpChangelogTapGesture() {

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Background/View/UI/BackgroundSelectionButtonView.swift

@@ -1,3 +1,4 @@
+import RuuviLocalization
 import UIKit
 
 protocol BackgroundSelectionButtonViewDelegate: NSObjectProtocol {
@@ -10,7 +11,7 @@ class BackgroundSelectionButtonView: UIView {
     // UI
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.textColor = RuuviColor.ruuviTextColor
+        label.textColor = RuuviColor.textColor.color
         label.textAlignment = .left
         label.numberOfLines = 0
         label.font = UIFont.Muli(.bold, size: 16)
@@ -21,11 +22,11 @@ class BackgroundSelectionButtonView: UIView {
         let iv = UIImageView()
         iv.contentMode = .scaleAspectFit
         iv.backgroundColor = .clear
-        iv.tintColor = RuuviColor.ruuviTintColor
+        iv.tintColor = RuuviColor.tintColor.color
         return iv
     }()
 
-    lazy var seprator = UIView(color: RuuviColor.ruuviLineColor)
+    lazy var seprator = UIView(color: RuuviColor.lineColor.color)
 
     override init(frame: CGRect) {
         super.init(frame: frame)

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Background/View/UI/BackgroundSelectionUploadProgressView.swift

@@ -1,3 +1,4 @@
+import RuuviLocalization
 import UIKit
 
 // swiftlint:disable:next type_name
@@ -21,7 +22,7 @@ class BackgroundSelectionUploadProgressView: UIView {
         let iv = UIImageView()
         iv.contentMode = .scaleAspectFit
         iv.backgroundColor = .clear
-        iv.tintColor = RuuviColor.ruuviTintColor
+        iv.tintColor = RuuviColor.tintColor.color
         iv.isUserInteractionEnabled = true
         iv.image = UIImage(systemName: "xmark.circle.fill")
         let tap = UITapGestureRecognizer(target: self, action: #selector(handleCancelTap))
@@ -42,7 +43,7 @@ class BackgroundSelectionUploadProgressView: UIView {
 
 private extension BackgroundSelectionUploadProgressView {
     func setUpUI() {
-        backgroundColor = RuuviColor.ruuviGraphBGColor
+        backgroundColor = RuuviColor.graphBGColor.color
         layer.cornerRadius = 4
         clipsToBounds = true
 

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Background/View/UI/BackgroundSelectionViewController.swift

@@ -81,7 +81,7 @@ private extension BackgroundSelectionViewController {
     }
 
     func setUpBaseView() {
-        view.backgroundColor = RuuviColor.dashboardBGColor
+        view.backgroundColor = RuuviColor.dashboardBG.color
     }
 
     func setUpHeaderView() {

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Background/View/UI/BackgroundSelectionViewHeader.swift

@@ -15,15 +15,15 @@ class BackgroundSelectionViewHeader: UICollectionReusableView {
 
     private lazy var descriptionLabel: UILabel = {
         let label = UILabel()
-        label.textColor = RuuviColor.ruuviTextColor
+        label.textColor = RuuviColor.textColor.color
         label.textAlignment = .left
         label.numberOfLines = 0
         label.font = UIFont.Muli(.regular, size: 16)
         label.text = RuuviLocalization.changeBackgroundMessage
         return label
     }()
 
-    lazy var seprator = UIView(color: RuuviColor.ruuviLineColor)
+    lazy var seprator = UIView(color: RuuviColor.lineColor.color)
     lazy var takePhotoButton = BackgroundSelectionButtonView(
         title: RuuviLocalization.takePhoto,
         icon: "camera.fill",
@@ -37,7 +37,7 @@ class BackgroundSelectionViewHeader: UICollectionReusableView {
 
     private lazy var selectFromDefaultLabel: UILabel = {
         let label = UILabel()
-        label.textColor = RuuviColor.ruuviTextColor
+        label.textColor = RuuviColor.textColor.color
         label.textAlignment = .left
         label.numberOfLines = 0
         label.font = UIFont.Muli(.bold, size: 16)

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Cards/View/UI/CardsViewController.swift

@@ -1,9 +1,9 @@
+// swiftlint:disable file_length
 import Humidity
 import RuuviLocal
 import RuuviLocalization
 import RuuviOntology
 import RuuviService
-// swiftlint:disable file_length
 import UIKit
 
 class CardsViewController: UIViewController {
@@ -56,7 +56,7 @@ class CardsViewController: UIViewController {
 
     // Base
     private lazy var cardBackgroundView = CardsBackgroundView()
-    private lazy var chartViewBackground = UIView(color: RuuviColor.ruuviGraphBGColor)
+    private lazy var chartViewBackground = UIView(color: RuuviColor.graphBGColor.color)
 
     // Header View
     // Ruuvi Logo
@@ -261,7 +261,7 @@ private extension CardsViewController {
     }
 
     func setUpBaseView() {
-        view.backgroundColor = RuuviColor.ruuviPrimary
+        view.backgroundColor = RuuviColor.primary.color
 
         view.addSubview(cardBackgroundView)
         cardBackgroundView.fillSuperview()

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Charts/Helpers/TagChartsHelper.swift

@@ -1,18 +1,19 @@
 import Charts
 import Foundation
+import RuuviLocalization
 
 enum TagChartsHelper {
     static func newDataSet(entries: [ChartDataEntry] = []) -> LineChartDataSet {
         let lineChartDataSet = LineChartDataSet(entries: entries)
         lineChartDataSet.axisDependency = .left
-        lineChartDataSet.setColor(RuuviColor.ruuviGraphLineColor ?? RuuviColor.fallbackGraphLineColor)
+        lineChartDataSet.setColor(RuuviColor.graphLineColor.color)
         lineChartDataSet.lineWidth = 1.5
         lineChartDataSet.drawCirclesEnabled = false
         lineChartDataSet.circleRadius = 0.8
         lineChartDataSet.drawValuesEnabled = false
         lineChartDataSet.fillAlpha = 1
-        lineChartDataSet.fillColor = RuuviColor.ruuviGraphFillColor ?? RuuviColor.fallbackGraphFillColor
-        lineChartDataSet.highlightColor = RuuviColor.ruuviGraphFillColor ?? RuuviColor.fallbackGraphFillColor
+        lineChartDataSet.fillColor = RuuviColor.graphFillColor.color
+        lineChartDataSet.highlightColor = RuuviColor.graphFillColor.color
         lineChartDataSet.highlightLineDashLengths = [2, 1, 0]
         lineChartDataSet.highlightLineWidth = 1
         lineChartDataSet.drawCircleHoleEnabled = false

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Charts/View/UI/TagChartsMarkerView.swift

@@ -1,4 +1,5 @@
 import Charts
+import RuuviLocalization
 import RuuviService
 import UIKit
 
@@ -21,7 +22,7 @@ class TagChartsMarkerView: MarkerImage {
     private let yBottomPadding: CGFloat = 32.0
 
     init(
-        color: UIColor? = RuuviColor.ruuviGraphMarkerColor,
+        color: UIColor? = RuuviColor.graphMarkerColor.color,
         font: UIFont = UIFont.Muli(.regular, size: 8),
         textColor: UIColor = .white
     ) {

Apps/RuuviStation/Sources/Classes/Presentation/Modules/Dashboard/Charts/View/UI/TagChartsViewController.swift

@@ -84,7 +84,7 @@ class TagChartsViewController: UIViewController {
             titleColor: .white,
             title: RuuviLocalization.day1,
             icon: RuuviAssets.dropDownArrowImage,
-            iconTintColor: RuuviColor.logoTintColor,
+            iconTintColor: RuuviColor.logoTintColor.color,
             iconSize: .init(width: 14, height: 14),
             preccedingIcon: false
         )