hedgewars: comparison project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m

equal deleted inserted replaced

-:c129707eb1e6
+:0c1f3a8ba0bb
 #import "MissionTrainingViewController.h"
 #import <QuartzCore/QuartzCore.h>
 #import "GameInterfaceBridge.h"
+#define TRAINING_MISSION_TYPE @"Training"
 @implementation MissionTrainingViewController
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
 return rotationManager(interfaceOrientation);
 self.descriptionLabel.textColor = [UIColor lightYellowColor];
 }
 - (void)viewWillAppear:(BOOL)animated {
-NSIndexPath *indexPath = [NSIndexPath indexPathForRow:arc4random_uniform((int)[self.listOfMissionIDs count]) inSection:0];
+NSInteger randomSection = arc4random_uniform((int)[self.missionsTypes count]);
+NSString *type = self.missionsTypes[randomSection];
+NSArray *listOfIDs = [self listOfMissionsIDsForType:type];
+NSInteger randomRow = arc4random_uniform((int)[listOfIDs count]);
+NSIndexPath *indexPath = [NSIndexPath indexPathForRow:randomRow inSection:randomSection];
 [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionMiddle];
 [self tableView:self.tableView didSelectRowAtIndexPath:indexPath];
 [super viewWillAppear:animated];
 }
 }
 }
 #pragma mark - Missions dictionaries methods
-- (NSDictionary *)newLocalizedMissionsDictionary
+- (NSDictionary *)newLocalizedMissionsDictionaryForType: (NSString *)type
 {
 NSString *languageID = [HWUtils languageID];
 NSString *missionsDescLocation = [[NSString alloc] initWithFormat:@"%@/missions_en.txt",LOCALE_DIRECTORY()];
 NSString *localizedMissionsDescLocation = [[NSString alloc] initWithFormat:@"%@/missions_%@.txt", LOCALE_DIRECTORY(), languageID];
 if (![languageID isEqualToString:@"en"] && [[NSFileManager defaultManager] fileExistsAtPath:localizedMissionsDescLocation])
 {
-NSDictionary *missionsDict = [self newMissionsDictionaryFromMissionsFile:missionsDescLocation];
+NSDictionary *missionsDict = [self newMissionsDictionaryForType:type fromMissionsFile:missionsDescLocation];
-NSDictionary *localizedMissionsDict = [self newMissionsDictionaryFromMissionsFile:localizedMissionsDescLocation];
+NSDictionary *localizedMissionsDict = [self newMissionsDictionaryForType:type fromMissionsFile:localizedMissionsDescLocation];
 NSMutableDictionary *tempMissionsDict = [[NSMutableDictionary alloc] init];
 for (NSString *key in [missionsDict allKeys])
 return tempMissionsDict;
 }
 else
 {
-NSDictionary *missionsDict = [self newMissionsDictionaryFromMissionsFile:missionsDescLocation];
+NSDictionary *missionsDict = [self newMissionsDictionaryForType:type fromMissionsFile:missionsDescLocation];
 return missionsDict;
 }
 }
