Skip to content

Commit 3014e9b

Browse files
committed
New app icons
1 parent b4c7d32 commit 3014e9b

38 files changed

+31
-31
lines changed

Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/Contents.json renamed to Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "adamant-logo-1024x1024.png",
5+
"filename" : "adamant-logo-1024.png",
66
"scale" : "1x"
77
},
88
{
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Adamant/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,109 +3,109 @@
33
{
44
"size" : "20x20",
55
"idiom" : "iphone",
6-
"filename" : "adamant-app-logo-20@2x.png",
6+
"filename" : "icon-bold-20@2x.png",
77
"scale" : "2x"
88
},
99
{
1010
"size" : "20x20",
1111
"idiom" : "iphone",
12-
"filename" : "adamant-app-logo-20@3x.png",
12+
"filename" : "icon-bold-20@3x.png",
1313
"scale" : "3x"
1414
},
1515
{
1616
"size" : "29x29",
1717
"idiom" : "iphone",
18-
"filename" : "adamant-app-logo-29@2x.png",
18+
"filename" : "adamant-icon-bold-29@2x.png",
1919
"scale" : "2x"
2020
},
2121
{
2222
"size" : "29x29",
2323
"idiom" : "iphone",
24-
"filename" : "adamant-app-logo-29@3x.png",
24+
"filename" : "adamant-icon-bold-29@3x.png",
2525
"scale" : "3x"
2626
},
2727
{
2828
"size" : "40x40",
2929
"idiom" : "iphone",
30-
"filename" : "adamant-app-logo-40@2x.png",
30+
"filename" : "adamant-icon-bold-40@2x.png",
3131
"scale" : "2x"
3232
},
3333
{
3434
"size" : "40x40",
3535
"idiom" : "iphone",
36-
"filename" : "adamant-app-logo-40@3x.png",
36+
"filename" : "adamant-icon-bold-40@3x.png",
3737
"scale" : "3x"
3838
},
3939
{
4040
"size" : "60x60",
4141
"idiom" : "iphone",
42-
"filename" : "60@2x.png",
42+
"filename" : "adamant-icon-bold-60@2x.png",
4343
"scale" : "2x"
4444
},
4545
{
4646
"size" : "60x60",
4747
"idiom" : "iphone",
48-
"filename" : "60@3x.png",
48+
"filename" : "adamant-icon-bold-60@3x.png",
4949
"scale" : "3x"
5050
},
5151
{
5252
"size" : "20x20",
5353
"idiom" : "ipad",
54-
"filename" : "adamant-app-logo-20.png",
54+
"filename" : "adamant-icon-bold-20.png",
5555
"scale" : "1x"
5656
},
5757
{
5858
"size" : "20x20",
5959
"idiom" : "ipad",
60-
"filename" : "adamant-app-logo-20@2x.png",
60+
"filename" : "adamant-icon-bold-20@2x.png",
6161
"scale" : "2x"
6262
},
6363
{
6464
"size" : "29x29",
6565
"idiom" : "ipad",
66-
"filename" : "adamant-app-logo-29.png",
66+
"filename" : "adamant-icon-bold-29.png",
6767
"scale" : "1x"
6868
},
6969
{
7070
"size" : "29x29",
7171
"idiom" : "ipad",
72-
"filename" : "adamant-app-logo-29@2x.png",
72+
"filename" : "adamant-icon-bold-29@2x-1.png",
7373
"scale" : "2x"
7474
},
7575
{
7676
"size" : "40x40",
7777
"idiom" : "ipad",
78-
"filename" : "adamant-app-logo-40.png",
78+
"filename" : "adamant-icon-bold-40.png",
7979
"scale" : "1x"
8080
},
8181
{
8282
"size" : "40x40",
8383
"idiom" : "ipad",
84-
"filename" : "adamant-app-logo-40@2x.png",
84+
"filename" : "adamant-icon-bold-40@2x-1.png",
8585
"scale" : "2x"
8686
},
8787
{
8888
"size" : "76x76",
8989
"idiom" : "ipad",
90-
"filename" : "76.png",
90+
"filename" : "adamant-icon-bold-76.png",
9191
"scale" : "1x"
9292
},
9393
{
9494
"size" : "76x76",
9595
"idiom" : "ipad",
96-
"filename" : "76@2x.png",
96+
"filename" : "adamant-icon-bold-76@2x.png",
9797
"scale" : "2x"
9898
},
9999
{
100100
"size" : "83.5x83.5",
101101
"idiom" : "ipad",
102-
"filename" : "83@2x.png",
102+
"filename" : "adamant-icon-bold-83.5@2x.png",
103103
"scale" : "2x"
104104
},
105105
{
106106
"size" : "1024x1024",
107107
"idiom" : "ios-marketing",
108-
"filename" : "adamant-1024.png",
108+
"filename" : "adamant-icon-1024.png",
109109
"scale" : "1x"
110110
}
111111
],
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

