commit 001fb6529dc447f6d242cda3f97b28fd77eda1ff
parent a11f117c6bd5a67e4b068fd74a1bab8bc826870f
Author: Kyle Milz <kyle@Kyles-MacBook-Pro.local>
Date: Sat, 19 Sep 2015 15:54:29 -0600
ios: merge ListData and SharedList data structures into single file
Diffstat:
13 files changed, 53 insertions(+), 65 deletions(-)
diff --git a/ios-ng/NewItemTableViewController.h b/ios-ng/NewItemTableViewController.h
@@ -1,5 +1,5 @@
#import <UIKit/UIKit.h>
-#import "ListItem.h"
+#import "DataStructures.h"
@interface NewItemTableViewController : UITableViewController
diff --git a/ios-ng/shlist.xcodeproj/project.pbxproj b/ios-ng/shlist.xcodeproj/project.pbxproj
@@ -18,7 +18,7 @@
27C70F101B32AF8000DADEB3 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 27C70F0F1B32AF8000DADEB3 /* Images.xcassets */; };
27C70F131B32AF8000DADEB3 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 27C70F111B32AF8000DADEB3 /* LaunchScreen.xib */; };
27C70F1F1B32AF8000DADEB3 /* shlistTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C70F1E1B32AF8000DADEB3 /* shlistTests.m */; };
- 27C70F2A1B33D1C900DADEB3 /* SharedList.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C70F291B33D1C900DADEB3 /* SharedList.m */; };
+ 27C70F2A1B33D1C900DADEB3 /* DataStructures.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C70F291B33D1C900DADEB3 /* DataStructures.m */; };
27C70F2D1B33F3C300DADEB3 /* NewListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C70F2C1B33F3C300DADEB3 /* NewListViewController.m */; };
27C70F301B33F4FA00DADEB3 /* MainTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27C70F2F1B33F4FA00DADEB3 /* MainTableViewController.m */; };
27D805731BA2649D00867494 /* ContactsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 27D805721BA2649D00867494 /* ContactsTableViewController.m */; };
@@ -26,7 +26,6 @@
27DCC9E81B9EB4E800207340 /* information15-3.png in Resources */ = {isa = PBXBuildFile; fileRef = 27DCC9E71B9EB4E800207340 /* information15-3.png */; };
27DCC9EB1B9FF89E00207340 /* AddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 27DCC9EA1B9FF89E00207340 /* AddressBook.m */; };
BF7776B91B38928D00526CB0 /* ListDetailTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7776B81B38928D00526CB0 /* ListDetailTableViewController.m */; };
- BF7776BC1B38D0DB00526CB0 /* ListItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7776BB1B38D0DB00526CB0 /* ListItem.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -59,8 +58,8 @@
27C70F181B32AF8000DADEB3 /* shlistTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = shlistTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
27C70F1D1B32AF8000DADEB3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
27C70F1E1B32AF8000DADEB3 /* shlistTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = shlistTests.m; sourceTree = "<group>"; };
- 27C70F281B33CE2500DADEB3 /* SharedList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SharedList.h; sourceTree = "<group>"; };
- 27C70F291B33D1C900DADEB3 /* SharedList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SharedList.m; sourceTree = "<group>"; };
+ 27C70F281B33CE2500DADEB3 /* DataStructures.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataStructures.h; sourceTree = "<group>"; };
+ 27C70F291B33D1C900DADEB3 /* DataStructures.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataStructures.m; sourceTree = "<group>"; };
27C70F2B1B33F3C300DADEB3 /* NewListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewListViewController.h; sourceTree = "<group>"; };
27C70F2C1B33F3C300DADEB3 /* NewListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewListViewController.m; sourceTree = "<group>"; };
27C70F2E1B33F4FA00DADEB3 /* MainTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainTableViewController.h; sourceTree = "<group>"; };
@@ -73,8 +72,6 @@
27DCC9EA1B9FF89E00207340 /* AddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressBook.m; sourceTree = "<group>"; };
BF7776B71B38928D00526CB0 /* ListDetailTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListDetailTableViewController.h; sourceTree = "<group>"; };
BF7776B81B38928D00526CB0 /* ListDetailTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListDetailTableViewController.m; sourceTree = "<group>"; };
- BF7776BA1B38D0DB00526CB0 /* ListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListItem.h; sourceTree = "<group>"; };
- BF7776BB1B38D0DB00526CB0 /* ListItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListItem.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -132,21 +129,19 @@
27D805721BA2649D00867494 /* ContactsTableViewController.m */,
27B039FD1B43B6830054B6D2 /* ContactsViewController.h */,
27B039FE1B43B6830054B6D2 /* ContactsViewController.m */,
+ 27C70F281B33CE2500DADEB3 /* DataStructures.h */,
+ 27C70F291B33D1C900DADEB3 /* DataStructures.m */,
27DCC9DD1B8A98D400207340 /* dollar103-2.png */,
27C70F0F1B32AF8000DADEB3 /* Images.xcassets */,
27DCC9E71B9EB4E800207340 /* information15-3.png */,
27C70F111B32AF8000DADEB3 /* LaunchScreen.xib */,
BF7776B71B38928D00526CB0 /* ListDetailTableViewController.h */,
BF7776B81B38928D00526CB0 /* ListDetailTableViewController.m */,
- BF7776BA1B38D0DB00526CB0 /* ListItem.h */,
- BF7776BB1B38D0DB00526CB0 /* ListItem.m */,
27C70F0C1B32AF8000DADEB3 /* Main.storyboard */,
- 27C70F2B1B33F3C300DADEB3 /* NewListViewController.h */,
- 27C70F2C1B33F3C300DADEB3 /* NewListViewController.m */,
- 27C70F281B33CE2500DADEB3 /* SharedList.h */,
- 27C70F291B33D1C900DADEB3 /* SharedList.m */,
27C70F2E1B33F4FA00DADEB3 /* MainTableViewController.h */,
27C70F2F1B33F4FA00DADEB3 /* MainTableViewController.m */,
+ 27C70F2B1B33F3C300DADEB3 /* NewListViewController.h */,
+ 27C70F2C1B33F3C300DADEB3 /* NewListViewController.m */,
27C70F021B32AF8000DADEB3 /* Supporting Files */,
);
path = shlist;
@@ -283,10 +278,9 @@
files = (
BF7776B91B38928D00526CB0 /* ListDetailTableViewController.m in Sources */,
27AAC22C1B50ABAF00D99171 /* NewItemTableViewController.m in Sources */,
- BF7776BC1B38D0DB00526CB0 /* ListItem.m in Sources */,
27C70F0B1B32AF8000DADEB3 /* ShlistServer.m in Sources */,
27D805731BA2649D00867494 /* ContactsTableViewController.m in Sources */,
- 27C70F2A1B33D1C900DADEB3 /* SharedList.m in Sources */,
+ 27C70F2A1B33D1C900DADEB3 /* DataStructures.m in Sources */,
27C70F2D1B33F3C300DADEB3 /* NewListViewController.m in Sources */,
27C70F081B32AF8000DADEB3 /* AppDelegate.m in Sources */,
27B039FF1B43B6830054B6D2 /* ContactsViewController.m in Sources */,
diff --git a/ios-ng/shlist/DataStructures.h b/ios-ng/shlist/DataStructures.h
@@ -0,0 +1,27 @@
+#import <UIKit/UIKit.h>
+
+@interface SharedList : NSObject
+
+// @property (weak, nonatomic) IBOutlet;
+// UILabel *names;
+
+@property NSString *list_name;
+@property NSData *list_id;
+@property NSString *list_members;
+@property NSDate *list_date;
+@property UITableViewCell *cell;
+
+@property int items_ready;
+@property int items_total;
+
+@end
+
+@interface ListItem : NSObject
+
+@property int modifier;
+@property NSString *name;
+@property int quantity;
+@property NSString *owner;
+@property int completed;
+
+@end
+\ No newline at end of file
diff --git a/ios-ng/shlist/DataStructures.m b/ios-ng/shlist/DataStructures.m
@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+#import "DataStructures.h"
+
+@implementation SharedList
+
+@end
+
+@implementation ListItem
+
+@end
+\ No newline at end of file
diff --git a/ios-ng/shlist/ListDetailTableViewController.h b/ios-ng/shlist/ListDetailTableViewController.h
@@ -1,5 +1,5 @@
#import <UIKit/UIKit.h>
-#import "SharedList.h"
+#import "DataStructures.h"
@interface ListDetailTableViewController : UITableViewController
diff --git a/ios-ng/shlist/ListDetailTableViewController.m b/ios-ng/shlist/ListDetailTableViewController.m
@@ -1,5 +1,5 @@
#import "ListDetailTableViewController.h"
-#import "ListItem.h"
+#import "DataStructures.h"
#import "ShlistServer.h"
@interface ListDetailTableViewController ()
diff --git a/ios-ng/shlist/ListItem.h b/ios-ng/shlist/ListItem.h
@@ -1,11 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface ListItem : NSObject
-
-@property int modifier;
-@property NSString *name;
-@property int quantity;
-@property NSString *owner;
-@property int completed;
-
-@end
diff --git a/ios-ng/shlist/ListItem.m b/ios-ng/shlist/ListItem.m
@@ -1,5 +0,0 @@
-#import "ListItem.h"
-
-@implementation ListItem
-
-@end
diff --git a/ios-ng/shlist/MainTableViewController.h b/ios-ng/shlist/MainTableViewController.h
@@ -1,6 +1,6 @@
#import <UIKit/UIKit.h>
-#import "SharedList.h"
+#import "DataStructures.h"
@interface MainTableViewController : UITableViewController
diff --git a/ios-ng/shlist/NewListViewController.h b/ios-ng/shlist/NewListViewController.h
@@ -1,5 +1,5 @@
#import <UIKit/UIKit.h>
-#import "SharedList.h"
+#import "DataStructures.h"
@interface NewListViewController : UIViewController
diff --git a/ios-ng/shlist/SharedList.h b/ios-ng/shlist/SharedList.h
@@ -1,22 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#ifndef shlist_List_h
-#define shlist_List_h
-
-@interface SharedList : NSObject
-
-// @property (weak, nonatomic) IBOutlet;
-// UILabel *names;
-
-@property NSString *list_name;
-@property NSData *list_id;
-@property NSString *list_members;
-@property NSDate *list_date;
-@property UITableViewCell *cell;
-
-@property int items_ready;
-@property int items_total;
-
-@end
-
-#endif
-\ No newline at end of file
diff --git a/ios-ng/shlist/SharedList.m b/ios-ng/shlist/SharedList.m
@@ -1,6 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SharedList.h"
-
-@implementation SharedList
-
-@end
diff --git a/ios-ng/shlist/ShlistServer.m b/ios-ng/shlist/ShlistServer.m
@@ -1,5 +1,5 @@
#import "ShlistServer.h"
-#import "SharedList.h"
+#import "DataStructures.h"
#import "AddressBook.h"
@interface ShlistServer ()
