From 7dcf9d844c5db40032ba9716df8a3d5a96fa66c2 Mon Sep 17 00:00:00 2001 From: lizj0505 Date: Wed, 17 Jul 2013 14:24:41 +0800 Subject: [PATCH] ui for create issue --- .../RedmineMobile.xcodeproj/project.pbxproj | 16 +- .../RedmineMobile/Utils/OZLNetwork.m | 2 +- .../OZLIssueCreateViewController.h | 2 +- .../OZLIssueCreateViewController.m | 7 +- .../OZLIssueCreateViewController.storyboard | 280 ++++++++++++++++ .../OZLIssueCreateViewController.xib | 316 ------------------ .../OZLIssueDetailViewController.storyboard | 0 .../OZLProjectViewController.m | 30 +- 8 files changed, 316 insertions(+), 337 deletions(-) create mode 100644 RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.storyboard delete mode 100644 RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.xib rename RedmineMobile/RedmineMobile/{Views => ViewControllers}/OZLIssueDetailViewController.storyboard (100%) diff --git a/RedmineMobile/RedmineMobile.xcodeproj/project.pbxproj b/RedmineMobile/RedmineMobile.xcodeproj/project.pbxproj index b5dca30..d0e341f 100644 --- a/RedmineMobile/RedmineMobile.xcodeproj/project.pbxproj +++ b/RedmineMobile/RedmineMobile.xcodeproj/project.pbxproj @@ -7,13 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 2B62D0DF1796498800AC3C19 /* OZLIssueCreateViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2B62D0DE1796498800AC3C19 /* OZLIssueCreateViewController.storyboard */; }; + 2B62D0E1179649A800AC3C19 /* OZLIssueDetailViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2B62D0E0179649A800AC3C19 /* OZLIssueDetailViewController.storyboard */; }; 2B8A11E217963CE500906D34 /* OZLIssueDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8A11E117963CE500906D34 /* OZLIssueDetailViewController.m */; }; 2B9968AB1794F71B0086F115 /* OZLModelIssueCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B9968AA1794F71B0086F115 /* OZLModelIssueCategory.m */; }; 2B9968AF1794FC0A0086F115 /* OZLProjectCreateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B9968AD1794FC0A0086F115 /* OZLProjectCreateViewController.m */; }; 2B9968B01794FC0A0086F115 /* OZLProjectCreateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B9968AE1794FC0A0086F115 /* OZLProjectCreateViewController.xib */; }; 2B9968B417951A5C0086F115 /* OZLIssueCreateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B9968B217951A5C0086F115 /* OZLIssueCreateViewController.m */; }; - 2B9968B517951A5C0086F115 /* OZLIssueCreateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B9968B317951A5C0086F115 /* OZLIssueCreateViewController.xib */; }; - 2BCB510417963768006845AC /* OZLIssueDetailViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2BCB510317963768006845AC /* OZLIssueDetailViewController.storyboard */; }; 2BCCA0541795312E00FA8B1A /* OZLConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BCCA0531795312E00FA8B1A /* OZLConstants.m */; }; 2BCF880C1793A26A006FC859 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BCF880B1793A26A006FC859 /* MBProgressHUD.m */; }; 2BCF88101793ABA0006FC859 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BCF880F1793ABA0006FC859 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -61,6 +61,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 2B62D0DE1796498800AC3C19 /* OZLIssueCreateViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueCreateViewController.storyboard; path = ViewControllers/OZLIssueCreateViewController.storyboard; sourceTree = ""; }; + 2B62D0E0179649A800AC3C19 /* OZLIssueDetailViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueDetailViewController.storyboard; path = ViewControllers/OZLIssueDetailViewController.storyboard; sourceTree = ""; }; 2B8A11E017963CE500906D34 /* OZLIssueDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OZLIssueDetailViewController.h; path = ViewControllers/OZLIssueDetailViewController.h; sourceTree = ""; }; 2B8A11E117963CE500906D34 /* OZLIssueDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OZLIssueDetailViewController.m; path = ViewControllers/OZLIssueDetailViewController.m; sourceTree = ""; }; 2B9968A91794F71B0086F115 /* OZLModelIssueCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OZLModelIssueCategory.h; path = Models/OZLModelIssueCategory.h; sourceTree = ""; }; @@ -70,8 +72,6 @@ 2B9968AE1794FC0A0086F115 /* OZLProjectCreateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = OZLProjectCreateViewController.xib; path = ViewControllers/OZLProjectCreateViewController.xib; sourceTree = ""; }; 2B9968B117951A5C0086F115 /* OZLIssueCreateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OZLIssueCreateViewController.h; path = ViewControllers/OZLIssueCreateViewController.h; sourceTree = ""; }; 2B9968B217951A5C0086F115 /* OZLIssueCreateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OZLIssueCreateViewController.m; path = ViewControllers/OZLIssueCreateViewController.m; sourceTree = ""; }; - 2B9968B317951A5C0086F115 /* OZLIssueCreateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = OZLIssueCreateViewController.xib; path = ViewControllers/OZLIssueCreateViewController.xib; sourceTree = ""; }; - 2BCB510317963768006845AC /* OZLIssueDetailViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OZLIssueDetailViewController.storyboard; path = Views/OZLIssueDetailViewController.storyboard; sourceTree = ""; }; 2BCCA0521795312E00FA8B1A /* OZLConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OZLConstants.h; path = Models/OZLConstants.h; sourceTree = ""; }; 2BCCA0531795312E00FA8B1A /* OZLConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OZLConstants.m; path = Models/OZLConstants.m; sourceTree = ""; }; 2BCF880A1793A26A006FC859 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = ""; }; @@ -217,10 +217,10 @@ D5DB80AB1792F6980081662A /* OZLProjectViewController.xib */, 2B9968B117951A5C0086F115 /* OZLIssueCreateViewController.h */, 2B9968B217951A5C0086F115 /* OZLIssueCreateViewController.m */, - 2B9968B317951A5C0086F115 /* OZLIssueCreateViewController.xib */, + 2B62D0DE1796498800AC3C19 /* OZLIssueCreateViewController.storyboard */, 2B8A11E017963CE500906D34 /* OZLIssueDetailViewController.h */, 2B8A11E117963CE500906D34 /* OZLIssueDetailViewController.m */, - 2BCB510317963768006845AC /* OZLIssueDetailViewController.storyboard */, + 2B62D0E0179649A800AC3C19 /* OZLIssueDetailViewController.storyboard */, ); name = Issue; sourceTree = ""; @@ -460,8 +460,8 @@ D5DB80B61793016B0081662A /* OZLAccountViewController.xib in Resources */, 2BCF88191793E353006FC859 /* OZLProjectDetailViewController.xib in Resources */, 2B9968B01794FC0A0086F115 /* OZLProjectCreateViewController.xib in Resources */, - 2B9968B517951A5C0086F115 /* OZLIssueCreateViewController.xib in Resources */, - 2BCB510417963768006845AC /* OZLIssueDetailViewController.storyboard in Resources */, + 2B62D0DF1796498800AC3C19 /* OZLIssueCreateViewController.storyboard in Resources */, + 2B62D0E1179649A800AC3C19 /* OZLIssueDetailViewController.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RedmineMobile/RedmineMobile/Utils/OZLNetwork.m b/RedmineMobile/RedmineMobile/Utils/OZLNetwork.m index 6c92909..beeab35 100644 --- a/RedmineMobile/RedmineMobile/Utils/OZLNetwork.m +++ b/RedmineMobile/RedmineMobile/Utils/OZLNetwork.m @@ -91,7 +91,7 @@ } failure:^(AFHTTPRequestOperation *operation, NSError *error) { if (block) { - block([NSArray array], error); + block(nil, error); } }]; diff --git a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.h b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.h index e239033..9e3b41d 100644 --- a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.h +++ b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.h @@ -8,7 +8,7 @@ #import -@interface OZLIssueCreateViewController : UIViewController +@interface OZLIssueCreateViewController : UITableViewController - (IBAction)onCancel:(id)sender; - (IBAction)onSave:(id)sender; diff --git a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.m b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.m index 6e9f417..a26d473 100644 --- a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.m +++ b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.m @@ -26,7 +26,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - // Do any additional setup after loading the view from its nib. + + UIBarButtonItem* cancelBtn = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(onCancel:)]; + [self.navigationItem setLeftBarButtonItem:cancelBtn]; + UIBarButtonItem* saveBtn = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(onSave:)]; + [self.navigationItem setRightBarButtonItem:saveBtn]; + } - (void)didReceiveMemoryWarning diff --git a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.storyboard b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.storyboard new file mode 100644 index 0000000..72f10cd --- /dev/null +++ b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.storyboard @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.xib b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.xib deleted file mode 100644 index 0ba1228..0000000 --- a/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueCreateViewController.xib +++ /dev/null @@ -1,316 +0,0 @@ - - - - 1552 - 11G63 - 3084 - 1138.51 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBNSLayoutConstraint - IBProxyObject - IBUIBarButtonItem - IBUINavigationBar - IBUINavigationItem - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 290 - {320, 44} - - - - _NS:9 - IBCocoaTouchFramework - - - - Title - - Cancel - IBCocoaTouchFramework - 1 - - - - Save - IBCocoaTouchFramework - 1 - - - IBCocoaTouchFramework - - - - - {{0, 20}, {320, 548}} - - - - - 3 - MQA - - 2 - - - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - onCancel: - - - - 11 - - - - onSave: - - - - 12 - - - - - - 0 - - - - - - 1 - - - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - - 5 - - - - - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - - - OZLIssueCreateViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 12 - - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - OZLIssueCreateViewController - UIViewController - - id - id - - - - onCancel: - id - - - onSave: - id - - - - IBProjectSource - ./Classes/OZLIssueCreateViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - YES - 2083 - - diff --git a/RedmineMobile/RedmineMobile/Views/OZLIssueDetailViewController.storyboard b/RedmineMobile/RedmineMobile/ViewControllers/OZLIssueDetailViewController.storyboard similarity index 100% rename from RedmineMobile/RedmineMobile/Views/OZLIssueDetailViewController.storyboard rename to RedmineMobile/RedmineMobile/ViewControllers/OZLIssueDetailViewController.storyboard diff --git a/RedmineMobile/RedmineMobile/ViewControllers/OZLProjectViewController.m b/RedmineMobile/RedmineMobile/ViewControllers/OZLProjectViewController.m index e1a46f0..30e60e1 100644 --- a/RedmineMobile/RedmineMobile/ViewControllers/OZLProjectViewController.m +++ b/RedmineMobile/RedmineMobile/ViewControllers/OZLProjectViewController.m @@ -84,17 +84,25 @@ } [_HUD show:YES]; [OZLNetwork getDetailForProject:_projectData.index withParams:nil andBlock:^(OZLModelProject *result, NSError *error) { - _projectData = result; - [self.navigationItem setTitle:_projectData.name]; - - // load issues - [OZLNetwork getIssueListForProject:_projectData.index withParams:nil andBlock:^(NSArray *result, NSError *error) { - _issuesList = result; - - [_issuesTableview reloadData]; + if (error) { + NSLog(@"error getDetailForProject: %@",error.description); [_HUD hide:YES]; - }]; + }else { + _projectData = result; + [self.navigationItem setTitle:_projectData.name]; + + // load issues + [OZLNetwork getIssueListForProject:_projectData.index withParams:nil andBlock:^(NSArray *result, NSError *error) { + if (error) { + NSLog(@"error getIssueListForProject: %@",error.description); + }else { + _issuesList = result; + [_issuesTableview reloadData]; + } + [_HUD hide:YES]; + }]; + } }]; } @@ -241,7 +249,9 @@ } - (IBAction)onNewIssue:(id)sender { - OZLIssueCreateViewController* creator = [[OZLIssueCreateViewController alloc] initWithNibName:@"OZLIssueCreateViewController" bundle:nil]; + //OZLIssueCreateViewController* creator = [[OZLIssueCreateViewController alloc] initWithNibName:@"OZLIssueCreateViewController" bundle:nil]; + UIStoryboard *tableViewStoryboard = [UIStoryboard storyboardWithName:@"OZLIssueCreateViewController" bundle:nil]; + OZLIssueDetailViewController* creator = [tableViewStoryboard instantiateViewControllerWithIdentifier:@"OZLIssueCreateViewController"]; [self.navigationController presentModalViewController:creator animated:YES]; } @end