Skip to content

1
1weather
Commit 1b95cad5 by Dmitriy Stepanets
Options

Replaced splash screen background

parent d0ecc49d
Showing with 36 additions and 42 deletions
1Weather/Model/CCPA/CCPAHelper.swift
...@@ -148,7 +148,6 @@ class CCPAHelper { ...@@ -148,7 +148,6 @@ class CCPAHelper {
} }
// Firebase // Firebase
Firebase.Analytics.setUserProperty(canCollectData ? "true" : "false", forName: AnalyticsUserPropertyAllowAdPersonalizationSignals) Firebase.Analytics.setUserProperty(canCollectData ? "true" : "false", forName: AnalyticsUserPropertyAllowAdPersonalizationSignals)
Firebase.Analytics.setAnalyticsCollectionEnabled(canCollectData) Firebase.Analytics.setAnalyticsCollectionEnabled(canCollectData)
......
1Weather/Resources/Assets.xcassets/splash_background.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "splash_background.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "original"
}
}
1Weather/Resources/LaunchScreen.storyboard
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<customFonts key="customFonts">
<array key="SF-Pro.ttf">
<string>SFPro-Bold</string>
<string>SFPro-Regular</string>
</array>
</customFonts>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
<scene sceneID="EHf-IW-A2E"> <scene sceneID="EHf-IW-A2E">
...@@ -25,42 +19,16 @@ ...@@ -25,42 +19,16 @@
<rect key="frame" x="0.0" y="0.0" width="390" height="844"/> <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pgM-ha-uFh" userLabel="Logo Container View"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splash_background" translatesAutoresizingMaskIntoConstraints="NO" id="yBk-JY-Vpa">
<rect key="frame" x="103.66666666666667" y="386" width="182.66666666666663" height="72"/> <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
<subviews> </imageView>
<imageView clipsSubviews="YES" clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_app_icon" translatesAutoresizingMaskIntoConstraints="NO" id="vyA-OC-sOG" userLabel="Logo Image View">
<rect key="frame" x="8" y="0.0" width="48" height="48"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Proud to serve 50 million users" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mIG-va-ePB">
<rect key="frame" x="4" y="58" width="175" height="14"/>
<fontDescription key="fontDescription" name="SFPro-Regular" family="SF Pro" pointSize="12"/>
<color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1Weather" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cpE-Vg-eMU">
<rect key="frame" x="67.999999999999972" y="10" width="106.66666666666666" height="28"/>
<fontDescription key="fontDescription" name="SFPro-Bold" family="SF Pro" pointSize="24"/>
<color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.070963539179999993" green="0.098073191939999999" blue="0.1129643098" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="vyA-OC-sOG" firstAttribute="leading" secondItem="pgM-ha-uFh" secondAttribute="leading" constant="8" id="0lS-xt-LeQ"/>
<constraint firstItem="mIG-va-ePB" firstAttribute="centerX" secondItem="pgM-ha-uFh" secondAttribute="centerX" id="8NR-gd-Gar"/>
<constraint firstItem="mIG-va-ePB" firstAttribute="top" secondItem="vyA-OC-sOG" secondAttribute="bottom" constant="10" id="DYb-sz-DkP"/>
<constraint firstItem="vyA-OC-sOG" firstAttribute="top" secondItem="pgM-ha-uFh" secondAttribute="top" id="XGC-8j-hAa"/>
<constraint firstItem="cpE-Vg-eMU" firstAttribute="leading" secondItem="vyA-OC-sOG" secondAttribute="trailing" constant="12" id="cfL-yp-Lz8"/>
<constraint firstItem="cpE-Vg-eMU" firstAttribute="centerY" secondItem="vyA-OC-sOG" secondAttribute="centerY" id="eT7-JO-S3T"/>
<constraint firstAttribute="bottom" secondItem="mIG-va-ePB" secondAttribute="bottom" id="nuo-0R-06a"/>
<constraint firstAttribute="trailing" secondItem="cpE-Vg-eMU" secondAttribute="trailing" constant="8" id="p9F-o6-J4N"/>
</constraints>
</view>
</subviews> </subviews>
<color key="backgroundColor" red="0.074509803921568626" green="0.098039215686274508" blue="0.11372549019607843" alpha="1" colorSpace="custom" customColorSpace="displayP3"/> <color key="backgroundColor" red="0.074509803921568626" green="0.098039215686274508" blue="0.11372549019607843" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints> <constraints>
<constraint firstItem="pgM-ha-uFh" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="lC5-Ud-bhG"/> <constraint firstAttribute="bottom" secondItem="yBk-JY-Vpa" secondAttribute="bottom" id="Pj0-xJ-24h"/>
<constraint firstItem="pgM-ha-uFh" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="tis-hw-QqQ"/> <constraint firstItem="yBk-JY-Vpa" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="dqM-6Q-E0L"/>
<constraint firstAttribute="trailing" secondItem="yBk-JY-Vpa" secondAttribute="trailing" id="nVI-bi-CTI"/>
<constraint firstItem="yBk-JY-Vpa" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="x99-B0-qB3"/>
</constraints> </constraints>
</view> </view>
</viewController> </viewController>
...@@ -70,6 +38,6 @@ ...@@ -70,6 +38,6 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="launch_app_icon" width="48" height="48"/> <image name="splash_background" width="390" height="788"/>
</resources> </resources>
</document> </document>
1Weather/UI/View controllers/SplashAnimation/SplashAnimationViewController.swift
...@@ -10,6 +10,7 @@ import Lottie ...@@ -10,6 +10,7 @@ import Lottie
class SplashAnimationViewController: UIViewController { class SplashAnimationViewController: UIViewController {
private let appCoordinator:AppCoordinator private let appCoordinator:AppCoordinator
private let backgroundImageView = UIImageView()
private let animation = Animation.named("splash") private let animation = Animation.named("splash")
private var animationView:AnimationView? private var animationView:AnimationView?
private let playButton = UIButton() private let playButton = UIButton()
...@@ -26,7 +27,17 @@ class SplashAnimationViewController: UIViewController { ...@@ -26,7 +27,17 @@ class SplashAnimationViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = UIColor(hex: 0x13191D) view.backgroundColor = .black
//Background image
backgroundImageView.image = UIImage(named: "splash_background")
backgroundImageView.contentMode = .scaleAspectFill
view.addSubview(backgroundImageView)
backgroundImageView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
//Animation
animationView = AnimationView(animation: animation) animationView = AnimationView(animation: animation)
view.addSubview(animationView!) view.addSubview(animationView!)
......
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
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