Skip to content

Commit

Permalink
Merge pull request #18 from cuappdev/drew/profile
Browse files Browse the repository at this point in the history 
Profile View
  • Loading branch information
drewsdunne committed Nov 30, 2016
2 parents d9bdb43 + c2a694c commit b6305ac
Show file tree
Hide file tree
Showing 16 changed files with 787 additions and 186 deletions.
37 changes: 37 additions & 0 deletions .gitingore
View file
@@ -0,0 +1,37 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
.DS_Store

## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control

Pods/
54 changes: 51 additions & 3 deletions Podcast.xcodeproj/project.pbxproj
View file
Expand Up @@ -35,6 +35,12 @@
D39BEE1F1D8A0B3B00131936 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39BEE1E1D8A0B3B00131936 /* User.swift */; };
D3DB5A651DA18FC600E550E8 /* CategoriesCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3DB5A641DA18FC600E550E8 /* CategoriesCollectionViewCell.swift */; };
D3DB5A681DA1B19800E550E8 /* PodcastCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3DB5A671DA1B19800E550E8 /* PodcastCollectionViewFlowLayout.swift */; };
FD015A001DCBFC80003E7B4E /* ProfileMiniHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0159FF1DCBFC80003E7B4E /* ProfileMiniHeader.swift */; };
FD8F7DFC1DDD20FC00DCC511 /* SeriesCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD8F7DFB1DDD20FC00DCC511 /* SeriesCollectionViewCell.swift */; };
FD8F7DFE1DDD36D600DCC511 /* ProfileSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD8F7DFD1DDD36D600DCC511 /* ProfileSectionHeaderView.swift */; };
FD9421421DB5307B00685E14 /* ProfileHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9421411DB5307B00685E14 /* ProfileHeaderView.swift */; };
FDF1D1CF1DAEE2E300697379 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF1D1CE1DAEE2E300697379 /* ProfileViewController.swift */; };
FDF5E0CF1DD3A091005CCB53 /* FollowButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF5E0CE1DD3A091005CCB53 /* FollowButton.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -96,6 +102,12 @@
D3DB5A641DA18FC600E550E8 /* CategoriesCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CategoriesCollectionViewCell.swift; sourceTree = "<group>"; };
D3DB5A671DA1B19800E550E8 /* PodcastCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PodcastCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
D8AE0B8B5C25FFEB0C3DF5AF /* Pods_Podcast.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Podcast.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FD0159FF1DCBFC80003E7B4E /* ProfileMiniHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileMiniHeader.swift; sourceTree = "<group>"; };
FD8F7DFB1DDD20FC00DCC511 /* SeriesCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeriesCollectionViewCell.swift; sourceTree = "<group>"; };
FD8F7DFD1DDD36D600DCC511 /* ProfileSectionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileSectionHeaderView.swift; sourceTree = "<group>"; };
FD9421411DB5307B00685E14 /* ProfileHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileHeaderView.swift; sourceTree = "<group>"; };
FDF1D1CE1DAEE2E300697379 /* ProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
FDF5E0CE1DD3A091005CCB53 /* FollowButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FollowButton.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -159,10 +171,12 @@
D3DB5A611DA1879F00E550E8 /* Utilities */,
D393D7531D8F0CC600241460 /* Cells */,
42D7D98C1D80C557000691A4 /* AppDelegate.swift */,
FD9421401DB5306200685E14 /* Views */,
D39BEE191D8A04C900131936 /* Models */,
7F97FBDD1D8663000073FC0F /* REST.swift */,
42F684EA1D80CC7E0035217A /* PlayerViewController.swift */,
421501261D9F5FE1002839D1 /* Player.swift */,
FDF1D1CE1DAEE2E300697379 /* ProfileViewController.swift */,
42D7D9901D80C557000691A4 /* Main.storyboard */,
42D7D9931D80C557000691A4 /* Assets.xcassets */,
42D7D9951D80C557000691A4 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -213,6 +227,7 @@
children = (
D393D7541D8F0D0C00241460 /* DiscoverTableViewCell.swift */,
D3DB5A641DA18FC600E550E8 /* CategoriesCollectionViewCell.swift */,
FD8F7DFB1DDD20FC00DCC511 /* SeriesCollectionViewCell.swift */,
);
name = Cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -257,6 +272,17 @@
name = Pods;
sourceTree = "<group>";
};
FD9421401DB5306200685E14 /* Views */ = {
isa = PBXGroup;
children = (
FD9421411DB5307B00685E14 /* ProfileHeaderView.swift */,
FD0159FF1DCBFC80003E7B4E /* ProfileMiniHeader.swift */,
FDF5E0CE1DD3A091005CCB53 /* FollowButton.swift */,
FD8F7DFD1DDD36D600DCC511 /* ProfileSectionHeaderView.swift */,
);
name = Views;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -318,6 +344,7 @@
42D7D9A61D80C557000691A4 /* Resources */,
EC0276E24C25C2645FA03C8E /* [CP] Copy Pods Resources */,
8FCDAF329BD8F017A3A052A8 /* 📦 Copy Pods Resources */,
376B806918EB2E4EFE3E9737 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -475,7 +502,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
376B806918EB2E4EFE3E9737 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PodcastUITests/Pods-PodcastUITests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
48898967F46B529D56984CE0 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -490,7 +532,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
49E4A9519E6E045E62B76D2D /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -535,7 +577,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
8FCDAF329BD8F017A3A052A8 /* 📦 Copy Pods Resources */ = {
Expand Down Expand Up @@ -650,18 +692,24 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FDF5E0CF1DD3A091005CCB53 /* FollowButton.swift in Sources */,
7F97FBDA1D85A99F0073FC0F /* Constants.swift in Sources */,
D3DB5A681DA1B19800E550E8 /* PodcastCollectionViewFlowLayout.swift in Sources */,
FD8F7DFE1DDD36D600DCC511 /* ProfileSectionHeaderView.swift in Sources */,
D39BEE1B1D8A050100131936 /* Episode.swift in Sources */,
7F97FBDC1D85A9E30073FC0F /* Extensions.swift in Sources */,
7F9D0E971D85A37700D2BC1C /* LoginViewController.swift in Sources */,
FD8F7DFC1DDD20FC00DCC511 /* SeriesCollectionViewCell.swift in Sources */,
FD015A001DCBFC80003E7B4E /* ProfileMiniHeader.swift in Sources */,
42F684ED1D80CC9F0035217A /* DiscoverViewController.swift in Sources */,
D300C0921DAEF801000CDBF5 /* CategoriesFeedViewController.swift in Sources */,
D3DB5A651DA18FC600E550E8 /* CategoriesCollectionViewCell.swift in Sources */,
FD9421421DB5307B00685E14 /* ProfileHeaderView.swift in Sources */,
42D7D98D1D80C557000691A4 /* AppDelegate.swift in Sources */,
D39BEE1D1D8A073200131936 /* Series.swift in Sources */,
42F684EB1D80CC7E0035217A /* PlayerViewController.swift in Sources */,
D39BEE1F1D8A0B3B00131936 /* User.swift in Sources */,
FDF1D1CF1DAEE2E300697379 /* ProfileViewController.swift in Sources */,
7F97FBDE1D8663000073FC0F /* REST.swift in Sources */,
D393D7551D8F0D0C00241460 /* DiscoverTableViewCell.swift in Sources */,
421501271D9F5FE1002839D1 /* Player.swift in Sources */,
Expand Down
Binary file removed ...odeproj/project.xcworkspace/xcuserdata/mabryan.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
111 changes: 0 additions & 111 deletions Podcast.xcodeproj/xcuserdata/AntonakakisJ.xcuserdatad/xcschemes/Podcast.xcscheme
View file

This file was deleted.

32 changes: 0 additions & 32 deletions Podcast.xcodeproj/xcuserdata/AntonakakisJ.xcuserdatad/xcschemes/xcschememanagement.plist
View file

This file was deleted.

32 changes: 0 additions & 32 deletions Podcast.xcodeproj/xcuserdata/mabryan.xcuserdatad/xcschemes/xcschememanagement.plist
View file

This file was deleted.

9 changes: 8 additions & 1 deletion Podcast/AppDelegate.swift
View file
Expand Up @@ -18,6 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var tabBarController: UITabBarController!
var playerVCnav: UINavigationController!
var discoverVCnav: UINavigationController!
var profileVCNav: UINavigationController!

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {

Expand All @@ -37,15 +38,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
discoverVCnav.setNavigationBarHidden(true, animated: true)
playerVCnav.pushViewController(PlayerViewController(), animated: false)
discoverVCnav.pushViewController(DiscoverViewController(), animated: false)
profileVCNav = UINavigationController()
profileVCNav.setNavigationBarHidden(true, animated: true)
profileVCNav.pushViewController(ProfileViewController(), animated: false)

// Tabbar initialization
tabBarController = UITabBarController()
tabBarController.viewControllers = [playerVCnav, discoverVCnav]
tabBarController.tabBar.isTranslucent = false
tabBarController.viewControllers = [playerVCnav, discoverVCnav, profileVCNav]
playerVCnav.tabBarItem = UITabBarItem(title: "Player", image: UIImage(), tag: 0)
discoverVCnav.tabBarItem = UITabBarItem(title: "Discover", image: UIImage(), tag: 1)
profileVCNav.tabBarItem = UITabBarItem(title: "Profile", image: UIImage(), tag: 2)

// Main NavigationController initialization
let firstVC = FBSDKAccessToken.current() != nil ? tabBarController : loginVC
// let firstVC = tabBarController

// Main window setup
window = UIWindow(frame: UIScreen.main.bounds)
Expand Down

0 comments on commit b6305ac

Please sign in to comment.