Removed various iPad-related UI elements

Diabetik.xcodeproj/project.pbxproj

@@ -169,7 +169,6 @@
 		53AFAA2318A90E7B00E65168 /* UAAddEntryModalButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AFAA1E18A90E7B00E65168 /* UAAddEntryModalButton.m */; };
 		53AFAA2418A90E7B00E65168 /* UAAddEntryModalView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53AFAA2018A90E7B00E65168 /* UAAddEntryModalView.m */; };
 		53AFAA2618A90E9700E65168 /* FXBlurView-License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 53AFAA2518A90E9700E65168 /* FXBlurView-License.txt */; };
-		53B5284918717597004E7F01 /* UAAddEntryListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B5284818717597004E7F01 /* UAAddEntryListViewController.m */; };
 		53B53AF418672BE000773EE7 /* UASettingsTextViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B53AF318672BE000773EE7 /* UASettingsTextViewCell.m */; };
 		53B576761709DF02007322EF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53B576751709DF02007322EF /* MessageUI.framework */; };
 		53BE89EE18983E650035CF4A /* UASettingsEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53BE89ED18983E650035CF4A /* UASettingsEntryViewController.m */; };
@@ -483,8 +482,6 @@
 		53AFAA1F18A90E7B00E65168 /* UAAddEntryModalView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAAddEntryModalView.h; sourceTree = "<group>"; };
 		53AFAA2018A90E7B00E65168 /* UAAddEntryModalView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UAAddEntryModalView.m; sourceTree = "<group>"; };
 		53AFAA2518A90E9700E65168 /* FXBlurView-License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "FXBlurView-License.txt"; sourceTree = "<group>"; };
-		53B5284718717597004E7F01 /* UAAddEntryListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UAAddEntryListViewController.h; sourceTree = "<group>"; };
-		53B5284818717597004E7F01 /* UAAddEntryListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UAAddEntryListViewController.m; sourceTree = "<group>"; };
 		53B53AF218672BE000773EE7 /* UASettingsTextViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UASettingsTextViewCell.h; sourceTree = "<group>"; };
 		53B53AF318672BE000773EE7 /* UASettingsTextViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UASettingsTextViewCell.m; sourceTree = "<group>"; };
 		53B576751709DF02007322EF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -746,8 +743,6 @@
 			children = (
 				53AFAA1618A90E7B00E65168 /* iPad */,
 				53AFAA1C18A90E7B00E65168 /* iPhone */,
-				53B5284718717597004E7F01 /* UAAddEntryListViewController.h */,
-				53B5284818717597004E7F01 /* UAAddEntryListViewController.m */,
 			);
 			path = "Add Entry";
 			sourceTree = "<group>";
@@ -1570,7 +1565,6 @@
 				533F347D1773266600AD89E2 /* UAHelper.m in Sources */,
 				537983AF17CD3F5A00032F3A /* UAShortcutButton.m in Sources */,
 				53FE5FB1189EC0E6008AC334 /* UACategorySelectorButton.m in Sources */,
-				53B5284918717597004E7F01 /* UAAddEntryListViewController.m in Sources */,
 				53AAE883189C26CC00499991 /* UAKeyboardShortcutButton.m in Sources */,
 				533F34A31773266600AD89E2 /* OrderedDictionary.m in Sources */,
 				53AFAA2118A90E7B00E65168 /* UAAddEntryiPadView.m in Sources */,

Diabetik/Diabetik-Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1755</string>
+	<string>1841</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalActivityIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalActivityIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalActivityIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalBloodIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalBloodIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalBloodIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalCloseIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalCloseIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalCloseIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalMealIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalMealIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalMealIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalMedicineIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalMedicineIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalMedicineIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/Resources/Media.xcassets/Entry Modal Icons/AddEntryModalNoteIconiPad.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "AddEntryModalNoteIconiPad.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "AddEntryModalNoteIconiPad@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Diabetik/UAAppDelegate.h

@@ -26,7 +26,7 @@
 #import "UAUI.h"
 #import "UABackupController.h"
 
-@interface UAAppDelegate : UIResponder <UIApplicationDelegate, UISplitViewControllerDelegate, CLLocationManagerDelegate, BITHockeyManagerDelegate>
+@interface UAAppDelegate : UIResponder <UIApplicationDelegate, CLLocationManagerDelegate, BITHockeyManagerDelegate>
 @property (strong, nonatomic) UIWindow *window;
 @property (strong, nonatomic) CLLocationManager *locationManager;
 @property (strong, nonatomic) UIViewController *viewController;

Diabetik/UAAppDelegate.m

