Skip to content

1
1weather
Commit b0b13c12 by Dmitriy Stepanets
Options

Added scrolling behavior for legend view

parent f6a6422b
Showing with 21 additions and 13 deletions
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>7</integer> <integer>37</integer>
</dict> </dict>
<key>PG (Playground) 1.xcscheme</key> <key>PG (Playground) 1.xcscheme</key>
<dict> <dict>
......
1Weather/Model/RadarLayers/SevereLayerType.swift
...@@ -119,13 +119,12 @@ public enum SevereLayerType:String, CaseIterable, RadarLayerType { ...@@ -119,13 +119,12 @@ public enum SevereLayerType:String, CaseIterable, RadarLayerType {
UIColor(hex: 0x7F1819), UIColor(hex: 0x7F1819),
UIColor(hex: 0xF0807F)].map{$0.cgColor} UIColor(hex: 0xF0807F)].map{$0.cgColor}
case .hurricaneTropicalTracks: case .hurricaneTropicalTracks:
return [UIColor.black, return [UIColor(hex: 0x61bb46),
UIColor.black, UIColor(hex: 0xfdb827),
UIColor.black, UIColor(hex: 0xf5821f),
UIColor.black, UIColor(hex: 0xe03a3e),
UIColor.black, UIColor(hex: 0x963d97),
UIColor.black, UIColor(hex: 0x009ddc)].map{$0.cgColor}
UIColor.black].map{$0.cgColor}
case .ice: case .ice:
return [UIColor(hex: 0x8A008B), return [UIColor(hex: 0x8A008B),
UIColor(hex: 0x8A008B), UIColor(hex: 0x8A008B),
......
1Weather/UI/View controllers/Radar/Controls/MapLegendSevereView.swift
...@@ -9,6 +9,7 @@ import UIKit ...@@ -9,6 +9,7 @@ import UIKit
class MapLegendSevereView: UIView { class MapLegendSevereView: UIView {
//Private //Private
private let scrollView = UIScrollView()
private let stackView = UIStackView() private let stackView = UIStackView()
init() { init() {
...@@ -37,13 +38,22 @@ class MapLegendSevereView: UIView { ...@@ -37,13 +38,22 @@ class MapLegendSevereView: UIView {
} }
private func prepare() { private func prepare() {
scrollView.showsVerticalScrollIndicator = false
scrollView.showsHorizontalScrollIndicator = false
scrollView.clipsToBounds = false
addSubview(scrollView)
scrollView.snp.makeConstraints { (make) in
make.edges.equalToSuperview()
}
stackView.axis = .horizontal stackView.axis = .horizontal
stackView.spacing = 8 stackView.spacing = 8
stackView.distribution = .equalSpacing stackView.distribution = .fillEqually
addSubview(stackView) scrollView.addSubview(stackView)
stackView.snp.makeConstraints { (make) in stackView.snp.makeConstraints { (make) in
make.edges.equalToSuperview() make.edges.height.equalToSuperview()
make.centerX.equalToSuperview().priority(.low)
} }
} }
} }
...@@ -78,8 +88,7 @@ private class SevereLegendElement:UIView { ...@@ -78,8 +88,7 @@ private class SevereLegendElement:UIView {
private func prepare() { private func prepare() {
self.snp.makeConstraints { (make) in self.snp.makeConstraints { (make) in
make.width.equalTo(50).priority(999) make.width.equalTo(50)
make.height.equalTo(40)
} }
imageView.clipsToBounds = true imageView.clipsToBounds = true
......
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