Skip to content

Commit 0c2a116

Browse files
authored
Обновил launcher screen (#113)
1 parent d531d51 commit 0c2a116

File tree

8 files changed

+98
-40
lines changed

8 files changed

+98
-40
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xFF",
9+
"green" : "0xFF",
10+
"red" : "0xFE"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0x1A",
27+
"green" : "0x1A",
28+
"red" : "0x1A"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "workout_logo_png_white.svg",
5+
"idiom" : "universal"
6+
},
7+
{
8+
"appearances" : [
9+
{
10+
"appearance" : "luminosity",
11+
"value" : "dark"
12+
}
13+
],
14+
"compression-type" : "automatic",
15+
"filename" : "workout_logo_black-2.svg",
16+
"idiom" : "universal"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "original"
25+
}
26+
}

SwiftUI-WorkoutApp/Resources/Assets.xcassets/launcherLogo.imageset/workout_logo_black-2.svg

Lines changed: 9 additions & 0 deletions
Loading

SwiftUI-WorkoutApp/Resources/Assets.xcassets/launcherLogo.imageset/workout_logo_png_white.svg

Lines changed: 9 additions & 0 deletions
Loading

SwiftUI-WorkoutApp/Resources/Assets.xcassets/login_logo.imageset/Contents.json

Lines changed: 0 additions & 22 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3-
<device id="retina6_1" orientation="portrait" appearance="light"/>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina6_72" orientation="portrait" appearance="dark"/>
44
<dependencies>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
7+
<capability name="Named colors" minToolsVersion="9.0"/>
68
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
79
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
810
</dependencies>
@@ -11,28 +13,21 @@
1113
<scene sceneID="EHf-IW-A2E">
1214
<objects>
1315
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
14-
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
15-
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
16+
<view key="view" clipsSubviews="YES" contentMode="scaleToFill" id="Ze5-6b-2t3">
17+
<rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
1618
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1719
<subviews>
18-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
19-
<rect key="frame" x="0.0" y="876" width="414" height="0.0"/>
20-
<fontDescription key="fontDescription" type="system" pointSize="17"/>
21-
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
22-
<nil key="highlightedColor"/>
23-
</label>
24-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_logo" translatesAutoresizingMaskIntoConstraints="NO" id="fqq-3l-q1e">
25-
<rect key="frame" x="117.5" y="374.5" width="179" height="147.5"/>
20+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launcherLogo" translatesAutoresizingMaskIntoConstraints="NO" id="fqq-3l-q1e">
21+
<rect key="frame" x="110" y="341" width="210" height="250"/>
2622
</imageView>
2723
</subviews>
2824
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
29-
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
25+
<color key="backgroundColor" name="launcherBackground"/>
3026
<constraints>
31-
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
3227
<constraint firstItem="fqq-3l-q1e" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="7kN-7G-jhj"/>
33-
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
34-
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
28+
<constraint firstItem="fqq-3l-q1e" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="110" id="bxj-JS-qdb"/>
3529
<constraint firstItem="fqq-3l-q1e" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="vac-mk-hXV"/>
30+
<constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="fqq-3l-q1e" secondAttribute="trailing" constant="110" id="wd0-ll-gZC"/>
3631
</constraints>
3732
</view>
3833
</viewController>
@@ -42,6 +37,9 @@
4237
</scene>
4338
</scenes>
4439
<resources>
45-
<image name="login_logo" width="179" height="147.5"/>
40+
<image name="launcherLogo" width="315" height="250"/>
41+
<namedColor name="launcherBackground">
42+
<color red="0.99999994039535522" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
43+
</namedColor>
4644
</resources>
4745
</document>

0 commit comments

Comments
 (0)