From 48324735e1c5887013fad4dde5d30f58d6a946d2 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Fri, 13 Sep 2013 22:32:32 -0400 Subject: [PATCH] Fixed counter issue, status bar issue and updated app icons. [FIXED] Counter should default to 1, not 0. [FIXED] Some issues with the status bar in the MPMainViewController. [UPDATED] AppIcons and LaunchImages converted to asset catalog. [ADDED] New iOS 7 size app icon images. --- .../ObjC/iOS/MPUnlockViewController.m | 2 +- .../ObjC/iOS/MainStoryboard_iPhone.storyboard | 8 ++- .../ObjC/iOS/MasterPassword-Info.plist | 19 +----- .../project.pbxproj | 58 +++--------------- .../Resources/Media/Default-568h.png | Bin 44262 -> 0 bytes MasterPassword/Resources/Media/Icon-72.png | Bin 4702 -> 0 bytes .../Resources/Media/Icon-Small-50.png | Bin 2363 -> 0 bytes MasterPassword/Resources/Media/Icon-Small.png | Bin 1201 -> 0 bytes MasterPassword/Resources/Media/Icon.png | Bin 2976 -> 0 bytes .../Resources/Media/Icon_Square.png | Bin 297210 -> 0 bytes .../AppIcon.appiconset/Contents.json | 44 +++++++++++++ .../AppIcon.appiconset/Icon-40.png | Bin 0 -> 1779 bytes .../AppIcon.appiconset/Icon-40@2x.png | Bin 0 -> 5439 bytes .../AppIcon.appiconset/Icon-60.png | Bin 0 -> 3173 bytes .../AppIcon.appiconset/Icon-60@2x.png | Bin 0 -> 9567 bytes .../AppIcon.appiconset/Icon-72.png | Bin 0 -> 4690 bytes .../AppIcon.appiconset}/Icon-72@2x.png | Bin 12462 -> 12462 bytes .../AppIcon.appiconset/Icon-Small-50.png | Bin 0 -> 2414 bytes .../AppIcon.appiconset}/Icon-Small-50@2x.png | Bin 7563 -> 7563 bytes .../AppIcon.appiconset/Icon-Small.png | Bin 0 -> 1207 bytes .../AppIcon.appiconset}/Icon-Small@2x.png | Bin 3042 -> 3042 bytes .../AppIcon.appiconset/Icon.png | Bin 0 -> 3032 bytes .../AppIcon.appiconset}/Icon@2x.png | Bin 8845 -> 8845 bytes .../AppIcon.appiconset/iTunesArtwork | Bin 0 -> 84033 bytes .../LaunchImage.launchimage/Contents.json | 42 +++++++++++++ .../LaunchImage.launchimage/Default-568h.png | Bin 0 -> 51582 bytes .../Default-568h@2x.png | Bin .../LaunchImage.launchimage}/Default.png | Bin .../LaunchImage.launchimage}/Default@2x.png | Bin .../Resources/Media/iTunesArtwork@2x.png | Bin 0 -> 319903 bytes Scripts/convertImages | 10 ++- 31 files changed, 109 insertions(+), 74 deletions(-) delete mode 100644 MasterPassword/Resources/Media/Default-568h.png delete mode 100644 MasterPassword/Resources/Media/Icon-72.png delete mode 100644 MasterPassword/Resources/Media/Icon-Small-50.png delete mode 100644 MasterPassword/Resources/Media/Icon-Small.png delete mode 100644 MasterPassword/Resources/Media/Icon.png delete mode 100644 MasterPassword/Resources/Media/Icon_Square.png create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png rename MasterPassword/Resources/Media/{ => Images.xcassets/AppIcon.appiconset}/Icon-72@2x.png (99%) create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png rename MasterPassword/Resources/Media/{ => Images.xcassets/AppIcon.appiconset}/Icon-Small-50@2x.png (98%) create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png rename MasterPassword/Resources/Media/{ => Images.xcassets/AppIcon.appiconset}/Icon-Small@2x.png (95%) create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png rename MasterPassword/Resources/Media/{ => Images.xcassets/AppIcon.appiconset}/Icon@2x.png (98%) create mode 100644 MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/iTunesArtwork create mode 100644 MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json create mode 100644 MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h.png rename MasterPassword/Resources/Media/{ => Images.xcassets/LaunchImage.launchimage}/Default-568h@2x.png (100%) rename MasterPassword/Resources/Media/{ => Images.xcassets/LaunchImage.launchimage}/Default.png (100%) rename MasterPassword/Resources/Media/{ => Images.xcassets/LaunchImage.launchimage}/Default@2x.png (100%) create mode 100644 MasterPassword/Resources/Media/iTunesArtwork@2x.png diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m index 4c50c146..33f65894 100644 --- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m +++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m @@ -982,7 +982,7 @@ self.emergencyName.text = @""; self.emergencyMasterPassword.text = @""; self.emergencySite.text = @""; - self.emergencyCounterStepper.value = 0; + self.emergencyCounterStepper.value = 1; [self.emergencyPassword setTitle:@"" forState:UIControlStateNormal]; [self.emergencyActivity stopAnimating]; self.emergencyGeneratorContainer.alpha = 0; diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard index 013fe907..5d24c05f 100644 --- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard @@ -1039,6 +1039,7 @@ L4m3P4sSw0rD + @@ -1624,7 +1625,7 @@ You can use the words in the background for inspiration in finding a memorable m -