Skip to content

Commit

Permalink
Merge branch 'dev/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kperusko
kperusko committed Feb 8, 2016
2 parents b9a5994 + eb211a3 commit b0235be
Show file tree
Hide file tree
Showing 32 changed files with 931 additions and 783 deletions.
54 changes: 29 additions & 25 deletions ... Studio Express.xcodeproj/project.pbxproj → Design Studio.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
E46A22081C010FE5004D5292 /* ChallengeDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46A22071C010FE5004D5292 /* ChallengeDetailViewModel.swift */; };
E47294E71C00C9FF00E59587 /* UIButtonTransparent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47294E61C00C9FF00E59587 /* UIButtonTransparent.swift */; };
E4766B4D1BF2A8550021059F /* UIButtonLightBlue.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4766B4C1BF2A8550021059F /* UIButtonLightBlue.swift */; };
E48641461C63FAA70063D624 /* UIAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E48641451C63FAA70063D624 /* UIAlertController.swift */; };
E49F45D91BFD468100F32AE9 /* ChallengesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49F45D81BFD468100F32AE9 /* ChallengesViewController.swift */; };
E49F45DC1BFE443B00F32AE9 /* StyledNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49F45DB1BFE443B00F32AE9 /* StyledNavigationBar.swift */; };
E4A4B4631C2372CC00D6664E /* UITableViewCellAddChallenge.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4A4B4621C2372CC00D6664E /* UITableViewCellAddChallenge.swift */; };
Expand Down Expand Up @@ -117,13 +118,13 @@
E41E772B1C06554D000364D6 /* UITextViewDelegateMaxLength.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITextViewDelegateMaxLength.swift; sourceTree = "<group>"; };
E41E772D1C067C6C000364D6 /* UITextDelegateBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITextDelegateBase.swift; sourceTree = "<group>"; };
E41E772F1C067D25000364D6 /* UITextFieldDelegateMaxLength.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITextFieldDelegateMaxLength.swift; sourceTree = "<group>"; };
E421C4121BF164AD003F9D8A /* Design Studio Express.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Design Studio Express.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E421C4121BF164AD003F9D8A /* Design Studio.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Design Studio.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E421C4151BF164AD003F9D8A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.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>"; };
E421C4211BF164AD003F9D8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E421C4261BF164AD003F9D8A /* Design Studio Express.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Design Studio Express.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
E421C4261BF164AD003F9D8A /* Design Studio.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Design Studio.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
E421C42A1BF164AD003F9D8A /* DesignStudioExpressTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignStudioExpressTests.swift; sourceTree = "<group>"; };
E421C42C1BF164AD003F9D8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E421C4361BF279FE003F9D8A /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -151,6 +152,7 @@
E46A22071C010FE5004D5292 /* ChallengeDetailViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChallengeDetailViewModel.swift; sourceTree = "<group>"; };
E47294E61C00C9FF00E59587 /* UIButtonTransparent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonTransparent.swift; sourceTree = "<group>"; };
E4766B4C1BF2A8550021059F /* UIButtonLightBlue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonLightBlue.swift; sourceTree = "<group>"; };
E48641451C63FAA70063D624 /* UIAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIAlertController.swift; sourceTree = "<group>"; };
E49F45D81BFD468100F32AE9 /* ChallengesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChallengesViewController.swift; sourceTree = "<group>"; };
E49F45DB1BFE443B00F32AE9 /* StyledNavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledNavigationBar.swift; sourceTree = "<group>"; };
E4A4B4621C2372CC00D6664E /* UITableViewCellAddChallenge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewCellAddChallenge.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -258,8 +260,8 @@
E421C4131BF164AD003F9D8A /* Products */ = {
isa = PBXGroup;
children = (
E421C4121BF164AD003F9D8A /* Design Studio Express.app */,
E421C4261BF164AD003F9D8A /* Design Studio Express.xctest */,
E421C4121BF164AD003F9D8A /* Design Studio.app */,
E421C4261BF164AD003F9D8A /* Design Studio.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -302,6 +304,7 @@
E4C113311BFA855700A7E1B3 /* RealmSwiftExtension.swift */,
E4C113351BFBBE3B00A7E1B3 /* StringExtension.swift */,
E429AF5A1BF539BC00AE4DA7 /* UIImageExtension.swift */,
E48641451C63FAA70063D624 /* UIAlertController.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -403,9 +406,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
E421C4111BF164AD003F9D8A /* Design Studio Express */ = {
E421C4111BF164AD003F9D8A /* Design Studio */ = {
isa = PBXNativeTarget;
buildConfigurationList = E421C42F1BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio Express" */;
buildConfigurationList = E421C42F1BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio" */;
buildPhases = (
D85651353B822225EAD177C7 /* Check Pods Manifest.lock */,
E421C40E1BF164AD003F9D8A /* Sources */,
Expand All @@ -419,14 +422,14 @@
);
dependencies = (
);
name = "Design Studio Express";
name = "Design Studio";
productName = DesignStudioExpress;
productReference = E421C4121BF164AD003F9D8A /* Design Studio Express.app */;
productReference = E421C4121BF164AD003F9D8A /* Design Studio.app */;
productType = "com.apple.product-type.application";
};
E421C4251BF164AD003F9D8A /* Design Studio ExpressTests */ = {
E421C4251BF164AD003F9D8A /* Design StudioTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = E421C4321BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio ExpressTests" */;
buildConfigurationList = E421C4321BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design StudioTests" */;
buildPhases = (
E421C4221BF164AD003F9D8A /* Sources */,
E421C4231BF164AD003F9D8A /* Frameworks */,
Expand All @@ -437,9 +440,9 @@
dependencies = (
E421C4281BF164AD003F9D8A /* PBXTargetDependency */,
);
name = "Design Studio ExpressTests";
name = "Design StudioTests";
productName = DesignStudioExpressTests;
productReference = E421C4261BF164AD003F9D8A /* Design Studio Express.xctest */;
productReference = E421C4261BF164AD003F9D8A /* Design Studio.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
Expand All @@ -461,7 +464,7 @@
};
};
};
buildConfigurationList = E421C40D1BF164AD003F9D8A /* Build configuration list for PBXProject "Design Studio Express" */;
buildConfigurationList = E421C40D1BF164AD003F9D8A /* Build configuration list for PBXProject "Design Studio" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -474,8 +477,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
E421C4111BF164AD003F9D8A /* Design Studio Express */,
E421C4251BF164AD003F9D8A /* Design Studio ExpressTests */,
E421C4111BF164AD003F9D8A /* Design Studio */,
E421C4251BF164AD003F9D8A /* Design StudioTests */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -575,6 +578,7 @@
E42DD3301BFE98020026390E /* ChallengesViewModel.swift in Sources */,
E421C4371BF279FE003F9D8A /* IntroViewController.swift in Sources */,
E4EB7A951C271226003FADA3 /* UITableViewCellSettings.swift in Sources */,
E48641461C63FAA70063D624 /* UIAlertController.swift in Sources */,
E429AF581BF530B200AE4DA7 /* DesignStudioStyles.swift in Sources */,
E45128F81BF29E09002AFC8A /* UIButtonRed.swift in Sources */,
E47294E71C00C9FF00E59587 /* UIButtonTransparent.swift in Sources */,
Expand Down Expand Up @@ -650,7 +654,7 @@
/* Begin PBXTargetDependency section */
E421C4281BF164AD003F9D8A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E421C4111BF164AD003F9D8A /* Design Studio Express */;
target = E421C4111BF164AD003F9D8A /* Design Studio */;
targetProxy = E421C4271BF164AD003F9D8A /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -772,7 +776,7 @@
INFOPLIST_FILE = DesignStudioExpress/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.alexanderinteractive.whackjobapp;
PRODUCT_NAME = "Design Studio Express";
PRODUCT_NAME = "Design Studio";
SWIFT_OBJC_BRIDGING_HEADER = "DesignStudioExpress/DesignStudioExpress-Bridging-Header.h";
};
name = Debug;
Expand All @@ -792,7 +796,7 @@
INFOPLIST_FILE = DesignStudioExpress/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.alexanderinteractive.whackjobapp;
PRODUCT_NAME = "Design Studio Express";
PRODUCT_NAME = "Design Studio";
SWIFT_OBJC_BRIDGING_HEADER = "DesignStudioExpress/DesignStudioExpress-Bridging-Header.h";
};
name = Release;
Expand All @@ -804,8 +808,8 @@
INFOPLIST_FILE = DesignStudioExpressTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.alexanderinteractive.DesignStudioExpressTests;
PRODUCT_NAME = "Design Studio Express";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Design Studio Express.app/Design Studio Express";
PRODUCT_NAME = "Design Studio";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Design Studio.app/Design Studio";
};
name = Debug;
};
Expand All @@ -816,15 +820,15 @@
INFOPLIST_FILE = DesignStudioExpressTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.alexanderinteractive.DesignStudioExpressTests;
PRODUCT_NAME = "Design Studio Express";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Design Studio Express.app/Design Studio Express";
PRODUCT_NAME = "Design Studio";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Design Studio.app/Design Studio";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
E421C40D1BF164AD003F9D8A /* Build configuration list for PBXProject "Design Studio Express" */ = {
E421C40D1BF164AD003F9D8A /* Build configuration list for PBXProject "Design Studio" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E421C42D1BF164AD003F9D8A /* Debug */,
Expand All @@ -833,7 +837,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E421C42F1BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio Express" */ = {
E421C42F1BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E421C4301BF164AD003F9D8A /* Debug */,
Expand All @@ -842,7 +846,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E421C4321BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design Studio ExpressTests" */ = {
E421C4321BF164AD003F9D8A /* Build configuration list for PBXNativeTarget "Design StudioTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E421C4331BF164AD003F9D8A /* Debug */,
Expand Down
0 ...io Express.xcodeproj/project.pbxproj.orig → Design Studio.xcodeproj/project.pbxproj.orig
View file
File renamed without changes.
0 ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ress.xcworkspace/contents.xcworkspacedata → ...udio.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions DesignStudioExpress.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

10 changes: 6 additions & 4 deletions DesignStudioExpress/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}


// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
func applicationDidEnterBackground(application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
AppDelegate.designStudio.disableScheduledTimer(true)
}

// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
func applicationWillEnterForeground(application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
AppDelegate.designStudio.rescheduleTimer()
}

func applicationDidBecomeActive(application: UIApplication) {
Expand Down
23 changes: 23 additions & 0 deletions DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Pencil.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion DesignStudioExpress/Base.lproj/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1605" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
Expand Down
Loading

0 comments on commit b0235be

Please sign in to comment.