From 7f1a28ffa75fde4d15d3096dd4c8e3ec6d37ed75 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 11 Apr 2020 12:10:42 -0400 Subject: [PATCH] Fixes and updates to iOS. Move dependencies into Podfile where possible. IASK doesn't wrap properly; just removed it. Fixes to safe area and content insets. --- .gitmodules | 12 - platform-darwin/External/AttributedMarkdown | 2 +- platform-darwin/External/InAppSettingsKit | 1 - platform-darwin/External/KCOrderedAccessorFix | 1 - platform-darwin/External/jrswizzle | 1 - platform-darwin/External/uicolor-utilities | 1 - .../project.pbxproj | 462 +----------------- .../project.pbxproj | 11 +- platform-darwin/Podfile | 3 + platform-darwin/Source/MPAppDelegate_Shared.m | 6 +- .../Source/iOS/MPAppSettingsViewController.h | 23 - .../Source/iOS/MPAppSettingsViewController.m | 45 -- .../Source/iOS/MPLogsViewController.m | 12 +- .../Source/iOS/MPPreferencesViewController.m | 11 + .../Source/iOS/MPSitesViewController.m | 35 +- .../Source/iOS/MPStoreViewController.m | 11 + .../Source/iOS/Storyboard.storyboard | 87 +--- 17 files changed, 73 insertions(+), 651 deletions(-) delete mode 160000 platform-darwin/External/InAppSettingsKit delete mode 160000 platform-darwin/External/KCOrderedAccessorFix delete mode 160000 platform-darwin/External/jrswizzle delete mode 160000 platform-darwin/External/uicolor-utilities delete mode 100644 platform-darwin/Source/iOS/MPAppSettingsViewController.h delete mode 100644 platform-darwin/Source/iOS/MPAppSettingsViewController.m diff --git a/.gitmodules b/.gitmodules index 99749761..0e757169 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,9 @@ [submodule "External/Pearl"] path = platform-darwin/External/Pearl url = git://github.com/Lyndir/Pearl.git -[submodule "External/InAppSettingsKit"] - path = platform-darwin/External/InAppSettingsKit - url = git://github.com/lhunath/InAppSettingsKit.git -[submodule "External/KCOrderedAccessorFix"] - path = platform-darwin/External/KCOrderedAccessorFix - url = https://github.com/lhunath/KCOrderedAccessorFix.git [submodule "External/AttributedMarkdown"] path = platform-darwin/External/AttributedMarkdown url = https://github.com/dreamwieber/AttributedMarkdown.git -[submodule "External/uicolor-utilities"] - path = platform-darwin/External/uicolor-utilities - url = git://github.com/lhunath/uicolor-utilities.git -[submodule "External/jrswizzle"] - path = platform-darwin/External/jrswizzle - url = git://github.com/jonmarimba/jrswizzle.git [submodule "MasterPassword/Web/js/mpw-js"] path = platform-independent/web/js/mpw-js url = https://github.com/tmthrgd/mpw-js.git diff --git a/platform-darwin/External/AttributedMarkdown b/platform-darwin/External/AttributedMarkdown index d598fb4f..4aef3c80 160000 --- a/platform-darwin/External/AttributedMarkdown +++ b/platform-darwin/External/AttributedMarkdown @@ -1 +1 @@ -Subproject commit d598fb4f5e29f5aaa66e7e880a9857019865881b +Subproject commit 4aef3c80e0ffe6c7011c20c7f703ea56af774861 diff --git a/platform-darwin/External/InAppSettingsKit b/platform-darwin/External/InAppSettingsKit deleted file mode 160000 index 2dcb598d..00000000 --- a/platform-darwin/External/InAppSettingsKit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2dcb598d18a64a61509e418079bc448ce6b5268a diff --git a/platform-darwin/External/KCOrderedAccessorFix b/platform-darwin/External/KCOrderedAccessorFix deleted file mode 160000 index 1b8f8b79..00000000 --- a/platform-darwin/External/KCOrderedAccessorFix +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b8f8b79ad12b70976c7a417ff1a9d29e8c0ed73 diff --git a/platform-darwin/External/jrswizzle b/platform-darwin/External/jrswizzle deleted file mode 160000 index 98d18aee..00000000 --- a/platform-darwin/External/jrswizzle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98d18aee73329321c320a2df85bacdb9f08a34a6 diff --git a/platform-darwin/External/uicolor-utilities b/platform-darwin/External/uicolor-utilities deleted file mode 160000 index ae96212a..00000000 --- a/platform-darwin/External/uicolor-utilities +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae96212a4903a2b9e1df1e3542c9962f0d64a74b diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 862a349e..023342a2 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -55,7 +55,6 @@ 93D39B76DD5AB108BA8928E8 /* UIScrollView+PearlAdjustInsets.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39DE2CB351D4E3789462B /* UIScrollView+PearlAdjustInsets.h */; }; 93D39B842AB9A5D072810D76 /* NSError+PearlFullDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */; }; 93D39B8F90F58A5D158DDBA3 /* MPSitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3924EE15017F8A12CB436 /* MPSitesViewController.m */; }; - 93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */; }; 93D39BFB5F5F9337F6565DE3 /* UIView+Visible.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39B7B765546B1F1900CB7 /* UIView+Visible.h */; }; 93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; }; 93D39D47FC623E91FC39D20C /* UICollectionView+PearlReloadItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadItems.m */; }; @@ -69,22 +68,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 */; }; - DA0CC5291EAB99BA009A8ED9 /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */; }; - DA0CC52A1EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */; }; - DA0CC52B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */; }; - DA0CC52C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */; }; - DA0CC52D1EAB99BA009A8ED9 /* IASKSettingsReader.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */; }; - DA0CC52E1EAB99BA009A8ED9 /* IASKSettingsStore.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */; }; - DA0CC52F1EAB99BA009A8ED9 /* IASKSettingsStoreFile.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */; }; - DA0CC5301EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */; }; - DA0CC5311EAB99BA009A8ED9 /* IASKSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */; }; - DA0CC5321EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */; }; - DA0CC5331EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */; }; - DA0CC5341EAB99BA009A8ED9 /* IASKSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */; }; - DA0CC5351EAB99BA009A8ED9 /* IASKSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */; }; - DA0CC5361EAB99BA009A8ED9 /* IASKTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */; }; - DA0CC5371EAB99BA009A8ED9 /* IASKTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */; }; - DA0CC5381EAB99BA009A8ED9 /* IASKTextViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */; }; DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */; }; DA0CC58C1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */; }; DA0CC58D1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */; }; @@ -137,8 +120,6 @@ DA32D00A19CF5C55004F3F0E /* icon_question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FF1711E29600CF925C /* icon_question@2x.png */; }; DA32D01A19D046E1004F3F0E /* PearlFixedTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */; }; DA32D01B19D046E1004F3F0E /* PearlFixedTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */; }; - DA32D03C19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D03A19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m */; }; - DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */; }; DA32D04219D27093004F3F0E /* thumb_generated_answers@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D03F19D27093004F3F0E /* thumb_generated_answers@3x.png */; }; DA32D04319D27093004F3F0E /* thumb_generated_answers@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D04019D27093004F3F0E /* thumb_generated_answers@2x.png */; }; DA32D04419D27093004F3F0E /* thumb_generated_answers.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D04119D27093004F3F0E /* thumb_generated_answers.png */; }; @@ -169,8 +150,6 @@ DA45224B190628B2008F650A /* icon_gear.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37821711E29500CF925C /* icon_gear.png */; }; DA45224C190628B2008F650A /* icon_gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37831711E29500CF925C /* icon_gear@2x.png */; }; DA46021D23D5E30B00398FF4 /* MPSecrets.m in Sources */ = {isa = PBXBuildFile; fileRef = DA46021C23D5E30B00398FF4 /* MPSecrets.m */; }; - DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; }; - DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; }; DA5A09DF171A70E4005284AB /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DD171A70E4005284AB /* play.png */; }; DA5A09E0171A70E4005284AB /* play@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DE171A70E4005284AB /* play@2x.png */; }; DA5A09EA171BB0F7005284AB /* unlocked.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09E8171BB0F7005284AB /* unlocked.png */; }; @@ -356,26 +335,17 @@ DABD3FCB1712446200CF925C /* cloud@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FC91712446200CF925C /* cloud@2x.png */; }; DABD3FCE1714F45C00CF925C /* identity.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FCC1714F45B00CF925C /* identity.png */; }; DABD3FCF1714F45C00CF925C /* identity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD3FCD1714F45B00CF925C /* identity@2x.png */; }; - DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; - DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC632891486D9690075AEA5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; }; DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC8DF47192831E100BA7D71 /* icon_key.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379A1711E29600CF925C /* icon_key.png */; }; DAC8DF48192831E100BA7D71 /* icon_key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379B1711E29600CF925C /* icon_key@2x.png */; }; DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; }; - DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; }; - DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; }; - DACA29BC1705E2DE002C6C22 /* UIColor+Expanded.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29B51705E2DE002C6C22 /* UIColor+Expanded.h */; }; - DACA29BD1705E2DE002C6C22 /* UIColor+HSV.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29B61705E2DE002C6C22 /* UIColor+HSV.h */; }; - DACA29BE1705E2DE002C6C22 /* UIColor+Expanded.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA29BA1705E2DE002C6C22 /* UIColor+Expanded.m */; }; - DACA29BF1705E2DE002C6C22 /* UIColor+HSV.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA29BB1705E2DE002C6C22 /* UIColor+HSV.m */; }; DACE2F6519BA6A0A0010F92E /* PearlProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6319BA6A0A0010F92E /* PearlProfiler.m */; }; DACE2F6619BA6A0A0010F92E /* PearlProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6419BA6A0A0010F92E /* PearlProfiler.h */; }; DACE2F6C19BA6A2A0010F92E /* PearlMutableStaticTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DACE2F6819BA6A2A0010F92E /* PearlMutableStaticTableViewController.m */; }; DACE2F6D19BA6A2A0010F92E /* PearlMutableStaticTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6919BA6A2A0010F92E /* PearlMutableStaticTableViewController.h */; }; DACE2F6E19BA6A2A0010F92E /* UIView+FontScale.h in Headers */ = {isa = PBXBuildFile; fileRef = DACE2F6A19BA6A2A0010F92E /* UIView+FontScale.h */; }; DAE1EF2217E942DE00BC0086 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAE1EF2417E942DE00BC0086 /* Localizable.strings */; }; - DAE2725919C93B80007C5262 /* libInAppSettingsKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */; }; DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA70EC7F1811B13C00F65DB2 /* StoreKit.framework */; }; DAE2726319CE9CB3007C5262 /* UITableViewCell+PearlDeque.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE2726119CE9CB3007C5262 /* UITableViewCell+PearlDeque.m */; }; DAE2726419CE9CB3007C5262 /* UITableViewCell+PearlDeque.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE2726219CE9CB3007C5262 /* UITableViewCell+PearlDeque.h */; }; @@ -390,7 +360,6 @@ DAF4EF51190A81E400023C90 /* NSManagedObject+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */; }; DAFC1F702439795100D1CD66 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAFC1F6F2439795000D1CD66 /* CoreServices.framework */; }; DAFC1F73243989FB00D1CD66 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAFC1F72243989FB00D1CD66 /* Launch Screen.storyboard */; }; - DAFC5656172C573B00CB5CC5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAFE4A1315039824003ABA7C /* NSObject+PearlExport.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */; }; DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */; }; DAFE4A1515039824003ABA7C /* NSString+PearlNSArrayFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */; }; @@ -475,15 +444,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - DA32D01E19D111C6004F3F0E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DAA1757B19D86BE70044227B /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -507,7 +467,6 @@ 93D39149A5F1F9B174D6D061 /* MPStoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPStoreViewController.h; sourceTree = ""; }; 93D3914D7597F9A28DB9D85E /* MPSitesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesViewController.h; sourceTree = ""; }; 93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlSizedTextView.m; sourceTree = ""; }; - 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppSettingsViewController.m; sourceTree = ""; }; 93D391943675426839501BB8 /* MPLogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLogsViewController.h; sourceTree = ""; }; 93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = ""; }; 93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UICollectionView+PearlReloadItems.h"; sourceTree = ""; }; @@ -570,7 +529,6 @@ 93D39C41A27AA42D044D68AE /* NSString+MPMarkDown.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+MPMarkDown.m"; path = "iOS/NSString+MPMarkDown.m"; sourceTree = ""; }; 93D39C426E03358384018E85 /* MPAnswersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAnswersViewController.m; sourceTree = ""; }; 93D39C44361BE57AF0B3071F /* MPSitesSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSitesSegue.h; sourceTree = ""; }; - 93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppSettingsViewController.h; sourceTree = ""; }; 93D39CB0EABD2748740992D8 /* MPMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMessageViewController.h; sourceTree = ""; }; 93D39CC01630D0421205C4C4 /* MPNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNavigationController.m; sourceTree = ""; }; 93D39CDD434AFD6E1B0DA359 /* MPEmergencyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEmergencyViewController.h; sourceTree = ""; }; @@ -594,41 +552,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 = ""; }; - DA0CC4F61EAB99BA009A8ED9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/IASKLocalizable.strings; sourceTree = ""; }; - DA0CC4F91EAB99BA009A8ED9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IASKLocalizable.strings; sourceTree = ""; }; - DA0CC5061EAB99BA009A8ED9 /* IASKAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKAppSettingsViewController.h; sourceTree = ""; }; - DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKAppSettingsViewController.m; sourceTree = ""; }; - DA0CC5081EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKAppSettingsWebViewController.h; sourceTree = ""; }; - DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKAppSettingsWebViewController.m; sourceTree = ""; }; - DA0CC50A1EAB99BA009A8ED9 /* IASKMultipleValueSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKMultipleValueSelection.h; sourceTree = ""; }; - DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKMultipleValueSelection.m; sourceTree = ""; }; - DA0CC50C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSpecifierValuesViewController.h; sourceTree = ""; }; - DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSpecifierValuesViewController.m; sourceTree = ""; }; - DA0CC50E1EAB99BA009A8ED9 /* IASKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKViewController.h; sourceTree = ""; }; - DA0CC5101EAB99BA009A8ED9 /* IASKSettingsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsReader.h; sourceTree = ""; }; - DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsReader.m; sourceTree = ""; }; - DA0CC5121EAB99BA009A8ED9 /* IASKSettingsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStore.h; sourceTree = ""; }; - DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStore.m; sourceTree = ""; }; - DA0CC5141EAB99BA009A8ED9 /* IASKSettingsStoreFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStoreFile.h; sourceTree = ""; }; - DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStoreFile.m; sourceTree = ""; }; - DA0CC5161EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSettingsStoreUserDefaults.h; sourceTree = ""; }; - DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSettingsStoreUserDefaults.m; sourceTree = ""; }; - DA0CC5181EAB99BA009A8ED9 /* IASKSpecifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSpecifier.h; sourceTree = ""; }; - DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSpecifier.m; sourceTree = ""; }; - DA0CC51B1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKPSSliderSpecifierViewCell.h; sourceTree = ""; }; - DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKPSSliderSpecifierViewCell.m; sourceTree = ""; }; - DA0CC51D1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKPSTextFieldSpecifierViewCell.h; sourceTree = ""; }; - DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKPSTextFieldSpecifierViewCell.m; sourceTree = ""; }; - DA0CC51F1EAB99BA009A8ED9 /* IASKSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSlider.h; sourceTree = ""; }; - DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSlider.m; sourceTree = ""; }; - DA0CC5211EAB99BA009A8ED9 /* IASKSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKSwitch.h; sourceTree = ""; }; - DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKSwitch.m; sourceTree = ""; }; - DA0CC5231EAB99BA009A8ED9 /* IASKTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextField.h; sourceTree = ""; }; - DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextField.m; sourceTree = ""; }; - DA0CC5251EAB99BA009A8ED9 /* IASKTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextView.h; sourceTree = ""; }; - DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextView.m; sourceTree = ""; }; - DA0CC5271EAB99BA009A8ED9 /* IASKTextViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextViewCell.h; sourceTree = ""; }; - DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextViewCell.m; sourceTree = ""; }; DA0CC5451EB6AD0E009A8ED9 /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = ""; }; DA0CC5461EB6AD0E009A8ED9 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = ""; }; DA0CC5471EB6AD0E009A8ED9 /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = ""; }; @@ -704,7 +627,6 @@ DA30E9D615723E6900A68B4C /* PearlLazy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlLazy.m; sourceTree = ""; }; DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlFixedTableView.m; sourceTree = ""; }; DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlFixedTableView.h; sourceTree = ""; }; - DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; }; DA32D03919D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectModel+KCOrderedAccessorFix.h"; sourceTree = ""; }; DA32D03A19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectModel+KCOrderedAccessorFix.m"; sourceTree = ""; }; DA32D03F19D27093004F3F0E /* thumb_generated_answers@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_answers@3x.png"; sourceTree = ""; }; @@ -1573,8 +1495,6 @@ DABD3FC91712446200CF925C /* cloud@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cloud@2x.png"; sourceTree = ""; }; DABD3FCC1714F45B00CF925C /* identity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = identity.png; sourceTree = ""; }; DABD3FCD1714F45B00CF925C /* identity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "identity@2x.png"; sourceTree = ""; }; - DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libuicolor-utilities.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - DAC6326C148680650075AEA5 /* libjrswizzle.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjrswizzle.a; sourceTree = BUILT_PRODUCTS_DIR; }; DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; DAC77CAD148291A600BCF976 /* libPearl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPearl.a; sourceTree = BUILT_PRODUCTS_DIR; }; DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 1; lastKnownFileType = text; path = dictionary.lst; sourceTree = ""; }; @@ -1605,7 +1525,6 @@ DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObject+Pearl.h"; sourceTree = ""; }; DAFC1F6F2439795000D1CD66 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; DAFC1F72243989FB00D1CD66 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; - DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInAppSettingsKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+PearlExport.h"; sourceTree = ""; }; DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+PearlExport.m"; sourceTree = ""; }; DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PearlNSArrayFormat.h"; sourceTree = ""; }; @@ -1680,13 +1599,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - DA32D01D19D111C6004F3F0E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DA5BFA41147E415C00F98B1E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1697,10 +1609,8 @@ DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */, DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */, DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */, - DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */, DAFC1F702439795100D1CD66 /* CoreServices.framework in Frameworks */, DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */, - DAE2725919C93B80007C5262 /* libInAppSettingsKit.a in Frameworks */, DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */, DA6701DE16406B7300B61001 /* Social.framework in Frameworks */, DA6701B816406A4100B61001 /* Accounts.framework in Frameworks */, @@ -1724,40 +1634,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC6325A1486805C0075AEA5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DAC63269148680650075AEA5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DAC77CAA148291A600BCF976 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */, - DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */, DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DAFC5652172C573B00CB5CC5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DAFC5656172C573B00CB5CC5 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -1803,68 +1687,6 @@ path = "../platform-independent/c/core/src"; sourceTree = ""; }; - DA0CC4F41EAB99BA009A8ED9 /* Resources */ = { - isa = PBXGroup; - children = ( - DA0CC4F51EAB99BA009A8ED9 /* IASKLocalizable.strings */, - ); - path = Resources; - sourceTree = ""; - }; - DA0CC5051EAB99BA009A8ED9 /* Controllers */ = { - isa = PBXGroup; - children = ( - DA0CC5061EAB99BA009A8ED9 /* IASKAppSettingsViewController.h */, - DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */, - DA0CC5081EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.h */, - DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */, - DA0CC50A1EAB99BA009A8ED9 /* IASKMultipleValueSelection.h */, - DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */, - DA0CC50C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.h */, - DA0CC50D1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m */, - DA0CC50E1EAB99BA009A8ED9 /* IASKViewController.h */, - ); - path = Controllers; - sourceTree = ""; - }; - DA0CC50F1EAB99BA009A8ED9 /* Models */ = { - isa = PBXGroup; - children = ( - DA0CC5101EAB99BA009A8ED9 /* IASKSettingsReader.h */, - DA0CC5111EAB99BA009A8ED9 /* IASKSettingsReader.m */, - DA0CC5121EAB99BA009A8ED9 /* IASKSettingsStore.h */, - DA0CC5131EAB99BA009A8ED9 /* IASKSettingsStore.m */, - DA0CC5141EAB99BA009A8ED9 /* IASKSettingsStoreFile.h */, - DA0CC5151EAB99BA009A8ED9 /* IASKSettingsStoreFile.m */, - DA0CC5161EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.h */, - DA0CC5171EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m */, - DA0CC5181EAB99BA009A8ED9 /* IASKSpecifier.h */, - DA0CC5191EAB99BA009A8ED9 /* IASKSpecifier.m */, - ); - path = Models; - sourceTree = ""; - }; - DA0CC51A1EAB99BA009A8ED9 /* Views */ = { - isa = PBXGroup; - children = ( - DA0CC51B1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.h */, - DA0CC51C1EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m */, - DA0CC51D1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.h */, - DA0CC51E1EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m */, - DA0CC51F1EAB99BA009A8ED9 /* IASKSlider.h */, - DA0CC5201EAB99BA009A8ED9 /* IASKSlider.m */, - DA0CC5211EAB99BA009A8ED9 /* IASKSwitch.h */, - DA0CC5221EAB99BA009A8ED9 /* IASKSwitch.m */, - DA0CC5231EAB99BA009A8ED9 /* IASKTextField.h */, - DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */, - DA0CC5251EAB99BA009A8ED9 /* IASKTextView.h */, - DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */, - DA0CC5271EAB99BA009A8ED9 /* IASKTextViewCell.h */, - DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */, - ); - path = Views; - sourceTree = ""; - }; DA24EBB019DAD4D000FF010B /* ios */ = { isa = PBXGroup; children = ( @@ -1970,10 +1792,6 @@ children = ( DA5BFA44147E415C00F98B1E /* MasterPassword.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, - DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */, - DAC6326C148680650075AEA5 /* libjrswizzle.a */, - DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */, - DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */, DAA1757D19D86BE70044227B /* libAttributedMarkdown.a */, ); name = Products; @@ -2956,8 +2774,6 @@ DABD3BF81711E2DC00CF925C /* MasterPassword.entitlements */, 93D39D6604447D7708039155 /* MPAnswersViewController.h */, 93D39C426E03358384018E85 /* MPAnswersViewController.m */, - 93D39C86E984EC65DA5ACB1D /* MPAppSettingsViewController.h */, - 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */, 93D39DA27D768B53C8B1330C /* MPAvatarCell.h */, 93D39B381350802A194BF332 /* MPAvatarCell.m */, 93D390519405B76CC6A57C4F /* MPCell.h */, @@ -3028,7 +2844,6 @@ DAA7BB6D20C4C0C400101DC7 /* libjson-c-ios */, DAA7BB8720C4C10F00101DC7 /* libsodium-ios */, DAA1759319D86C610044227B /* AttributedMarkdown */, - DAFC5662172C57EC00CB5CC5 /* InAppSettingsKit */, DAA141181922FED80032B392 /* iOS */, DACA29751705E2BD002C6C22 /* jrswizzle */, DA32D03719D111EB004F3F0E /* KCOrderedAccessorFix */, @@ -3076,18 +2891,6 @@ path = "uicolor-utilities"; sourceTree = ""; }; - DAFC5662172C57EC00CB5CC5 /* InAppSettingsKit */ = { - isa = PBXGroup; - children = ( - DA0CC4F41EAB99BA009A8ED9 /* Resources */, - DA0CC5051EAB99BA009A8ED9 /* Controllers */, - DA0CC50F1EAB99BA009A8ED9 /* Models */, - DA0CC51A1EAB99BA009A8ED9 /* Views */, - ); - name = InAppSettingsKit; - path = InAppSettingsKit/InAppSettingsKit; - sourceTree = ""; - }; DAFE45D715039823003ABA7C /* Pearl */ = { isa = PBXGroup; children = ( @@ -3282,23 +3085,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - DAC6325B1486805C0075AEA5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA29BC1705E2DE002C6C22 /* UIColor+Expanded.h in Headers */, - DACA29BD1705E2DE002C6C22 /* UIColor+HSV.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DAC6326A148680650075AEA5 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DAC77CAB148291A600BCF976 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -3417,23 +3203,6 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - DA32D01F19D111C6004F3F0E /* KCOrderedAccessorFix */ = { - isa = PBXNativeTarget; - buildConfigurationList = DA32D03419D111C7004F3F0E /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */; - buildPhases = ( - DA32D01C19D111C6004F3F0E /* Sources */, - DA32D01D19D111C6004F3F0E /* Frameworks */, - DA32D01E19D111C6004F3F0E /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = KCOrderedAccessorFix; - productName = KCOrderedAccessorFix; - productReference = DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */; - productType = "com.apple.product-type.library.static"; - }; DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */ = { isa = PBXNativeTarget; buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword-iOS" */; @@ -3475,40 +3244,6 @@ productReference = DAA1757D19D86BE70044227B /* libAttributedMarkdown.a */; productType = "com.apple.product-type.library.static"; }; - DAC6325C1486805C0075AEA5 /* uicolor-utilities */ = { - isa = PBXNativeTarget; - buildConfigurationList = DAC632651486805C0075AEA5 /* Build configuration list for PBXNativeTarget "uicolor-utilities" */; - buildPhases = ( - DAC632591486805C0075AEA5 /* Sources */, - DAC6325A1486805C0075AEA5 /* Frameworks */, - DAC6325B1486805C0075AEA5 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "uicolor-utilities"; - productName = "uicolor-utilities"; - productReference = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; - productType = "com.apple.product-type.library.static"; - }; - DAC6326B148680650075AEA5 /* jrswizzle */ = { - isa = PBXNativeTarget; - buildConfigurationList = DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */; - buildPhases = ( - DAC63268148680650075AEA5 /* Sources */, - DAC63269148680650075AEA5 /* Frameworks */, - DAC6326A148680650075AEA5 /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = jrswizzle; - productName = jrswizzle; - productReference = DAC6326C148680650075AEA5 /* libjrswizzle.a */; - productType = "com.apple.product-type.library.static"; - }; DAC77CAC148291A600BCF976 /* Pearl */ = { isa = PBXNativeTarget; buildConfigurationList = DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */; @@ -3527,22 +3262,6 @@ productReference = DAC77CAD148291A600BCF976 /* libPearl.a */; productType = "com.apple.product-type.library.static"; }; - DAFC5654172C573B00CB5CC5 /* InAppSettingsKit */ = { - isa = PBXNativeTarget; - buildConfigurationList = DAFC565E172C573B00CB5CC5 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */; - buildPhases = ( - DAFC5651172C573B00CB5CC5 /* Sources */, - DAFC5652172C573B00CB5CC5 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = InAppSettingsKit; - productName = InAppSettingsKit; - productReference = DAFC5655172C573B00CB5CC5 /* libInAppSettingsKit.a */; - productType = "com.apple.product-type.library.static"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -3554,9 +3273,6 @@ LastUpgradeCheck = 0920; ORGANIZATIONNAME = Lyndir; TargetAttributes = { - DA32D01F19D111C6004F3F0E = { - DevelopmentTeam = HL3Q45LX9N; - }; DA5BFA43147E415C00F98B1E = { DevelopmentTeam = HL3Q45LX9N; LastSwiftMigration = 0920; @@ -3589,18 +3305,9 @@ DevelopmentTeam = HL3Q45LX9N; ProvisioningStyle = Automatic; }; - DAC6325C1486805C0075AEA5 = { - DevelopmentTeam = HL3Q45LX9N; - }; - DAC6326B148680650075AEA5 = { - DevelopmentTeam = HL3Q45LX9N; - }; DAC77CAC148291A600BCF976 = { DevelopmentTeam = HL3Q45LX9N; }; - DAFC5654172C573B00CB5CC5 = { - DevelopmentTeam = HL3Q45LX9N; - }; }; }; buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */; @@ -3618,10 +3325,6 @@ targets = ( DA5BFA43147E415C00F98B1E /* MasterPassword-iOS */, DAC77CAC148291A600BCF976 /* Pearl */, - DAC6325C1486805C0075AEA5 /* uicolor-utilities */, - DAC6326B148680650075AEA5 /* jrswizzle */, - DAFC5654172C573B00CB5CC5 /* InAppSettingsKit */, - DA32D01F19D111C6004F3F0E /* KCOrderedAccessorFix */, DAA1757C19D86BE70044227B /* AttributedMarkdown */, DAB7AE471F3D468300C856B1 /* libsodium-ios */, DAB7AE3D1F3D464A00C856B1 /* libjson-c-ios */, @@ -3824,15 +3527,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Countly-iOS/Countly.framework", - "${BUILT_PRODUCTS_DIR}/Sentry-iOS/Sentry.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Countly.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-iOS/Pods-MasterPassword-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -3926,14 +3626,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - DA32D01C19D111C6004F3F0E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DA32D03C19D111EB004F3F0E /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DA5BFA40147E415C00F98B1E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3974,7 +3666,6 @@ 93D394B5036C882B33C71872 /* MPSitesSegue.m in Sources */, DA0CC5911EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m in Sources */, 93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */, - 93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */, DA0CC58F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m in Sources */, 93D396D8B67DA6522CDBA142 /* MPCoachmarkViewController.m in Sources */, DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */, @@ -4015,23 +3706,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC632591486805C0075AEA5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA29BE1705E2DE002C6C22 /* UIColor+Expanded.m in Sources */, - DACA29BF1705E2DE002C6C22 /* UIColor+HSV.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DAC63268148680650075AEA5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DAC77CA9148291A600BCF976 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4112,29 +3786,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAFC5651172C573B00CB5CC5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DA0CC52B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m in Sources */, - DA0CC5321EAB99BA009A8ED9 /* IASKPSSliderSpecifierViewCell.m in Sources */, - DA0CC52D1EAB99BA009A8ED9 /* IASKSettingsReader.m in Sources */, - DA0CC52A1EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m in Sources */, - DA0CC5291EAB99BA009A8ED9 /* IASKAppSettingsViewController.m in Sources */, - DA0CC5381EAB99BA009A8ED9 /* IASKTextViewCell.m in Sources */, - DA0CC5311EAB99BA009A8ED9 /* IASKSpecifier.m in Sources */, - DA0CC5341EAB99BA009A8ED9 /* IASKSlider.m in Sources */, - DA0CC5351EAB99BA009A8ED9 /* IASKSwitch.m in Sources */, - DA0CC5331EAB99BA009A8ED9 /* IASKPSTextFieldSpecifierViewCell.m in Sources */, - DA0CC52E1EAB99BA009A8ED9 /* IASKSettingsStore.m in Sources */, - DA0CC52C1EAB99BA009A8ED9 /* IASKSpecifierValuesViewController.m in Sources */, - DA0CC5361EAB99BA009A8ED9 /* IASKTextField.m in Sources */, - DA0CC5371EAB99BA009A8ED9 /* IASKTextView.m in Sources */, - DA0CC52F1EAB99BA009A8ED9 /* IASKSettingsStoreFile.m in Sources */, - DA0CC5301EAB99BA009A8ED9 /* IASKSettingsStoreUserDefaults.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -4151,15 +3802,6 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - DA0CC4F51EAB99BA009A8ED9 /* IASKLocalizable.strings */ = { - isa = PBXVariantGroup; - children = ( - DA0CC4F61EAB99BA009A8ED9 /* Base */, - DA0CC4F91EAB99BA009A8ED9 /* en */, - ); - name = IASKLocalizable.strings; - sourceTree = ""; - }; DABD3BFA1711E2DC00CF925C /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -4187,18 +3829,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - DA32D02E19D111C7004F3F0E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = Debug; - }; - DA32D02F19D111C7004F3F0E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = Release; - }; DA5BFA6B147E415C00F98B1E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4600,38 +4230,6 @@ }; name = Release; }; - DAC632661486805C0075AEA5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Debug; - }; - DAC632671486805C0075AEA5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Release; - }; - DAC63275148680650075AEA5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Debug; - }; - DAC63276148680650075AEA5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = NO; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Release; - }; DAC77CB5148291A600BCF976 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4658,34 +4256,9 @@ }; name = Release; }; - DAFC565F172C573B00CB5CC5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Debug; - }; - DAFC5660172C573B00CB5CC5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DA32D03419D111C7004F3F0E /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DA32D02E19D111C7004F3F0E /* Debug */, - DA32D02F19D111C7004F3F0E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4731,24 +4304,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - DAC632651486805C0075AEA5 /* Build configuration list for PBXNativeTarget "uicolor-utilities" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DAC632661486805C0075AEA5 /* Debug */, - DAC632671486805C0075AEA5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; - DAC63274148680650075AEA5 /* Build configuration list for PBXNativeTarget "jrswizzle" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DAC63275148680650075AEA5 /* Debug */, - DAC63276148680650075AEA5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; DAC77CB7148291A600BCF976 /* Build configuration list for PBXNativeTarget "Pearl" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4758,15 +4313,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - DAFC565E172C573B00CB5CC5 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DAFC565F172C573B00CB5CC5 /* Debug */, - DAFC5660172C573B00CB5CC5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index 13b97746..7e002a3a 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -2716,15 +2716,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Countly-macOS/Countly.framework", - "${BUILT_PRODUCTS_DIR}/Sentry-macOS/Sentry.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Countly.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MasterPassword-macOS/Pods-MasterPassword-macOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/platform-darwin/Podfile b/platform-darwin/Podfile index c58302ed..b31f090c 100644 --- a/platform-darwin/Podfile +++ b/platform-darwin/Podfile @@ -11,6 +11,9 @@ target 'MasterPassword-iOS' do pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git' pod 'Countly' + pod 'UIColor-Utilities' + pod 'KCOrderedAccessorFix' + pod 'JRSwizzle' end target 'MasterPassword-macOS' do diff --git a/platform-darwin/Source/MPAppDelegate_Shared.m b/platform-darwin/Source/MPAppDelegate_Shared.m index f45e77f8..0e645074 100644 --- a/platform-darwin/Source/MPAppDelegate_Shared.m +++ b/platform-darwin/Source/MPAppDelegate_Shared.m @@ -112,7 +112,7 @@ static MPAppDelegate_Shared *instance; - (void)setActiveUser:(MPUserEntity *)activeUser { NSManagedObjectID *activeUserOID = activeUser.permanentObjectID; - if ([self.activeUserOID isEqual:activeUserOID]) + if (self.activeUserOID == activeUserOID || [self.activeUserOID isEqual:activeUserOID]) return; if (self.key) @@ -121,9 +121,9 @@ static MPAppDelegate_Shared *instance; if ([[MPConfig get].sendInfo boolValue]) [Countly.sharedInstance userLoggedOut]; - [[NSNotificationCenter defaultCenter] postNotificationName:MPSignedOutNotification object:self]; - self.activeUserOID = activeUserOID; + + [[NSNotificationCenter defaultCenter] postNotificationName:MPSignedOutNotification object:self]; } - (void)handleCoordinatorError:(NSError *)error { diff --git a/platform-darwin/Source/iOS/MPAppSettingsViewController.h b/platform-darwin/Source/iOS/MPAppSettingsViewController.h deleted file mode 100644 index 76774ad5..00000000 --- a/platform-darwin/Source/iOS/MPAppSettingsViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -//============================================================================== -// This file is part of Master Password. -// Copyright (c) 2011-2017, Maarten Billemont. -// -// Master Password is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Master Password is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You can find a copy of the GNU General Public License in the -// LICENSE file. Alternatively, see . -//============================================================================== - -#import -#import "IASKAppSettingsViewController.h" - -@interface MPAppSettingsViewController : IASKAppSettingsViewController -@end diff --git a/platform-darwin/Source/iOS/MPAppSettingsViewController.m b/platform-darwin/Source/iOS/MPAppSettingsViewController.m deleted file mode 100644 index 5b6aa8ad..00000000 --- a/platform-darwin/Source/iOS/MPAppSettingsViewController.m +++ /dev/null @@ -1,45 +0,0 @@ -//============================================================================== -// This file is part of Master Password. -// Copyright (c) 2011-2017, Maarten Billemont. -// -// Master Password is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Master Password is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You can find a copy of the GNU General Public License in the -// LICENSE file. Alternatively, see . -//============================================================================== - -#import "MPAppSettingsViewController.h" -#import "UIColor+Expanded.h" - -@implementation MPAppSettingsViewController - -- (void)viewWillAppear:(BOOL)animated { - - [super viewWillAppear:animated]; - - self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 ); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath]; - cell.backgroundColor = [UIColor clearColor]; - cell.textLabel.textColor = [UIColor whiteColor]; - - if (cell.selectionStyle != UITableViewCellSelectionStyleNone) { - cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds]; - cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33]; - } - - return cell; -} - -@end diff --git a/platform-darwin/Source/iOS/MPLogsViewController.m b/platform-darwin/Source/iOS/MPLogsViewController.m index 01d5f87b..23ae2ca8 100644 --- a/platform-darwin/Source/iOS/MPLogsViewController.m +++ b/platform-darwin/Source/iOS/MPLogsViewController.m @@ -18,7 +18,6 @@ #import "MPLogsViewController.h" #import "MPiOSAppDelegate.h" -#import "MPAppDelegate_Store.h" @implementation MPLogsViewController @@ -52,6 +51,17 @@ PearlRemoveNotificationObservers(); } +#pragma clang diagnostic push +#pragma ide diagnostic ignored "UnavailableInDeploymentTarget" +- (void)viewSafeAreaInsetsDidChange { + + [super viewSafeAreaInsetsDidChange]; + + self.logView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 ); + self.logView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 ); +} +#pragma clang diagnostic pop + - (IBAction)toggleLevelControl:(UISegmentedControl *)sender { BOOL traceEnabled = (BOOL)self.levelControl.selectedSegmentIndex; diff --git a/platform-darwin/Source/iOS/MPPreferencesViewController.m b/platform-darwin/Source/iOS/MPPreferencesViewController.m index a3f4968f..3556a1f0 100644 --- a/platform-darwin/Source/iOS/MPPreferencesViewController.m +++ b/platform-darwin/Source/iOS/MPPreferencesViewController.m @@ -52,6 +52,17 @@ [self reload]; } +#pragma clang diagnostic push +#pragma ide diagnostic ignored "UnavailableInDeploymentTarget" +- (void)viewSafeAreaInsetsDidChange { + + [super viewSafeAreaInsetsDidChange]; + + self.tableView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 ); + self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 ); +} +#pragma clang diagnostic pop + - (void)reload { MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread]; diff --git a/platform-darwin/Source/iOS/MPSitesViewController.m b/platform-darwin/Source/iOS/MPSitesViewController.m index 17d52aa8..645bd621 100644 --- a/platform-darwin/Source/iOS/MPSitesViewController.m +++ b/platform-darwin/Source/iOS/MPSitesViewController.m @@ -127,6 +127,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) { PearlRemoveNotificationObservers(); } +- (void)viewWillLayoutSubviews { + + self.collectionView.contentInset = [self.collectionView occludedInsets]; + self.collectionView.scrollIndicatorInsets = self.collectionView.contentInset; + + [super viewWillLayoutSubviews]; +} + - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { if ([segue.identifier isEqualToString:@"popdown"]) @@ -144,33 +152,6 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) { [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; } -#pragma mark - UICollectionViewDelegateFlowLayout - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - - UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout; - CGFloat itemWidth = UIEdgeInsetsInsetRect( collectionView.bounds, layout.sectionInset ).size.width; - return CGSizeMake( itemWidth, 100 ); -} - -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout - insetForSectionAtIndex:(NSInteger)section { - - UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout; - UIEdgeInsets occludedInsets = [self.collectionView occludedInsets]; - UIEdgeInsets insets = layout.sectionInset; - insets.top = insets.bottom; // Undo storyboard hack for manual top-occluded insets. - - if (section == 0) - insets.top += occludedInsets.top; - - if (section == collectionView.numberOfSections - 1) - insets.bottom += occludedInsets.bottom; - - return insets; -} - #pragma mark - UICollectionViewDataSource - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView { diff --git a/platform-darwin/Source/iOS/MPStoreViewController.m b/platform-darwin/Source/iOS/MPStoreViewController.m index 4a5a9cde..6909cf30 100644 --- a/platform-darwin/Source/iOS/MPStoreViewController.m +++ b/platform-darwin/Source/iOS/MPStoreViewController.m @@ -64,6 +64,17 @@ PearlEnum( MPDevelopmentFuelConsumption, [[MPiOSAppDelegate get] removeProductsObserver:self]; } +#pragma clang diagnostic push +#pragma ide diagnostic ignored "UnavailableInDeploymentTarget" +- (void)viewSafeAreaInsetsDidChange { + + [super viewSafeAreaInsetsDidChange]; + + self.tableView.contentInset = UIEdgeInsetsMake( 44, 0, 0, 0 ); + self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake( 44, 0, 0, 0 ); +} +#pragma clang diagnostic pop + #pragma mark - UITableViewDataSource - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { diff --git a/platform-darwin/Source/iOS/Storyboard.storyboard b/platform-darwin/Source/iOS/Storyboard.storyboard index 4d4f110c..1b41d548 100644 --- a/platform-darwin/Source/iOS/Storyboard.storyboard +++ b/platform-darwin/Source/iOS/Storyboard.storyboard @@ -69,7 +69,7 @@ - + @@ -600,7 +600,6 @@ - @@ -1150,11 +1149,11 @@ - + - + @@ -2091,58 +2090,6 @@ This app is now out of maintenance. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2278,7 +2225,7 @@ CgoKCgoKCgoKCgoKCg - + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris facilisis tortor leo, iaculis mollis elit dictum et. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In congue justo porta enim imperdiet, id luctus justo fringilla. Nunc nec sem id augue bibendum hendrerit eu ut eros. Ut fermentum augue quis nunc feugiat vehicula. Quisque in ultrices magna. Praesent quis mollis lectus. Sed fringilla massa vitae eros luctus, eget convallis justo pretium. Duis non tristique ante. Sed suscipit tortor ligula, sed fermentum eros sodales ut. Maecenas sed ante et orci posuere lobortis et sodales diam. Nunc non ullamcorper orci. @@ -2290,7 +2237,7 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien. - + @@ -2323,8 +2270,8 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien. - - + + @@ -2384,10 +2331,10 @@ Suspendisse potenti. Etiam ut nisi id augue tempor ultrices et sit amet sapien. - +