Skip to content

Commit 438956b

Browse files
kent0318kent0318
committed
added the mapview and hookup the explore gallery
1 parent 3015057 commit 438956b

File tree

701 files changed

+24623
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

701 files changed

+24623
-822
lines changed

‎Gallery.xcodeproj/project.pbxproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
D8561D5B1F9B74F30082DF25 /* GalleryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561D5A1F9B74F30082DF25 /* GalleryTableViewController.swift */; };
2020
D8561D5D1F9B75C40082DF25 /* GalleryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561D5C1F9B75C40082DF25 /* GalleryTableViewCell.swift */; };
2121
D8561D5F1F9B82C00082DF25 /* ExploreGalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8561D5E1F9B82C00082DF25 /* ExploreGalleryViewController.swift */; };
22-
D8EF2E2C1F9BE07B003F1A96 /* 6901603studio.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D8EF2E2B1F9BE07B003F1A96 /* 6901603studio.jpeg */; };
22+
D85D8C2B1F9C5986009EA36B /* PlacesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85D8C2A1F9C5986009EA36B /* PlacesViewController.swift */; };
23+
D8EF2E2C1F9BE07B003F1A96 /* (null) in Resources */ = {isa = PBXBuildFile; };
2324
EBF2A54B1F9C124400310674 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1866E0AA1F9B16F30061E036 /* Main.storyboard */; };
2425
/* End PBXBuildFile section */
2526

@@ -42,6 +43,7 @@
4243
D8561D5A1F9B74F30082DF25 /* GalleryTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryTableViewController.swift; sourceTree = "<group>"; };
4344
D8561D5C1F9B75C40082DF25 /* GalleryTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryTableViewCell.swift; sourceTree = "<group>"; };
4445
D8561D5E1F9B82C00082DF25 /* ExploreGalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreGalleryViewController.swift; sourceTree = "<group>"; };
46+
D85D8C2A1F9C5986009EA36B /* PlacesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacesViewController.swift; sourceTree = "<group>"; };
4547
/* End PBXFileReference section */
4648

