Merge branch 'release/0.3.12'

Adamant/Assets/Assets.xcassets/Adamant_Logo.imageset/Contents.json → Adamant/Assets/Assets.xcassets/Adamant-logo.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "adamant-logo-1024x1024.png",
+      "filename" : "adamant-logo-1024.png",
       "scale" : "1x"
     },
     {

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

@@ -3,109 +3,109 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "icon-bold[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "icon-bold[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
+      "filename" : "adamant-icon-bold-[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
+      "filename" : "adamant-icon-bold-[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo-20.png",
+      "filename" : "adamant-icon-bold-20.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo-29.png",
+      "filename" : "adamant-icon-bold-29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold-29@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo-40.png",
+      "filename" : "adamant-icon-bold-40.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "adamant-app-logo[email protected]",
+      "filename" : "adamant-icon-bold-40@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "76.png",
+      "filename" : "adamant-icon-bold-76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "[email protected]",
+      "filename" : "adamant-icon-bold-[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "83@2x.png",
+      "filename" : "adamant-icon-bold-83.5@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "adamant-1024.png",
+      "filename" : "adamant-icon-1024.png",
       "scale" : "1x"
     }
   ],

Adamant/Assets/LaunchScreen.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -20,14 +20,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant_Logo" translatesAutoresizingMaskIntoConstraints="NO" id="Tte-Yg-uSj">
+                            <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Tte-Yg-uSj">
                                 <rect key="frame" x="75" y="231" width="225" height="225"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Tte-Yg-uSj" secondAttribute="height" multiplier="1:1" id="o2N-vd-Hdc"/>
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="Tte-Yg-uSj" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="ZIP-t2-Exv"/>
                             <constraint firstItem="Tte-Yg-uSj" firstAttribute="width" secondItem="6Tk-OE-BBY" secondAttribute="width" multiplier="0.6" id="hL5-t8-v0f"/>
@@ -42,6 +42,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Adamant_Logo" width="1024" height="1024"/>
+        <image name="Adamant-logo" width="1024" height="1024"/>
     </resources>
 </document>

Adamant/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.3.12</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>32</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

Adamant/Stories/Login/LoginHeader.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -24,16 +24,16 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="hUF-Ul-HEi">
-                    <rect key="frame" x="0.0" y="46.5" width="320" height="257"/>
+                    <rect key="frame" x="0.0" y="47.5" width="320" height="255.5"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant_Logo" translatesAutoresizingMaskIntoConstraints="NO" id="Ci1-bB-rdf">
-                            <rect key="frame" x="64" y="0.0" width="192" height="191.5"/>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Ci1-bB-rdf">
+                            <rect key="frame" x="64" y="0.5" width="192" height="191.5"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="Ci1-bB-rdf" secondAttribute="height" multiplier="1:1" id="whs-kN-2Wa"/>
                             </constraints>
                         </imageView>
                         <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">
-                            <rect key="frame" x="64" y="206.5" width="192.5" height="50.5"/>
+                            <rect key="frame" x="59" y="207" width="202.5" height="49"/>
                             <fontDescription key="fontDescription" name="Exo2-Thin" family="Exo 2 Thin" pointSize="42"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
@@ -56,6 +56,6 @@
         </view>
     </objects>
     <resources>
-        <image name="Adamant_Logo" width="1024" height="1024"/>
+        <image name="Adamant-logo" width="1024" height="1024"/>
     </resources>
 </document>