Skip to content

Commit

Permalink
Added the nav bar, and views for the prospective pages
Browse files Browse the repository at this point in the history
  • Loading branch information
itsthemoon committed Sep 13, 2022
1 parent 4b78050 commit 5f2de3f
Show file tree
Hide file tree
Showing 12 changed files with 154 additions and 191 deletions.
58 changes: 21 additions & 37 deletions Rift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
objects = {

/* Begin PBXBuildFile section */
E98F7B6628CF786A007A6024 /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B6528CF786A007A6024 /* Tests_iOS.swift */; };
E98F7B6828CF786A007A6024 /* Tests_iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B6728CF786A007A6024 /* Tests_iOSLaunchTests.swift */; };
E98F7B7228CF786A007A6024 /* Tests_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B7128CF786A007A6024 /* Tests_macOS.swift */; };
E98F7B7428CF786A007A6024 /* Tests_macOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B7328CF786A007A6024 /* Tests_macOSLaunchTests.swift */; };
E98F7B7528CF786A007A6024 /* RiftApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B4D28CF7867007A6024 /* RiftApp.swift */; };
E98F7B7628CF786A007A6024 /* RiftApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B4D28CF7867007A6024 /* RiftApp.swift */; };
E98F7B7728CF786A007A6024 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B4E28CF7867007A6024 /* ContentView.swift */; };
E98F7B7828CF786A007A6024 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B4E28CF7867007A6024 /* ContentView.swift */; };
E98F7B7928CF786A007A6024 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E98F7B4F28CF786A007A6024 /* Assets.xcassets */; };
E98F7B7A28CF786A007A6024 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E98F7B4F28CF786A007A6024 /* Assets.xcassets */; };
E98F7B9528CF8CBC007A6024 /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B9428CF8CBC007A6024 /* Home.swift */; };
E98F7B9728CF8CC4007A6024 /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B9628CF8CC4007A6024 /* Search.swift */; };
E98F7B9928CF8CCD007A6024 /* Closet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B9828CF8CCD007A6024 /* Closet.swift */; };
E98F7B9B28CF8CD3007A6024 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98F7B9A28CF8CD3007A6024 /* Account.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -42,13 +42,12 @@
E98F7B4F28CF786A007A6024 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E98F7B5428CF786A007A6024 /* Rift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rift.app; sourceTree = BUILT_PRODUCTS_DIR; };
E98F7B5A28CF786A007A6024 /* Rift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rift.app; sourceTree = BUILT_PRODUCTS_DIR; };
E98F7B5C28CF786A007A6024 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
E98F7B6128CF786A007A6024 /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
E98F7B6528CF786A007A6024 /* Tests_iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_iOS.swift; sourceTree = "<group>"; };
E98F7B6728CF786A007A6024 /* Tests_iOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_iOSLaunchTests.swift; sourceTree = "<group>"; };
E98F7B6D28CF786A007A6024 /* Tests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
E98F7B7128CF786A007A6024 /* Tests_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_macOS.swift; sourceTree = "<group>"; };
E98F7B7328CF786A007A6024 /* Tests_macOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_macOSLaunchTests.swift; sourceTree = "<group>"; };
E98F7B9428CF8CBC007A6024 /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
E98F7B9628CF8CC4007A6024 /* Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = "<group>"; };
E98F7B9828CF8CCD007A6024 /* Closet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Closet.swift; sourceTree = "<group>"; };
E98F7B9A28CF8CD3007A6024 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -87,16 +86,14 @@
isa = PBXGroup;
children = (
E98F7B4C28CF7867007A6024 /* Shared */,
E98F7B5B28CF786A007A6024 /* macOS */,
E98F7B6428CF786A007A6024 /* Tests iOS */,
E98F7B7028CF786A007A6024 /* Tests macOS */,
E98F7B5528CF786A007A6024 /* Products */,
);
sourceTree = "<group>";
};
E98F7B4C28CF7867007A6024 /* Shared */ = {
isa = PBXGroup;
children = (
E98F7B8928CF8BF2007A6024 /* Views */,
E98F7B4D28CF7867007A6024 /* RiftApp.swift */,
E98F7B4E28CF7867007A6024 /* ContentView.swift */,
E98F7B4F28CF786A007A6024 /* Assets.xcassets */,
Expand All @@ -115,30 +112,15 @@
name = Products;
sourceTree = "<group>";
};
E98F7B5B28CF786A007A6024 /* macOS */ = {
E98F7B8928CF8BF2007A6024 /* Views */ = {
isa = PBXGroup;
children = (
E98F7B5C28CF786A007A6024 /* macOS.entitlements */,
E98F7B9428CF8CBC007A6024 /* Home.swift */,
E98F7B9628CF8CC4007A6024 /* Search.swift */,
E98F7B9828CF8CCD007A6024 /* Closet.swift */,
E98F7B9A28CF8CD3007A6024 /* Account.swift */,
);
path = macOS;
sourceTree = "<group>";
};
E98F7B6428CF786A007A6024 /* Tests iOS */ = {
isa = PBXGroup;
children = (
E98F7B6528CF786A007A6024 /* Tests_iOS.swift */,
E98F7B6728CF786A007A6024 /* Tests_iOSLaunchTests.swift */,
);
path = "Tests iOS";
sourceTree = "<group>";
};
E98F7B7028CF786A007A6024 /* Tests macOS */ = {
isa = PBXGroup;
children = (
E98F7B7128CF786A007A6024 /* Tests_macOS.swift */,
E98F7B7328CF786A007A6024 /* Tests_macOSLaunchTests.swift */,
);
path = "Tests macOS";
path = Views;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -299,8 +281,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E98F7B9928CF8CCD007A6024 /* Closet.swift in Sources */,
E98F7B7728CF786A007A6024 /* ContentView.swift in Sources */,
E98F7B9728CF8CC4007A6024 /* Search.swift in Sources */,
E98F7B9528CF8CBC007A6024 /* Home.swift in Sources */,
E98F7B7528CF786A007A6024 /* RiftApp.swift in Sources */,
E98F7B9B28CF8CD3007A6024 /* Account.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -317,17 +303,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E98F7B6828CF786A007A6024 /* Tests_iOSLaunchTests.swift in Sources */,
E98F7B6628CF786A007A6024 /* Tests_iOS.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E98F7B6928CF786A007A6024 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E98F7B7428CF786A007A6024 /* Tests_macOSLaunchTests.swift in Sources */,
E98F7B7228CF786A007A6024 /* Tests_macOS.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -469,6 +451,7 @@
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
Expand Down Expand Up @@ -499,6 +482,7 @@
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
</dict>
<array/>
</plist>
5 changes: 5 additions & 0 deletions Shared/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
Expand Down
39 changes: 37 additions & 2 deletions Shared/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,44 @@
import SwiftUI

struct ContentView: View {

@State var selectedIndex = 0

let tabBarImageNames = ["shippingbox", "magnifyingglass", "tshirt"]

var body: some View {
Text("Hello, world!")
.padding()
VStack {
ZStack {

switch selectedIndex {
case 0:
Home()
case 1:
Search()
case 2:
Closet()
default:
Text("Remaining tabs")
}
}

Spacer()

HStack {
ForEach(0..<3) { num in
Button(action: {
selectedIndex = num
}, label: {
Spacer()
Image(systemName: tabBarImageNames[num])
.foregroundColor(selectedIndex == num ? Color(.label) : .init(white: 0.8))
.font(.system(size: 24))
Spacer()
})
}
}
}

}
}

Expand Down
23 changes: 23 additions & 0 deletions Shared/Views/Account.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Account.swift
// Rift (iOS)
//
// Created by Jackson Davis on 9/12/22.
//

import SwiftUI

struct Account: View {
var body: some View {
ZStack {
Color.purple
}

}
}

struct Account_Previews: PreviewProvider {
static var previews: some View {
Account()
}
}
23 changes: 23 additions & 0 deletions Shared/Views/Closet.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Closet.swift
// Rift (iOS)
//
// Created by Jackson Davis on 9/12/22.
//

import SwiftUI

struct Closet: View {
var body: some View {
ZStack {
Color.green
}

}
}

struct Closet_Previews: PreviewProvider {
static var previews: some View {
Closet()
}
}
21 changes: 21 additions & 0 deletions Shared/Views/Home.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// Home.swift
// Rift (iOS)
//
// Created by Jackson Davis on 9/12/22.
//

import SwiftUI

struct Home: View {
var body: some View {
ZStack {
Color.red
} }
}

struct Home_Previews: PreviewProvider {
static var previews: some View {
Home()
}
}
23 changes: 23 additions & 0 deletions Shared/Views/Search.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Search.swift
// Rift (iOS)
//
// Created by Jackson Davis on 9/12/22.
//

import SwiftUI

struct Search: View {
var body: some View {
ZStack {
Color.blue
}

}
}

struct Search_Previews: PreviewProvider {
static var previews: some View {
Search()
}
}
41 changes: 0 additions & 41 deletions Tests iOS/Tests_iOS.swift

This file was deleted.

32 changes: 0 additions & 32 deletions Tests iOS/Tests_iOSLaunchTests.swift

This file was deleted.

Loading

0 comments on commit 5f2de3f

Please sign in to comment.