project cleanup

26 files changed, 78 insertions, 52 deletions

diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj
index fff0dfb..b68ad14 100644
--- a/Juick.xcodeproj/project.pbxproj
+++ b/Juick.xcodeproj/project.pbxproj
@@ -111,12 +111,12 @@
 		77E35A81189A5B5A00B2D216 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		77FCADDE1D6A50DA00CBA649 /* APIClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APIClient.m; sourceTree = "<group>"; };
 		77FCADE01D6A50EC00CBA649 /* APIClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIClient.h; sourceTree = "<group>"; };
-		77FFC0161D5FD186003BD81A /* MessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MessageCell.h; path = Views/MessageCell.h; sourceTree = "<group>"; };
-		77FFC0171D5FD186003BD81A /* MessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MessageCell.m; path = Views/MessageCell.m; sourceTree = "<group>"; };
-		77FFC0181D5FD186003BD81A /* MessageCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageCell.xib; path = Views/MessageCell.xib; sourceTree = "<group>"; };
-		77FFC01B1D5FE7CE003BD81A /* NavCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NavCell.h; path = Views/NavCell.h; sourceTree = "<group>"; };
-		77FFC01C1D5FE7CE003BD81A /* NavCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NavCell.m; path = Views/NavCell.m; sourceTree = "<group>"; };
-		77FFC01D1D5FE7CE003BD81A /* NavCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = NavCell.xib; path = Views/NavCell.xib; sourceTree = "<group>"; };
+		77FFC0161D5FD186003BD81A /* MessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageCell.h; sourceTree = "<group>"; };
+		77FFC0171D5FD186003BD81A /* MessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageCell.m; sourceTree = "<group>"; };
+		77FFC0181D5FD186003BD81A /* MessageCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageCell.xib; sourceTree = "<group>"; };
+		77FFC01B1D5FE7CE003BD81A /* NavCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavCell.h; sourceTree = "<group>"; };
+		77FFC01C1D5FE7CE003BD81A /* NavCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavCell.m; sourceTree = "<group>"; };
+		77FFC01D1D5FE7CE003BD81A /* NavCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NavCell.xib; sourceTree = "<group>"; };
 		8F93DB342C85111DFBC86143 /* Pods-Juick.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.release.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.release.xcconfig"; sourceTree = "<group>"; };
 		D5F79ADD6611E9C3C0D56671 /* Pods-JuickTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JuickTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests.debug.xcconfig"; sourceTree = "<group>"; };
 		F3C23ADDEF1C47900AA28093 /* Pods-Juick.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.debug.xcconfig"; sourceTree = "<group>"; };
@@ -166,12 +166,12 @@
 		77317B9F181BBE8500D60005 = {
 			isa = PBXGroup;
 			children = (
-				7738FEC41D36CE6D008B5CD0 /* Launch Screen.storyboard */,
+				77317BAA181BBE8500D60005 /* Frameworks */,
 				77317BB1181BBE8500D60005 /* Juick */,
 				77317BD3181BBE8500D60005 /* JuickTests */,
-				77317BAA181BBE8500D60005 /* Frameworks */,
-				77317BA9181BBE8500D60005 /* Products */,
 				478C26C1EEFED1F89B8F65E7 /* Pods */,
+				77317BA9181BBE8500D60005 /* Products */,
+				7738FEC41D36CE6D008B5CD0 /* Launch Screen.storyboard */,
 			);
 			sourceTree = "<group>";
 		};
