Skip to content

1
1weather
Commit 1a9581e2 by Dmitriy Stepanets
Options

Working on onboarding

parent 1b2c820b
Showing with 438 additions and 17 deletions
1Weather.xcodeproj/project.pbxproj
...@@ -15,7 +15,15 @@ ...@@ -15,7 +15,15 @@
CD1237DE255D612300C98139 /* CurrentForecastCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237DD255D612300C98139 /* CurrentForecastCell.swift */; }; CD1237DE255D612300C98139 /* CurrentForecastCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237DD255D612300C98139 /* CurrentForecastCell.swift */; };
CD1237F1255D83C500C98139 /* UIColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237F0255D83C500C98139 /* UIColor+Hex.swift */; }; CD1237F1255D83C500C98139 /* UIColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237F0255D83C500C98139 /* UIColor+Hex.swift */; };
CD1237F4255D889F00C98139 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237F3255D889F00C98139 /* GradientView.swift */; }; CD1237F4255D889F00C98139 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1237F3255D889F00C98139 /* GradientView.swift */; };
CD6B3036257262C2004B34B3 /* UIColor+Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B3035257262C2004B34B3 /* UIColor+Highlight.swift */; };
CD6B303B2572680C004B34B3 /* SelfSizingButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */; };
CD6B303E25726960004B34B3 /* ThemeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B303D25726960004B34B3 /* ThemeProtocol.swift */; };
CD6B304325726AD1004B34B3 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6B304225726AD1004B34B3 /* DefaultTheme.swift */; };
CDCC480E255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCC480D255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift */; }; CDCC480E255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCC480D255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift */; };
CDD0F1DF2572403E00CF5017 /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD0F1DE2572403E00CF5017 /* LocationViewController.swift */; };
CDD0F1E52572425200CF5017 /* SF-Pro.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CDD0F1E42572425200CF5017 /* SF-Pro.ttf */; };
CDD0F1E82572429E00CF5017 /* AppFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD0F1E72572429E00CF5017 /* AppFont.swift */; };
CDD0F1EE25725BCF00CF5017 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD0F1ED25725BCF00CF5017 /* ThemeManager.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -31,7 +39,15 @@ ...@@ -31,7 +39,15 @@
CD1237DD255D612300C98139 /* CurrentForecastCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentForecastCell.swift; sourceTree = "<group>"; }; CD1237DD255D612300C98139 /* CurrentForecastCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentForecastCell.swift; sourceTree = "<group>"; };
CD1237F0255D83C500C98139 /* UIColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Hex.swift"; sourceTree = "<group>"; }; CD1237F0255D83C500C98139 /* UIColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Hex.swift"; sourceTree = "<group>"; };
CD1237F3255D889F00C98139 /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; }; CD1237F3255D889F00C98139 /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
CD6B3035257262C2004B34B3 /* UIColor+Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Highlight.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>"; };
CD6B304225726AD1004B34B3 /* DefaultTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; };
CDCC480D255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentForecastDetailsCell.swift; sourceTree = "<group>"; }; CDCC480D255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentForecastDetailsCell.swift; sourceTree = "<group>"; };
CDD0F1DE2572403E00CF5017 /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
CDD0F1E42572425200CF5017 /* SF-Pro.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-Pro.ttf"; sourceTree = "<group>"; };
CDD0F1E72572429E00CF5017 /* AppFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppFont.swift; sourceTree = "<group>"; };
CDD0F1ED25725BCF00CF5017 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
DF826CF4702D9DCCB9A9DD71 /* Pods-1Weather.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-1Weather.release.xcconfig"; path = "Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig"; sourceTree = "<group>"; }; DF826CF4702D9DCCB9A9DD71 /* Pods-1Weather.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-1Weather.release.xcconfig"; path = "Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -77,13 +93,13 @@ ...@@ -77,13 +93,13 @@
CD1237C1255D5C5900C98139 /* 1Weather */ = { CD1237C1255D5C5900C98139 /* 1Weather */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CD1237DA255D5DFA00C98139 /* PG.playground */,
CDD0F1DC2572400200CF5017 /* UI */,
CD1237EF255D838600C98139 /* Extensions */, CD1237EF255D838600C98139 /* Extensions */,
CD1237E5255D74C400C98139 /* Common */, CD1237E5255D74C400C98139 /* Common */,
CD1237DC255D60EC00C98139 /* Cells */, CDD0F1E2257240DA00CF5017 /* Resources */,
CD1237DA255D5DFA00C98139 /* PG.playground */,
CD1237C2255D5C5900C98139 /* AppDelegate.swift */, CD1237C2255D5C5900C98139 /* AppDelegate.swift */,
CD1237C6255D5C5900C98139 /* ViewController.swift */, CD1237C6255D5C5900C98139 /* ViewController.swift */,
CD1237CB255D5C5C00C98139 /* Assets.xcassets */,
CD1237CD255D5C5C00C98139 /* LaunchScreen.storyboard */, CD1237CD255D5C5C00C98139 /* LaunchScreen.storyboard */,
CD1237D0255D5C5C00C98139 /* Info.plist */, CD1237D0255D5C5C00C98139 /* Info.plist */,
); );
...@@ -102,7 +118,6 @@ ...@@ -102,7 +118,6 @@
CD1237E5255D74C400C98139 /* Common */ = { CD1237E5255D74C400C98139 /* Common */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CD1237F3255D889F00C98139 /* GradientView.swift */,
); );
path = Common; path = Common;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -111,10 +126,83 @@ ...@@ -111,10 +126,83 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CD1237F0255D83C500C98139 /* UIColor+Hex.swift */, CD1237F0255D83C500C98139 /* UIColor+Hex.swift */,
CD6B3035257262C2004B34B3 /* UIColor+Highlight.swift */,
); );
path = Extensions; path = Extensions;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
CD6B3038257267E2004B34B3 /* View controllers */ = {
isa = PBXGroup;
children = (
CDD0F1DD2572401000CF5017 /* Location */,
);
path = "View controllers";
sourceTree = "<group>";
};
CD6B3039257267FB004B34B3 /* Buttons */ = {
isa = PBXGroup;
children = (
CD6B303A2572680C004B34B3 /* SelfSizingButton.swift */,
);
path = Buttons;
sourceTree = "<group>";
};
CD6B304125726ABE004B34B3 /* Themes */ = {
isa = PBXGroup;
children = (
CD6B303D25726960004B34B3 /* ThemeProtocol.swift */,
CD6B304225726AD1004B34B3 /* DefaultTheme.swift */,
);
path = Themes;
sourceTree = "<group>";
};
CDD0F1DC2572400200CF5017 /* UI */ = {
isa = PBXGroup;
children = (
CD6B3039257267FB004B34B3 /* Buttons */,
CD6B3038257267E2004B34B3 /* View controllers */,
CD1237DC255D60EC00C98139 /* Cells */,
CDD0F1F025725BD700CF5017 /* Helpers */,
);
path = UI;
sourceTree = "<group>";
};
CDD0F1DD2572401000CF5017 /* Location */ = {
isa = PBXGroup;
children = (
CDD0F1DE2572403E00CF5017 /* LocationViewController.swift */,
);
path = Location;
sourceTree = "<group>";
};
CDD0F1E2257240DA00CF5017 /* Resources */ = {
isa = PBXGroup;
children = (
CD1237CB255D5C5C00C98139 /* Assets.xcassets */,
CDD0F1E3257240F300CF5017 /* Fonts */,
);
path = Resources;
sourceTree = "<group>";
};
CDD0F1E3257240F300CF5017 /* Fonts */ = {
isa = PBXGroup;
children = (
CDD0F1E42572425200CF5017 /* SF-Pro.ttf */,
);
path = Fonts;
sourceTree = "<group>";
};
CDD0F1F025725BD700CF5017 /* Helpers */ = {
isa = PBXGroup;
children = (
CD6B304125726ABE004B34B3 /* Themes */,
CD1237F3255D889F00C98139 /* GradientView.swift */,
CDD0F1E72572429E00CF5017 /* AppFont.swift */,
CDD0F1ED25725BCF00CF5017 /* ThemeManager.swift */,
);
path = Helpers;
sourceTree = "<group>";
};
DBFD169AA2AA6A3CB5B68BB5 /* Frameworks */ = { DBFD169AA2AA6A3CB5B68BB5 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -183,6 +271,7 @@ ...@@ -183,6 +271,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
CD1237CF255D5C5C00C98139 /* LaunchScreen.storyboard in Resources */, CD1237CF255D5C5C00C98139 /* LaunchScreen.storyboard in Resources */,
CDD0F1E52572425200CF5017 /* SF-Pro.ttf in Resources */,
CD1237CC255D5C5C00C98139 /* Assets.xcassets in Resources */, CD1237CC255D5C5C00C98139 /* Assets.xcassets in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -236,11 +325,18 @@ ...@@ -236,11 +325,18 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
CDD0F1E82572429E00CF5017 /* AppFont.swift in Sources */,
CDD0F1DF2572403E00CF5017 /* LocationViewController.swift in Sources */,
CDCC480E255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift in Sources */, CDCC480E255EA8D2003EA8A7 /* CurrentForecastDetailsCell.swift in Sources */,
CD1237C7255D5C5900C98139 /* ViewController.swift in Sources */, CD1237C7255D5C5900C98139 /* ViewController.swift in Sources */,
CD1237F1255D83C500C98139 /* UIColor+Hex.swift in Sources */, CD1237F1255D83C500C98139 /* UIColor+Hex.swift in Sources */,
CDD0F1EE25725BCF00CF5017 /* ThemeManager.swift in Sources */,
CD1237F4255D889F00C98139 /* GradientView.swift in Sources */, CD1237F4255D889F00C98139 /* GradientView.swift in Sources */,
CD1237C3255D5C5900C98139 /* AppDelegate.swift in Sources */, CD1237C3255D5C5900C98139 /* AppDelegate.swift in Sources */,
CD6B304325726AD1004B34B3 /* DefaultTheme.swift in Sources */,
CD6B3036257262C2004B34B3 /* UIColor+Highlight.swift in Sources */,
CD6B303E25726960004B34B3 /* ThemeProtocol.swift in Sources */,
CD6B303B2572680C004B34B3 /* SelfSizingButton.swift in Sources */,
CD1237DE255D612300C98139 /* CurrentForecastCell.swift in Sources */, CD1237DE255D612300C98139 /* CurrentForecastCell.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
......
1Weather.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>1Weather.xcscheme_^#shared#^_</key> <key>1Weather.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>2</integer> <integer>4</integer>
</dict> </dict>
<key>PG (Playground) 1.xcscheme</key> <key>PG (Playground) 1.xcscheme</key>
<dict> <dict>
......
1Weather.xcworkspace/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key> <key>orderHint</key>
<integer>3</integer> <integer>5</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
1Weather/AppDelegate.swift
...@@ -13,8 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -13,8 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
ThemeManager.refreshAppearance()
self.window = UIWindow(frame: UIScreen.main.bounds) self.window = UIWindow(frame: UIScreen.main.bounds)
self.window?.rootViewController = ViewController() self.window?.rootViewController = UINavigationController(rootViewController: LocationViewController())
self.window?.makeKeyAndVisible() self.window?.makeKeyAndVisible()
return true return true
......
1Weather/Extensions/UIColor+Highlight.swift 0 → 100644
//
// UIColor+Highlight.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
extension UIColor {
var highlighted:UIColor {
return self.adjust(by: -30)
}
private func adjust(by percentage:CGFloat=30.0) -> UIColor {
var r:CGFloat=0, g:CGFloat=0, b:CGFloat=0, a:CGFloat=0;
if(self.getRed(&r, green: &g, blue: &b, alpha: &a)){
return UIColor(red: min(r + percentage/100, 1.0),
green: min(g + percentage/100, 1.0),
blue: min(b + percentage/100, 1.0),
alpha: a)
}
else{
return self
}
}
}
1Weather/Info.plist
...@@ -41,5 +41,9 @@ ...@@ -41,5 +41,9 @@
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIAppFonts</key>
<array>
<string>SF-Pro.ttf</string>
</array>
</dict> </dict>
</plist> </plist>
1Weather/Resources/Assets.xcassets/close_cross.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "close-cross.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "template"
}
}
1Weather/Resources/Assets.xcassets/location_arrow.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "location_arrow.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "original"
}
}
1Weather/UI/Buttons/SelfSizingButton.swift 0 → 100644
//
// SelfSizingButton.swift
// SquareOffs
//
// Created by Dmitry Stepanets on 30.10.2019.
// Copyright © 2019 Dynamix Software. All rights reserved.
//
import UIKit
class SelfSizingButton: UIButton {
override var intrinsicContentSize: CGSize {
let size = super.intrinsicContentSize
return CGSize(width: size.width + titleEdgeInsets.left + titleEdgeInsets.right,
height: size.height + titleEdgeInsets.top + titleEdgeInsets.bottom)
}
}
1Weather/UI/Helpers/AppFont.swift 0 → 100644
//
// AppFont.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
public struct AppFont {
public struct SFPro {
static func regular(size: CGFloat) -> UIFont {
guard let font = UIFont(name: "SFPro-Regualr", size: size) else {
return UIFont.systemFont(ofSize: size)
}
return font
}
static func bold(size: CGFloat) -> UIFont {
guard let font = UIFont(name: "SFPro-Bold", size: size) else {
return UIFont.systemFont(ofSize: size, weight: .bold)
}
return font
}
}
}
1Weather/UI/Helpers/ThemeManager.swift 0 → 100644
//
// ThemeManager.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
public struct ThemeManager {
struct Colors {
static let locationBlue = UIColor(hex: 0x1071F0)
}
static var currentTheme:ThemeProtocol {
return DefaultTheme()
}
static func refreshAppearance() {
UINavigationBar.appearance().barTintColor = currentTheme.navigationBarBackgroundColor
UINavigationBar.appearance().isTranslucent = false
UINavigationBar.appearance().tintColor = currentTheme.navigationTintColor
}
}
1Weather/UI/Helpers/Themes/DefaultTheme.swift 0 → 100644
//
// DefaultTheme.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
struct DefaultTheme: ThemeProtocol {
var name: String {
return "Default"
}
var navigationBarBackgroundColor: UIColor {
return UIColor(hex: 0x17181A)
}
var navigationTintColor: UIColor {
return .white
}
var tabBarTintColor: UIColor {
return .white
}
var tabBarBarTintColor: UIColor {
return navigationBarBackgroundColor
}
var primaryTextColor: UIColor {
return .white
}
}
1Weather/UI/Helpers/Themes/ThemeProtocol.swift 0 → 100644
//
// ThemeProtocol.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
protocol ThemeProtocol {
var name:String { get }
var navigationBarBackgroundColor:UIColor { get }
var navigationTintColor:UIColor { get }
var tabBarTintColor:UIColor { get }
var tabBarBarTintColor:UIColor { get }
var primaryTextColor:UIColor { get }
}
1Weather/UI/View controllers/Location/LocationViewController.swift 0 → 100644
//
// LocationViewController.swift
// 1Weather
//
// Created by Dmitry Stepanets on 28.11.2020.
//
import UIKit
class LocationViewController: UIViewController {
//Private
private let searchBar = UISearchBar()
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = ThemeManager.currentTheme.navigationBarBackgroundColor
edgesForExtendedLayout = []
prepareNavBar()
prepareSearchBar()
prepareLocationButton()
}
@objc private func handleCloseButton() {
}
@objc private func handleLocationButton() {
}
}
//MARK:- Prepare
private extension LocationViewController {
func prepareNavBar() {
self.navigationController?.view.backgroundColor = .white
//Title
let titleLabel = UILabel()
titleLabel.textAlignment = .left
titleLabel.font = AppFont.SFPro.bold(size: 24)
titleLabel.text = "Select Location"
titleLabel.translatesAutoresizingMaskIntoConstraints = false
titleLabel.textColor = ThemeManager.currentTheme.navigationTintColor
navigationItem.titleView = titleLabel
guard let containerView = self.navigationItem.titleView?.superview else { return }
titleLabel.snp.makeConstraints({ (make) in
make.left.equalTo(containerView).inset(16).priority(.medium)
make.top.equalTo(containerView).priority(.medium)
make.right.equalTo(containerView).priority(.medium)
make.bottom.equalTo(containerView).priority(.medium)
})
//Close button
let closeButton = UIBarButtonItem(image: UIImage(named: "close_cross"), style: .plain, target: self, action: #selector(handleCloseButton))
closeButton.tintColor = ThemeManager.currentTheme.navigationTintColor
self.navigationItem.rightBarButtonItems = [closeButton]
}
func prepareSearchBar() {
searchBar.searchBarStyle = .minimal
searchBar.placeholder = "Search"
view.addSubview(searchBar)
searchBar.snp.makeConstraints { (make) in
make.top.equalToSuperview()
make.left.equalToSuperview().inset(16)
make.right.equalToSuperview().inset(16)
}
}
func prepareLocationButton() {
let locationButton = SelfSizingButton(frame: .zero)
locationButton.tintColor = ThemeManager.Colors.locationBlue
locationButton.setImage(UIImage(named: "location_arrow"), for: .normal)
locationButton.setTitle("Use Current Location", for: .normal)
locationButton.setTitleColor(ThemeManager.Colors.locationBlue, for: .normal)
locationButton.setTitleColor(ThemeManager.Colors.locationBlue.highlighted, for: .highlighted)
locationButton.addTarget(self, action: #selector(handleLocationButton), for: .touchUpInside)
locationButton.titleLabel?.font = AppFont.SFPro.regular(size: 18)
locationButton.titleEdgeInsets = .init(top: 0, left: 26, bottom: 0, right: 0)
locationButton.sizeToFit()
view.addSubview(locationButton)
locationButton.snp.makeConstraints { (make) in
make.left.equalToSuperview().inset(16)
make.top.equalTo(searchBar.snp.bottom).offset(12)
}
}
}
Podfile
...@@ -7,4 +7,5 @@ target '1Weather' do ...@@ -7,4 +7,5 @@ target '1Weather' do
# Pods for 1Weather # Pods for 1Weather
pod 'SnapKit' pod 'SnapKit'
pod 'AlgoliaSearchClient'
end end
Podfile.lock
PODS: PODS:
- AlgoliaSearchClient (8.3.0):
- Logging
- Logging (1.4.0)
- SnapKit (5.0.1) - SnapKit (5.0.1)
DEPENDENCIES: DEPENDENCIES:
- AlgoliaSearchClient
- SnapKit - SnapKit
SPEC REPOS: SPEC REPOS:
trunk: trunk:
- AlgoliaSearchClient
- Logging
- SnapKit - SnapKit
SPEC CHECKSUMS: SPEC CHECKSUMS:
AlgoliaSearchClient: 3a2f00249fc9013cd4fc0a2d27f8ac56f5219db6
Logging: beeb016c9c80cf77042d62e83495816847ef108b
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
PODFILE CHECKSUM: 557cc3adbb76884c3857787d3eee498b180b38f5 PODFILE CHECKSUM: 4ce4a0351a59be583159c027f42455d95400fe08
COCOAPODS: 1.10.0 COCOAPODS: 1.10.0
Pods/Manifest.lock
PODS: PODS:
- AlgoliaSearchClient (8.3.0):
- Logging
- Logging (1.4.0)
- SnapKit (5.0.1) - SnapKit (5.0.1)
DEPENDENCIES: DEPENDENCIES:
- AlgoliaSearchClient
- SnapKit - SnapKit
SPEC REPOS: SPEC REPOS:
trunk: trunk:
- AlgoliaSearchClient
- Logging
- SnapKit - SnapKit
SPEC CHECKSUMS: SPEC CHECKSUMS:
AlgoliaSearchClient: 3a2f00249fc9013cd4fc0a2d27f8ac56f5219db6
Logging: beeb016c9c80cf77042d62e83495816847ef108b
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
PODFILE CHECKSUM: 557cc3adbb76884c3857787d3eee498b180b38f5 PODFILE CHECKSUM: 4ce4a0351a59be583159c027f42455d95400fe08
COCOAPODS: 1.10.0 COCOAPODS: 1.10.0
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Pods.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -4,20 +4,34 @@ ...@@ -4,20 +4,34 @@
<dict> <dict>
<key>SchemeUserState</key> <key>SchemeUserState</key>
<dict> <dict>
<key>Pods-1Weather.xcscheme</key> <key>AlgoliaSearchClient.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key> <key>orderHint</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>SnapKit.xcscheme</key> <key>Logging.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key> <key>orderHint</key>
<integer>1</integer> <integer>1</integer>
</dict> </dict>
<key>Pods-1Weather.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>SnapKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
<dict/> <dict/>
......
Pods/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks-Debug-input-files.xcfilelist
${PODS_ROOT}/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks.sh ${PODS_ROOT}/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks.sh
${BUILT_PRODUCTS_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework
${BUILT_PRODUCTS_DIR}/Logging/Logging.framework
${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework ${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
\ No newline at end of file
Pods/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks-Debug-output-files.xcfilelist
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlgoliaSearchClient.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Logging.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
\ No newline at end of file
Pods/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks-Release-input-files.xcfilelist
${PODS_ROOT}/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks.sh ${PODS_ROOT}/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks.sh
${BUILT_PRODUCTS_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework
${BUILT_PRODUCTS_DIR}/Logging/Logging.framework
${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework ${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
\ No newline at end of file
Pods/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks-Release-output-files.xcfilelist
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlgoliaSearchClient.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Logging.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
\ No newline at end of file
Pods/Target Support Files/Pods-1Weather/Pods-1Weather-frameworks.sh
...@@ -175,9 +175,13 @@ code_sign_if_enabled() { ...@@ -175,9 +175,13 @@ code_sign_if_enabled() {
} }
if [[ "$CONFIGURATION" == "Debug" ]]; then if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Logging/Logging.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework" install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
fi fi
if [[ "$CONFIGURATION" == "Release" ]]; then if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework"
install_framework "${BUILT_PRODUCTS_DIR}/Logging/Logging.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework" install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
fi fi
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
......
Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AlgoliaSearchClient" "${PODS_CONFIGURATION_BUILD_DIR}/Logging" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Logging/Logging.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -framework "SnapKit" OTHER_LDFLAGS = $(inherited) -framework "AlgoliaSearchClient" -framework "Logging" -framework "SnapKit"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR} PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AlgoliaSearchClient" "${PODS_CONFIGURATION_BUILD_DIR}/Logging" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AlgoliaSearchClient/AlgoliaSearchClient.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Logging/Logging.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -framework "SnapKit" OTHER_LDFLAGS = $(inherited) -framework "AlgoliaSearchClient" -framework "Logging" -framework "SnapKit"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR} PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
......
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