From 21f1e7ee49a82d3893206180e766407ea9db4530 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sat, 2 Feb 2013 01:38:11 -0500
Subject: [PATCH] New element fix and statusbar experimentation.

[FIXED]     Set lastUsed when creating a new site since elements can't
            be saved without that value set.
[UPDATED]   Configuration for tinting of status bar.
            Doesn't work yet with the custom navbar container image:
            Should check if last row of that image's pixels isn't too
            dark.  iOS 6 apparently averages it for the tint color.
---
 MasterPassword-iOS.xcodeproj/project.pbxproj  | 12 ++---------
 .../MasterPassword (App Store).xcscheme       |  1 +
 .../MasterPassword (Development).xcscheme     |  2 +-
 MasterPassword/iOS/MPAllSitesViewController.m | 15 ++++++-------
 MasterPassword/iOS/MPSearchDelegate.m         |  1 +
 .../iOS/MainStoryboard_iPhone.storyboard      | 13 ++++++------
 MasterPassword/iOS/MasterPassword-Info.plist  | 21 ++++++++++++++++++-
 7 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj
index 079dfbd4..b82d2c51 100644
--- a/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3855,7 +3855,8 @@
 		DA5BFA3B147E415C00F98B1E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				CLASSPREFIX = MP;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = Lyndir;
 			};
 			buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */;
@@ -4996,7 +4997,6 @@
 		DA497BA115E8C90E00B52167 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5008,7 +5008,6 @@
 		DA497BA215E8C90E00B52167 /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5020,7 +5019,6 @@
 		DA497BA315E8C90E00B52167 /* AppStore */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5038,7 +5036,6 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
-				CLANG_WARN_OBJCPP_ARC_ABI = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
@@ -5101,7 +5098,6 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
-				CLANG_WARN_OBJCPP_ARC_ABI = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
@@ -5253,7 +5249,6 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
-				CLANG_WARN_OBJCPP_ARC_ABI = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
@@ -5468,7 +5463,6 @@
 		DAD3127A15528CD200A3F9ED /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 			};
 			name = Debug;
@@ -5476,7 +5470,6 @@
 		DAD3127B15528CD200A3F9ED /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 			};
 			name = AdHoc;
@@ -5484,7 +5477,6 @@
 		DAD3127C15528CD200A3F9ED /* AppStore */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_WARN_OBJCPP_ARC_ABI = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 			};
 			name = AppStore;
