From 376072712ab762037093019ea200f8f8f0eee07b Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sun, 7 Sep 2014 07:18:07 +0200 Subject: [PATCH] about page now gets information from service --- FestivalHelper.xcodeproj/project.pbxproj | 26 +++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 104 +++++----- FestivalHelper/Base.lproj/Main.storyboard | 185 ++++++++++++++---- FestivalHelper/FestivalHelper-Prefix.pch | 2 + FestivalHelper/about/FESAboutEntry.h | 20 ++ FestivalHelper/about/FESAboutEntry.m | 31 +++ FestivalHelper/about/FESAboutViewController.h | 21 ++ FestivalHelper/about/FESAboutViewController.m | 91 +++++++++ .../films/FESFilmDetailsViewController.h | 32 +++ .../films/FESFilmDetailsViewController.m | 71 +++++++ .../films/FESFilmsTableViewController.m | 11 +- .../schedule/FESScheduleFilmsViewController.m | 2 + .../schedule/FESScheduleTableViewController.m | 10 + tools/testbackend/sff2014/about.json | 8 + tools/testbackend/sff2014/films.json | 14 +- 15 files changed, 522 insertions(+), 106 deletions(-) create mode 100644 FestivalHelper/about/FESAboutEntry.h create mode 100644 FestivalHelper/about/FESAboutEntry.m create mode 100644 FestivalHelper/about/FESAboutViewController.h create mode 100644 FestivalHelper/about/FESAboutViewController.m create mode 100644 FestivalHelper/films/FESFilmDetailsViewController.h create mode 100644 FestivalHelper/films/FESFilmDetailsViewController.m create mode 100644 tools/testbackend/sff2014/about.json diff --git a/FestivalHelper.xcodeproj/project.pbxproj b/FestivalHelper.xcodeproj/project.pbxproj index 6d3073b..2e5aeb0 100644 --- a/FestivalHelper.xcodeproj/project.pbxproj +++ b/FestivalHelper.xcodeproj/project.pbxproj @@ -10,6 +10,9 @@ 303A457E19BAEE51003C8860 /* FESFilmEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A457D19BAEE51003C8860 /* FESFilmEntry.m */; }; 303A458119BB07BC003C8860 /* FESFilmEntryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A458019BB07BC003C8860 /* FESFilmEntryCell.m */; }; 303A458419BB0C44003C8860 /* FESFilmsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A458319BB0C44003C8860 /* FESFilmsTableViewController.m */; }; + 303A458719BB4C9A003C8860 /* FESFilmDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A458619BB4C9A003C8860 /* FESFilmDetailsViewController.m */; }; + 303A458B19BB5B10003C8860 /* FESAboutEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A458A19BB5B10003C8860 /* FESAboutEntry.m */; }; + 303A458E19BC0A4C003C8860 /* FESAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 303A458D19BC0A4C003C8860 /* FESAboutViewController.m */; }; 3068700719B2D6B1007E4A0E /* FESSCheduleEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068700619B2D6B1007E4A0E /* FESSCheduleEntry.m */; }; 3068700A19B2F826007E4A0E /* FESScheduleFilm.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068700919B2F826007E4A0E /* FESScheduleFilm.m */; }; 3068700D19B5AB16007E4A0E /* FESScheduleTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3068700C19B5AB16007E4A0E /* FESScheduleTableViewController.m */; }; @@ -52,6 +55,12 @@ 303A458019BB07BC003C8860 /* FESFilmEntryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESFilmEntryCell.m; path = films/FESFilmEntryCell.m; sourceTree = ""; }; 303A458219BB0C44003C8860 /* FESFilmsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESFilmsTableViewController.h; path = films/FESFilmsTableViewController.h; sourceTree = ""; }; 303A458319BB0C44003C8860 /* FESFilmsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESFilmsTableViewController.m; path = films/FESFilmsTableViewController.m; sourceTree = ""; }; + 303A458519BB4C9A003C8860 /* FESFilmDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESFilmDetailsViewController.h; path = films/FESFilmDetailsViewController.h; sourceTree = ""; }; + 303A458619BB4C9A003C8860 /* FESFilmDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESFilmDetailsViewController.m; path = films/FESFilmDetailsViewController.m; sourceTree = ""; }; + 303A458919BB5B10003C8860 /* FESAboutEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESAboutEntry.h; path = about/FESAboutEntry.h; sourceTree = ""; }; + 303A458A19BB5B10003C8860 /* FESAboutEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESAboutEntry.m; path = about/FESAboutEntry.m; sourceTree = ""; }; + 303A458C19BC0A4C003C8860 /* FESAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESAboutViewController.h; path = about/FESAboutViewController.h; sourceTree = ""; }; + 303A458D19BC0A4C003C8860 /* FESAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESAboutViewController.m; path = about/FESAboutViewController.m; sourceTree = ""; }; 3068700519B2D6B1007E4A0E /* FESSCheduleEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESSCheduleEntry.h; path = schedule/FESSCheduleEntry.h; sourceTree = ""; }; 3068700619B2D6B1007E4A0E /* FESSCheduleEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FESSCheduleEntry.m; path = schedule/FESSCheduleEntry.m; sourceTree = ""; }; 3068700819B2F826007E4A0E /* FESScheduleFilm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FESScheduleFilm.h; path = schedule/FESScheduleFilm.h; sourceTree = ""; }; @@ -124,10 +133,23 @@ 303A458019BB07BC003C8860 /* FESFilmEntryCell.m */, 303A458219BB0C44003C8860 /* FESFilmsTableViewController.h */, 303A458319BB0C44003C8860 /* FESFilmsTableViewController.m */, + 303A458519BB4C9A003C8860 /* FESFilmDetailsViewController.h */, + 303A458619BB4C9A003C8860 /* FESFilmDetailsViewController.m */, ); name = films; sourceTree = ""; }; + 303A458819BB5AE6003C8860 /* about */ = { + isa = PBXGroup; + children = ( + 303A458919BB5B10003C8860 /* FESAboutEntry.h */, + 303A458A19BB5B10003C8860 /* FESAboutEntry.m */, + 303A458C19BC0A4C003C8860 /* FESAboutViewController.h */, + 303A458D19BC0A4C003C8860 /* FESAboutViewController.m */, + ); + name = about; + sourceTree = ""; + }; 3068700419B2D4C7007E4A0E /* schedule */ = { isa = PBXGroup; children = ( @@ -202,6 +224,7 @@ 3CEA73C219B1A86D00076FC5 /* FestivalHelper */ = { isa = PBXGroup; children = ( + 303A458819BB5AE6003C8860 /* about */, 303A457B19BAEE1F003C8860 /* films */, 3068702419B8C00E007E4A0E /* common */, 3068701A19B86EF4007E4A0E /* venues */, @@ -345,7 +368,9 @@ 303A457E19BAEE51003C8860 /* FESFilmEntry.m in Sources */, 303A458119BB07BC003C8860 /* FESFilmEntryCell.m in Sources */, 3068700D19B5AB16007E4A0E /* FESScheduleTableViewController.m in Sources */, + 303A458E19BC0A4C003C8860 /* FESAboutViewController.m in Sources */, 3068702019B88054007E4A0E /* FESVenueEntryCell.m in Sources */, + 303A458719BB4C9A003C8860 /* FESFilmDetailsViewController.m in Sources */, 3CEA73C919B1A86D00076FC5 /* main.m in Sources */, 303A458419BB0C44003C8860 /* FESFilmsTableViewController.m in Sources */, 3068702719B8C03E007E4A0E /* FESDataProvider.m in Sources */, @@ -355,6 +380,7 @@ 3068700719B2D6B1007E4A0E /* FESSCheduleEntry.m in Sources */, 3CEA73CD19B1A86D00076FC5 /* FESAppDelegate.m in Sources */, 3068701619B6DA8D007E4A0E /* FESScheduleFilmsViewController.m in Sources */, + 303A458B19BB5B10003C8860 /* FESAboutEntry.m in Sources */, 3068702319B883C1007E4A0E /* FESVenuesTableViewController.m in Sources */, 3068700A19B2F826007E4A0E /* FESScheduleFilm.m in Sources */, ); diff --git a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6823cd2..fb35555 100644 --- a/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FestivalHelper.xcodeproj/xcuserdata/hamo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,55 +10,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "FestivalHelper/schedule/FESScheduleTableViewController.m" - timestampString = "431586143.879636" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "84" - endingLineNumber = "84" - landmarkName = "-setupScheduleFromJSONArray:" - landmarkType = "5"> - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/FestivalHelper/Base.lproj/Main.storyboard b/FestivalHelper/Base.lproj/Main.storyboard index fe89ac7..7d99f28 100644 --- a/FestivalHelper/Base.lproj/Main.storyboard +++ b/FestivalHelper/Base.lproj/Main.storyboard @@ -89,25 +89,25 @@ -