@@ -204,38 +204,23 @@
 		77317BB1181BBE8500D60005 /* Juick */ = {
 			isa = PBXGroup;
 			children = (
+				774DD4601D735E1D00C7F290 /* Helpers */,
+				774DD45D1D735DDD00C7F290 /* Model */,
+				77317BB2181BBE8500D60005 /* Supporting Files */,
+				774DD45F1D735E0300C7F290 /* ViewControllers */,
 				77FFC0151D5FD13C003BD81A /* Views */,
 				77A5BDAF189AEB28000F8D9E /* 0.png */,
-				77418CC0182FBABB004111B7 /* iTunesArtwork@2x */,
+				77FCADE01D6A50EC00CBA649 /* APIClient.h */,
+				77FCADDE1D6A50DA00CBA649 /* APIClient.m */,
+				77317BBA181BBE8500D60005 /* AppDelegate.h */,
+				77317BBB181BBE8500D60005 /* AppDelegate.m */,
 				77418CBA182F9A78004111B7 /* AttachPlaceholder@2x.png */,
-				77418CBE182FBAB5004111B7 /* iTunesArtwork */,
+				77317BC6181BBE8500D60005 /* Images.xcassets */,
 				77C67EE918283C8D00427098 /* buttons.png */,
-				77C67EE31828342000427098 /* NSURL+PathParameters.h */,
-				77C67EE41828342000427098 /* NSURL+PathParameters.m */,
+				77418CBE182FBAB5004111B7 /* iTunesArtwork */,
+				77418CC0182FBABB004111B7 /* iTunesArtwork@2x */,
 				77C67EDC182827DB00427098 /* reveal-icon.png */,
 				77C67EDD182827DB00427098 /* reveal-icon@2x.png */,
-				77317BBA181BBE8500D60005 /* AppDelegate.h */,
-				77317BBB181BBE8500D60005 /* AppDelegate.m */,
-				77317BC0181BBE8500D60005 /* MessagesViewController.h */,
-				77317BC1181BBE8500D60005 /* MessagesViewController.m */,
-				77317BC6181BBE8500D60005 /* Images.xcassets */,
-				77317BB2181BBE8500D60005 /* Supporting Files */,
-				77A09548181F1F25002BDECD /* Message.h */,
-				77A09549181F1F25002BDECD /* Message.m */,
-				77C67EE01828288C00427098 /* RevealPanelViewController.h */,
-				77C67EE11828288C00427098 /* RevealPanelViewController.m */,
-				77C67EE61828379700427098 /* ColorScheme.h */,
-				77C67EE71828379700427098 /* ColorScheme.m */,
-				77975A1B182B6E9A00410C2B /* NewPostViewController.h */,
-				77975A1C182B6E9A00410C2B /* NewPostViewController.m */,
-				77E35A80189A5B5A00B2D216 /* LoginViewController.h */,
-				77E35A81189A5B5A00B2D216 /* LoginViewController.m */,
-				77B09992189D0B9900A84F59 /* UIImage+Utils.h */,
-				77B09993189D0B9900A84F59 /* UIImage+Utils.m */,
-				77B099A4189D57F000A84F59 /* User.h */,
-				77B099A5189D57F000A84F59 /* User.m */,
-				77FCADDE1D6A50DA00CBA649 /* APIClient.m */,
-				77FCADE01D6A50EC00CBA649 /* APIClient.h */,
 			);
 			path = Juick;
 			sourceTree = "<group>";
@@ -243,19 +228,19 @@
 		77317BB2181BBE8500D60005 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				77317BB3181BBE8500D60005 /* Juick-Info.plist */,
 				77317BB4181BBE8500D60005 /* InfoPlist.strings */,
-				77317BB7181BBE8500D60005 /* main.m */,
+				77317BB3181BBE8500D60005 /* Juick-Info.plist */,
 				77317BB9181BBE8500D60005 /* Juick-Prefix.pch */,
+				77317BB7181BBE8500D60005 /* main.m */,
 			);
-			name = "Supporting Files";
+			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		77317BD3181BBE8500D60005 /* JuickTests */ = {
 			isa = PBXGroup;
 			children = (
-				77317BD9181BBE8500D60005 /* JuickTests.m */,
 				77317BD4181BBE8500D60005 /* Supporting Files */,
+				77317BD9181BBE8500D60005 /* JuickTests.m */,
 			);
 			path = JuickTests;
 			sourceTree = "<group>";
@@ -263,10 +248,49 @@
 		77317BD4181BBE8500D60005 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				77317BD5181BBE8500D60005 /* JuickTests-Info.plist */,
 				77317BD6181BBE8500D60005 /* InfoPlist.strings */,
+				77317BD5181BBE8500D60005 /* JuickTests-Info.plist */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		774DD45D1D735DDD00C7F290 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				77A09548181F1F25002BDECD /* Message.h */,
+				77A09549181F1F25002BDECD /* Message.m */,
+				77B099A4189D57F000A84F59 /* User.h */,
+				77B099A5189D57F000A84F59 /* User.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		774DD45F1D735E0300C7F290 /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				77E35A80189A5B5A00B2D216 /* LoginViewController.h */,
+				77E35A81189A5B5A00B2D216 /* LoginViewController.m */,
+				77317BC0181BBE8500D60005 /* MessagesViewController.h */,
+				77317BC1181BBE8500D60005 /* MessagesViewController.m */,
+				77975A1B182B6E9A00410C2B /* NewPostViewController.h */,
+				77975A1C182B6E9A00410C2B /* NewPostViewController.m */,
+				77C67EE01828288C00427098 /* RevealPanelViewController.h */,
+				77C67EE11828288C00427098 /* RevealPanelViewController.m */,
+			);
+			path = ViewControllers;
+			sourceTree = "<group>";
+		};
+		774DD4601D735E1D00C7F290 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				77C67EE61828379700427098 /* ColorScheme.h */,
+				77C67EE71828379700427098 /* ColorScheme.m */,
+				77C67EE31828342000427098 /* NSURL+PathParameters.h */,
+				77C67EE41828342000427098 /* NSURL+PathParameters.m */,
+				77B09992189D0B9900A84F59 /* UIImage+Utils.h */,
+				77B09993189D0B9900A84F59 /* UIImage+Utils.m */,
 			);
