diff --git a/MasterPassword/ObjC/iOS/MPAvatarCell.m b/MasterPassword/ObjC/iOS/MPAvatarCell.m index cc874ef6..eb827809 100644 --- a/MasterPassword/ObjC/iOS/MPAvatarCell.m +++ b/MasterPassword/ObjC/iOS/MPAvatarCell.m @@ -273,7 +273,7 @@ const long MPAvatarAdd = 10000; self.avatarImageView.layer.cornerRadius = self.avatarImageView.bounds.size.height / 2; self.spinner.alpha = self.spinnerActive? 1: 0; - [self layoutIfNeeded]; + [self layoutSubviews]; } completion:nil]; } diff --git a/MasterPassword/ObjC/iOS/MPGuideViewController.m b/MasterPassword/ObjC/iOS/MPGuideViewController.m index 4918cc4b..57e07676 100644 --- a/MasterPassword/ObjC/iOS/MPGuideViewController.m +++ b/MasterPassword/ObjC/iOS/MPGuideViewController.m @@ -50,16 +50,14 @@ [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-5"] caption: @"Your sites are easy to find and sorted by recency.\nTap any site to copy its password.\nYou can now switch and paste it in another app."], [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-6"] caption: - @"If the site you're looking for isn't easy to find, just type a few letters in the search box to filter the site list."], - [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-7"] caption: - @"If you ever need a new password for the site, just tap the plus icon to increment its counter.\nYou can hold down to reset it back to 1."], - [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-8"] caption: @"The user icon lets you save your site's login.\nThis is useful if you find it hard to remember the user name for this site."], + [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-7"] caption: + @"To make changes to the site password, tap the settings icon or swipe left to reveal extra buttons."], + [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-8"] caption: + @"If you ever need a new password for the site, just tap the plus icon to increment its counter.\nYou can hold down to reset it back to 1."], [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-9"] caption: - @"Master Password lets you swipe to upgrade or downgrade your password's complexity.\nSome sites won't let you use complex passwords."], + @"Use the list icon to upgrade or downgrade your password's complexity.\nSome sites won't let you use complex passwords."], [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-10"] caption: - @"To delete a site, swipe it all the way left to find the \"Delete Site\" button."], - [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-11"] caption: @"If you have a password that you cannot change, you can save it as a Personal password. Device Private means the site will not be backed up."], ]; } diff --git a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m index 2476bd00..41ac3929 100644 --- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m +++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m @@ -565,6 +565,7 @@ - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager willLoadStoreIsCloud:(BOOL)isCloudStore { dispatch_async( dispatch_get_main_queue(), ^{ + [self signOutAnimated:YES]; [self.handleCloudContentAlert cancelAlertAnimated:YES]; if (!self.storeLoadingOverlay) self.storeLoadingOverlay = [PearlOverlay showProgressOverlayWithTitle:@"Loading Sites"]; diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj index 30101388..e5fed7a0 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -53,8 +53,6 @@ DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; }; DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; }; DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; }; - DA2509FB1956484D00AC23F1 /* image-11@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E11956484D00AC23F1 /* image-11@2x.png */; }; - DA2509FC1956484D00AC23F1 /* image-11.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E21956484D00AC23F1 /* image-11.png */; }; DA2509FD1956484D00AC23F1 /* image-10@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E31956484D00AC23F1 /* image-10@2x.png */; }; DA2509FE1956484D00AC23F1 /* image-10.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E41956484D00AC23F1 /* image-10.png */; }; DA2509FF1956484D00AC23F1 /* image-9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E51956484D00AC23F1 /* image-9@2x.png */; }; @@ -443,8 +441,6 @@ DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = ""; }; DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = ""; }; - DA2509E11956484D00AC23F1 /* image-11@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-11@2x.png"; sourceTree = ""; }; - DA2509E21956484D00AC23F1 /* image-11.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-11.png"; sourceTree = ""; }; DA2509E31956484D00AC23F1 /* image-10@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-10@2x.png"; sourceTree = ""; }; DA2509E41956484D00AC23F1 /* image-10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-10.png"; sourceTree = ""; }; DA2509E51956484D00AC23F1 /* image-9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-9@2x.png"; sourceTree = ""; }; @@ -1417,8 +1413,6 @@ DA2509B619563E1E00AC23F1 /* Guide */ = { isa = PBXGroup; children = ( - DA2509E11956484D00AC23F1 /* image-11@2x.png */, - DA2509E21956484D00AC23F1 /* image-11.png */, DA2509E31956484D00AC23F1 /* image-10@2x.png */, DA2509E41956484D00AC23F1 /* image-10.png */, DA2509E51956484D00AC23F1 /* image-9@2x.png */, @@ -3019,7 +3013,6 @@ DABD393E1711E29700CF925C /* avatar-12.png in Resources */, DABD393F1711E29700CF925C /* avatar-12@2x.png in Resources */, DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */, - DA2509FC1956484D00AC23F1 /* image-11.png in Resources */, DABD39401711E29700CF925C /* avatar-13.png in Resources */, DABD39411711E29700CF925C /* avatar-13@2x.png in Resources */, DABD39421711E29700CF925C /* avatar-14.png in Resources */, @@ -3122,7 +3115,6 @@ DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */, DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */, DA25C5F8197AFFB40046CDCF /* icon_tools.png in Resources */, - DA2509FB1956484D00AC23F1 /* image-11@2x.png in Resources */, DA250A0B1956484D00AC23F1 /* image-3@2x.png in Resources */, DABD3FCA1712446200CF925C /* cloud.png in Resources */, DABD3FCB1712446200CF925C /* cloud@2x.png in Resources */, diff --git a/MasterPassword/ObjC/iOS/Storyboard.storyboard b/MasterPassword/ObjC/iOS/Storyboard.storyboard index 5c945e46..eba349cf 100644 --- a/MasterPassword/ObjC/iOS/Storyboard.storyboard +++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard @@ -2435,7 +2435,7 @@ See - + diff --git a/MasterPassword/Resources/Media/Guide/image-0.png b/MasterPassword/Resources/Media/Guide/image-0.png index 03084b95..f0f6e0df 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-0.png and b/MasterPassword/Resources/Media/Guide/image-0.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-0@2x.png b/MasterPassword/Resources/Media/Guide/image-0@2x.png index 639d3bbd..1e3701f0 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-0@2x.png and b/MasterPassword/Resources/Media/Guide/image-0@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-1.png b/MasterPassword/Resources/Media/Guide/image-1.png index bbb994a6..147807a5 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-1.png and b/MasterPassword/Resources/Media/Guide/image-1.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-10.png b/MasterPassword/Resources/Media/Guide/image-10.png index 98103e97..d7fcaa63 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-10.png and b/MasterPassword/Resources/Media/Guide/image-10.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-10@2x.png b/MasterPassword/Resources/Media/Guide/image-10@2x.png index 4dd18646..6eb664c7 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-10@2x.png and b/MasterPassword/Resources/Media/Guide/image-10@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-11.png b/MasterPassword/Resources/Media/Guide/image-11.png deleted file mode 100644 index 63558f75..00000000 Binary files a/MasterPassword/Resources/Media/Guide/image-11.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Guide/image-11@2x.png b/MasterPassword/Resources/Media/Guide/image-11@2x.png deleted file mode 100644 index 92d90b67..00000000 Binary files a/MasterPassword/Resources/Media/Guide/image-11@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Guide/image-1@2x.png b/MasterPassword/Resources/Media/Guide/image-1@2x.png index 0ed7f1d7..32a9d4c6 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-1@2x.png and b/MasterPassword/Resources/Media/Guide/image-1@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-2.png b/MasterPassword/Resources/Media/Guide/image-2.png index 75fc55de..e777392b 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-2.png and b/MasterPassword/Resources/Media/Guide/image-2.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-2@2x.png b/MasterPassword/Resources/Media/Guide/image-2@2x.png index e6fbcb65..f6a35b5b 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-2@2x.png and b/MasterPassword/Resources/Media/Guide/image-2@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-3.png b/MasterPassword/Resources/Media/Guide/image-3.png index 64a9fbf2..a35f709c 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-3.png and b/MasterPassword/Resources/Media/Guide/image-3.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-3@2x.png b/MasterPassword/Resources/Media/Guide/image-3@2x.png index 71de522b..9e57fbc0 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-3@2x.png and b/MasterPassword/Resources/Media/Guide/image-3@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-4.png b/MasterPassword/Resources/Media/Guide/image-4.png index 8e82abe9..25ff71bc 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-4.png and b/MasterPassword/Resources/Media/Guide/image-4.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-4@2x.png b/MasterPassword/Resources/Media/Guide/image-4@2x.png index 7d505187..fac38c63 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-4@2x.png and b/MasterPassword/Resources/Media/Guide/image-4@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-5.png b/MasterPassword/Resources/Media/Guide/image-5.png index 3c1654f4..96324421 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-5.png and b/MasterPassword/Resources/Media/Guide/image-5.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-5@2x.png b/MasterPassword/Resources/Media/Guide/image-5@2x.png index c0e65203..cafe23e1 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-5@2x.png and b/MasterPassword/Resources/Media/Guide/image-5@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-6.png b/MasterPassword/Resources/Media/Guide/image-6.png index d26b3bd8..c6bb1326 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-6.png and b/MasterPassword/Resources/Media/Guide/image-6.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-6@2x.png b/MasterPassword/Resources/Media/Guide/image-6@2x.png index 1ee86fe9..929a31a3 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-6@2x.png and b/MasterPassword/Resources/Media/Guide/image-6@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-7.png b/MasterPassword/Resources/Media/Guide/image-7.png index 1ed99659..aac0e45f 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-7.png and b/MasterPassword/Resources/Media/Guide/image-7.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-7@2x.png b/MasterPassword/Resources/Media/Guide/image-7@2x.png index bec99ab7..1feb2765 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-7@2x.png and b/MasterPassword/Resources/Media/Guide/image-7@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-8.png b/MasterPassword/Resources/Media/Guide/image-8.png index dde61cf2..e5f0dcea 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-8.png and b/MasterPassword/Resources/Media/Guide/image-8.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-8@2x.png b/MasterPassword/Resources/Media/Guide/image-8@2x.png index 4c80ff94..4ae7dfba 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-8@2x.png and b/MasterPassword/Resources/Media/Guide/image-8@2x.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-9.png b/MasterPassword/Resources/Media/Guide/image-9.png index 88db5ad1..9db72e30 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-9.png and b/MasterPassword/Resources/Media/Guide/image-9.png differ diff --git a/MasterPassword/Resources/Media/Guide/image-9@2x.png b/MasterPassword/Resources/Media/Guide/image-9@2x.png index 0654136d..55459f1b 100644 Binary files a/MasterPassword/Resources/Media/Guide/image-9@2x.png and b/MasterPassword/Resources/Media/Guide/image-9@2x.png differ