more 4.3 compat, and theming for mangroves

ushahidi · May 5, 2012 · 946143f · 946143f
1 parent 2692674
commit 946143f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/Classes/Common/AppDelegate.m b/Classes/Common/AppDelegate.m
@@ -140,7 +140,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     NavigationController *masterNavigationController = [[[NavigationController alloc] init] autorelease];
     masterNavigationController.navigationBar.barStyle = UIBarStyleBlackOpaque;
-    masterNavigationController.navigationBar.tintColor = [[Settings sharedSettings] navBarTintColor];
+    masterNavigationController.navigationBar.tintColor = [[Settings sharedSettings] navBarTintColor];   
 
     NavigationController *detailNavigationController = [[[NavigationController alloc] init] autorelease];
     detailNavigationController.navigationBar.barStyle = UIBarStyleBlackOpaque;

diff --git a/Classes/Controllers/BaseAddViewController.m b/Classes/Controllers/BaseAddViewController.m
@@ -52,7 +52,9 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     self.cancelButton.title = NSLocalizedString(@"Cancel", nil);
     self.doneButton.title = NSLocalizedString(@"Add", nil);
-    self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    if ([self.doneButton respondsToSelector:@selector(setTintColor:)]) {
+        self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    }
 }
 
 - (void)viewDidUnload {

diff --git a/Classes/Controllers/BaseTableViewController.m b/Classes/Controllers/BaseTableViewController.m
@@ -59,7 +59,8 @@ - (void) showSearchBarWithPlaceholder:(NSString *)placeholder {
 	searchBar.autocorrectionType = UITextAutocorrectionTypeNo;
 	searchBar.barStyle = UIBarStyleBlack;
 	searchBar.placeholder = placeholder;
-	searchBar.tintColor = [[Settings sharedSettings] searchBarTintColor];
+    searchBar.tintColor = [[Settings sharedSettings] searchBarTintColor];
+
 	[searchBar sizeToFit];
 	[self.tableView setTableHeaderView:searchBar];
 	[searchBar release];

diff --git a/Classes/Controllers/CategoryTableViewController.m b/Classes/Controllers/CategoryTableViewController.m
@@ -50,7 +50,9 @@ - (IBAction) done:(id)sender {
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.doneButton.title = NSLocalizedString(@"Done", nil);
-    self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    if ([self.doneButton respondsToSelector:@selector(setTintColor:)]) {
+        self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    }
 	[self showSearchBarWithPlaceholder:NSLocalizedString(@"Search categories...", nil)];
 }
 

diff --git a/Classes/Controllers/LocationSelectViewController.m b/Classes/Controllers/LocationSelectViewController.m
@@ -118,7 +118,9 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     self.locations = [[NSMutableArray alloc] initWithCapacity:0];
     self.doneButton.title = NSLocalizedString(@"Done", nil);
-    self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    if ([self.doneButton respondsToSelector:@selector(setTintColor:)]) {
+        self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    }
     UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
     tapGestureRecognizer.numberOfTapsRequired = 2;
     tapGestureRecognizer.numberOfTouchesRequired = 1;

diff --git a/Classes/Controllers/SettingsViewController.m b/Classes/Controllers/SettingsViewController.m
@@ -156,7 +156,9 @@ - (void)viewDidLoad {
     [super viewDidLoad];
 	self.navigationBar.topItem.title = NSLocalizedString(@"Settings", nil);
     self.doneButton.title = NSLocalizedString(@"Done", nil);
-    self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    if ([self.doneButton respondsToSelector:@selector(setTintColor:)]) {
+        self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    }
 	self.email = [[Email alloc] initWithController:self];
 	self.logo = [Device isIPad] ? [UIImage imageNamed:@"Logo_iPad.png"] : [UIImage imageNamed:@"Logo_iPhone.png"];
 	[self setHeader:NSLocalizedString(@"Contact Settings", nil) atSection:TableSectionContact];

diff --git a/Classes/Controllers/TwitterViewController.m b/Classes/Controllers/TwitterViewController.m
@@ -134,8 +134,9 @@ - (void)viewDidLoad {
 	self.twitter = [[MGTwitterEngine alloc] initWithDelegate:self];
 	self.navigationBar.topItem.title = NSLocalizedString(@"Twitter", nil);
 	self.doneButton.title = NSLocalizedString(@"Send", nil);
-    self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    if ([self.doneButton respondsToSelector:@selector(setTintColor:)]) {
-
+        self.doneButton.tintColor = [[Settings sharedSettings] doneButtonColor];
+    }
 	NSString *twitterApiKey = [[Settings sharedSettings] twitterApiKey];
 	NSString *twitterApiSecret = [[Settings sharedSettings] twitterApiSecret];
 	DLog(@"Twitter key:%@ secret:%@", twitterApiKey, twitterApiSecret);

diff --git a/Themes/MangrovesMap/Info.plist b/Themes/MangrovesMap/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Ushahidi</string>
+	<string>Mapping The Mangroves</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
@@ -44,11 +44,11 @@
 	<key>NSMainNibFile~ipad</key>
 	<string>MainWindow_iPad</string>
 	<key>USHNavBarColor</key>
-	<string>#524939</string>
+	<string>#390d07</string>
 	<key>USHReportNewsURL</key>
 	<true/>
 	<key>USHSearchBarColor</key>
-	<string>#756d61</string>
+	<string>#faf0cf</string>
 	<key>USHSupportEmail</key>
 	<string>support@ushahidi.com</string>
 	<key>USHSupportURL</key>