-			name = "Supporting Files";
+			path = Helpers;
 			sourceTree = "<group>";
 		};
 		77FFC0151D5FD13C003BD81A /* Views */ = {
@@ -279,7 +303,7 @@
 				77FFC01C1D5FE7CE003BD81A /* NavCell.m */,
 				77FFC01D1D5FE7CE003BD81A /* NavCell.xib */,
 			);
-			name = Views;
+			path = Views;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -532,6 +556,7 @@
 				77317BB5181BBE8500D60005 /* en */,
 			);
 			name = InfoPlist.strings;
+			path = .;
 			sourceTree = "<group>";
 		};
 		77317BD6181BBE8500D60005 /* InfoPlist.strings */ = {
@@ -540,6 +565,7 @@
 				77317BD7181BBE8500D60005 /* en */,
 			);
 			name = InfoPlist.strings;
+			path = .;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
@@ -624,8 +650,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch";
-				INFOPLIST_FILE = "Juick/Juick-Info.plist";
+				GCC_PREFIX_HEADER = "Juick/Supporting Files/Juick-Prefix.pch";
+				INFOPLIST_FILE = "Juick/Supporting Files/Juick-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -642,8 +668,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch";
-				INFOPLIST_FILE = "Juick/Juick-Info.plist";
+				GCC_PREFIX_HEADER = "Juick/Supporting Files/Juick-Prefix.pch";
+				INFOPLIST_FILE = "Juick/Supporting Files/Juick-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -663,12 +689,12 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch";
+				GCC_PREFIX_HEADER = "Juick/Supporting Files/Juick-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "JuickTests/JuickTests-Info.plist";
+				INFOPLIST_FILE = "JuickTests/Supporting Files/JuickTests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
@@ -687,8 +713,8 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch";
-				INFOPLIST_FILE = "JuickTests/JuickTests-Info.plist";
+				GCC_PREFIX_HEADER = "Juick/Supporting Files/Juick-Prefix.pch";
+				INFOPLIST_FILE = "JuickTests/Supporting Files/JuickTests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index 9dc5362..56b6ee9 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -37,7 +37,7 @@
         self.viewController = reveal;
         [messages.navigationController.navigationBar addGestureRecognizer:reveal.panGestureRecognizer];
         UIBarButtonItem *revealButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"reveal-icon.png"]
-                                                                             style:UIBarButtonItemStyleBordered target:reveal action:@selector(revealToggle:)];
+                                                                             style:UIBarButtonItemStylePlain target:reveal action:@selector(revealToggle:)];
         messages.navigationItem.leftBarButtonItem = revealButtonItem;
         UIBarButtonItem *compose = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCompose
                                                                                  target:messages action:@selector(composePressed)];
diff --git a/Juick/ColorScheme.h b/Juick/Helpers/ColorScheme.h
index de69689..de69689 100644
--- a/Juick/ColorScheme.h
+++ b/Juick/Helpers/ColorScheme.h
diff --git a/Juick/ColorScheme.m b/Juick/Helpers/ColorScheme.m
index 8417489..8417489 100644
--- a/Juick/ColorScheme.m
+++ b/Juick/Helpers/ColorScheme.m
diff --git a/Juick/NSURL+PathParameters.h b/Juick/Helpers/NSURL+PathParameters.h
index 73fc004..73fc004 100644
--- a/Juick/NSURL+PathParameters.h
+++ b/Juick/Helpers/NSURL+PathParameters.h
diff --git a/Juick/NSURL+PathParameters.m b/Juick/Helpers/NSURL+PathParameters.m
index 83a55bb..83a55bb 100644
--- a/Juick/NSURL+PathParameters.m
+++ b/Juick/Helpers/NSURL+PathParameters.m
diff --git a/Juick/UIImage+Utils.h b/Juick/Helpers/UIImage+Utils.h
index 8de91bf..8de91bf 100644
--- a/Juick/UIImage+Utils.h
+++ b/Juick/Helpers/UIImage+Utils.h
diff --git a/Juick/UIImage+Utils.m b/Juick/Helpers/UIImage+Utils.m
index 4617c65..4617c65 100644
--- a/Juick/UIImage+Utils.m
+++ b/Juick/Helpers/UIImage+Utils.m
diff --git a/Juick/Message.h b/Juick/Model/Message.h
index 39d3c38..b100e7d 100644
--- a/Juick/Message.h
+++ b/Juick/Model/Message.h
@@ -15,7 +15,7 @@
 @property NSNumber *RID;
 @property User *user;
 @property NSString *text;