Adamant/Assets/LaunchScreen.storyboard

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
99
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
1010
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
1111
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -20,14 +20,14 @@
2020
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2121
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2222
<subviews>
23-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant_Logo" translatesAutoresizingMaskIntoConstraints="NO" id="Tte-Yg-uSj">
23+
<imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Tte-Yg-uSj">
2424
<rect key="frame" x="75" y="231" width="225" height="225"/>
2525
<constraints>
2626
<constraint firstAttribute="width" secondItem="Tte-Yg-uSj" secondAttribute="height" multiplier="1:1" id="o2N-vd-Hdc"/>
2727
</constraints>
2828
</imageView>
2929
</subviews>
30-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
30+
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
3131
<constraints>
3232
<constraint firstItem="Tte-Yg-uSj" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="ZIP-t2-Exv"/>
3333
<constraint firstItem="Tte-Yg-uSj" firstAttribute="width" secondItem="6Tk-OE-BBY" secondAttribute="width" multiplier="0.6" id="hL5-t8-v0f"/>
@@ -42,6 +42,6 @@
4242
</scene>
4343
</scenes>
4444
<resources>
45-
<image name="Adamant_Logo" width="1024" height="1024"/>
45+
<image name="Adamant-logo" width="1024" height="1024"/>
4646
</resources>
4747
</document>

Adamant/Stories/Login/LoginHeader.xib

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina4_0" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
99
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
1010
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
1111
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -24,16 +24,16 @@
2424
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2525
<subviews>
2626
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="hUF-Ul-HEi">
27-
<rect key="frame" x="0.0" y="46.5" width="320" height="257"/>
27+
<rect key="frame" x="0.0" y="47.5" width="320" height="255.5"/>
2828
<subviews>
29-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant_Logo" translatesAutoresizingMaskIntoConstraints="NO" id="Ci1-bB-rdf">
30-
<rect key="frame" x="64" y="0.0" width="192" height="191.5"/>
29+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Ci1-bB-rdf">
30+
<rect key="frame" x="64" y="0.5" width="192" height="191.5"/>
3131
<constraints>
3232
<constraint firstAttribute="width" secondItem="Ci1-bB-rdf" secondAttribute="height" multiplier="1:1" id="whs-kN-2Wa"/>
3333
</constraints>
3434
</imageView>
3535
<label opaque="NO" userInteractionEnabled="NO" tag="888" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ADAMANT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MaP-ZE-Rez">
36-
<rect key="frame" x="64" y="206.5" width="192.5" height="50.5"/>
36+
<rect key="frame" x="59" y="207" width="202.5" height="49"/>
3737
<fontDescription key="fontDescription" name="Exo2-Thin" family="Exo 2 Thin" pointSize="42"/>
3838
<nil key="textColor"/>
3939
<nil key="highlightedColor"/>
@@ -56,6 +56,6 @@
5656
</view>
5757
</objects>
5858
<resources>
59-
<image name="Adamant_Logo" width="1024" height="1024"/>
59+
<image name="Adamant-logo" width="1024" height="1024"/>
6060
</resources>
6161
</document>

0 commit comments

Comments
 (0)