Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Master #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f0a86e
Edited fonts and layout. Fixed transition to and from position. Added…
Oct 11, 2017
8ee42ed
Merge pull request #1 from YannisDC/dev
YannisDC Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions AppStoreClone.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
DE61C2401F8E060F00AE564C /* UILabel+FontLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE61C23F1F8E060F00AE564C /* UILabel+FontLayout.swift */; };
F68726328846CEED2119C295 /* Pods_AppStoreClone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF0671D9ED588DEDA4879E66 /* Pods_AppStoreClone.framework */; };
F70D31EA1EF5EE4400DC3326 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70D31E91EF5EE4400DC3326 /* GradientView.swift */; };
F70D31ED1EF6090400DC3326 /* WorldPremiereCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70D31EB1EF6090400DC3326 /* WorldPremiereCell.swift */; };
Expand Down Expand Up @@ -39,6 +40,7 @@
7969423CEC4E6739F6E8EED0 /* Pods-AppStoreClone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppStoreClone.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AppStoreClone/Pods-AppStoreClone.debug.xcconfig"; sourceTree = "<group>"; };
BD89E3096EF2B1D912C836DA /* Pods-AppStoreClone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppStoreClone.release.xcconfig"; path = "Pods/Target Support Files/Pods-AppStoreClone/Pods-AppStoreClone.release.xcconfig"; sourceTree = "<group>"; };
BF0671D9ED588DEDA4879E66 /* Pods_AppStoreClone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppStoreClone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DE61C23F1F8E060F00AE564C /* UILabel+FontLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+FontLayout.swift"; sourceTree = "<group>"; };
F70D31E91EF5EE4400DC3326 /* GradientView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
F70D31EB1EF6090400DC3326 /* WorldPremiereCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WorldPremiereCell.swift; path = CollectionViewCells/WorldPremiereCell.swift; sourceTree = "<group>"; };
F70D31EC1EF6090400DC3326 /* WorldPremiereCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WorldPremiereCell.xib; path = CollectionViewCells/WorldPremiereCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -176,6 +178,7 @@
F7F0F1661EF5EB3900D73E20 /* UIView+Constraints.swift */,
F70D31F21EF60B5700DC3326 /* Reusable.swift */,
F70D31F01EF60B3100DC3326 /* UICollectionView+Reusable.swift */,
DE61C23F1F8E060F00AE564C /* UILabel+FontLayout.swift */,
);
name = Utility;
sourceTree = "<group>";
Expand Down Expand Up @@ -324,6 +327,7 @@
F70D32031EF62E3D00DC3326 /* AppOfTheDayCell.swift in Sources */,
F7F0F14F1EF5EA1C00D73E20 /* AppDelegate.swift in Sources */,
F7C44AA61EF70CF700E8E658 /* StoryDetailViewController.swift in Sources */,
DE61C2401F8E060F00AE564C /* UILabel+FontLayout.swift in Sources */,
F70D320B1EF6532300DC3326 /* PresentStoryViewAnimationController.swift in Sources */,
F7F0F1631EF5EAEF00D73E20 /* BaseView.swift in Sources */,
);
Expand Down
57 changes: 42 additions & 15 deletions AppStoreClone/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -75,23 +75,36 @@
<constraint firstAttribute="height" constant="500" id="FEJ-w9-gpH"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="The Art of the Impossible" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E3B-K9-gc4">
<rect key="frame" x="20" y="37" width="264" height="26.5"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.69999998807907104" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WORLD PREMIERE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aYA-YL-0Nq">
<rect key="frame" x="20" y="20" width="125" height="17"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
<rect key="frame" x="20" y="9" width="133" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="aSj-xW-BAs"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="lineHeight">
<real key="value" value="32"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="kerning">
<real key="value" value="0.55000000000000004"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Inside the extraordinary world of Monument Valley 2" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kBE-bX-oK6">
<rect key="frame" x="20" y="441.5" width="295" height="38.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
<rect key="frame" x="20" y="441.5" width="275" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="kerning">
<real key="value" value="0.25"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="lineHeight">
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P6u-LC-ZiY">
<rect key="frame" x="300" y="15" width="20" height="20"/>
Expand All @@ -104,12 +117,26 @@
<action selector="closeButtonDidPress:" destination="urk-bB-7gL" eventType="touchUpInside" id="zyZ-T4-WjN"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="The Art of the Impossible" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E3B-K9-gc4">
<rect key="frame" x="20" y="40" width="185.5" height="67"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="28"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="kerning">
<real key="value" value="0.75"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="lineHeight">
<real key="value" value="33"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
<constraint firstItem="V2J-r3-S12" firstAttribute="leading" secondItem="T42-bT-V0h" secondAttribute="leading" id="BeG-Dp-q2W"/>
<constraint firstItem="E3B-K9-gc4" firstAttribute="top" secondItem="aYA-YL-0Nq" secondAttribute="bottom" id="Hng-Aw-zf1"/>
<constraint firstItem="E3B-K9-gc4" firstAttribute="top" secondItem="V2J-r3-S12" secondAttribute="top" constant="40" id="Hng-Aw-zf1"/>
<constraint firstItem="kBE-bX-oK6" firstAttribute="leading" secondItem="T42-bT-V0h" secondAttribute="leading" constant="20" id="NJL-Xi-TJQ"/>
<constraint firstItem="aYA-YL-0Nq" firstAttribute="top" secondItem="V2J-r3-S12" secondAttribute="top" constant="20" id="Na4-F0-r2B"/>
<constraint firstItem="aYA-YL-0Nq" firstAttribute="top" secondItem="V2J-r3-S12" secondAttribute="top" constant="9" id="Na4-F0-r2B"/>
<constraint firstAttribute="trailing" secondItem="V2J-r3-S12" secondAttribute="trailing" id="YBI-UR-Tbu"/>
<constraint firstItem="V2J-r3-S12" firstAttribute="bottom" secondItem="kBE-bX-oK6" secondAttribute="bottom" constant="20" id="jEC-TI-Osc"/>
<constraint firstItem="V2J-r3-S12" firstAttribute="top" secondItem="T42-bT-V0h" secondAttribute="top" id="lAL-SI-hSU"/>
Expand All @@ -130,7 +157,7 @@
<constraint firstItem="T42-bT-V0h" firstAttribute="leading" secondItem="T0G-xr-uy0" secondAttribute="leading" id="gVi-xV-nag"/>
<constraint firstItem="V2J-r3-S12" firstAttribute="width" secondItem="T0G-xr-uy0" secondAttribute="width" id="hUe-0x-xLE"/>
<constraint firstItem="E3B-K9-gc4" firstAttribute="leading" secondItem="T0G-xr-uy0" secondAttribute="leading" constant="20" id="u9Q-YB-f47"/>
<constraint firstAttribute="trailing" secondItem="kBE-bX-oK6" secondAttribute="trailing" constant="20" id="xhN-vb-PTy"/>
<constraint firstAttribute="trailing" secondItem="kBE-bX-oK6" secondAttribute="trailing" constant="40" id="xhN-vb-PTy"/>
</constraints>
</view>
</subviews>
Expand Down
9 changes: 8 additions & 1 deletion AppStoreClone/CollectionViewCells/AppOfTheDayCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ internal class AppOfTheDayCell: BaseRoundedCardCell {
@IBOutlet private weak var imageView: UIImageView!

@IBOutlet private weak var iconImageView: UIImageView!
@IBOutlet weak var titleLabel: InsetLabel!
@IBOutlet weak var appNameLabel: UILabel!
@IBOutlet weak var appSummaryLabel: UILabel!

@IBOutlet private weak var getButtonView: UIView!
@IBOutlet weak var buttonLabel: UILabel!

// MARK: - Factory Method

Expand All @@ -31,8 +35,11 @@ internal class AppOfTheDayCell: BaseRoundedCardCell {
super.awakeFromNib()

imageView.layer.cornerRadius = 14.0
iconImageView.layer.cornerRadius = 14.0
iconImageView.layer.cornerRadius = 19.0
getButtonView.layer.cornerRadius = getButtonView.bounds.height/2
titleLabel.attributedText = NSMutableAttributedString(string: "APP\nOF THE\nDAY")
titleLabel.setLineHeight(lineHeight: 44.0, lineSpacing: 0.0)
titleLabel.font = UIFont.systemFont(ofSize: 55.0, weight: UIFontWeightHeavy)
}

}
Loading