ipad fixes

Author: danielbarela

Mage/MageSideBarController.swift

@@ -178,15 +178,16 @@ class SidebarUIButton: UIButton {
         let locationButton: SidebarUIButton = createRailItem(sidebarType: SidebarUIButton.SidebarType.locations, title: "People", imageName: "people");
         locationButton.addTarget(self, action: #selector(activateButton(button:)), for: .touchUpInside);
         let locationViewController : LocationsTableViewController = LocationsTableViewController(scheme: self.scheme);
-        locationViewController.actionsDelegate = delegate;
+//        locationViewController.actionsDelegate = delegate;
         locationButton.viewController = locationViewController;
         return locationButton;
     }
 
     func createObservationsRailView() -> SidebarUIButton {
         let observationButton: SidebarUIButton = createRailItem(sidebarType: SidebarUIButton.SidebarType.observations, title: "Observations", imageName: "observations");
         observationButton.addTarget(self, action: #selector(activateButton(button:)), for: .touchUpInside);
-        let observationViewController : ObservationTableViewController = ObservationTableViewController(attachmentDelegate: delegate, observationActionsDelegate: delegate, scheme: self.scheme);
+//        let observationViewController : ObservationTableViewController = ObservationTableViewController(attachmentDelegate: delegate, observationActionsDelegate: delegate, scheme: self.scheme);
+        let observationViewController : ObservationTableViewController = ObservationTableViewController(scheme: self.scheme);
         observationButton.viewController = observationViewController;
         return observationButton;
     }

Mage/MageSplitViewController.m

@@ -59,8 +59,9 @@ - (instancetype) initWithScheme: (id<MDCContainerScheming>) containerScheme {
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self setMaximumPrimaryColumnWidth:376];
+    [self setMaximumPrimaryColumnWidth:426];
     [self setPreferredPrimaryColumnWidthFraction:1.0];
+    self.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
     self.childCoordinators = [[NSMutableArray alloc] init];
 
     [[Mage singleton] startServicesAsInitial:YES];

Mage/MapViewController.h

@@ -25,6 +25,8 @@
 @property (strong, nonatomic) NSMutableArray *childCoordinators;
 @property (nonatomic) LocationService *locationService;
 @property (strong, nonatomic) id<MDCContainerScheming> scheme;
+@property (strong, nonatomic) IBOutlet MDCFloatingButton *createFab;
+
 
 - (instancetype) initWithScheme: (id<MDCContainerScheming>) containerScheme andMapEventDelegate: (id<MKMapViewDelegate>) mapEventDelegate;
 - (instancetype) initWithScheme: (id<MDCContainerScheming>) containerScheme;

Mage/MapViewController.m

@@ -39,7 +39,6 @@
 @interface MapViewController ()<UserTrackingModeChanged, LocationAuthorizationStatusChanged, CacheOverlayDelegate, ObservationEditDelegate, MapSettingsCoordinatorDelegate, FeatureDetailDelegate, AttachmentViewDelegate, UIGestureRecognizerDelegate>
     @property (strong, nonatomic) IBOutlet MDCFloatingButton *trackingButton;
     @property (strong, nonatomic) IBOutlet MDCFloatingButton *reportLocationButton;
-    @property (strong, nonatomic) IBOutlet MDCFloatingButton *createFab;
     @property (strong, nonatomic) IBOutlet UIButton *showPeopleButton;
     @property (strong, nonatomic) IBOutlet UIButton *showObservationsButton;
     @property (strong, nonatomic) IBOutlet MDCFloatingButton *mapSettingsButton;

Mage/MapViewController_iPad.m

@@ -40,9 +40,8 @@ - (void) setupNavigationBar {
     UIBarButtonItem *profileButton2 = [[UIBarButtonItem alloc] initWithCustomView:self.profileButton];
     UIBarButtonItem *filterButton = [[UIBarButtonItem alloc] initWithTitle:@"Filter"  style:UIBarButtonItemStylePlain target:self action:@selector(filterTapped:)];
     UIBarButtonItem *moreButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"more"] style:UIBarButtonItemStylePlain target:self action:@selector(moreTapped:)];
-    UIBarButtonItem *newButton = [[UIBarButtonItem alloc] initWithTitle:@"New" style:UIBarButtonItemStylePlain target:self action:@selector(createNewObservation:)];
 
-    [self.navigationItem setRightBarButtonItems: [NSArray arrayWithObjects: moreButton, [self createSeparator], profileButton2, [self createSeparator], filterButton, [self createSeparator], newButton, nil]];
+    [self.navigationItem setRightBarButtonItems: [NSArray arrayWithObjects: moreButton, [self createSeparator], profileButton2, [self createSeparator], filterButton, nil]];
 }
 
 - (void) viewWillAppear:(BOOL)animated {
@@ -52,6 +51,7 @@ - (void) viewWillAppear:(BOOL)animated {
 
     self.offlineObservationManager = [[MageOfflineObservationManager alloc] initWithDelegate:self];
     [self.offlineObservationManager start];
+    [self.createFab setHidden:true];
 }
 
 - (void) viewWillDisappear:(BOOL)animated {
@@ -128,7 +128,8 @@ - (void) mapSettingsComplete:(NSObject *) coordinator {
 }
 
 - (void)observationDetailSelected:(Observation *)observation {
-    
+    ObservationViewCardCollectionViewController *ovc = [[ObservationViewCardCollectionViewController alloc] initWithObservation:observation scheme:self.scheme];
+    [self.navigationController pushViewController:ovc animated:YES];
 }
 
 - (void)selectedObservation:(Observation *)observation {
@@ -148,15 +149,23 @@ - (void)selectedUser:(User *)user region:(MKCoordinateRegion)region {
 }
 
 - (void)userDetailSelected:(User *)user {
-    
+    UserViewController *uc = [[UserViewController alloc] initWithUser:user scheme:self.scheme];
+    [self.navigationController pushViewController:uc animated:YES];
 }
 
 - (void)calloutTapped:(id)calloutItem {
-    
+    if ([calloutItem isKindOfClass:[User class]]) {
+        [self userDetailSelected:(User *) calloutItem];
+    } else if ([calloutItem isKindOfClass:[Observation class]]) {
+        [self observationDetailSelected:(Observation *) calloutItem];
+    } else if ([calloutItem isKindOfClass:[FeedItem class]]) {
+        [self feedItemSelected:(FeedItem *) calloutItem];
+    }
 }
 
 - (void)feedItemSelected:(nonnull FeedItem *)feedItem {
-    
+    FeedItemViewController *fivc = [[FeedItemViewController alloc] initWithFeedItem:feedItem scheme:self.scheme];
+    [self.navigationController pushViewController:fivc animated:YES];
 }
 
 @end