Skip to content

Commit

Permalink
Some project structure updates.
Browse files Browse the repository at this point in the history
Temp App icons and launch screen.
  • Loading branch information
RealBonus committed Jan 7, 2018
1 parent d9b4635 commit d2799fd
Show file tree
Hide file tree
Showing 28 changed files with 87 additions and 93 deletions.
34 changes: 21 additions & 13 deletions Adamant-ios.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@
E9E7CD9020026FA100DFC4DB /* SwinjectDependencies.swift */,
E913C8F31FFFA51D001A83F7 /* ViewController.swift */,
E913C8F51FFFA51D001A83F7 /* Main.storyboard */,
E913C8F81FFFA51D001A83F7 /* Assets.xcassets */,
E913C8FA1FFFA51D001A83F7 /* LaunchScreen.storyboard */,
E913C8FD1FFFA51E001A83F7 /* Info.plist */,
);
path = "Adamant-ios";
Expand Down Expand Up @@ -188,17 +186,9 @@
E913C9111FFFAB05001A83F7 /* Assets */ = {
isa = PBXGroup;
children = (
E91947A3200010DD001362F8 /* Exo+2_100_normal.ttf */,
E91947A4200010DE001362F8 /* Exo+2_300_normal.ttf */,
E919479F200010DC001362F8 /* Exo+2_400_italic.ttf */,
E91947A8200010DF001362F8 /* Exo+2_400_normal.ttf */,
E91947A9200010E0001362F8 /* Exo+2_500_normal.ttf */,
E91947A2200010DD001362F8 /* Exo+2_700_normal.ttf */,
E91947A0200010DC001362F8 /* Roboto_300_normal.ttf */,
E91947A1200010DD001362F8 /* Roboto_400_italic.ttf */,
E91947A6200010DF001362F8 /* Roboto_400_normal.ttf */,
E91947A5200010DE001362F8 /* Roboto_500_normal.ttf */,
E91947A7200010DF001362F8 /* Roboto_700_normal.ttf */,
E9E7CDA42002A6EB00DFC4DB /* Fonts */,
E913C8FA1FFFA51D001A83F7 /* LaunchScreen.storyboard */,
E913C8F81FFFA51D001A83F7 /* Assets.xcassets */,
E913C9121FFFAB19001A83F7 /* adamant-core.js */,
E913C9141FFFAB58001A83F7 /* utilites.js */,
);
Expand Down Expand Up @@ -231,6 +221,24 @@
path = ServerResponses;
sourceTree = "<group>";
};
E9E7CDA42002A6EB00DFC4DB /* Fonts */ = {
isa = PBXGroup;
children = (
E91947A3200010DD001362F8 /* Exo+2_100_normal.ttf */,
E91947A4200010DE001362F8 /* Exo+2_300_normal.ttf */,
E919479F200010DC001362F8 /* Exo+2_400_italic.ttf */,
E91947A8200010DF001362F8 /* Exo+2_400_normal.ttf */,
E91947A9200010E0001362F8 /* Exo+2_500_normal.ttf */,
E91947A2200010DD001362F8 /* Exo+2_700_normal.ttf */,
E91947A0200010DC001362F8 /* Roboto_300_normal.ttf */,
E91947A1200010DD001362F8 /* Roboto_400_italic.ttf */,
E91947A6200010DF001362F8 /* Roboto_400_normal.ttf */,
E91947A5200010DE001362F8 /* Roboto_500_normal.ttf */,
E91947A7200010DF001362F8 /* Roboto_700_normal.ttf */,
);
path = Fonts;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,93 +1,57 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "adamant-1024.png",
"scale" : "1x"
}
],
Expand Down
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
47 changes: 47 additions & 0 deletions Adamant-ios/Assets/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?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">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<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"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<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_big" translatesAutoresizingMaskIntoConstraints="NO" id="QFi-yD-WfI">
<rect key="frame" x="75.5" y="231.5" width="225" height="225"/>
<constraints>
<constraint firstAttribute="width" secondItem="QFi-yD-WfI" secondAttribute="height" multiplier="1:1" id="1aK-Eg-xSX"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="QFi-yD-WfI" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="Aj7-Tp-RFa"/>
<constraint firstItem="QFi-yD-WfI" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="0.6" id="VhX-8V-nXU"/>
<constraint firstItem="QFi-yD-WfI" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="mGW-pQ-edp"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<image name="Adamant_Logo_big" width="1024" height="1024"/>
</resources>
</document>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 0 additions & 25 deletions Adamant-ios/Base.lproj/LaunchScreen.storyboard

This file was deleted.

2 changes: 1 addition & 1 deletion Adamant-ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Adamant</string>
<string>ADAMANT</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down

0 comments on commit d2799fd

Please sign in to comment.