From 7bea7f47fc047d50536ac58e1edb5264f1e20e45 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Fri, 5 Sep 2014 07:27:19 +0200 Subject: [PATCH] venues now have correct information on them --- FestivalHelper.xcodeproj/project.pbxproj | 40 +++++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 44 ++--- FestivalHelper/Base.lproj/Main.storyboard | 56 +++++-- FestivalHelper/FestivalHelper-Prefix.pch | 6 +- FestivalHelper/common/FESDataProvider.h | 15 ++ FestivalHelper/common/FESDataProvider.m | 27 +++ .../schedule/FESScheduleFilmsViewController.m | 1 + .../schedule/FESScheduleTableViewController.m | 26 +-- FestivalHelper/venues/FESVenueEntry.h | 21 +++ FestivalHelper/venues/FESVenueEntry.m | 32 ++++ FestivalHelper/venues/FESVenueEntryCell.h | 18 ++ FestivalHelper/venues/FESVenueEntryCell.m | 38 +++++ .../venues/FESVenuesTableViewController.h | 15 ++ .../venues/FESVenuesTableViewController.m | 155 ++++++++++++++++++ tools/testbackend/sff2014/venues.json | 45 +++++ 15 files changed, 475 insertions(+), 64 deletions(-) create mode 100644 FestivalHelper/common/FESDataProvider.h create mode 100644 FestivalHelper/common/FESDataProvider.m create mode 100644 FestivalHelper/venues/FESVenueEntry.h create mode 100644 FestivalHelper/venues/FESVenueEntry.m create mode 100644 FestivalHelper/venues/FESVenueEntryCell.h create mode 100644 FestivalHelper/venues/FESVenueEntryCell.m create mode 100644 FestivalHelper/venues/FESVenuesTableViewController.h create mode 100644 FestivalHelper/venues/FESVenuesTableViewController.m create mode 100644 tools/testbackend/sff2014/venues.json diff --git a/FestivalHelper.xcodeproj/project.pbxproj b/FestivalHelper.xcodeproj/project.pbxproj index 9b19bec..953c0de 100644 --- a/FestivalHelper.xcodeproj/project.pbxproj +++ b/FestivalHelper.xcodeproj/project.pbxproj @@ -13,6 +13,10 @@ 3068701319B6301C007E4A0E /* FESScheduleEntryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701219B6301C007E4A0E /* FESScheduleEntryCell.m */; }; 3068701619B6DA8D007E4A0E /* FESScheduleFilmsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701519B6DA8D007E4A0E /* FESScheduleFilmsViewController.m */; }; 3068701919B6F135007E4A0E /* FESScheduleFilmCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701819B6F135007E4A0E /* FESScheduleFilmCell.m */; }; + 3068701D19B8723E007E4A0E /* FESVenueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701C19B8723E007E4A0E /* FESVenueEntry.m */; }; + 3068702019B88054007E4A0E /* FESVenueEntryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068701F19B88054007E4A0E /* FESVenueEntryCell.m */; }; + 3068702319B883C1007E4A0E /* FESVenuesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068702219B883C1007E4A0E /* FESVenuesTableViewController.m */; }; + 3068702719B8C03E007E4A0E /* FESDataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068702619B8C03E007E4A0E /* FESDataProvider.m */; }; 3CEA73BD19B1A86D00076FC5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73BC19B1A86C00076FC5 /* Foundation.framework */; }; 3CEA73BF19B1A86D00076FC5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73BE19B1A86D00076FC5 /* CoreGraphics.framework */; }; 3CEA73C119B1A86D00076FC5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CEA73C019B1A86D00076FC5 /* UIKit.framework */; }; @@ -51,6 +55,14 @@ 3068701519B6DA8D007E4A0E /* FESScheduleFilmsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESScheduleFilmsViewController.m; path = schedule/FESScheduleFilmsViewController.m; sourceTree = ""; }; 3068701719B6F135007E4A0E /* FESScheduleFilmCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESScheduleFilmCell.h; path = schedule/FESScheduleFilmCell.h; sourceTree = ""; }; 3068701819B6F135007E4A0E /* FESScheduleFilmCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESScheduleFilmCell.m; path = schedule/FESScheduleFilmCell.m; sourceTree = ""; }; + 3068701B19B8723E007E4A0E /* FESVenueEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESVenueEntry.h; path = venues/FESVenueEntry.h; sourceTree = ""; }; + 3068701C19B8723E007E4A0E /* FESVenueEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESVenueEntry.m; path = venues/FESVenueEntry.m; sourceTree = ""; }; + 3068701E19B88054007E4A0E /* FESVenueEntryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESVenueEntryCell.h; path = venues/FESVenueEntryCell.h; sourceTree = ""; }; + 3068701F19B88054007E4A0E /* FESVenueEntryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESVenueEntryCell.m; path = venues/FESVenueEntryCell.m; sourceTree = ""; }; + 3068702119B883C1007E4A0E /* FESVenuesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESVenuesTableViewController.h; path = venues/FESVenuesTableViewController.h; sourceTree = ""; }; + 3068702219B883C1007E4A0E /* FESVenuesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESVenuesTableViewController.m; path = venues/FESVenuesTableViewController.m; sourceTree = ""; }; + 3068702519B8C03E007E4A0E /* FESDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESDataProvider.h; path = common/FESDataProvider.h; sourceTree = ""; }; + 3068702619B8C03E007E4A0E /* FESDataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESDataProvider.m; path = common/FESDataProvider.m; sourceTree = ""; }; 3CEA73B919B1A86C00076FC5 /* FestivalHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FestivalHelper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3CEA73BC19B1A86C00076FC5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 3CEA73BE19B1A86D00076FC5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -113,6 +125,28 @@ name = schedule; sourceTree = ""; }; + 3068701A19B86EF4007E4A0E /* venues */ = { + isa = PBXGroup; + children = ( + 3068701B19B8723E007E4A0E /* FESVenueEntry.h */, + 3068701C19B8723E007E4A0E /* FESVenueEntry.m */, + 3068701E19B88054007E4A0E /* FESVenueEntryCell.h */, + 3068701F19B88054007E4A0E /* FESVenueEntryCell.m */, + 3068702119B883C1007E4A0E /* FESVenuesTableViewController.h */, + 3068702219B883C1007E4A0E /* FESVenuesTableViewController.m */, + ); + name = venues; + sourceTree = ""; + }; + 3068702419B8C00E007E4A0E /* common */ = { + isa = PBXGroup; + children = ( + 3068702519B8C03E007E4A0E /* FESDataProvider.h */, + 3068702619B8C03E007E4A0E /* FESDataProvider.m */, + ); + name = common; + sourceTree = ""; + }; 3CEA73B019B1A86C00076FC5 = { isa = PBXGroup; children = ( @@ -146,6 +180,8 @@ 3CEA73C219B1A86D00076FC5 /* FestivalHelper */ = { isa = PBXGroup; children = ( + 3068702419B8C00E007E4A0E /* common */, + 3068701A19B86EF4007E4A0E /* venues */, 3068700419B2D4C7007E4A0E /* schedule */, 3CEA73CB19B1A86D00076FC5 /* FESAppDelegate.h */, 3CEA73CC19B1A86D00076FC5 /* FESAppDelegate.m */, @@ -284,12 +320,16 @@ buildActionMask = 2147483647; files = ( 3068700D19B5AB16007E4A0E /* FESScheduleTableViewController.m in Sources */, + 3068702019B88054007E4A0E /* FESVenueEntryCell.m in Sources */, 3CEA73C919B1A86D00076FC5 /* main.m in Sources */, + 3068702719B8C03E007E4A0E /* FESDataProvider.m in Sources */, 3068701319B6301C007E4A0E /* FESScheduleEntryCell.m in Sources */, 3068701919B6F135007E4A0E /* FESScheduleFilmCell.m in Sources */, + 3068701D19B8723E007E4A0E /* FESVenueEntry.m in Sources */, 3068700719B2D6B1007E4A0E /* FESSCheduleEntry.m in Sources */, 3CEA73CD19B1A86D00076FC5 /* FESAppDelegate.m in Sources */, 3068701619B6DA8D007E4A0E /* FESScheduleFilmsViewController.m in Sources */, + 3068702319B883C1007E4A0E /* FESVenuesTableViewController.m in Sources */, 3068700A19B2F826007E4A0E /* FESScheduleFilm.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index d99e47a..6823cd2 100644 --- a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,11 +10,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431422378.990975" + timestampString = "431586143.879636" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "98" - endingLineNumber = "98" + startingLineNumber = "84" + endingLineNumber = "84" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -26,12 +26,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431422378.990975" + timestampString = "431586143.879636" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "75" - endingLineNumber = "75" - landmarkName = "-getScheduleDataFromServer" + startingLineNumber = "73" + endingLineNumber = "73" + landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -42,7 +42,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431422378.990975" + timestampString = "431586143.879636" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "87" @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431422378.990975" + timestampString = "431586143.879636" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "101" - endingLineNumber = "101" + startingLineNumber = "85" + endingLineNumber = "85" landmarkName = "-setupScheduleFromJSONArray:" landmarkType = "5"> @@ -74,27 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431422378.990975" + timestampString = "431586143.879636" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "99" - endingLineNumber = "99" - landmarkName = "-setupScheduleFromJSONArray:" - landmarkType = "5"> - - - - diff --git a/FestivalHelper/Base.lproj/Main.storyboard b/FestivalHelper/Base.lproj/Main.storyboard index 98a9c0f..5c6d938 100644 --- a/FestivalHelper/Base.lproj/Main.storyboard +++ b/FestivalHelper/Base.lproj/Main.storyboard @@ -89,25 +89,25 @@ -