diff --git a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (App Store).xcscheme b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (App Store).xcscheme
index 8ee8e2a9..70ba9774 100644
--- a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (App Store).xcscheme	
+++ b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (App Store).xcscheme	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme
index 33ed0f7c..e179af1f 100644
--- a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
+++ b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0430"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MasterPassword/iOS/MPAllSitesViewController.m b/MasterPassword/iOS/MPAllSitesViewController.m
index e813108c..9ddddb4d 100644
--- a/MasterPassword/iOS/MPAllSitesViewController.m
+++ b/MasterPassword/iOS/MPAllSitesViewController.m
@@ -48,7 +48,7 @@
 
 - (IBAction)add:(id)sender {
 
-    [PearlAlert showAlertWithTitle:@"Site To Add" message:nil viewStyle:UIAlertViewStylePlainTextInput initAlert:nil
+    [PearlAlert showAlertWithTitle:@"Add Site" message:nil viewStyle:UIAlertViewStylePlainTextInput initAlert:nil
                  tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
                      if (alert.cancelButtonIndex == buttonIndex)
                          return;
@@ -68,13 +68,14 @@
 
                          MPElementEntity *element = [NSEntityDescription insertNewObjectForEntityForName:typeEntityClassName
                                                                                   inManagedObjectContext:moc];
-         
-                         element.name    = siteName;
-                         element.user    = activeUser;
-                         element.type    = type;
-                         element.version = MPAlgorithmDefaultVersion;
+
+                         element.name     = siteName;
+                         element.user     = activeUser;
+                         element.type     = type;
+                         element.lastUsed = [NSDate date];
+                         element.version  = MPAlgorithmDefaultVersion;
                          [element saveContext];
-         
+
                          NSManagedObjectID *elementOID = [element objectID];
                          dispatch_async(dispatch_get_main_queue(), ^{
                              MPElementEntity *element_ = (MPElementEntity *)[[MPAppDelegate managedObjectContextForThreadIfReady]
diff --git a/MasterPassword/iOS/MPSearchDelegate.m b/MasterPassword/iOS/MPSearchDelegate.m
index 975d40d6..117fae41 100644
--- a/MasterPassword/iOS/MPSearchDelegate.m
+++ b/MasterPassword/iOS/MPSearchDelegate.m
@@ -357,6 +357,7 @@
                 element.name    = siteName;
                 element.user    = activeUser;
                 element.type    = type;
+                element.lastUsed = [NSDate date];
                 element.version = MPAlgorithmDefaultVersion;
                 [element saveContext];
 
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index f9c4939f..fddcc8b1 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -633,10 +633,11 @@ Your passwords will be AES-encrypted with your master password.</string>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             </view>
-                            <searchBar contentMode="redraw" barStyle="blackOpaque" placeholder="Site name" showsBookmarkButton="YES" id="qeo-n2-WVh">
+                            <searchBar contentMode="redraw" placeholder="Site name" showsBookmarkButton="YES" id="qeo-n2-WVh">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <gestureRecognizers/>
+                                <color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="URL"/>
                                 <scopeButtonTitles>
                                     <string>All</string>
@@ -1151,7 +1152,7 @@ Pink fluffy door frame.</string>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </pageControl>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                     </view>
                     <nil key="simulatedStatusBarMetrics"/>
                     <connections>
@@ -1633,10 +1634,10 @@ You could use the word wall for  inspiration in finding a memorable master passw
         <scene sceneID="rAg-OU-9QV">
             <objects>
                 <navigationController definesPresentationContext="YES" id="KZ9-Bb-FN7" sceneMemberID="viewController">
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackOpaque" prompted="NO"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="blackOpaque" id="s0n-kY-htJ">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="s0n-kY-htJ">
                         <rect key="frame" x="0.0" y="-44" width="0.0" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
                     </navigationBar>
                     <connections>
                         <segue destination="idA-Pj-1U9" kind="relationship" relationship="rootViewController" id="dmZ-bA-SbA"/>
@@ -1753,10 +1754,10 @@ You could use the word wall for  inspiration in finding a memorable master passw
             <objects>
                 <navigationController id="KZF-fe-y9n" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/>
-                    <navigationBar key="navigationBar" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" barStyle="blackOpaque" id="sif-x3-Fol">
+                    <navigationBar key="navigationBar" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="sif-x3-Fol">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="0.37254901960784315" green="0.39215686274509803" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
diff --git a/MasterPassword/iOS/MasterPassword-Info.plist b/MasterPassword/iOS/MasterPassword-Info.plist
index ed36747f..f72485ee 100644
--- a/MasterPassword/iOS/MasterPassword-Info.plist
+++ b/MasterPassword/iOS/MasterPassword-Info.plist
@@ -110,7 +110,26 @@
 	<key>UIStatusBarHidden</key>
 	<true/>
 	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleBlackOpaque</string>
+	<string>UIStatusBarStyleDefault</string>
+	<key>UIStatusBarTintParameters</key>
+	<dict>
+		<key>UINavigationBar</key>
+		<dict>
+			<key>Style</key>
+			<string>UIBarStyleDefault</string>
+			<key>TintColor</key>
+			<dict>
+				<key>Blue</key>
+				<real>0.42745098039215684</real>
+				<key>Green</key>
+				<real>0.39215686274509803</real>
+				<key>Red</key>
+				<real>0.37254901960784315</real>
+			</dict>
+			<key>Translucent</key>
+			<false/>
+		</dict>
+	</dict>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>