Skip to content

Commit

Permalink
Merge pull request #4 from debugsquad/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
vicegax authored Apr 10, 2017
2 parents 3eb1e42 + 88af65f commit a37063e
Show file tree
Hide file tree
Showing 586 changed files with 12,812 additions and 16,443 deletions.
1,641 changes: 794 additions & 847 deletions Hyperborea.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions Hyperborea.xcworkspace/contents.xcworkspacedata

This file was deleted.

168 changes: 0 additions & 168 deletions Hyperborea/Analytics/AMain.swift

This file was deleted.

26 changes: 0 additions & 26 deletions Hyperborea/Analytics/GoogleService-Info.plist

This file was deleted.

44 changes: 35 additions & 9 deletions Hyperborea/Assets/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -20,16 +20,42 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="assetGenericLogo" translatesAutoresizingMaskIntoConstraints="NO" id="1ob-tD-Aev">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SCn-QD-BZ3">
<rect key="frame" x="0.0" y="259" width="375" height="150"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="assetGenericLogo" translatesAutoresizingMaskIntoConstraints="NO" id="VXj-Pm-ktI">
<rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="5Ao-yJ-HMs"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hyperborea" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NOU-59-1Af">
<rect key="frame" x="0.0" y="100" width="375" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="X72-Wy-I3O"/>
</constraints>
<fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="22"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="VXj-Pm-ktI" secondAttribute="trailing" id="1oK-HV-VNr"/>
<constraint firstItem="VXj-Pm-ktI" firstAttribute="top" secondItem="SCn-QD-BZ3" secondAttribute="top" id="6CF-UR-12R"/>
<constraint firstItem="NOU-59-1Af" firstAttribute="leading" secondItem="SCn-QD-BZ3" secondAttribute="leading" id="N57-R4-no2"/>
<constraint firstItem="VXj-Pm-ktI" firstAttribute="leading" secondItem="SCn-QD-BZ3" secondAttribute="leading" id="NxF-Uu-2gG"/>
<constraint firstAttribute="height" constant="150" id="WIa-9c-0bD"/>
<constraint firstAttribute="bottom" secondItem="NOU-59-1Af" secondAttribute="bottom" id="ftu-ne-kDa"/>
<constraint firstAttribute="trailing" secondItem="NOU-59-1Af" secondAttribute="trailing" id="vPP-Hj-2ks"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="1ob-tD-Aev" secondAttribute="trailing" id="esa-wy-g5k"/>
<constraint firstItem="1ob-tD-Aev" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="jzx-wK-iEU"/>
<constraint firstItem="1ob-tD-Aev" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="tsU-cW-9hx"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="1ob-tD-Aev" secondAttribute="bottom" id="yes-yj-xQf"/>
<constraint firstAttribute="trailing" secondItem="SCn-QD-BZ3" secondAttribute="trailing" id="CKA-Bp-8df"/>
<constraint firstItem="SCn-QD-BZ3" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="mm8-XI-sBd"/>
<constraint firstItem="SCn-QD-BZ3" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="sOb-Sb-ZLx"/>
</constraints>
</view>
</viewController>
Expand Down
34 changes: 17 additions & 17 deletions Hyperborea/Assets/brand.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,103 +3,103 @@
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "brand40w-2.png",
"filename" : "logo40w.png",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "brand60w.png",
"filename" : "logo60w.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "brand58w-1.png",
"filename" : "logo58w-1.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "brand87w.png",
"filename" : "logo87w.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "brand80w-1.png",
"filename" : "logo80w.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "brand120w.png",
"filename" : "logo120w.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "brand120w-1.png",
"filename" : "logo120w-1.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "brand180w.png",
"filename" : "logo180w.png",
"scale" : "3x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "brand20w.png",
"filename" : "logo20w.png",
"scale" : "1x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "brand40w.png",
"filename" : "logo40w-1.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "brand29w.png",
"filename" : "logo29w.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "brand58w.png",
"filename" : "logo58w.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "brand40w-1.png",
"filename" : "logo40w-2.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "brand80w.png",
"filename" : "logo80w-1.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "brand76w.png",
"filename" : "logo76w.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "brand152w.png",
"filename" : "logo152w.png",
"scale" : "2x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "brand167w.png",
"filename" : "logo167w.png",
"scale" : "2x"
}
],
Expand Down
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.
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a37063e

Please sign in to comment.