Fixed graph drawning

1Weather/Resources/en.lproj/Localizable.strings

@@ -30,6 +30,9 @@
 "forecast.smoke" = "Smoke";
 "forecast.unknown" = "Unknown";
 
+//Day
+"day.today" = "Today";
+
 //Day time
 "dayTime.morning" = "Morning";
 "dayTime.noon" = "Noon";

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

@@ -34,7 +34,7 @@ class CityForecastCell: UITableViewCell {
     }
     
     public func configure(with location:Location) {
-        cityImageView.image = UIImage(named: location.imageName)
+        cityImageView.image = UIImage(named: location.imageName ?? "")
         temperatureLabel.text = location.today?.temp?.shortString
         let maxTemp = location.today?.maxTemp?.shortString ?? "--"
         let minTemp = location.today?.minTemp?.shortString ?? "--"

1Weather/UI/View controllers/Today/Cells/CityForecastTimePeriod/CityForecastTimePeriodCell.swift

@@ -40,6 +40,7 @@ class CityForecastTimePeriodCell: UITableViewCell {
     private let graphView = GraphView()
     private var graphIsDrawn = false
     
+    //MARK:- Cell life cycle
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         
@@ -62,7 +63,7 @@ class CityForecastTimePeriodCell: UITableViewCell {
     }
     
     public func drawGraphIfNeeded() {
-        guard !graphIsDrawn else { return }
+        guard graphIsDrawn == false else { return }
         
         //Checking for correct height
         guard
@@ -74,7 +75,7 @@ class CityForecastTimePeriodCell: UITableViewCell {
         
         graphView.frame = .init(x: 0,
                                 y: periodButton.graphRect.origin.y,
-                                width: scrollView.contentSize.width,
+                                width: stackView.frame.width,
                                 height: periodButton.graphRect.height)
         
         updateGraphPoints()
@@ -162,7 +163,11 @@ class CityForecastTimePeriodCell: UITableViewCell {
             self.graphView.tintMainDotAt(point: maxTempPoints[button.index])
             self.graphView.tintAdditionalDotAt(point: minTempsPoints[button.index])
         case .hourly:
-            break
+            guard let points = hourlyGraphPoints?.points else { return }
+            self.graphView.tintGraphFrom(startPointX: button.frame.origin.x,
+                                         endPointX: button.frame.origin.x + button.bounds.width)
+            self.graphView.tintMainDotAt(point: points[button.index])
+            
         }
     }
     
@@ -235,10 +240,11 @@ class CityForecastTimePeriodCell: UITableViewCell {
             
             let levelsCount = CGFloat(Set(temps).count)
             let levelHeight = (graphView.frame.height / CGFloat(levelsCount)).rounded(.down)
-            let tempFrame = CGRect(x: 0, y: 0, width: graphView.frame.width, height: levelsCount * levelHeight)
+            let tempFrame = CGRect(x: 0, y: 0, width: graphView.frame.width, height: graphView.frame.height)
             
-            var pointLevel = tempFrame.origin.y + ((maxTemp - temps[index]) * levelHeight) + levelHeight
-            pointLevel = min(pointLevel, tempFrame.height + 5)
+            var pointLevel = tempFrame.origin.y + ((maxTemp - temps[index]) * levelHeight)
+            pointLevel = max(pointLevel, tempFrame.origin.y + 10)
+            pointLevel = min(tempFrame.height - 10, pointLevel)
          
             points.append(.init(x: buttonCenterX, y: pointLevel))
         }

1Weather/UI/View controllers/Today/Cells/CityForecastTimePeriod/PeriodForecastButton.swift

@@ -9,6 +9,16 @@ import UIKit
 
 class PeriodForecastButton: UIControl {
     //Private
+    private static let hourlyFormatter: DateFormatter = {
+        let fmt = DateFormatter()
+        fmt.dateFormat = "h a"
+        return fmt
+    }()
+    private static let dailyFormatter: DateFormatter = {
+        let fmt = DateFormatter()
+        fmt.dateFormat = "d, E"
+        return fmt
+    }()
     private let kGraphInset:CGFloat = 10
     private let forecastImageView = UIImageView()
     private let tempLabel = UILabel()
@@ -73,11 +83,20 @@ class PeriodForecastButton: UIControl {
     public func configure(dailyWeather: DailyWeather) {
         self.tempLabel.text = dailyWeather.maxTemp?.shortString
         self.minTempLabel.text = dailyWeather.minTemp?.shortString
+        self.indicatorImageView.image = nil
+        if Calendar.current.isDateInToday(dailyWeather.date) {
+            self.timeLabel.text = "day.today".localized()
+        }
+        else {
+            self.timeLabel.text = PeriodForecastButton.dailyFormatter.string(from: dailyWeather.date)
+        }
     }
     
     public func configure(hourlyWeather: HourlyWeather) {
         self.tempLabel.text = hourlyWeather.temp?.shortString
         self.minTempLabel.text = nil
+        self.indicatorImageView.image = nil
+        self.timeLabel.text = PeriodForecastButton.hourlyFormatter.string(from: hourlyWeather.date)
     }
 }
 

1Weather/ViewModels/TodayViewModel.swift

@@ -55,8 +55,9 @@ class TodayViewModel {
                                    moonState: .normal)
         
         var daily = [DailyWeather]()
+        var dailyStartDate = Date() - TimeInterval(3600 * 24)
         for index in 0..<7 {
-            let day = DailyWeather(date: Date(),
+            let day = DailyWeather(date: dailyStartDate,
                                    timeZone: .current,
                                    weekDay: weekDay(byIndex: index),
                                    type: WeatherType.allCases.randomElement() ?? .unknown,
@@ -65,17 +66,18 @@ class TodayViewModel {
                                    windSpeed: .init(value: Double.random(in: 0..<10), unit: .milesPerHour),
                                    windDirection: WindDirection.allCases.randomElement() ?? .east,
                                    precipitationProbability: .some(UInt.random(in: 0..<100)),
-                                   sunrise: .init(hours: 5, minutes: 23),
-                                   sunset: .init(hours: 17, minutes: 40),
+                                   sunrise: nil,
+                                   sunset: nil,
                                    sunState: .normal,
-                                   moonrise: .init(hours: 22, minutes: 15),
-                                   moonset: .init(hours: 2, minutes: 30),
+                                   moonrise: nil,
+                                   moonset: nil,
                                    moonState: .normal)
+            dailyStartDate = dailyStartDate + TimeInterval(3600 * 24)
             daily.append(day)
         }
         
         var hourly = [HourlyWeather]()
-        var startDate = Date()
+        var startDate = Date() - TimeInterval(3600)
         for _ in 0..<24 {
             let hour = HourlyWeather(date: startDate,
                                      timeZone: TimeZone(abbreviation: "EST") ?? .current,

Pods/Pods.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -21,7 +21,7 @@
 		<key>Cirque.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>6</integer>
 		</dict>
 		<key>Localize-Swift.xcscheme</key>
 		<dict>
@@ -33,26 +33,26 @@
 		<key>Localize-Swift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Pods-1Weather.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>SnapKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>2</integer>
 		</dict>
 		<key>XMLCoder.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>