Skip to content

Commit

Permalink
#10 Finished Add challenges screen. Fixed navigation bar colors probl…
Browse files Browse the repository at this point in the history
…em when switching views
  • Loading branch information
kperusko committed Nov 19, 2015
1 parent d830c86 commit ddbedd3
Show file tree
Hide file tree
Showing 15 changed files with 316 additions and 56 deletions.
24 changes: 20 additions & 4 deletions DesignStudioExpress.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
DE9CC0FF2AB206A55D253AC2 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAF9E289780C23ADD06A8363 /* Pods.framework */; };
E421C4161BF164AD003F9D8A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E421C4151BF164AD003F9D8A /* AppDelegate.swift */; };
E421C4181BF164AD003F9D8A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E421C4171BF164AD003F9D8A /* ViewController.swift */; };
E421C41B1BF164AD003F9D8A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E421C4191BF164AD003F9D8A /* Main.storyboard */; };
E421C41D1BF164AD003F9D8A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E421C41C1BF164AD003F9D8A /* Assets.xcassets */; };
E421C4201BF164AD003F9D8A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E421C41E1BF164AD003F9D8A /* LaunchScreen.storyboard */; };
Expand All @@ -21,9 +20,12 @@
E429AF5D1BF5404200AE4DA7 /* BaseUIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E429AF5C1BF5404200AE4DA7 /* BaseUIViewController.swift */; };
E429AF651BF64DD300AE4DA7 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E429AF641BF64DD300AE4DA7 /* HomeViewController.swift */; };
E429AF691BF6619200AE4DA7 /* MGSwiteTableCellCentered.swift in Sources */ = {isa = PBXBuildFile; fileRef = E429AF681BF6619200AE4DA7 /* MGSwiteTableCellCentered.swift */; };
E42DD3271BFE68380026390E /* DesignStudioStyleCustomization.swift in Sources */ = {isa = PBXBuildFile; fileRef = E42DD3261BFE68380026390E /* DesignStudioStyleCustomization.swift */; };
E45128F81BF29E09002AFC8A /* UIButtonRed.swift in Sources */ = {isa = PBXBuildFile; fileRef = E45128F71BF29E09002AFC8A /* UIButtonRed.swift */; };
E4607F261BF6A82C000C44C7 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4607F251BF6A82C000C44C7 /* HomeViewModel.swift */; };
E4766B4D1BF2A8550021059F /* UIButtonLightBlue.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4766B4C1BF2A8550021059F /* UIButtonLightBlue.swift */; };
E49F45D91BFD468100F32AE9 /* ChallengesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49F45D81BFD468100F32AE9 /* ChallengesViewController.swift */; };
E49F45DC1BFE443B00F32AE9 /* StyledNavigationBarProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49F45DB1BFE443B00F32AE9 /* StyledNavigationBarProtocol.swift */; };
E4BFF0081BF3B33900E4255A /* Intro.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = E4BFF0071BF3B33900E4255A /* Intro.mp4 */; };
E4BFF00C1BF3BF1100E4255A /* UIButtonBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4BFF00B1BF3BF1100E4255A /* UIButtonBase.swift */; };
E4C113301BFA66CF00A7E1B3 /* NSAttributedStringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4C1132F1BFA66CF00A7E1B3 /* NSAttributedStringExtension.swift */; };
Expand All @@ -50,7 +52,6 @@
AAF9E289780C23ADD06A8363 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E421C4121BF164AD003F9D8A /* DesignStudioExpress.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DesignStudioExpress.app; sourceTree = BUILT_PRODUCTS_DIR; };
E421C4151BF164AD003F9D8A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
E421C4171BF164AD003F9D8A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
E421C41A1BF164AD003F9D8A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
E421C41C1BF164AD003F9D8A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E421C41F1BF164AD003F9D8A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -65,9 +66,12 @@
E429AF5C1BF5404200AE4DA7 /* BaseUIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseUIViewController.swift; sourceTree = "<group>"; };
E429AF641BF64DD300AE4DA7 /* HomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
E429AF681BF6619200AE4DA7 /* MGSwiteTableCellCentered.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MGSwiteTableCellCentered.swift; sourceTree = "<group>"; };
E42DD3261BFE68380026390E /* DesignStudioStyleCustomization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DesignStudioStyleCustomization.swift; sourceTree = "<group>"; };
E45128F71BF29E09002AFC8A /* UIButtonRed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonRed.swift; sourceTree = "<group>"; };
E4607F251BF6A82C000C44C7 /* HomeViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
E4766B4C1BF2A8550021059F /* UIButtonLightBlue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonLightBlue.swift; sourceTree = "<group>"; };
E49F45D81BFD468100F32AE9 /* ChallengesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChallengesViewController.swift; sourceTree = "<group>"; };
E49F45DB1BFE443B00F32AE9 /* StyledNavigationBarProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledNavigationBarProtocol.swift; sourceTree = "<group>"; };
E4BFF0071BF3B33900E4255A /* Intro.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = Intro.mp4; sourceTree = "<group>"; };
E4BFF00B1BF3BF1100E4255A /* UIButtonBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonBase.swift; sourceTree = "<group>"; };
E4C1132F1BFA66CF00A7E1B3 /* NSAttributedStringExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSAttributedStringExtension.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -137,6 +141,7 @@
E421C4141BF164AD003F9D8A /* DesignStudioExpress */ = {
isa = PBXGroup;
children = (
E49F45DA1BFE442500F32AE9 /* Protocols */,
E4FF2BBE1BF78DB200A3C732 /* Models */,
E4607F241BF6A7B8000C44C7 /* ViewModels */,
E429AF591BF5396C00AE4DA7 /* Extensions */,
Expand Down Expand Up @@ -180,11 +185,20 @@
path = ViewModels;
sourceTree = "<group>";
};
E49F45DA1BFE442500F32AE9 /* Protocols */ = {
isa = PBXGroup;
children = (
E49F45DB1BFE443B00F32AE9 /* StyledNavigationBarProtocol.swift */,
);
name = Protocols;
sourceTree = "<group>";
};
E4BFF0051BF3A4C300E4255A /* Resources */ = {
isa = PBXGroup;
children = (
E429AF571BF530B200AE4DA7 /* DesignStudioStyles.swift */,
E4BFF0071BF3B33900E4255A /* Intro.mp4 */,
E42DD3261BFE68380026390E /* DesignStudioStyleCustomization.swift */,
);
path = Resources;
sourceTree = "<group>";
Expand All @@ -194,9 +208,9 @@
children = (
E4BFF00F1BF3BF3300E4255A /* Subviews */,
E421C4361BF279FE003F9D8A /* IntroViewController.swift */,
E421C4171BF164AD003F9D8A /* ViewController.swift */,
E429AF641BF64DD300AE4DA7 /* HomeViewController.swift */,
E4ECC4F01BF8E92C00834AD3 /* DetailDesignStudioViewController.swift */,
E49F45D81BFD468100F32AE9 /* ChallengesViewController.swift */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -393,8 +407,8 @@
E429AF581BF530B200AE4DA7 /* DesignStudioStyles.swift in Sources */,
E45128F81BF29E09002AFC8A /* UIButtonRed.swift in Sources */,
E4C113321BFA855700A7E1B3 /* RealmSwiftExtension.swift in Sources */,
E421C4181BF164AD003F9D8A /* ViewController.swift in Sources */,
E421C4161BF164AD003F9D8A /* AppDelegate.swift in Sources */,
E49F45D91BFD468100F32AE9 /* ChallengesViewController.swift in Sources */,
E4ECC4F11BF8E92C00834AD3 /* DetailDesignStudioViewController.swift in Sources */,
E429AF5B1BF539BC00AE4DA7 /* UIImageExtension.swift in Sources */,
E4BFF00C1BF3BF1100E4255A /* UIButtonBase.swift in Sources */,
Expand All @@ -403,11 +417,13 @@
E4607F261BF6A82C000C44C7 /* HomeViewModel.swift in Sources */,
E4FF2BC01BF78DE500A3C732 /* DesignStudio.swift in Sources */,
E4766B4D1BF2A8550021059F /* UIButtonLightBlue.swift in Sources */,
E42DD3271BFE68380026390E /* DesignStudioStyleCustomization.swift in Sources */,
E429AF5D1BF5404200AE4DA7 /* BaseUIViewController.swift in Sources */,
E4ECC4F31BF8EF1200834AD3 /* DetailDesignStudioViewModel.swift in Sources */,
E4C113361BFBBE3B00A7E1B3 /* StringExtension.swift in Sources */,
E429AF4E1BF3F65400AE4DA7 /* BaseUITabBarController.swift in Sources */,
E429AF691BF6619200AE4DA7 /* MGSwiteTableCellCentered.swift in Sources */,
E49F45DC1BFE443B00F32AE9 /* StyledNavigationBarProtocol.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "DS_Icon_big.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ddbedd3

Please sign in to comment.