Skip to content

Commit

Permalink
Fixed crash with iPads on iOS < 8
Browse files Browse the repository at this point in the history
Removed unnecessary cancel button from search bar
Fixed formatting for different screen sizes
Added scripts to generate SQLite Data file
Cleaned up Data file: removed extra Borg Octahedron entries, fixed syntax around tactical cube
Added large image file to repo
Added Fighter Squadron 6 preview
  • Loading branch information
Robert George authored and Robert George committed Jan 1, 2015
1 parent 233e2a3 commit e68e619
Show file tree
Hide file tree
Showing 19 changed files with 1,579 additions and 243 deletions.
6 changes: 6 additions & 0 deletions Space Dock.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
D4F872A818B5A87600783285 /* DockShipDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D4F872A718B5A87600783285 /* DockShipDelegate.m */; };
D4F8B50C1837E4EC0051A486 /* DockSetsListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4F8B50B1837E4EC0051A486 /* DockSetsListViewController.m */; };
D4F8B50F1837EFF20051A486 /* DockSetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D4F8B50E1837EFF20051A486 /* DockSetTableViewCell.m */; };
DA1C31931A548097006B9BB9 /* DockSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA1C31911A548097006B9BB9 /* DockSplitViewController.m */; };
DA2880D41A30190300A9C736 /* SpaceDock_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA2880D31A30190300A9C736 /* SpaceDock_iPad.storyboard */; };
DA2880D71A3037A700A9C736 /* DockPushStartSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2880D61A3037A700A9C736 /* DockPushStartSegue.m */; };
DA2880DB1A304FDF00A9C736 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA2880DA1A304FDF00A9C736 /* Launch Screen.xib */; };
Expand Down Expand Up @@ -801,6 +802,8 @@
D4F8B50B1837E4EC0051A486 /* DockSetsListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockSetsListViewController.m; sourceTree = "<group>"; };
D4F8B50D1837EFF20051A486 /* DockSetTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockSetTableViewCell.h; sourceTree = "<group>"; };
D4F8B50E1837EFF20051A486 /* DockSetTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockSetTableViewCell.m; sourceTree = "<group>"; };
DA1C31911A548097006B9BB9 /* DockSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockSplitViewController.m; sourceTree = "<group>"; };
DA1C31921A548097006B9BB9 /* DockSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockSplitViewController.h; sourceTree = "<group>"; };
DA2880D31A30190300A9C736 /* SpaceDock_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SpaceDock_iPad.storyboard; sourceTree = "<group>"; };
DA2880D51A3037A700A9C736 /* DockPushStartSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockPushStartSegue.h; sourceTree = "<group>"; };
DA2880D61A3037A700A9C736 /* DockPushStartSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockPushStartSegue.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -974,6 +977,8 @@
D41129C119925D2200EC6E30 /* Other View Controllers */ = {
isa = PBXGroup;
children = (
DA1C31911A548097006B9BB9 /* DockSplitViewController.m */,
DA1C31921A548097006B9BB9 /* DockSplitViewController.h */,
D457FD16181D58E0009C2E13 /* DockEditValueController.h */,
D457FD17181D58E0009C2E13 /* DockEditValueController.m */,
D40108E318208F000029FDC4 /* DockTableViewController.h */,
Expand Down Expand Up @@ -1904,6 +1909,7 @@
D4EDBF3B199516C200D390C3 /* DockAdmiralRowHandler.m in Sources */,
D43AAFC31993C867002081E4 /* DockFleetCaptainRowHandler.m in Sources */,
D47316B518182C4C00046428 /* DockUtils.m in Sources */,
DA1C31931A548097006B9BB9 /* DockSplitViewController.m in Sources */,
D433FE21181503A20062731A /* DockShipsViewController.m in Sources */,
D4F6869E18F995EA0019C067 /* DockTech.m in Sources */,
D427CDE3184A50CF0086EB86 /* DockConstants.m in Sources */,
Expand Down
Binary file added art/space_dock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion ios/DockAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#import "DockShip+Addons.h"
#import "DockTopMenuViewController.h"
#import "DockUpgrade+Addons.h"
#import "DockSplitViewController.h"

@interface DockAppDelegate ()

Expand Down Expand Up @@ -124,7 +125,16 @@ -(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(N

if ([self.window.rootViewController isKindOfClass:[UISplitViewController class]]) {
UISplitViewController* splitViewController = (UISplitViewController*) self.window.rootViewController;
splitViewController.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
if ([splitViewController respondsToSelector:@selector(setPreferredDisplayMode:)]) {
splitViewController.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
}
} else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
DockSplitViewController* splitViewController = [[DockSplitViewController alloc] init];
UINavigationController* navigationController = [[UINavigationController alloc] initWithRootViewController:[[UITableViewController alloc] init]];

[splitViewController addChildViewController:self.window.rootViewController];
[splitViewController addChildViewController:navigationController];
self.window.rootViewController = splitViewController;
}

[self loadAppData];
Expand Down
14 changes: 10 additions & 4 deletions ios/DockPushStartSegue.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ @implementation DockPushStartSegue
-(void)perform {

UIWindow* w = [[[ UIApplication sharedApplication ] windows ] objectAtIndex: 0 ];

UISplitViewController* root = (UISplitViewController*)w.rootViewController;
UINavigationController* detailsNavController = [ root.viewControllers objectAtIndex: 1 ];
[detailsNavController setViewControllers:[NSArray arrayWithObjects:[self destinationViewController],nil]];
if ([w.rootViewController isKindOfClass:[UISplitViewController class]]) {
UISplitViewController* root = (UISplitViewController*)w.rootViewController;
UINavigationController* detailsNavController = [ root.viewControllers objectAtIndex: 1 ];
[detailsNavController setViewControllers:[NSArray arrayWithObjects:[self destinationViewController],nil]];
}
else if ([w.rootViewController isKindOfClass:[UINavigationController class]])
{
UINavigationController* detailsNavController = (UINavigationController*)w.rootViewController;
[detailsNavController pushViewController:[self destinationViewController] animated:YES];
}
}

@end
13 changes: 13 additions & 0 deletions ios/DockSplitViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// DockSplitViewController.h
// Space Dock
//
// Created by Robert George on 12/31/14.
// Copyright (c) 2014 Robert George. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface DockSplitViewController : UISplitViewController <UISplitViewControllerDelegate>

@end
53 changes: 53 additions & 0 deletions ios/DockSplitViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
//
// DockSplitViewController.m
// Space Dock
//
// Created by Robert George on 12/31/14.
// Copyright (c) 2014 Robert George. All rights reserved.
//

#import "DockSplitViewController.h"

@interface DockSplitViewController ()

@end

@implementation DockSplitViewController

- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
self.delegate = self;
}

- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

#pragma mark - UISplitViewControllerDelegate

- (BOOL)splitViewController:(UISplitViewController *)splitViewController
collapseSecondaryViewController:(UIViewController *)secondaryViewController
ontoPrimaryViewController:(UIViewController *)primaryViewController
{
return YES;
}

- (BOOL)splitViewController:(UISplitViewController *)svc
shouldHideViewController:(UIViewController *)vc
inOrientation:(UIInterfaceOrientation)orientation
{
return NO;
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/

@end
6 changes: 3 additions & 3 deletions ios/Space Dock iOS-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.funnyhatsoftware.${PRODUCT_NAME:rfc1034identifier}</string>
<string>com.funnyhatsoftware.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>98</string>
<string>99</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
Loading

0 comments on commit e68e619

Please sign in to comment.