From c0a50a771c898e87f280c961ed91f32dc56bfcc4 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Tue, 12 Aug 2014 17:41:49 +0000 Subject: [PATCH] --- DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 43806 -> 0 bytes DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard | 20 +++++++++++++++----- DUREX Vendor Control/MenuTableViewController.m | 18 ++++++++++++++---- DUREX tests/Base.lproj/MainStoryboard.storyboard | 20 +++++++++++++++----- DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 246035 -> 0 bytes DUREX tests/MenuTableViewController.m | 18 ++++++++++++++---- 6 files changed, 58 insertions(+), 18 deletions(-) diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 1b2b4a4..13cd5c4 100644 Binary files a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard index dce227d..378c741 100644 --- a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard @@ -142,18 +142,22 @@ - - + + + + + + diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m index 67b2453..ae9c227 100644 --- a/DUREX Vendor Control/MenuTableViewController.m +++ b/DUREX Vendor Control/MenuTableViewController.m @@ -283,11 +283,21 @@ [[cell textLabel] setText:NSLocalizedString([[self currentElements] objectAtIndex:[indexPath row]+offset],nil)]; if([self currentNavLevel] == MAINTENANCE) { - [[cell detailTextLabel] setText:@"VALUE"]; - [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_checkmark"]]]; - if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"CH4 presence",nil)]) + if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Sales log",nil)] || [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Incident report",nil)] || [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Send report",nil)]) { - [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_delete"]]]; + [[cell detailTextLabel] setText:@""]; + [cell setAccessoryView:nil]; + [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator]; + } + else + { + [[cell detailTextLabel] setText:@"VALUE"]; + [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_checkmark"]]]; + if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"CH4 presence",nil)]) + { + [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_delete"]]]; + } + } } return cell; diff --git a/DUREX tests/Base.lproj/MainStoryboard.storyboard b/DUREX tests/Base.lproj/MainStoryboard.storyboard index 3628b38..8b1c189 100644 --- a/DUREX tests/Base.lproj/MainStoryboard.storyboard +++ b/DUREX tests/Base.lproj/MainStoryboard.storyboard @@ -142,18 +142,22 @@ - - + + + + + + diff --git a/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 91dbece..df5336e 100644 Binary files a/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DUREX tests/MenuTableViewController.m b/DUREX tests/MenuTableViewController.m index d6a072c..a339fc1 100644 --- a/DUREX tests/MenuTableViewController.m +++ b/DUREX tests/MenuTableViewController.m @@ -256,11 +256,21 @@ [[cell textLabel] setText:NSLocalizedString([[self currentElements] objectAtIndex:[indexPath row]+offset],nil)]; if([self currentNavLevel] == MAINTENANCE) { - [[cell detailTextLabel] setText:@"VALUE"]; - [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_checkmark"]]]; - if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"CH4 presence",nil)]) + if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Sales log",nil)] || [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Incident report",nil)] || [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"Send report",nil)]) { - [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_delete"]]]; + [[cell detailTextLabel] setText:@""]; + [cell setAccessoryView:nil]; + [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator]; + } + else + { + [[cell detailTextLabel] setText:@"VALUE"]; + [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_checkmark"]]]; + if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"CH4 presence",nil)]) + { + [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_delete"]]]; + } + } } return cell; -- libgit2 0.22.2