Skip to content

Commit

Permalink
Added support for DNA Encoded Messages (iOS/Mac)
Browse files Browse the repository at this point in the history
Added better handling of Front-Line Retrofit and Captain's Chair (iOS)
Added new Resource Upgrade type (iOS/Mac)
Added Ship cost to ship selection list (iOS)
  • Loading branch information
rrgeorge committed Nov 30, 2017
1 parent eb0c088 commit 32621da
Show file tree
Hide file tree
Showing 25 changed files with 813 additions and 301 deletions.
30 changes: 27 additions & 3 deletions Space Dock.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,16 @@
DA3F16701A2275C90083989E /* white-right-90-degree-rotate.png in Resources */ = {isa = PBXBuildFile; fileRef = DA3F162E1A2275C90083989E /* white-right-90-degree-rotate.png */; };
DA3F16711A2275C90083989E /* white-stop.pdf in Resources */ = {isa = PBXBuildFile; fileRef = DA3F162F1A2275C90083989E /* white-stop.pdf */; };
DA3F16741A2275C90083989E /* white-stop.png in Resources */ = {isa = PBXBuildFile; fileRef = DA3F16301A2275C90083989E /* white-stop.png */; };
DA4CDE821FCF752E0051CA14 /* DockResourceUpgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4CDE811FCF752E0051CA14 /* DockResourceUpgrade.m */; };
DA4CDE831FCF752E0051CA14 /* DockResourceUpgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4CDE811FCF752E0051CA14 /* DockResourceUpgrade.m */; };
DA4CDE861FCF75810051CA14 /* DockResourceUpgrade+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4CDE851FCF75810051CA14 /* DockResourceUpgrade+Addons.m */; };
DA4CDE871FCF75810051CA14 /* DockResourceUpgrade+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4CDE851FCF75810051CA14 /* DockResourceUpgrade+Addons.m */; };
DA6DD7D21A1E98AF00CCD443 /* DockSquadronUpgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6DD7D11A1E98AF00CCD443 /* DockSquadronUpgrade.m */; };
DA6DD7D31A1E98AF00CCD443 /* DockSquadronUpgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6DD7D11A1E98AF00CCD443 /* DockSquadronUpgrade.m */; };
DA6DD7DA1A1E99E000CCD443 /* DockSquadronUpgrade+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6DD7D91A1E99E000CCD443 /* DockSquadronUpgrade+Addons.m */; };
DA6DD7DB1A1E99E000CCD443 /* DockSquadronUpgrade+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6DD7D91A1E99E000CCD443 /* DockSquadronUpgrade+Addons.m */; };
DA99A5131A844104004C1D53 /* DockExchangeFactionsSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = DA99A5121A844104004C1D53 /* DockExchangeFactionsSelection.m */; };
DAC4B8C41FCF88D50016FA1F /* DockResourceUpgradeRowHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC4B8C31FCF88D50016FA1F /* DockResourceUpgradeRowHandler.m */; };
DAC7599A1A96DE18005A7993 /* DockResource+MacAddons.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC759991A96DE18005A7993 /* DockResource+MacAddons.m */; };
DACF40DC1A107EA4004E2DAF /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DACF40DB1A107EA4004E2DAF /* Settings.bundle */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -854,6 +859,10 @@
DA3F162E1A2275C90083989E /* white-right-90-degree-rotate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "white-right-90-degree-rotate.png"; path = "images/white-right-90-degree-rotate.png"; sourceTree = SOURCE_ROOT; };
DA3F162F1A2275C90083989E /* white-stop.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "white-stop.pdf"; sourceTree = "<group>"; };
DA3F16301A2275C90083989E /* white-stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "white-stop.png"; path = "images/white-stop.png"; sourceTree = SOURCE_ROOT; };
DA4CDE801FCF752E0051CA14 /* DockResourceUpgrade.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DockResourceUpgrade.h; sourceTree = "<group>"; };
DA4CDE811FCF752E0051CA14 /* DockResourceUpgrade.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DockResourceUpgrade.m; sourceTree = "<group>"; };
DA4CDE841FCF75810051CA14 /* DockResourceUpgrade+Addons.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DockResourceUpgrade+Addons.h"; sourceTree = "<group>"; };
DA4CDE851FCF75810051CA14 /* DockResourceUpgrade+Addons.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DockResourceUpgrade+Addons.m"; sourceTree = "<group>"; };
DA6DD7CF1A1E95D700CCD443 /* Space_Dock_ 18.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Space_Dock_ 18.xcdatamodel"; sourceTree = "<group>"; };
DA6DD7D01A1E98AF00CCD443 /* DockSquadronUpgrade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockSquadronUpgrade.h; sourceTree = "<group>"; };
DA6DD7D11A1E98AF00CCD443 /* DockSquadronUpgrade.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockSquadronUpgrade.m; sourceTree = "<group>"; };
Expand All @@ -862,6 +871,9 @@
DA8A41401A1196D700190B34 /* Space_Dock_17.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Space_Dock_17.xcdatamodel; sourceTree = "<group>"; };
DA99A5111A844104004C1D53 /* DockExchangeFactionsSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockExchangeFactionsSelection.h; sourceTree = "<group>"; };
DA99A5121A844104004C1D53 /* DockExchangeFactionsSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockExchangeFactionsSelection.m; sourceTree = "<group>"; };
DAC4B8C11FCF7D6D0016FA1F /* Space_Dock_20.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Space_Dock_20.xcdatamodel; sourceTree = "<group>"; };
DAC4B8C21FCF88D50016FA1F /* DockResourceUpgradeRowHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DockResourceUpgradeRowHandler.h; sourceTree = "<group>"; };
DAC4B8C31FCF88D50016FA1F /* DockResourceUpgradeRowHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DockResourceUpgradeRowHandler.m; sourceTree = "<group>"; };
DAC759981A96DE18005A7993 /* DockResource+MacAddons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DockResource+MacAddons.h"; sourceTree = "<group>"; };
DAC759991A96DE18005A7993 /* DockResource+MacAddons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DockResource+MacAddons.m"; sourceTree = "<group>"; };
DACF40DB1A107EA4004E2DAF /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1142,6 +1154,8 @@
children = (
D4EDBF39199516C200D390C3 /* DockAdmiralRowHandler.h */,
D4EDBF3A199516C200D390C3 /* DockAdmiralRowHandler.m */,
DAC4B8C21FCF88D50016FA1F /* DockResourceUpgradeRowHandler.h */,
DAC4B8C31FCF88D50016FA1F /* DockResourceUpgradeRowHandler.m */,
D40108E0182015090029FDC4 /* DockEquippedShipController.h */,
D40108E1182015090029FDC4 /* DockEquippedShipController.m */,
D43AAFBE1993BBF5002081E4 /* DockFlagshipRowHandler.h */,
Expand Down Expand Up @@ -1307,7 +1321,9 @@
D4F6866718F995E90019C067 /* DockUpgrade.h */,
D4F6866818F995E90019C067 /* DockUpgrade.m */,
DA6DD7D01A1E98AF00CCD443 /* DockSquadronUpgrade.h */,
DA4CDE801FCF752E0051CA14 /* DockResourceUpgrade.h */,
DA6DD7D11A1E98AF00CCD443 /* DockSquadronUpgrade.m */,
DA4CDE811FCF752E0051CA14 /* DockResourceUpgrade.m */,
);
name = Entities;
sourceTree = "<group>";
Expand Down Expand Up @@ -1465,6 +1481,7 @@
D460664218FC226B007A1655 /* DockBorg+Addons.h */,
D460664318FC226B007A1655 /* DockBorg+Addons.m */,
D4D7BE6617F76FB50070D94D /* DockCaptain+Addons.h */,
D433E4F418B7C7B300FB6579 /* DockEquippedFlagship.h */,
D4D7BE6717F76FB50070D94D /* DockCaptain+Addons.m */,
D427CDE0184A50CF0086EB86 /* DockConstants.h */,
D427CDE1184A50CF0086EB86 /* DockConstants.m */,
Expand All @@ -1476,7 +1493,6 @@
D4AD470418708E6600A9B451 /* DockDataLoader.m */,
D4E94BA81853F8A300AE415D /* DockDataUpdater.h */,
D4E94BA91853F8A300AE415D /* DockDataUpdater.m */,
D433E4F418B7C7B300FB6579 /* DockEquippedFlagship.h */,
D433E4F518B7C7B300FB6579 /* DockEquippedFlagship.m */,
D4AAA28617F4082F00A99383 /* DockEquippedShip+Addons.h */,
D4AAA28717F4082F00A99383 /* DockEquippedShip+Addons.m */,
Expand All @@ -1501,7 +1517,6 @@
D4F7F1A81808DBB000157E32 /* DockSet+Addons.m */,
D415E16E186683B800D3B25D /* DockSetItem+Addons.h */,
D415E16F186683B800D3B25D /* DockSetItem+Addons.m */,
D41BA80617F67FE0005266E6 /* DockShip+Addons.h */,
D41BA80717F67FE0005266E6 /* DockShip+Addons.m */,
D4711F6B18427CA300EFF34B /* DockShipClassDetails+Addons.h */,
D4711F6C18427CA300EFF34B /* DockShipClassDetails+Addons.m */,
Expand All @@ -1513,9 +1528,12 @@
D4E4868D18DB424900D3BAB8 /* DockSquadImporter.m */,
DA6DD7D81A1E99E000CCD443 /* DockSquadronUpgrade+Addons.h */,
DA6DD7D91A1E99E000CCD443 /* DockSquadronUpgrade+Addons.m */,
DA4CDE841FCF75810051CA14 /* DockResourceUpgrade+Addons.h */,
DA4CDE851FCF75810051CA14 /* DockResourceUpgrade+Addons.m */,
D4F671A619BFCE3500F9EDBC /* DockUnique.h */,
D4AAA28917F408D400A99383 /* DockUpgrade+Addons.h */,
D4AAA28A17F408D400A99383 /* DockUpgrade+Addons.m */,
D41BA80617F67FE0005266E6 /* DockShip+Addons.h */,
D45AF1EE17FFE7F900C04F9A /* DockUtils.h */,
D45AF1EF17FFE7F900C04F9A /* DockUtils.m */,
D437079C1800AFDF00622E7F /* DockWeapon+Addons.h */,
Expand Down Expand Up @@ -1839,6 +1857,7 @@
D4ACA9771842F86B008B3EB6 /* DockMoveGrid.m in Sources */,
D4B903E018BB0742004F279F /* DockWeaponRange.m in Sources */,
D4E94BAA1853F8A300AE415D /* DockDataUpdater.m in Sources */,
DA4CDE821FCF752E0051CA14 /* DockResourceUpgrade.m in Sources */,
D4F6869D18F995EA0019C067 /* DockTech.m in Sources */,
D475C6721916BD9B00275EF1 /* DockBoxView.m in Sources */,
D461E4BA182488C800F18FBC /* DockErrors.m in Sources */,
Expand Down Expand Up @@ -1871,6 +1890,7 @@
D410C994197AB7B600AEEF4D /* DockSetTabController.m in Sources */,
D4A66CA718A08C060050A37A /* DockAbilityDelegate.m in Sources */,
D4838F29198690FA00994639 /* DockSearchFieldController.m in Sources */,
DA4CDE861FCF75810051CA14 /* DockResourceUpgrade+Addons.m in Sources */,
D4F6866D18F995E90019C067 /* DockFlagship.m in Sources */,
D4AAA29417F48F8100A99383 /* DockEquippedUpgrade+Addons.m in Sources */,
D415E170186683B800D3B25D /* DockSetItem+Addons.m in Sources */,
Expand Down Expand Up @@ -1920,6 +1940,7 @@
D4D32EB918EF08E70055B015 /* DockSquadImporteriOS.m in Sources */,
D4408DE4184589E0008BA352 /* DockMovesViewController.m in Sources */,
D4641E71183D9B3A00121086 /* DockManeuver+Addons.m in Sources */,
DAC4B8C41FCF88D50016FA1F /* DockResourceUpgradeRowHandler.m in Sources */,
D4EDBF3B199516C200D390C3 /* DockAdmiralRowHandler.m in Sources */,
D43AAFC31993C867002081E4 /* DockFleetCaptainRowHandler.m in Sources */,
D47316B518182C4C00046428 /* DockUtils.m in Sources */,
Expand Down Expand Up @@ -1966,6 +1987,7 @@
D45E4CB3182E8FE400F0AA7D /* DockDetailViewController.m in Sources */,
D46FB28E1821F20100E7017D /* DockUpgradesViewController.m in Sources */,
D4C8EF1E1863425B007BBD1A /* DockFlagship+Addons.m in Sources */,
DA4CDE831FCF752E0051CA14 /* DockResourceUpgrade.m in Sources */,
D4F6866A18F995E90019C067 /* DockUpgrade.m in Sources */,
D4F8B50C1837E4EC0051A486 /* DockSetsListViewController.m in Sources */,
D4A7B58B18329BA600C66123 /* DockSquadListCell.m in Sources */,
Expand Down Expand Up @@ -1996,6 +2018,7 @@
D43AAFB71993B37C002081E4 /* DockSectionHandler.m in Sources */,
DA6DD7D31A1E98AF00CCD443 /* DockSquadronUpgrade.m in Sources */,
D4F8B50F1837EFF20051A486 /* DockSetTableViewCell.m in Sources */,
DA4CDE871FCF75810051CA14 /* DockResourceUpgrade+Addons.m in Sources */,
D415E171186683B800D3B25D /* DockSetItem+Addons.m in Sources */,
D4F6867E18F995E90019C067 /* DockSideboard.m in Sources */,
D4962837192839EE007EFE5A /* DockReferenceViewController.m in Sources */,
Expand Down Expand Up @@ -2395,6 +2418,7 @@
D4F7F40C17F2C95D00F5A808 /* Space_Dock.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
DAC4B8C11FCF7D6D0016FA1F /* Space_Dock_20.xcdatamodel */,
DAFB9FFC1A78D1BA00AC675F /* Space_Dock_ 19.xcdatamodel */,
DA6DD7CF1A1E95D700CCD443 /* Space_Dock_ 18.xcdatamodel */,
DA8A41401A1196D700190B34 /* Space_Dock_17.xcdatamodel */,
Expand All @@ -2415,7 +2439,7 @@
D40AF35A1802FB36000B9FF3 /* Space_Dock_2.xcdatamodel */,
D4F7F40D17F2C95D00F5A808 /* Space_Dock.xcdatamodel */,
);
currentVersion = DAFB9FFC1A78D1BA00AC675F /* Space_Dock_ 19.xcdatamodel */;
currentVersion = DAC4B8C11FCF7D6D0016FA1F /* Space_Dock_20.xcdatamodel */;
path = Space_Dock.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
2 changes: 1 addition & 1 deletion ios/DockBuildSheetRenderer.m
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ -(NSString*)handleUpgrade:(int)col index:(long)index
}

