From e678fe584e3da1509299ca3e4720e4df02e0afe0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 9 Oct 2014 09:30:29 +0200
Subject: [PATCH] Add cancel button on searchbar and some possible
 customization code as comments

---
 Classes/Base.lproj/ContactsViewController.xib |  2 +-
 Classes/ContactsViewController.m              | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Classes/Base.lproj/ContactsViewController.xib b/Classes/Base.lproj/ContactsViewController.xib
index ab36f8c0b..96630bbeb 100644
--- a/Classes/Base.lproj/ContactsViewController.xib
+++ b/Classes/Base.lproj/ContactsViewController.xib
@@ -110,7 +110,7 @@
                                 <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="89"/>
                             </connections>
                         </button>
-                        <searchBar contentMode="redraw" id="5jE-oF-d45" userLabel="searchBar">
+                        <searchBar contentMode="redraw" showsCancelButton="YES" id="5jE-oF-d45" userLabel="searchBar">
                             <rect key="frame" x="0.0" y="44" width="320" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <textInputTraits key="textInputTraits"/>
diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m
index b2a898eba..c22804e5e 100644
--- a/Classes/ContactsViewController.m
+++ b/Classes/ContactsViewController.m
@@ -151,6 +151,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
 
+	// cannot change search bar icon nor text font from the interface builder...
+	// [_searchBar setImage:[UIImage imageNamed:@"contact_search.png" ] forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal];
+	// UITextField *searchText = [_searchBar valueForKey:@"_searchField"];
+	// [searchText setFont:[UIFont fontWithName:@"CustomFont" size:12]];
+
 	BOOL use_system = [[LinphoneManager instance] lpConfigBoolForKey:@"use_system_contacts"];
 	if( use_system && !self.sysViewController){// use system contacts
 		ABPeoplePickerNavigationController* picker = [[ABPeoplePickerNavigationController alloc] init];
@@ -305,6 +310,12 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
+	[self searchBar:searchBar textDidChange:nil];
+	[searchBar resignFirstResponder];
+	[searchBar setText:nil];
+}
+
 #pragma mark - ABPeoplePickerDelegate
 
 -(void)peoplePickerNavigationControllerDidCancel:(ABPeoplePickerNavigationController *)peoplePicker
@@ -338,6 +349,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
+	// set searchbar text in uppercase here
+	// searchBar.text = [searchText uppercaseString];
+
 	[ContactSelection setNameOrEmailFilter:searchText];
 	[tableController loadData];
 }