-@property NSArray *tags;
+@property NSArray<NSString *> *tags;
 @property NSString *timestamp;
 @property NSString *attach;
 @property NSString *repliesBy;
diff --git a/Juick/Message.m b/Juick/Model/Message.m
index de08e98..de08e98 100644
--- a/Juick/Message.m
+++ b/Juick/Model/Message.m
diff --git a/Juick/User.h b/Juick/Model/User.h
index 84300f3..84300f3 100644
--- a/Juick/User.h
+++ b/Juick/Model/User.h
diff --git a/Juick/User.m b/Juick/Model/User.m
index f4b1e00..f4b1e00 100644
--- a/Juick/User.m
+++ b/Juick/Model/User.m
diff --git a/Juick/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index 0df6f2a..0df6f2a 100644
--- a/Juick/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
diff --git a/Juick/Juick-Prefix.pch b/Juick/Supporting Files/Juick-Prefix.pch
index c80380f..c80380f 100644
--- a/Juick/Juick-Prefix.pch
+++ b/Juick/Supporting Files/Juick-Prefix.pch
diff --git a/Juick/en.lproj/InfoPlist.strings b/Juick/Supporting Files/en.lproj/InfoPlist.strings
index 477b28f..477b28f 100644
--- a/Juick/en.lproj/InfoPlist.strings
+++ b/Juick/Supporting Files/en.lproj/InfoPlist.strings
diff --git a/Juick/main.m b/Juick/Supporting Files/main.m
index 67b222f..67b222f 100644
--- a/Juick/main.m
+++ b/Juick/Supporting Files/main.m
diff --git a/Juick/LoginViewController.h b/Juick/ViewControllers/LoginViewController.h
index bf980fa..bf980fa 100644
--- a/Juick/LoginViewController.h
+++ b/Juick/ViewControllers/LoginViewController.h
diff --git a/Juick/LoginViewController.m b/Juick/ViewControllers/LoginViewController.m
index eedc6d3..eedc6d3 100644
--- a/Juick/LoginViewController.m
+++ b/Juick/ViewControllers/LoginViewController.m
diff --git a/Juick/MessagesViewController.h b/Juick/ViewControllers/MessagesViewController.h
index 38123bd..38123bd 100644
--- a/Juick/MessagesViewController.h
+++ b/Juick/ViewControllers/MessagesViewController.h
diff --git a/Juick/MessagesViewController.m b/Juick/ViewControllers/MessagesViewController.m
index 28e7613..28e7613 100644
--- a/Juick/MessagesViewController.m
+++ b/Juick/ViewControllers/MessagesViewController.m
diff --git a/Juick/NewPostViewController.h b/Juick/ViewControllers/NewPostViewController.h
index ceaca49..ceaca49 100644
--- a/Juick/NewPostViewController.h
+++ b/Juick/ViewControllers/NewPostViewController.h
diff --git a/Juick/NewPostViewController.m b/Juick/ViewControllers/NewPostViewController.m
index 8c8fbf0..8c8fbf0 100644
--- a/Juick/NewPostViewController.m
+++ b/Juick/ViewControllers/NewPostViewController.m
diff --git a/Juick/RevealPanelViewController.h b/Juick/ViewControllers/RevealPanelViewController.h
index ff5006c..ff5006c 100644
--- a/Juick/RevealPanelViewController.h
+++ b/Juick/ViewControllers/RevealPanelViewController.h
diff --git a/Juick/RevealPanelViewController.m b/Juick/ViewControllers/RevealPanelViewController.m
index d890f97..d890f97 100644
--- a/Juick/RevealPanelViewController.m
+++ b/Juick/ViewControllers/RevealPanelViewController.m
diff --git a/JuickTests/JuickTests-Info.plist b/JuickTests/Supporting Files/JuickTests-Info.plist
index 169b6f7..169b6f7 100644
--- a/JuickTests/JuickTests-Info.plist
+++ b/JuickTests/Supporting Files/JuickTests-Info.plist
diff --git a/JuickTests/en.lproj/InfoPlist.strings b/JuickTests/Supporting Files/en.lproj/InfoPlist.strings
index 477b28f..477b28f 100644
--- a/JuickTests/en.lproj/InfoPlist.strings
+++ b/JuickTests/Supporting Files/en.lproj/InfoPlist.strings