@@ -95,24 +95,16 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     UAJournalViewController *journalViewController = [[UAJournalViewController alloc] init];
     UANavigationController *navigationController = [[UANavigationController alloc] initWithRootViewController:journalViewController];
 
-    if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-    {
-        UISplitViewController *splitViewController = [[UISplitViewController alloc] initWithNibName:nil bundle:nil];
-        splitViewController.viewControllers = @[[[UASideMenuViewController alloc] init], navigationController];
-        splitViewController.delegate = self;
-        self.viewController = splitViewController;
-    }
-    else
-    {
-        REFrostedViewController *viewController = [[REFrostedViewController alloc] initWithContentViewController:navigationController menuViewController:[[UASideMenuViewController alloc] init]];
-        viewController.direction = REFrostedViewControllerDirectionLeft;
-        viewController.liveBlurBackgroundStyle = REFrostedViewControllerLiveBackgroundStyleLight;
-        viewController.liveBlur = NO;
-        viewController.limitMenuViewSize = YES;
-        viewController.blurSaturationDeltaFactor = 3.0f;
-        viewController.blurRadius = 10.0f;
-        self.viewController = viewController;
-    }
+    REFrostedViewController *viewController = [[REFrostedViewController alloc] initWithContentViewController:navigationController menuViewController:[[UASideMenuViewController alloc] init]];
+    viewController.direction = REFrostedViewControllerDirectionLeft;
+    viewController.liveBlurBackgroundStyle = REFrostedViewControllerLiveBackgroundStyleLight;
+    viewController.liveBlur = NO;
+    viewController.limitMenuViewSize = YES;
+    viewController.blurSaturationDeltaFactor = 3.0f;
+    viewController.blurRadius = 10.0f;
+    viewController.limitMenuViewSize = YES;
+    viewController.menuViewSize = CGSizeMake(320.0f, self.window.frame.size.height);
+    self.viewController = viewController;
 
     // Delay launch on non-essential classes
     __weak typeof(self) weakSelf = self;
@@ -243,31 +235,6 @@ - (void)setupStyling
     [ShinobiCharts setTheme:[SChartiOS7Theme new]];
 }
 
-#pragma mark - UISplitViewControllerDelegate method
-- (void)splitViewController:(UISplitViewController *)svc
-     willHideViewController:(UIViewController *)aViewController
-          withBarButtonItem:(UIBarButtonItem *)barButtonItem
-       forPopoverController:(UIPopoverController *)pc
-{
-    UINavigationController *nvc = svc.viewControllers[1];
-    UIViewController *vc = nvc.viewControllers[0];
-
-    barButtonItem.image = [[UIImage imageNamed:@"NavBarIconListMenu"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    vc.navigationItem.leftBarButtonItem = barButtonItem;
-}
-- (void)splitViewController:(UISplitViewController *)svc
-     willShowViewController:(UIViewController *)aViewController
-  invalidatingBarButtonItem:(UIBarButtonItem *)button
-{
-    UINavigationController *nvc = svc.viewControllers[1];
-    UIViewController *vc = nvc.viewControllers[0];
-    vc.navigationItem.leftBarButtonItem = nil;
-}
-- (BOOL)splitViewController:(UISplitViewController *)svc shouldHideViewController:(UIViewController *)vc inOrientation:(UIInterfaceOrientation)orientation
-{
-    return (orientation == UIInterfaceOrientationMaskPortrait);
-}
-
 #pragma mark - Location services
 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
 {

Diabetik/View Controllers/Events/UAInputBaseViewController.m

@@ -111,9 +111,9 @@ - (void)viewWillAppear:(BOOL)animated
 - (void)viewWillLayoutSubviews
 {
     [super viewWillLayoutSubviews];
-    
-    self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(0.0f, 0.0f, 0.0f, 0.0f);
-    self.tableView.contentInset = UIEdgeInsetsMake(0.0f, 0.0f, 0.0f, 0.0f);
+
+    self.tableView.scrollIndicatorInsets = UIEdgeInsetsZero;
+    self.tableView.contentInset = UIEdgeInsetsZero;
 }
 
 #pragma mark - Logic

Diabetik/View Controllers/Events/UAInputParentViewController.h

@@ -35,6 +35,7 @@
 #import "UAEventInputViewCell.h"
 #import "UAEventInputTextFieldViewCell.h"
 #import "UAEventInputTextViewViewCell.h"
+#import "TPKeyboardAvoidingScrollView.h"
 
 @class UAInputBaseViewController;
 @interface UAInputParentViewController : UABaseViewController <UIActionSheetDelegate, UIScrollViewDelegate>