Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
3010f66
Logic for adLibCollection
MarcJacques Feb 27, 2020
e6892d4
Story Selector
MarcJacques Feb 27, 2020
d74e75c
Merge remote-tracking branch 'origin/David' into Marc
Feb 27, 2020
e1b4ebf
switched launchscreen image and added outlets for extra inputs
davidWilliams96080 Feb 28, 2020
52b1694
added things
Feb 28, 2020
1ca24df
Again
davidWilliams96080 Feb 28, 2020
dae6c80
Merge branch 'David' into development
davidWilliams96080 Feb 28, 2020
28ee3bd
Merge branch 'Marc' into development
Feb 28, 2020
9c2f744
Merge branch 'development' into David
davidWilliams96080 Feb 28, 2020
190c9a3
Fixed issues and set a staring VC, wired up correct outlets
davidWilliams96080 Feb 28, 2020
6a608e4
made changes with creating an adlib object
davidWilliams96080 Feb 28, 2020
247d5ef
Merge branch 'David' into development
davidWilliams96080 Feb 28, 2020
03ed314
added textField changes and settings for color changed working
davidWilliams96080 Mar 2, 2020
e2fb011
Settings worked on with color control
davidWilliams96080 Mar 2, 2020
b267d9d
Worked on SettingsViewController and story selection with highlighted…
davidWilliams96080 Mar 3, 2020
04ddf4a
Fixed background color bug in InformationViewController scene
davidWilliams96080 Mar 3, 2020
a3cf42c
theme picker background color alpha adjusted
davidWilliams96080 Mar 3, 2020
9ae991b
redefined green background to match launch screen's color green
davidWilliams96080 Mar 3, 2020
96451f0
Merge branch 'development' into David
davidWilliams96080 Mar 3, 2020
b87510c
updated stories
davidWilliams96080 Mar 3, 2020
4c2a4a7
sets picker value to saved setting upon relaunch
davidWilliams96080 Mar 4, 2020
58fc63b
showing stories built
davidWilliams96080 Mar 5, 2020
112fbd4
adjusting create story func in controller
davidWilliams96080 Mar 5, 2020
de34e14
set up saving adlib and save action
davidWilliams96080 Mar 5, 2020
75db598
working on collectionView
davidWilliams96080 Mar 5, 2020
9691435
working on view controller
davidWilliams96080 Mar 5, 2020
339747c
worked on collectionView setup and cell still won't show, and added …
davidWilliams96080 Mar 5, 2020
36b17fe
Made small changes to code base incl...
davidWilliams96080 Mar 6, 2020
68f9b07
Merge branch 'development' into David
davidWilliams96080 Mar 6, 2020
5068129
Persistence updated
Mar 6, 2020
f223161
Merge branch 'Marc' into development
Mar 6, 2020
0f6a62f
Added viewController scene...
davidWilliams96080 Mar 6, 2020
a66c0e7
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
76a9666
Merge branch 'development' into Marc
Mar 6, 2020
1d91006
StoryTableVC and Storycell work
Mar 6, 2020
954aae5
Merge branch 'Marc' into development
Mar 6, 2020
fd9252d
added delete and update story functions
davidWilliams96080 Mar 6, 2020
5cbb313
Merge branch 'development' into David
davidWilliams96080 Mar 6, 2020
38d9711
Merge branch 'development' into Marc
Mar 6, 2020
087b719
Fixed updating and reloading issues
davidWilliams96080 Mar 6, 2020
8388bb1
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
16f5ab1
Improved view popping back to Book View
davidWilliams96080 Mar 6, 2020
381c1ef
Merge branch 'development' into Marc
Mar 6, 2020
05c8745
fixed saving issue
Mar 6, 2020
ba33c3f
Merge branch 'Marc' into development
Mar 6, 2020
2e922f1
Merge branch 'development' into David
davidWilliams96080 Mar 6, 2020
1e2f91f
fixed segue
Mar 6, 2020
c6a8c0b
Merge branch 'Marc' into development
Mar 6, 2020
ba93438
Merge branch 'development' into David
davidWilliams96080 Mar 6, 2020
cd2d01a
Fixed saving and editing with reloading tableview
davidWilliams96080 Mar 6, 2020
f05afee
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
856a5e3
Refactored for readability
davidWilliams96080 Mar 6, 2020
fc571d9
Merge branch 'development' into David
davidWilliams96080 Mar 6, 2020
a2fa278
Added firstResponder functionality
davidWilliams96080 Mar 6, 2020
c217a00
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
fff8bb3
cleaned up delegate call into one line
davidWilliams96080 Mar 6, 2020
ace6f05
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
d12c603
Added clear textField from storyboard
davidWilliams96080 Mar 6, 2020
ec21f33
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
5972d38
added successful sorting
davidWilliams96080 Mar 6, 2020
8167bdc
Merge branch 'David' into development
davidWilliams96080 Mar 6, 2020
619fefe
Fixed issue where wrong row was selected n tableView
davidWilliams96080 Mar 7, 2020
0fb169c
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
72f3894
Got the random adlib generator working
davidWilliams96080 Mar 7, 2020
9ce78a3
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
e675a26
Got randomizer better configured
davidWilliams96080 Mar 7, 2020
78be25d
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
7d9687b
Finished randomization
davidWilliams96080 Mar 7, 2020
e74a08d
Merge branch 'development' into David
davidWilliams96080 Mar 7, 2020
46f70d6
updated Information screen to include randomizing
davidWilliams96080 Mar 7, 2020
03b184a
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
636a3a5
fixed constraint issues and modified Information Text
davidWilliams96080 Mar 7, 2020
6a8eea9
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
8155374
Launchscreen imageView constraint issue
davidWilliams96080 Mar 7, 2020
597436b
Merge branch 'development' into David
davidWilliams96080 Mar 7, 2020
22fc86a
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
947d3f3
Fixed constraints with AdLib Create scene
davidWilliams96080 Mar 7, 2020
2f8c377
Merge branch 'David' into development
davidWilliams96080 Mar 7, 2020
0f59854
cleaned up ad-lib story text and show store label
davidWilliams96080 Mar 9, 2020
5de6cf6
Merge branch 'David' into development
davidWilliams96080 Mar 9, 2020
3d79647
added an alert to notify when no text fields have data
davidWilliams96080 Mar 9, 2020
8f63ed9
Merge branch 'David' into development
davidWilliams96080 Mar 9, 2020
1fc962e
fixed bug where no data was passed in any textField and it still went…
davidWilliams96080 Mar 9, 2020
80870a5
Merge branch 'development' into David
davidWilliams96080 Mar 9, 2020
7e38613
Merge branch 'David' into development
davidWilliams96080 Mar 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 55 additions & 40 deletions AdLibs/AdLibs.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,43 @@
objects = {

/* Begin PBXBuildFile section */
0566EDE52411FBC7007EEBBC /* StoryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0566EDE42411FBC7007EEBBC /* StoryTableViewCell.swift */; };
0566EDE72411FBDF007EEBBC /* StoryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0566EDE62411FBDF007EEBBC /* StoryTableViewController.swift */; };
05AD2A17240767E30051AC59 /* AdLibCreatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05AD2A16240767E30051AC59 /* AdLibCreatorViewController.swift */; };
05AD2A1924076A880051AC59 /* StorySelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05AD2A1824076A880051AC59 /* StorySelector.swift */; };
05AD2A1B24076E0C0051AC59 /* AdLib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05AD2A1A24076E0C0051AC59 /* AdLib.swift */; };
05AD2A1D24076E2D0051AC59 /* AdLibController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05AD2A1C24076E2D0051AC59 /* AdLibController.swift */; };
05AD2A1F24077BD80051AC59 /* StoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05AD2A1E24077BD80051AC59 /* StoryViewController.swift */; };
381C8536240F687A0056DF8A /* Words.swift in Sources */ = {isa = PBXBuildFile; fileRef = 381C8535240F687A0056DF8A /* Words.swift */; };
381C8538240F98460056DF8A /* Story.swift in Sources */ = {isa = PBXBuildFile; fileRef = 381C8537240F98460056DF8A /* Story.swift */; };
38AF8E862406FCC400608D01 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E852406FCC400608D01 /* AppDelegate.swift */; };
38AF8E882406FCC400608D01 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E872406FCC400608D01 /* SceneDelegate.swift */; };
38AF8E8A2406FCC400608D01 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E892406FCC400608D01 /* ViewController.swift */; };
38AF8E8A2406FCC400608D01 /* WackyAdLibsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E892406FCC400608D01 /* WackyAdLibsViewController.swift */; };
38AF8E8D2406FCC400608D01 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 38AF8E8B2406FCC400608D01 /* Main.storyboard */; };
38AF8E8F2406FCC600608D01 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 38AF8E8E2406FCC600608D01 /* Assets.xcassets */; };
38AF8E922406FCC600608D01 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 38AF8E902406FCC600608D01 /* LaunchScreen.storyboard */; };
38AF8E9A24070B6200608D01 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E9924070B6200608D01 /* SettingsViewController.swift */; };
38AF8E9C24070F6100608D01 /* String+UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E9B24070F6100608D01 /* String+UserDefaults.swift */; };
38AF8EA024070FAF00608D01 /* ThemeHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8E9F24070FAF00608D01 /* ThemeHelper.swift */; };
38AF8EA524086A0800608D01 /* AdLibBookCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8EA424086A0800608D01 /* AdLibBookCollectionViewController.swift */; };
38AF8EA724086A2400608D01 /* AdLibBookCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8EA624086A2400608D01 /* AdLibBookCollectionViewCell.swift */; };
38AF8EAD240AF22000608D01 /* InformationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AF8EAC240AF22000608D01 /* InformationViewController.swift */; };
38FC6BAF240B3CCF007DFE79 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38FC6BAE240B3CCF007DFE79 /* Settings.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0566EDE42411FBC7007EEBBC /* StoryTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryTableViewCell.swift; sourceTree = "<group>"; };
0566EDE62411FBDF007EEBBC /* StoryTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryTableViewController.swift; sourceTree = "<group>"; };
05AD2A16240767E30051AC59 /* AdLibCreatorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdLibCreatorViewController.swift; sourceTree = "<group>"; };
05AD2A1824076A880051AC59 /* StorySelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorySelector.swift; sourceTree = "<group>"; };
05AD2A1A24076E0C0051AC59 /* AdLib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdLib.swift; sourceTree = "<group>"; };
05AD2A1C24076E2D0051AC59 /* AdLibController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdLibController.swift; sourceTree = "<group>"; };
05AD2A1E24077BD80051AC59 /* StoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryViewController.swift; sourceTree = "<group>"; };
381C8535240F687A0056DF8A /* Words.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Words.swift; sourceTree = "<group>"; };
381C8537240F98460056DF8A /* Story.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Story.swift; sourceTree = "<group>"; };
38AF8E822406FCC400608D01 /* AdLibs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AdLibs.app; sourceTree = BUILT_PRODUCTS_DIR; };
38AF8E852406FCC400608D01 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
38AF8E872406FCC400608D01 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
38AF8E892406FCC400608D01 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
38AF8E892406FCC400608D01 /* WackyAdLibsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WackyAdLibsViewController.swift; sourceTree = "<group>"; };
38AF8E8C2406FCC400608D01 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
38AF8E8E2406FCC600608D01 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
38AF8E912406FCC600608D01 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
38AF8E932406FCC600608D01 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
38AF8E9924070B6200608D01 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
38AF8E9B24070F6100608D01 /* String+UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+UserDefaults.swift"; sourceTree = "<group>"; };
38AF8E9F24070FAF00608D01 /* ThemeHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeHelper.swift; sourceTree = "<group>"; };
38AF8EA424086A0800608D01 /* AdLibBookCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdLibBookCollectionViewController.swift; sourceTree = "<group>"; };
38AF8EA624086A2400608D01 /* AdLibBookCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdLibBookCollectionViewCell.swift; sourceTree = "<group>"; };
38AF8EAC240AF22000608D01 /* InformationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InformationViewController.swift; sourceTree = "<group>"; };
38FC6BAE240B3CCF007DFE79 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -60,7 +60,8 @@
05AD2A122407670C0051AC59 /* Model */ = {
isa = PBXGroup;
children = (
05AD2A1A24076E0C0051AC59 /* AdLib.swift */,
381C8535240F687A0056DF8A /* Words.swift */,
381C8537240F98460056DF8A /* Story.swift */,
);
path = Model;
sourceTree = "<group>";
Expand All @@ -69,25 +70,27 @@
isa = PBXGroup;
children = (
05AD2A1C24076E2D0051AC59 /* AdLibController.swift */,
05AD2A1824076A880051AC59 /* StorySelector.swift */,
);
path = "Model Controller";
sourceTree = "<group>";
};
05AD2A14240767130051AC59 /* View Controller */ = {
05AD2A14240767130051AC59 /* View Controllers */ = {
isa = PBXGroup;
children = (
05AD2A16240767E30051AC59 /* AdLibCreatorViewController.swift */,
38AF8E892406FCC400608D01 /* WackyAdLibsViewController.swift */,
38AF8EAC240AF22000608D01 /* InformationViewController.swift */,
05AD2A1E24077BD80051AC59 /* StoryViewController.swift */,
38AF8E9924070B6200608D01 /* SettingsViewController.swift */,
0566EDE62411FBDF007EEBBC /* StoryTableViewController.swift */,
);
path = "View Controller";
path = "View Controllers";
sourceTree = "<group>";
};
05AD2A15240767160051AC59 /* Views */ = {
isa = PBXGroup;
children = (
05AD2A1824076A880051AC59 /* StoryMode.swift */,
38AF8EA624086A2400608D01 /* AdLibBookCollectionViewCell.swift */,
0566EDE42411FBC7007EEBBC /* StoryTableViewCell.swift */,
);
path = Views;
sourceTree = "<group>";
Expand All @@ -96,6 +99,8 @@
isa = PBXGroup;
children = (
38AF8E842406FCC400608D01 /* AdLibs */,
38AF8E932406FCC600608D01 /* Info.plist */,
38DA3DB4240E167D00236F1D /* Resources */,
38AF8E832406FCC400608D01 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -111,33 +116,43 @@
38AF8E842406FCC400608D01 /* AdLibs */ = {
isa = PBXGroup;
children = (
05AD2A122407670C0051AC59 /* Model */,
05AD2A15240767160051AC59 /* Views */,
05AD2A14240767130051AC59 /* View Controller */,
05AD2A14240767130051AC59 /* View Controllers */,
05AD2A13240767100051AC59 /* Model Controller */,
05AD2A122407670C0051AC59 /* Model */,
38AF8E852406FCC400608D01 /* AppDelegate.swift */,
38AF8E872406FCC400608D01 /* SceneDelegate.swift */,
38AF8E892406FCC400608D01 /* ViewController.swift */,
38AF8E8B2406FCC400608D01 /* Main.storyboard */,
38AF8E8E2406FCC600608D01 /* Assets.xcassets */,
38AF8E902406FCC600608D01 /* LaunchScreen.storyboard */,
38AF8E932406FCC600608D01 /* Info.plist */,
38DA3DB2240E153F00236F1D /* Storyboard */,
38AF8EA12407105300608D01 /* Settings */,
38AF8EA424086A0800608D01 /* AdLibBookCollectionViewController.swift */,
);
path = AdLibs;
sourceTree = "<group>";
};
38AF8EA12407105300608D01 /* Settings */ = {
isa = PBXGroup;
children = (
38AF8E9924070B6200608D01 /* SettingsViewController.swift */,
38AF8E9B24070F6100608D01 /* String+UserDefaults.swift */,
38AF8E9F24070FAF00608D01 /* ThemeHelper.swift */,
38FC6BAE240B3CCF007DFE79 /* Settings.swift */,
);
path = Settings;
sourceTree = "<group>";
};
38DA3DB2240E153F00236F1D /* Storyboard */ = {
isa = PBXGroup;
children = (
38AF8E8B2406FCC400608D01 /* Main.storyboard */,
);
path = Storyboard;
sourceTree = "<group>";
};
38DA3DB4240E167D00236F1D /* Resources */ = {
isa = PBXGroup;
children = (
38AF8E852406FCC400608D01 /* AppDelegate.swift */,
38AF8E872406FCC400608D01 /* SceneDelegate.swift */,
38AF8E8E2406FCC600608D01 /* Assets.xcassets */,
38AF8E902406FCC600608D01 /* LaunchScreen.storyboard */,
);
path = Resources;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -209,19 +224,19 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
05AD2A1924076A880051AC59 /* StorySelector.swift in Sources */,
05AD2A1B24076E0C0051AC59 /* AdLib.swift in Sources */,
38AF8E8A2406FCC400608D01 /* ViewController.swift in Sources */,
0566EDE72411FBDF007EEBBC /* StoryTableViewController.swift in Sources */,
38AF8E8A2406FCC400608D01 /* WackyAdLibsViewController.swift in Sources */,
38AF8E862406FCC400608D01 /* AppDelegate.swift in Sources */,
05AD2A1D24076E2D0051AC59 /* AdLibController.swift in Sources */,
05AD2A17240767E30051AC59 /* AdLibCreatorViewController.swift in Sources */,
381C8538240F98460056DF8A /* Story.swift in Sources */,
0566EDE52411FBC7007EEBBC /* StoryTableViewCell.swift in Sources */,
38AF8E882406FCC400608D01 /* SceneDelegate.swift in Sources */,
38AF8EA024070FAF00608D01 /* ThemeHelper.swift in Sources */,
38AF8EA524086A0800608D01 /* AdLibBookCollectionViewController.swift in Sources */,
05AD2A1F24077BD80051AC59 /* StoryViewController.swift in Sources */,
38AF8EA724086A2400608D01 /* AdLibBookCollectionViewCell.swift in Sources */,
381C8536240F687A0056DF8A /* Words.swift in Sources */,
38FC6BAF240B3CCF007DFE79 /* Settings.swift in Sources */,
38AF8EAD240AF22000608D01 /* InformationViewController.swift in Sources */,
38AF8E9A24070B6200608D01 /* SettingsViewController.swift in Sources */,
38AF8E9C24070F6100608D01 /* String+UserDefaults.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
90 changes: 0 additions & 90 deletions AdLibs/AdLibs/AdLibBookCollectionViewController.swift

This file was deleted.

Binary file not shown.
Loading