4749
/* Begin PBXFrameworksBuildPhase section */
@@ -80,6 +82,7 @@
8082
1866E0A41F9B16F30061E036 /* AppDelegate.swift */,
8183
1866E0A61F9B16F30061E036 /* art.scnassets */,
8284
1866E0A81F9B16F30061E036 /* CreateGalleryViewController.swift */,
85+
D8561D5E1F9B82C00082DF25 /* ExploreGalleryViewController.swift */,
8386
1866E0AA1F9B16F30061E036 /* Main.storyboard */,
8487
1866E0AD1F9B16F30061E036 /* Assets.xcassets */,
8588
1866E0AF1F9B16F30061E036 /* LaunchScreen.storyboard */,
@@ -88,8 +91,8 @@
8891
D8561D581F9B6F2A0082DF25 /* SignInViewController.swift */,
8992
D8561D5A1F9B74F30082DF25 /* GalleryTableViewController.swift */,
9093
D8561D5C1F9B75C40082DF25 /* GalleryTableViewCell.swift */,
91-
D8561D5E1F9B82C00082DF25 /* ExploreGalleryViewController.swift */,
9294
1866E0B81F9B18A20061E036 /* Portal.scnassets */,
95+
D85D8C2A1F9C5986009EA36B /* PlacesViewController.swift */,
9396
);
9497
path = Gallery;
9598
sourceTree = "<group>";
@@ -180,7 +183,7 @@
180183
1866E0B11F9B16F30061E036 /* LaunchScreen.storyboard in Resources */,
181184
D8561D571F9B6DCE0082DF25 /* GoogleService-Info.plist in Resources */,
182185
1866E0AE1F9B16F30061E036 /* Assets.xcassets in Resources */,
183-
D8EF2E2C1F9BE07B003F1A96 /* 6901603studio.jpeg in Resources */,
186+
D8EF2E2C1F9BE07B003F1A96 /* (null) in Resources */,
184187
);
185188
runOnlyForDeploymentPostprocessing = 0;
186189
};
@@ -248,6 +251,7 @@
248251
buildActionMask = 2147483647;
249252
files = (
250253
D8561D5B1F9B74F30082DF25 /* GalleryTableViewController.swift in Sources */,
254+
D85D8C2B1F9C5986009EA36B /* PlacesViewController.swift in Sources */,
251255
1866E0A91F9B16F30061E036 /* CreateGalleryViewController.swift in Sources */,
252256
1866E0A51F9B16F30061E036 /* AppDelegate.swift in Sources */,
253257
D8561D5D1F9B75C40082DF25 /* GalleryTableViewCell.swift in Sources */,

‎Gallery.xcodeproj/xcuserdata/joe.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>Gallery.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>3</integer>
10+
<integer>7</integer>
1111
</dict>
1212
</dict>
1313
</dict>

‎Gallery.xcworkspace/xcuserdata/joe.xcuserdatad/UserInterfaceState.xcuserstate

10.3 KB
Binary file not shown.

‎Gallery/AppDelegate.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import UIKit
1010
import Firebase
1111
import GoogleSignIn
12+
import GooglePlaces
13+
import GoogleMaps
1214
@UIApplicationMain
1315
class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate {
1416

@@ -20,6 +22,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate {
2022
FirebaseApp.configure()
2123
GIDSignIn.sharedInstance().clientID = FirebaseApp.app()?.options.clientID
2224
GIDSignIn.sharedInstance().delegate = self
25+
GMSPlacesClient.provideAPIKey("AIzaSyBx8sRuULklzNOxQEiKpTOe-5D9qhLX_zc")
26+
GMSServices.provideAPIKey("AIzaSyCJVFP9shkIrknlw4EDGfTbKRSYhJV88hQ")
27+
2328
return true
2429
}
2530
func application(_ application: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any])

‎Gallery/Assets.xcassets/refresh.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "refresh_grey_192x192.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Gallery/Assets.xcassets/refresh.imageset/refresh_grey_192x192.png

2.29 KB
Loading

‎Gallery/Base.lproj/Main.storyboard

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13528" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8ih-co-tIl">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13526" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8ih-co-tIl">
33
<device id="retina5_5" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13526"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13524"/>
99
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
1010
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
1111
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -92,7 +92,7 @@
9292
</tabBar>
9393
<connections>
9494
<segue destination="a0R-Ph-vx9" kind="relationship" relationship="viewControllers" id="238-pM-Pke"/>
95-
<segue destination="BV1-FR-VrT" kind="relationship" relationship="viewControllers" id="hA7-va-glX"/>
95+
<segue destination="H4T-dH-B9n" kind="relationship" relationship="viewControllers" id="uip-7I-suW"/>
9696
</connections>
9797
</tabBarController>
9898
<placeholder placeholderIdentifier="IBFirstResponder" id="jai-aE-OqD" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -289,19 +289,19 @@
289289
<objects>
290290
<viewController id="BV1-FR-VrT" customClass="ExploreGalleryViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
291291
<view key="view" contentMode="scaleToFill" id="WR6-5H-lIj">
292-
<rect key="frame" x="0.0" y="0.0" width="414" height="687"/>
292+
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
293293
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
294294
<subviews>
295295
<arscnView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x2S-YK-pjr">
296-
<rect key="frame" x="0.0" y="0.0" width="414" height="687"/>
296+
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
297297
</arscnView>
298-
<visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ipl-Ie-4of">
298+
<visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vnm-7Y-3fj">
299299
<rect key="frame" x="20" y="20" width="150" height="43"/>
300-
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="8Id-nQ-xnQ">
300+
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="fjz-Wf-T3C">
301301
<rect key="frame" x="0.0" y="0.0" width="150" height="43"/>
302302
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
303303
<subviews>
304-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Plane Detected!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qzS-L3-Aqh">
304+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Plane Detected!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" enabled="NO" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMr-6V-YNU">
305305
<rect key="frame" x="2" y="7" width="148" height="29"/>
306306
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
307307
<fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -315,25 +315,45 @@
315315
</subviews>
316316
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
317317
<constraints>
318-
<constraint firstItem="QC8-ig-Y1l" firstAttribute="bottom" secondItem="ipl-Ie-4of" secondAttribute="bottom" constant="624" id="1dZ-7m-vrc"/>
319-
<constraint firstItem="ipl-Ie-4of" firstAttribute="leading" secondItem="WR6-5H-lIj" secondAttribute="leadingMargin" id="5OH-pX-PIg"/>
318+
<constraint firstItem="Vnm-7Y-3fj" firstAttribute="leading" secondItem="WR6-5H-lIj" secondAttribute="leadingMargin" id="4pf-6n-LXQ"/>
320319
<constraint firstItem="x2S-YK-pjr" firstAttribute="leading" secondItem="WR6-5H-lIj" secondAttribute="leading" id="E0W-0S-q8v"/>
321320
<constraint firstAttribute="trailing" secondItem="x2S-YK-pjr" secondAttribute="trailing" id="ES8-eq-c3j"/>
321+
<constraint firstItem="Vnm-7Y-3fj" firstAttribute="top" secondItem="QC8-ig-Y1l" secondAttribute="top" id="I3b-C9-JJu"/>
322322
<constraint firstItem="x2S-YK-pjr" firstAttribute="bottom" secondItem="QC8-ig-Y1l" secondAttribute="bottom" id="NpY-Do-czY"/>
323-
<constraint firstItem="ipl-Ie-4of" firstAttribute="top" secondItem="QC8-ig-Y1l" secondAttribute="top" id="Ui2-gL-k7a"/>
324323
<constraint firstItem="x2S-YK-pjr" firstAttribute="top" secondItem="WR6-5H-lIj" secondAttribute="top" id="aA7-42-Sge"/>
325-
<constraint firstItem="QC8-ig-Y1l" firstAttribute="trailing" secondItem="ipl-Ie-4of" secondAttribute="trailing" constant="244" id="rHa-w4-6MY"/>
324+
<constraint firstItem="QC8-ig-Y1l" firstAttribute="bottom" secondItem="Vnm-7Y-3fj" secondAttribute="bottom" constant="673" id="tgh-br-9hc"/>
325+
<constraint firstItem="QC8-ig-Y1l" firstAttribute="trailing" secondItem="Vnm-7Y-3fj" secondAttribute="trailing" constant="244" id="yiq-Ki-kfn"/>
326326
</constraints>
327327
<viewLayoutGuide key="safeArea" id="QC8-ig-Y1l"/>
328328
</view>
329329
<tabBarItem key="tabBarItem" title="Explore" image="icons8-adventure 15-45-58-159" selectedImage="icons8-adventure_filled" id="1Fb-0o-wfL"/>
330330
<connections>
331+
<outlet property="planeDetected" destination="Vnm-7Y-3fj" id="Ugm-qo-6ni"/>
331332
<outlet property="sceneView" destination="x2S-YK-pjr" id="Pz1-X6-zjQ"/>
332333
</connections>
333334
</viewController>
334335
<placeholder placeholderIdentifier="IBFirstResponder" id="SZV-WD-TEh" sceneMemberID="firstResponder"/>
335336
</objects>
336-
<point key="canvasLocation" x="592.75362318840587" y="567.39130434782612"/>
337+
<point key="canvasLocation" x="1536" y="721"/>
338+
</scene>
339+
<!--Item-->
340+
<scene sceneID="XNN-hP-AVd">
341+
<objects>
342+
<viewController id="H4T-dH-B9n" customClass="PlacesViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
343+
<view key="view" contentMode="scaleToFill" id="toc-vP-Rel">
344+
<rect key="frame" x="0.0" y="0.0" width="414" height="687"/>
345+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
346+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
347+
<viewLayoutGuide key="safeArea" id="TvX-bC-mvX"/>
348+
</view>
349+
<tabBarItem key="tabBarItem" title="Item" selectedImage="icons8-adventure_filled" id="e2V-Mu-528"/>
350+
<connections>
351+
<segue destination="BV1-FR-VrT" kind="show" identifier="mapToAR" id="I9D-te-DrB"/>
352+
</connections>
353+
</viewController>
354+
<placeholder placeholderIdentifier="IBFirstResponder" id="5PP-lZ-bQF" userLabel="First Responder" sceneMemberID="firstResponder"/>
355+
</objects>
356+
<point key="canvasLocation" x="710" y="721"/>
337357
</scene>
338358
</scenes>
339359
<resources>

0 commit comments

Comments
 (0)