if (col == 3) {
if ([[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Federation Elite Talent"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Romulan Elite Talent"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Tech Upgrade"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Weapon Upgrade"] ) {
if ([[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Federation Elite Talent"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Romulan Elite Talent"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Tech Upgrade"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Weapon Upgrade"] || [[equippedUpgrade descriptionForBuildSheet] isEqualToString:@"Klingon Elite Talent"] ) {
return [NSString stringWithFormat: @"%d",equippedUpgrade.cost];
}
if ([[equippedUpgrade overridden] boolValue]) {
Expand Down
26 changes: 26 additions & 0 deletions ios/DockEquippedShipController.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#import "DockOfficerRowHandler.h"
#import "DockShipRowHandler.h"
#import "DockUpgradeRowHandler.h"
#import "DockResourceUpgradeRowHandler.h"

#pragma mark - DockEquippedShipController

Expand Down Expand Up @@ -142,7 +143,32 @@ -(void)createSectionAndRowHandlers
officerHandler.controller = self;
[extrasSection addRowHandler: officerHandler];
}

if (![sectionTitles containsObject: @"Resource"] && [_equippedShip.squad.resource.externalId isEqualToString:@"captains_chair_72936r"]) {

DockResourceUpgradeRowHandler* resourceHandler = [[DockResourceUpgradeRowHandler alloc] init];
resourceHandler.equippedShip = _equippedShip;
resourceHandler.controller = self;

if ([_equippedShip.squad.resource.externalId isEqualToString:@"captains_chair_72936r"] && [_equippedShip.squad containsUniqueUpgradeWithName:@"Captain's Chair"] == nil) {

resourceHandler.controller = self;
[extrasSection addRowHandler:resourceHandler];
}
}
if (![sectionTitles containsObject: @"Resource"] && [_equippedShip.squad.resource.externalId isEqualToString:@"front-line_retrofit_72941r"]) {

DockResourceUpgradeRowHandler* resourceHandler = [[DockResourceUpgradeRowHandler alloc] init];
resourceHandler.equippedShip = _equippedShip;
resourceHandler.controller = self;

if ([_equippedShip.squad.resource.externalId isEqualToString:@"front-line_retrofit_72941r"] && [_equippedShip.squad containsUniqueUpgradeWithName:@"Front-Line Retrofit"] == nil) {

resourceHandler.controller = self;
[extrasSection addRowHandler:resourceHandler];
}
}

if (extrasSection.rowHandlerCount > 0) {
[sections addObject: extrasSection];
}
Expand Down
15 changes: 15 additions & 0 deletions ios/DockResourceUpgradeRowHandler.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// DockResourceUpgradeRowHandler.h
// Space Dock iOS
//
// Created by Robert George on 11/29/17.
// Copyright © 2017 Robert George. All rights reserved.
//

#import "DockRowHandler.h"

@class DockEquippedShip;

@interface DockResourceUpgradeRowHandler : DockRowHandler
@property (strong, nonatomic) DockEquippedShip* equippedShip;
@end
68 changes: 68 additions & 0 deletions ios/DockResourceUpgradeRowHandler.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//
// DockResourceUpgradeRowHandler.m
// Space Dock iOS
//
// Created by Robert George on 11/29/17.
// Copyright © 2017 Robert George. All rights reserved.
//

#import "DockResourceUpgradeRowHandler.h"

#import "DockResourceUpgrade+Addons.h"
#import "DockConstants.h"
#import "DockEquippedShip+Addons.h"
#import "DockEquippedUpgrade+Addons.h"
#import "DockExtrasTableViewCell.h"
#import "DockUpgrade+Addons.h"

@implementation DockResourceUpgradeRowHandler

-(UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSIndexPath*)indexPath row:(NSInteger)row
{
DockEquippedUpgrade* eqr = _equippedShip.equippedResource;

NSString* upType = @"Resource";

UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier: @"upgrade" forIndexPath: indexPath];

if (eqr != nil) {
DockResourceUpgrade* resUp = (DockResourceUpgrade*)eqr.upgrade;
cell.textLabel.text = eqr.title;
cell.detailTextLabel.text = [[resUp cost] stringValue];
cell.textLabel.textColor = [UIColor blackColor];
} else {
cell.textLabel.text = upType;
cell.textLabel.textColor = [UIColor grayColor];
cell.detailTextLabel.text = @" ";
}

return cell;
}

-(void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath row:(NSInteger)row;
{
[_equippedShip removeUpgrade: [_equippedShip equippedAdmiral]];
}

-(void)tableView:(UITableView*)tableView didHighlightRowAtIndexPath:(NSIndexPath*)indexPath row:(NSInteger)row;
{
DockEquippedUpgrade* eqr = _equippedShip.equippedResource;
if (eqr == nil) {
NSManagedObjectContext* ctx = _equippedShip.managedObjectContext;
NSEntityDescription* entity = [NSEntityDescription entityForName: @"EquippedUpgrade" inManagedObjectContext: ctx];
eqr = [[DockEquippedUpgrade alloc] initWithEntity: entity insertIntoManagedObjectContext: ctx];
eqr.upgrade = [DockUpgrade placeholder:@"Resource" inContext:ctx];
}
[self.controller performSegueWithIdentifier: @"PickUpgrade" sender:eqr];
}

-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath row:(NSInteger)row
{
DockEquippedUpgrade* eqr = _equippedShip.equippedResource;
if (eqr != nil) {
return EXTRA_ROW_HEIGHT;
}
return tableView.rowHeight;
}

@end
2 changes: 1 addition & 1 deletion ios/DockShipsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ -(void)configureCell:(UITableViewCell*)cell atIndexPath:(NSIndexPath*)indexPath
// Configure the cell to show the book's title
DockShip* ship = [self.fetchedResultsController objectAtIndexPath: indexPath];
cell.textLabel.text = ship.descriptiveTitle;

cell.detailTextLabel.text = [ship.cost stringValue];
if ([ship isAnyKindOfUnique]) {
if (_targetSquad) {
if (_targetShip != ship && [_targetSquad containsShip: ship]) {
Expand Down
6 changes: 5 additions & 1 deletion ios/DockUpgradesViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ -(void)setUpType:(NSString*)upType

-(BOOL)useFactionFilter
{
return ![_upType isEqualToString: kOfficerUpgradeType];
return ![_upType isEqualToString: kOfficerUpgradeType] && ![_upType isEqualToString: @"Resource"];
}

-(NSArray*)filterForCost:(NSArray*)rawList
Expand Down Expand Up @@ -197,6 +197,10 @@ -(void)setupFetch:(NSFetchRequest*)fetchRequest context:(NSManagedObjectContext*
[predicateTerms addObject: @"title CONTAINS[cd] %@"];
[predicateValues addObject: searchTerm];
}
if ([_upType isEqualToString:@"Resource"] && self.targetSquad.resource != nil) {
[predicateTerms addObject: @"title = %@"];
[predicateValues addObject:self.targetSquad.resource.title];
}

NSString* predicateTermString = [predicateTerms componentsJoinedByString: @" and "];
NSPredicate *predicateTemplate = [NSPredicate predicateWithFormat: predicateTermString argumentArray: predicateValues];
Expand Down
Loading

0 comments on commit 32621da

Please sign in to comment.