diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj index c64b2e3f..7bbabaca 100644 --- a/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -39,6 +39,8 @@ DA350A0715F11F9400C14A8E /* pull-down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA350A0315F11F9400C14A8E /* pull-down@2x.png */; }; DA350A0815F11F9400C14A8E /* pull-up.png in Resources */ = {isa = PBXBuildFile; fileRef = DA350A0415F11F9400C14A8E /* pull-up.png */; }; DA350A0915F11F9400C14A8E /* pull-up@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA350A0515F11F9400C14A8E /* pull-up@2x.png */; }; + DA3EE946160145C700C68F6D /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = DA3EE944160145C700C68F6D /* Default-568h.png */; }; + DA3EE947160145C700C68F6D /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA3EE945160145C700C68F6D /* Default-568h@2x.png */; }; DA3EF17B15A47744003ABF4E /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA3EF17A15A47744003ABF4E /* SenTestingKit.framework */; }; DA3EF17C15A47744003ABF4E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA48147E415C00F98B1E /* UIKit.framework */; }; DA3EF17D15A47744003ABF4E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; @@ -1020,6 +1022,8 @@ DA350A0315F11F9400C14A8E /* pull-down@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pull-down@2x.png"; sourceTree = ""; }; DA350A0415F11F9400C14A8E /* pull-up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pull-up.png"; sourceTree = ""; }; DA350A0515F11F9400C14A8E /* pull-up@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pull-up@2x.png"; sourceTree = ""; }; + DA3EE944160145C700C68F6D /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = ""; }; + DA3EE945160145C700C68F6D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; DA3EF17915A47744003ABF4E /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; DA3EF17A15A47744003ABF4E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; DA3EF18015A47744003ABF4E /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; @@ -2635,6 +2639,8 @@ DAB8D46F15036BF600CED3BC /* Resources */ = { isa = PBXGroup; children = ( + DA3EE944160145C700C68F6D /* Default-568h.png */, + DA3EE945160145C700C68F6D /* Default-568h@2x.png */, DA6061CE15F20C0900097266 /* book.png */, DA6061CF15F20C0900097266 /* book@2x.png */, DA6061D015F20C0900097266 /* page-deblock.png */, @@ -4671,6 +4677,8 @@ DA6061D715F20C0900097266 /* page-deblock@2x.png in Resources */, DA6061D815F20C0900097266 /* page-gorillas.png in Resources */, DA6061D915F20C0900097266 /* page-gorillas@2x.png in Resources */, + DA3EE946160145C700C68F6D /* Default-568h.png in Resources */, + DA3EE947160145C700C68F6D /* Default-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MasterPassword/MPAppDelegate_Store.m b/MasterPassword/MPAppDelegate_Store.m index abe33de5..0ae9fd35 100644 --- a/MasterPassword/MPAppDelegate_Store.m +++ b/MasterPassword/MPAppDelegate_Store.m @@ -43,6 +43,7 @@ [managedObjectContext performBlockAndWait:^{ managedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy; managedObjectContext.undoManager = [NSUndoManager new]; + managedObjectContext.persistentStoreCoordinator = self.storeManager.persistentStoreCoordinator; }]; } diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m index 3cf80efc..cf335258 100644 --- a/MasterPassword/iOS/MPAppDelegate.m +++ b/MasterPassword/iOS/MPAppDelegate.m @@ -116,8 +116,10 @@ NSString *localyticsKey = [self localyticsKey]; if ([localyticsKey length]) { inf(@"Initializing Localytics"); + [[LocalyticsSession sharedLocalyticsSession] LocalyticsSession:localyticsKey]; + [[LocalyticsSession sharedLocalyticsSession] open]; [LocalyticsSession sharedLocalyticsSession].enableHTTPS = YES; - [[LocalyticsSession sharedLocalyticsSession] startSession:localyticsKey]; + [[LocalyticsSession sharedLocalyticsSession] upload]; [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) { if (message.level >= PearlLogLevelWarn) [[LocalyticsSession sharedLocalyticsSession] tagEvent:@"Problem" diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m index 94008290..12ed83bc 100644 --- a/MasterPassword/iOS/MPUnlockViewController.m +++ b/MasterPassword/iOS/MPUnlockViewController.m @@ -190,7 +190,7 @@ else [self updateLayoutAnimated:YES allowScroll:YES completion:nil]; - [UIView animateWithDuration:0.3 animations:^{ + [UIView animateWithDuration:0.5 animations:^{ self.uiContainer.alpha = 1; }]; diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard index 1a12d4aa..4bfef513 100644 --- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard @@ -1,8 +1,8 @@ - + - - + + @@ -419,7 +419,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -1166,7 +1166,6 @@ Pink fluffy door frame. - @@ -1214,6 +1213,7 @@ Pink fluffy door frame. + @@ -1225,7 +1225,7 @@ Pink fluffy door frame. - + @@ -1623,7 +1623,6 @@ You could use the word wall for inspiration in finding a memorable master passw - @@ -1660,6 +1659,7 @@ You could use the word wall for inspiration in finding a memorable master passw + @@ -2020,7 +2020,6 @@ You could use the word wall for inspiration in finding a memorable master passw - @@ -2068,6 +2067,7 @@ You could use the word wall for inspiration in finding a memorable master passw + @@ -2075,7 +2075,7 @@ You could use the word wall for inspiration in finding a memorable master passw - + @@ -2091,8 +2091,8 @@ You could use the word wall for inspiration in finding a memorable master passw - - + + @@ -2143,7 +2143,6 @@ You could use the word wall for inspiration in finding a memorable master passw - diff --git a/Resources/Background/background.png b/Resources/Background/background.png index 73c749e7..39e0ff67 100644 Binary files a/Resources/Background/background.png and b/Resources/Background/background.png differ diff --git a/Resources/Background/background@2x.png b/Resources/Background/background@2x.png index 245be036..55edff5b 100644 Binary files a/Resources/Background/background@2x.png and b/Resources/Background/background@2x.png differ diff --git a/Resources/Default-568h.png b/Resources/Default-568h.png new file mode 100644 index 00000000..7e4ad477 Binary files /dev/null and b/Resources/Default-568h.png differ diff --git a/Resources/Default-568h@2x.png b/Resources/Default-568h@2x.png new file mode 100644 index 00000000..af39c762 Binary files /dev/null and b/Resources/Default-568h@2x.png differ diff --git a/Resources/Default.png b/Resources/Default.png index 508671f2..0e87b063 100644 Binary files a/Resources/Default.png and b/Resources/Default.png differ diff --git a/Resources/Default@2x.png b/Resources/Default@2x.png index f01d534a..10fad339 100644 Binary files a/Resources/Default@2x.png and b/Resources/Default@2x.png differ diff --git a/Resources/page-deblock.png b/Resources/page-deblock.png index cae609a3..3fee2faf 100644 Binary files a/Resources/page-deblock.png and b/Resources/page-deblock.png differ diff --git a/Resources/page-gorillas.png b/Resources/page-gorillas.png index feed44cb..3fe6eb75 100644 Binary files a/Resources/page-gorillas.png and b/Resources/page-gorillas.png differ