Skip to content

1
1weather
Commit a20a4e11 by Dmitriy Stepanets
Options

UI changes

parent 29265d44
Showing with 10 additions and 22 deletions
1Weather.xcodeproj/project.pbxproj
...@@ -52,8 +52,6 @@ ...@@ -52,8 +52,6 @@
CD37D405260DFFDD002669D6 /* CellFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD37D404260DFFDD002669D6 /* CellFactory.swift */; }; CD37D405260DFFDD002669D6 /* CellFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD37D404260DFFDD002669D6 /* CellFactory.swift */; };
CD3883C22657B6A10070FD6F /* BlendHealthSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883C12657B6A10070FD6F /* BlendHealthSource.framework */; }; CD3883C22657B6A10070FD6F /* BlendHealthSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883C12657B6A10070FD6F /* BlendHealthSource.framework */; };
CD3883C32657B6A10070FD6F /* BlendHealthSource.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883C12657B6A10070FD6F /* BlendHealthSource.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CD3883C32657B6A10070FD6F /* BlendHealthSource.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883C12657B6A10070FD6F /* BlendHealthSource.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CD3883F72657B8E10070FD6F /* BlendFIPS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883F62657B8E10070FD6F /* BlendFIPS.framework */; };
CD3883F82657B8E10070FD6F /* BlendFIPS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD3883F62657B8E10070FD6F /* BlendFIPS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CD3884552657BA8B0070FD6F /* CoreDataStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */; }; CD3884552657BA8B0070FD6F /* CoreDataStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */; };
CD3884562657BA8B0070FD6F /* CoreDataStorage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CD3884562657BA8B0070FD6F /* CoreDataStorage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CD3884832657BBCC0070FD6F /* DelayedSaveStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884822657BBCC0070FD6F /* DelayedSaveStorage.framework */; }; CD3884832657BBCC0070FD6F /* DelayedSaveStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3884822657BBCC0070FD6F /* DelayedSaveStorage.framework */; };
...@@ -82,6 +80,8 @@ ...@@ -82,6 +80,8 @@
CD6761802625B0F50079D273 /* RadarLayerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD67617F2625B0F50079D273 /* RadarLayerCell.swift */; }; CD6761802625B0F50079D273 /* RadarLayerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD67617F2625B0F50079D273 /* RadarLayerCell.swift */; };
CD6761842625B6A10079D273 /* RadarLayersCellFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6761832625B6A10079D273 /* RadarLayersCellFactory.swift */; }; CD6761842625B6A10079D273 /* RadarLayersCellFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6761832625B6A10079D273 /* RadarLayersCellFactory.swift */; };
CD6761882625C3360079D273 /* RadarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6761872625C3360079D273 /* RadarViewModel.swift */; }; CD6761882625C3360079D273 /* RadarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6761872625C3360079D273 /* RadarViewModel.swift */; };
CD6ACFC5265B8DD200E09A9B /* BlendFIPSSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6ACFC4265B8DD200E09A9B /* BlendFIPSSource.framework */; };
CD6ACFC6265B8DD200E09A9B /* BlendFIPSSource.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CD6ACFC4265B8DD200E09A9B /* BlendFIPSSource.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CD6B303B2572680C004B34B3 /* SelfSizingButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */; }; CD6B303B2572680C004B34B3 /* SelfSizingButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */; };
CD6B303E25726960004B34B3 /* ThemeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303D25726960004B34B3 /* ThemeProtocol.swift */; }; CD6B303E25726960004B34B3 /* ThemeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303D25726960004B34B3 /* ThemeProtocol.swift */; };
CD6B304325726AD1004B34B3 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B304225726AD1004B34B3 /* DefaultTheme.swift */; }; CD6B304325726AD1004B34B3 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B304225726AD1004B34B3 /* DefaultTheme.swift */; };
...@@ -226,10 +226,10 @@ ...@@ -226,10 +226,10 @@
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
CDFE45BD26566EF50021A29F /* WDTWeatherSource.framework in Embed Frameworks */, CDFE45BD26566EF50021A29F /* WDTWeatherSource.framework in Embed Frameworks */,
CD6ACFC6265B8DD200E09A9B /* BlendFIPSSource.framework in Embed Frameworks */,
CE13B97C2626FB11007CBD4D /* PSMLocationSDK.xcframework in Embed Frameworks */, CE13B97C2626FB11007CBD4D /* PSMLocationSDK.xcframework in Embed Frameworks */,
CD615F7F265523BD00B717DB /* OneWeatherCore.framework in Embed Frameworks */, CD615F7F265523BD00B717DB /* OneWeatherCore.framework in Embed Frameworks */,
CD3884562657BA8B0070FD6F /* CoreDataStorage.framework in Embed Frameworks */, CD3884562657BA8B0070FD6F /* CoreDataStorage.framework in Embed Frameworks */,
CD3883F82657B8E10070FD6F /* BlendFIPS.framework in Embed Frameworks */,
CD3883C32657B6A10070FD6F /* BlendHealthSource.framework in Embed Frameworks */, CD3883C32657B6A10070FD6F /* BlendHealthSource.framework in Embed Frameworks */,
CD3884842657BBCC0070FD6F /* DelayedSaveStorage.framework in Embed Frameworks */, CD3884842657BBCC0070FD6F /* DelayedSaveStorage.framework in Embed Frameworks */,
); );
...@@ -329,6 +329,7 @@ ...@@ -329,6 +329,7 @@
CD67617F2625B0F50079D273 /* RadarLayerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarLayerCell.swift; sourceTree = "<group>"; }; CD67617F2625B0F50079D273 /* RadarLayerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarLayerCell.swift; sourceTree = "<group>"; };
CD6761832625B6A10079D273 /* RadarLayersCellFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarLayersCellFactory.swift; sourceTree = "<group>"; }; CD6761832625B6A10079D273 /* RadarLayersCellFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarLayersCellFactory.swift; sourceTree = "<group>"; };
CD6761872625C3360079D273 /* RadarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarViewModel.swift; sourceTree = "<group>"; }; CD6761872625C3360079D273 /* RadarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarViewModel.swift; sourceTree = "<group>"; };
CD6ACFC4265B8DD200E09A9B /* BlendFIPSSource.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BlendFIPSSource.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelfSizingButton.swift; sourceTree = "<group>"; }; CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelfSizingButton.swift; sourceTree = "<group>"; };
CD6B303D25726960004B34B3 /* ThemeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeProtocol.swift; sourceTree = "<group>"; }; CD6B303D25726960004B34B3 /* ThemeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeProtocol.swift; sourceTree = "<group>"; };
CD6B304225726AD1004B34B3 /* DefaultTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; }; CD6B304225726AD1004B34B3 /* DefaultTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; };
...@@ -469,11 +470,11 @@ ...@@ -469,11 +470,11 @@
CE14445F2638B6CF008E2162 /* StoreKit.framework in Frameworks */, CE14445F2638B6CF008E2162 /* StoreKit.framework in Frameworks */,
CD3883C22657B6A10070FD6F /* BlendHealthSource.framework in Frameworks */, CD3883C22657B6A10070FD6F /* BlendHealthSource.framework in Frameworks */,
CE13B97B2626FB11007CBD4D /* PSMLocationSDK.xcframework in Frameworks */, CE13B97B2626FB11007CBD4D /* PSMLocationSDK.xcframework in Frameworks */,
CD3883F72657B8E10070FD6F /* BlendFIPS.framework in Frameworks */,
CDFE45BC26566EF50021A29F /* WDTWeatherSource.framework in Frameworks */, CDFE45BC26566EF50021A29F /* WDTWeatherSource.framework in Frameworks */,
CD3884552657BA8B0070FD6F /* CoreDataStorage.framework in Frameworks */, CD3884552657BA8B0070FD6F /* CoreDataStorage.framework in Frameworks */,
34EAFD887EF2D1D7449A016C /* Pods_1Weather.framework in Frameworks */, 34EAFD887EF2D1D7449A016C /* Pods_1Weather.framework in Frameworks */,
CD3884832657BBCC0070FD6F /* DelayedSaveStorage.framework in Frameworks */, CD3884832657BBCC0070FD6F /* DelayedSaveStorage.framework in Frameworks */,
CD6ACFC5265B8DD200E09A9B /* BlendFIPSSource.framework in Frameworks */,
CD615F7E265523BD00B717DB /* OneWeatherCore.framework in Frameworks */, CD615F7E265523BD00B717DB /* OneWeatherCore.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -1251,6 +1252,7 @@ ...@@ -1251,6 +1252,7 @@
DBFD169AA2AA6A3CB5B68BB5 /* Frameworks */ = { DBFD169AA2AA6A3CB5B68BB5 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CD6ACFC4265B8DD200E09A9B /* BlendFIPSSource.framework */,
CD3884822657BBCC0070FD6F /* DelayedSaveStorage.framework */, CD3884822657BBCC0070FD6F /* DelayedSaveStorage.framework */,
CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */, CD3884542657BA8B0070FD6F /* CoreDataStorage.framework */,
CD3883F62657B8E10070FD6F /* BlendFIPS.framework */, CD3883F62657B8E10070FD6F /* BlendFIPS.framework */,
...@@ -1678,7 +1680,6 @@ ...@@ -1678,7 +1680,6 @@
CE13B819262480B3007CBD4D /* A9Cache.swift in Sources */, CE13B819262480B3007CBD4D /* A9Cache.swift in Sources */,
CE578FE625FB415F00E8B85D /* LocationViewController.swift in Sources */, CE578FE625FB415F00E8B85D /* LocationViewController.swift in Sources */,
CD86246525E66E8A0097F3FB /* PrecipitationCell.swift in Sources */, CD86246525E66E8A0097F3FB /* PrecipitationCell.swift in Sources */,
CD80917B2578E4A8003541A4 /* UIViewController+Alert.swift in Sources */,
CEF959932600C63500975FAA /* AppAnalytics.swift in Sources */, CEF959932600C63500975FAA /* AppAnalytics.swift in Sources */,
CEE0A1A426317A8F0044C257 /* NWSAlertInfoParser.swift in Sources */, CEE0A1A426317A8F0044C257 /* NWSAlertInfoParser.swift in Sources */,
CEBAC1C62638236D00A89681 /* PushNotificationsManager.swift in Sources */, CEBAC1C62638236D00A89681 /* PushNotificationsManager.swift in Sources */,
......
1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>OneWeatherNotificationServiceExtension.xcscheme_^#shared#^_</key> <key>OneWeatherNotificationServiceExtension.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>53</integer> <integer>49</integer>
</dict> </dict>
<key>PG (Playground) 1.xcscheme</key> <key>PG (Playground) 1.xcscheme</key>
<dict> <dict>
......
1Weather/Model/LocationManager.swift
...@@ -12,7 +12,7 @@ import MoEngage ...@@ -12,7 +12,7 @@ import MoEngage
import OneWeatherCore import OneWeatherCore
import WDTWeatherSource import WDTWeatherSource
import BlendHealthSource import BlendHealthSource
import BlendFIPS import BlendFIPSSource
import CoreDataStorage import CoreDataStorage
import DelayedSaveStorage import DelayedSaveStorage
......
1Weather/UI/Helpers/ForecastTimePeriod/Buttons/ForecastDetailPeriodButton.swift
...@@ -79,7 +79,7 @@ class ForecastDetailPeriodButton: UIControl, PeriodButtonProtocol { ...@@ -79,7 +79,7 @@ class ForecastDetailPeriodButton: UIControl, PeriodButtonProtocol {
else { else {
self.backgroundColor = ThemeManager.currentTheme.periodButtonBackgroundColor self.backgroundColor = ThemeManager.currentTheme.periodButtonBackgroundColor
self.layer.borderWidth = 1 / UIScreen.main.scale self.layer.borderWidth = 1 / UIScreen.main.scale
self.dateLabel.font = AppFont.SFPro.regular(size: 16) self.dateLabel.font = AppFont.SFPro.regular(size: 14)
self.maxTempLabel.font = AppFont.SFPro.regular(size: 16) self.maxTempLabel.font = AppFont.SFPro.regular(size: 16)
self.precipImageView.tintColor = UIColor(hex: 0x1f67f3) self.precipImageView.tintColor = UIColor(hex: 0x1f67f3)
......
1Weather/UI/View controllers/Radar/MapTimeControl/MapCurrentTimeView.swift
...@@ -9,7 +9,6 @@ import UIKit ...@@ -9,7 +9,6 @@ import UIKit
class MapCurrentTimeView: UIView { class MapCurrentTimeView: UIView {
private let imageView = UIImageView() private let imageView = UIImageView()
private let valueLabel = UILabel()
private let timeLabel = UILabel() private let timeLabel = UILabel()
private static var timeFormatter:DateFormatter = { private static var timeFormatter:DateFormatter = {
let fmt = DateFormatter() let fmt = DateFormatter()
...@@ -27,7 +26,6 @@ class MapCurrentTimeView: UIView { ...@@ -27,7 +26,6 @@ class MapCurrentTimeView: UIView {
public func configure(timeItem:MapTimeControlItem) { public func configure(timeItem:MapTimeControlItem) {
MapCurrentTimeView.timeFormatter.timeZone = timeItem.timeZone MapCurrentTimeView.timeFormatter.timeZone = timeItem.timeZone
valueLabel.text = ""
timeLabel.text = MapCurrentTimeView.timeFormatter.string(from: timeItem.date) timeLabel.text = MapCurrentTimeView.timeFormatter.string(from: timeItem.date)
} }
...@@ -54,12 +52,6 @@ private extension MapCurrentTimeView { ...@@ -54,12 +52,6 @@ private extension MapCurrentTimeView {
} }
func prepareLabels() { func prepareLabels() {
valueLabel.font = AppFont.SFPro.bold(size: 14)
valueLabel.textColor = .white
valueLabel.text = "49°"
valueLabel.setContentHuggingPriority(.fittingSizeLevel, for: .vertical)
addSubview(valueLabel)
timeLabel.textAlignment = .center timeLabel.textAlignment = .center
timeLabel.font = AppFont.SFPro.bold(size: 10) timeLabel.font = AppFont.SFPro.bold(size: 10)
timeLabel.textColor = .white timeLabel.textColor = .white
...@@ -67,13 +59,8 @@ private extension MapCurrentTimeView { ...@@ -67,13 +59,8 @@ private extension MapCurrentTimeView {
addSubview(timeLabel) addSubview(timeLabel)
//Constraints //Constraints
valueLabel.snp.makeConstraints { (make) in
make.top.equalToSuperview().inset(4)
make.centerX.equalToSuperview()
}
timeLabel.snp.makeConstraints { (make) in timeLabel.snp.makeConstraints { (make) in
make.top.equalTo(valueLabel.snp.bottom) make.top.equalToSuperview().inset(4)
make.left.right.equalToSuperview().inset(4) make.left.right.equalToSuperview().inset(4)
make.bottom.equalToSuperview().inset(9) make.bottom.equalToSuperview().inset(9)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment