Skip to content

Commit 4bd9faa

Browse files
lsecreaselsecrease
lsecrease
authored and
lsecrease
committed
GalleryChanges/etc.
1 parent cdd1cc5 commit 4bd9faa

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed

‎Dindr.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,15 @@
197197
name = Perks;
198198
sourceTree = "<group>";
199199
};
200+
284186791BF820200071DAB5 /* Metrics */ = {
201+
isa = PBXGroup;
202+
children = (
203+
CE9F9EEE1B802C1B0060D993 /* RestaurantDataViewController.swift */,
204+
CEEF5D9F1BA8A7610077769E /* RestCollectionViewCell.swift */,
205+
);
206+
name = Metrics;
207+
sourceTree = "<group>";
208+
};
200209
CE46054B1BC33FAF007A2B7D /* Gallery */ = {
201210
isa = PBXGroup;
202211
children = (
@@ -298,8 +307,7 @@
298307
CEB40ED61BD6BAA700863F60 /* LLSimpleCamera */,
299308
CEC9F20C1B7851B3000A74A9 /* AppDelegate.swift */,
300309
CE9C42F01BC1D36000504B69 /* Login */,
301-
CE9F9EEE1B802C1B0060D993 /* RestaurantDataViewController.swift */,
302-
CEEF5D9F1BA8A7610077769E /* RestCollectionViewCell.swift */,
310+
284186791BF820200071DAB5 /* Metrics */,
303311
284186781BF8173C0071DAB5 /* Perks */,
304312
CE46054B1BC33FAF007A2B7D /* Gallery */,
305313
CEEF5DA11BA8A8BF0077769E /* DishModel.swift */,

‎Dindr/Base.lproj/Main.storyboard‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,18 @@
394394
<outlet property="delegate" destination="n8g-fo-OsD" id="hhk-EB-Obq"/>
395395
</connections>
396396
</collectionView>
397-
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ekx-dY-pOI">
398-
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
397+
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ekx-dY-pOI">
398+
<rect key="frame" x="0.0" y="340" width="375" height="667"/>
399+
<subviews>
400+
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JTc-Oz-Dhg">
401+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
402+
<subviews>
403+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lyE-cI-Gqe">
404+
<rect key="frame" x="0.0" y="187" width="375" height="293"/>
405+
</imageView>
406+
</subviews>
407+
</scrollView>
408+
</subviews>
399409
<animations/>
400410
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
401411
</view>
@@ -404,20 +414,18 @@
404414
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
405415
<constraints>
406416
<constraint firstAttribute="trailing" secondItem="cIK-8c-mQG" secondAttribute="trailing" id="2Zl-kC-Mnc"/>
407-
<constraint firstItem="ekx-dY-pOI" firstAttribute="leading" secondItem="4Na-d2-0hx" secondAttribute="leading" id="31M-dM-dUK"/>
408-
<constraint firstAttribute="trailing" secondItem="ekx-dY-pOI" secondAttribute="trailing" id="Fsm-7y-p6B"/>
409417
<constraint firstItem="cIK-8c-mQG" firstAttribute="leading" secondItem="4Na-d2-0hx" secondAttribute="leading" id="Oad-EQ-wc3"/>
410-
<constraint firstItem="ekx-dY-pOI" firstAttribute="top" secondItem="4Na-d2-0hx" secondAttribute="top" id="R8s-Qm-7K6"/>
411418
<constraint firstAttribute="bottom" secondItem="cIK-8c-mQG" secondAttribute="bottom" id="a0z-3V-xPa"/>
412419
<constraint firstItem="cIK-8c-mQG" firstAttribute="top" secondItem="4Na-d2-0hx" secondAttribute="top" id="sj8-ep-ITP"/>
413-
<constraint firstAttribute="bottom" secondItem="ekx-dY-pOI" secondAttribute="bottom" id="wDT-hl-UZa"/>
414420
</constraints>
415421
</view>
416422
<navigationItem key="navigationItem" title="Gallery" id="FmE-My-Pge"/>
417423
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
418424
<connections>
419425
<outlet property="galleryCollView" destination="cIK-8c-mQG" id="Rmr-X5-4lH"/>
420426
<outlet property="imagePreviewView" destination="ekx-dY-pOI" id="9Bn-fh-Qc6"/>
427+
<outlet property="imgPrev" destination="lyE-cI-Gqe" id="XLM-Dy-aZg"/>
428+
<outlet property="imgScrollView" destination="JTc-Oz-Dhg" id="kbB-Kc-MW4"/>
421429
</connections>
422430
</viewController>
423431
<placeholder placeholderIdentifier="IBFirstResponder" id="m4D-BF-qA2" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -434,16 +442,16 @@
434442
<objects>
435443
<tableViewController id="MbD-2D-Sn3" customClass="SpecialsTableViewController" customModule="Dindr" customModuleProvider="target" sceneMemberID="viewController">
436444
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="150" sectionHeaderHeight="22" sectionFooterHeight="22" id="8Le-au-tMy">
437-
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
445+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
438446
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
439447
<animations/>
440448
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
441449
<prototypes>
442450
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerkCell" rowHeight="150" id="dHF-ME-DAE" customClass="SpecialsTableViewCell" customModule="Dindr" customModuleProvider="target">
443-
<rect key="frame" x="0.0" y="86" width="375" height="150"/>
451+
<rect key="frame" x="0.0" y="86" width="600" height="150"/>
444452
<autoresizingMask key="autoresizingMask"/>
445453
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dHF-ME-DAE" id="Nkj-7n-qdM">
446-
<rect key="frame" x="0.0" y="0.0" width="375" height="149.5"/>
454+
<rect key="frame" x="0.0" y="0.0" width="600" height="149.5"/>
447455
<autoresizingMask key="autoresizingMask"/>
448456
<subviews>
449457
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Perk Description" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tms-9A-knd">
@@ -508,16 +516,16 @@
508516
<viewControllerLayoutGuide type="bottom" id="ZUe-Zv-0bA"/>
509517
</layoutGuides>
510518
<view key="view" contentMode="scaleToFill" id="5b2-eD-Rvy">
511-
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
519+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
512520
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
513521
<subviews>
514522
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tell Us more about your Perk!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bnK-FD-NY6">
515-
<rect key="frame" x="59" y="115" width="257" height="25"/>
523+
<rect key="frame" x="171" y="115" width="257" height="25"/>
516524
<fontDescription key="fontDescription" name="AvenirNext-Bold" family="Avenir Next" pointSize="18"/>
517525
<nil key="highlightedColor"/>
518526
</label>
519527
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" text="This is the description of the Perk, etc., etc." textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="mug-WA-eKn">
520-
<rect key="frame" x="16" y="148" width="343" height="150"/>
528+
<rect key="frame" x="20" y="148" width="560" height="150"/>
521529
<constraints>
522530
<constraint firstAttribute="height" constant="100" id="4VJ-8n-or3"/>
523531
<constraint firstAttribute="height" constant="150" id="fhQ-jz-8ec"/>
@@ -762,7 +770,7 @@
762770
<tabBar key="tabBar" contentMode="scaleToFill" id="foS-DT-Td8">
763771
<autoresizingMask key="autoresizingMask"/>
764772
<animations/>
765-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
773+
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
766774
</tabBar>
767775
<connections>
768776
<segue destination="z1v-CH-54s" kind="relationship" relationship="viewControllers" id="XOH-o4-oN7"/>
@@ -840,7 +848,7 @@
840848
</navigationController>
841849
<placeholder placeholderIdentifier="IBFirstResponder" id="jdB-ZZ-1rd" userLabel="First Responder" sceneMemberID="firstResponder"/>
842850
</objects>
843-
<point key="canvasLocation" x="3649" y="1080"/>
851+
<point key="canvasLocation" x="3719" y="1079"/>
844852
</scene>
845853
</scenes>
846854
<resources>
@@ -853,6 +861,6 @@
853861
<image name="statbackground" width="187" height="170"/>
854862
</resources>
855863
<inferredMetricsTieBreakers>
856-
<segue reference="PQM-CW-iEg"/>
864+
<segue reference="uxh-bL-C00"/>
857865
</inferredMetricsTieBreakers>
858866
</document>

0 commit comments

Comments
 (0)