-- (NSDictionary *)newMissionsDictionaryFromMissionsFile:(NSString *)filePath
+- (NSDictionary *)newMissionsDictionaryForType:(NSString *)type fromMissionsFile:(NSString *)filePath
 {
 NSMutableDictionary *missionsDict = [[NSMutableDictionary alloc] init];
 NSString *missionsFileContents = [[NSString alloc] initWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL];
 NSArray *missionsLines = [missionsFileContents componentsSeparatedByString:@"\n"];
+NSString *directory = [self missionsDirectoryForType:type];
 for (NSString *line in missionsLines)
 {
 if ([line length] > 0)
 {
 NSUInteger firstDotLocation = [line rangeOfString:@"."].location;
 NSString *missionID = [line substringToIndex:firstDotLocation];
-NSString *missionFullPath = [NSString stringWithFormat:@"%@%@.lua", TRAININGS_DIRECTORY(), missionID];
+NSString *missionFullPath = [NSString stringWithFormat:@"%@%@.lua", directory, missionID];
 if (![[NSFileManager defaultManager] fileExistsAtPath:missionFullPath])
 {
 continue;
 }
 }
 #pragma mark -
 #pragma mark override setters/getters for better memory handling
--(NSArray *)listOfMissionIDs
+- (NSArray *)missionsTypes
 {
-if (!_listOfMissionIDs)
+if (!_missionsTypes)
 {
-NSArray *sortedKeys = [[self.dictOfMissions allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+_missionsTypes = @[ TRAINING_MISSION_TYPE ];
-_listOfMissionIDs = [[NSArray alloc] initWithArray:sortedKeys];
+}
-}
+return _missionsTypes;
-return _listOfMissionIDs;
+}
-}
+- (NSDictionary *)dictOfAllMissions
-- (NSDictionary *)dictOfMissions
+{
-{
+if (!_dictOfAllMissions)
-if (!_dictOfMissions)
+{
-{
+NSArray *types = [self missionsTypes];
-_dictOfMissions = [self newLocalizedMissionsDictionary];
+_dictOfAllMissions = @{ types[0] : [self dictOfTraining] };
 }
-return _dictOfMissions;
+return _dictOfAllMissions;
+}
+- (NSArray *)listOfTrainingIDs
+{
+if (!_listOfTrainingIDs)
+{
+NSArray *sortedKeys = [[self.dictOfTraining allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+_listOfTrainingIDs = [[NSArray alloc] initWithArray:sortedKeys];
+}
+return _listOfTrainingIDs;
+}
+- (NSDictionary *)dictOfTraining
+{
+if (!_dictOfTraining)
+{
+_dictOfTraining = [self newLocalizedMissionsDictionaryForType:TRAINING_MISSION_TYPE];
+}
+return _dictOfTraining;
+}
+#pragma mark -
+#pragma mark Missions types
+- (NSString *)missionsDirectoryForType:(NSString *)type
+{
+if ([type isEqualToString:TRAINING_MISSION_TYPE]) {
+return TRAININGS_DIRECTORY();
+}
+return nil;
+}
+- (NSArray *)listOfMissionsIDsForType:(NSString *)type
+{
+if ([type isEqualToString:TRAINING_MISSION_TYPE]) {
+return self.listOfTrainingIDs;
+}
+return nil;
+}
+- (NSDictionary *)dictOfMissionsForType:(NSString *)type
+{
+if ([type isEqualToString:TRAINING_MISSION_TYPE]) {
+return self.dictOfTraining;
+}
+return nil;
 }
 #pragma mark -
 #pragma mark Table view data source
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-return 1;
+return [self.missionsTypes count];
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-return [self.listOfMissionIDs count];
+NSString *type = self.missionsTypes[section];
+NSArray *listOfIDs = [self listOfMissionsIDsForType:type];
+return [listOfIDs count];
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
 return (IS_IPAD()) ? self.tableView.rowHeight : 80;
 }
 UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier];
 if (cell == nil)
 cell = [[UITableViewCell alloc] initWithStyle:(IS_IPAD()) ? UITableViewCellStyleDefault : UITableViewCellStyleSubtitle
 reuseIdentifier:CellIdentifier];
-NSString *missionID = [self.listOfMissionIDs objectAtIndex:row];
+NSInteger section = [indexPath section];
-cell.textLabel.text = self.dictOfMissions[missionID][@"name"];
+NSString *type = self.missionsTypes[section];
+NSArray *listOfIDs = [self listOfMissionsIDsForType:type];
+NSDictionary *dict = [self dictOfMissionsForType:type];
+NSString *missionID = [listOfIDs objectAtIndex:row];
+cell.textLabel.text = dict[missionID][@"name"];
 cell.textLabel.textColor = [UIColor lightYellowColor];
 //cell.textLabel.font = [UIFont fontWithName:@"Bradley Hand Bold" size:[UIFont labelFontSize]];
 cell.textLabel.textAlignment = (IS_IPAD()) ? NSTextAlignmentCenter : NSTextAlignmentLeft;
 cell.textLabel.backgroundColor = [UIColor clearColor];
 cell.textLabel.adjustsFontSizeToFitWidth = YES;
-cell.detailTextLabel.text = (IS_IPAD()) ? nil : self.dictOfMissions[missionID][@"desc"];
+cell.detailTextLabel.text = (IS_IPAD()) ? nil : dict[missionID][@"desc"];
 cell.detailTextLabel.textColor = [UIColor whiteColor];
 cell.detailTextLabel.backgroundColor = [UIColor clearColor];
 cell.detailTextLabel.adjustsFontSizeToFitWidth = YES;
 cell.detailTextLabel.numberOfLines = ([cell.detailTextLabel.text length] % 40);
 cell.detailTextLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
 }
 #pragma mark -
 #pragma mark Table view delegate
 - (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+NSInteger section = [indexPath section];
+NSString *type = self.missionsTypes[section];
+NSArray *listOfIDs = [self listOfMissionsIDsForType:type];
 NSInteger row = [indexPath row];
+self.missionName = [listOfIDs objectAtIndex:row];
-self.missionName = [self.listOfMissionIDs objectAtIndex:row];
 NSString *size = IS_IPAD() ? @"@2x" : @"";
-NSString *filePath = [[NSString alloc] initWithFormat:@"%@/Missions/Training/%@%@.png",GRAPHICS_DIRECTORY(),self.missionName,size];
+NSString *filePath = [[NSString alloc] initWithFormat:@"%@/Missions/%@/%@%@.png",GRAPHICS_DIRECTORY(), type, self.missionName, size];
 UIImage *img = [[UIImage alloc] initWithContentsOfFile:filePath];
 [self.previewImage setImage:img];
-self.descriptionLabel.text = self.dictOfMissions[self.missionName][@"desc"];
+NSDictionary *dict = [self dictOfMissionsForType:type];
+self.descriptionLabel.text = dict[self.missionName][@"desc"];
 }
 #pragma mark -
 #pragma mark Memory management
 - (void)didReceiveMemoryWarning
 {
-self.missionName = nil;
+self.listOfTrainingIDs = nil;
-self.listOfMissionIDs = nil;
+self.dictOfTraining = nil;
-self.dictOfMissions = nil;
+self.dictOfAllMissions = nil;
+self.missionsTypes = nil;
 // if you nil this one it won't get updated anymore
 //self.previewImage = nil;
 [super didReceiveMemoryWarning];
 }

branch	ios-develop
changeset 13191	0c1f3a8ba0bb
parent 13166	ba5c794adae3
child 13192	d6aea85111c7