diff --git a/External/Pearl b/External/Pearl index 201de69b..01f6c675 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 201de69bbfcbb02322aec9e5351bd23b1186dc4c +Subproject commit 01f6c675598757a26df6e61c63d476708e1d038b diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj index a069f1ca..80858c0e 100644 --- a/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -41,6 +41,10 @@ DA600C2815056428008E9AB6 /* MPConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA600C2715056427008E9AB6 /* MPConfig.m */; }; DA672D2F14F92C6B004A189C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DA672D2E14F92C6B004A189C /* libz.dylib */; }; DA672D3014F9413D004A189C /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; }; + DA829E52159847E0002417D3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; + DA829E6015984813002417D3 /* UIFont+Replacement.h in Headers */ = {isa = PBXBuildFile; fileRef = DA829E5E15984812002417D3 /* UIFont+Replacement.h */; }; + DA829E6115984813002417D3 /* UIFont+Replacement.m in Sources */ = {isa = PBXBuildFile; fileRef = DA829E5F15984812002417D3 /* UIFont+Replacement.m */; }; + DA829E6215984832002417D3 /* libFontReplacer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA829E51159847E0002417D3 /* libFontReplacer.a */; }; DA95D59D14DF063C008D1B94 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DA95D5CF14DF0691008D1B94 /* IASKAppSettingsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = DA95D5A814DF0691008D1B94 /* IASKAppSettingsViewController.h */; }; DA95D5D014DF0691008D1B94 /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA95D5A914DF0691008D1B94 /* IASKAppSettingsViewController.m */; }; @@ -916,6 +920,9 @@ DA672D2E14F92C6B004A189C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; DA79A9BB1557DB6F00BAA07A /* libscryptenc-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios.a"; sourceTree = ""; }; DA79A9BD1557DDC700BAA07A /* scrypt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = scrypt.xcodeproj; path = External/Pearl/External/iOSPorts/ports/security/scrypt/scrypt.xcodeproj; sourceTree = ""; }; + DA829E51159847E0002417D3 /* libFontReplacer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFontReplacer.a; sourceTree = BUILT_PRODUCTS_DIR; }; + DA829E5E15984812002417D3 /* UIFont+Replacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+Replacement.h"; sourceTree = ""; }; + DA829E5F15984812002417D3 /* UIFont+Replacement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+Replacement.m"; sourceTree = ""; }; DA902BD01576CA4A00C38161 /* keypad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = keypad.png; sourceTree = ""; }; DA95D59C14DF063C008D1B94 /* libInAppSettingsKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libInAppSettingsKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; DA95D5A814DF0691008D1B94 /* IASKAppSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKAppSettingsViewController.h; sourceTree = ""; }; @@ -1792,6 +1799,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DA829E6215984832002417D3 /* libFontReplacer.a in Frameworks */, DA44260A1557D9E40052177D /* libiCloudStoreManager.a in Frameworks */, DAD312C21552A22700A3F9ED /* libsqlite3.dylib in Frameworks */, DAD312BF1552A1BD00A3F9ED /* libLocalytics.a in Frameworks */, @@ -1812,6 +1820,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DA829E4E159847E0002417D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DA829E52159847E0002417D3 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DA95D59914DF063C008D1B94 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1883,6 +1899,7 @@ DAD3126115528C9C00A3F9ED /* TestFlight */, DAD3127315528CD200A3F9ED /* Localytics */, DA4425D71557BF260052177D /* iCloudStoreManager */, + DA829E5D15984812002417D3 /* FontReplacer */, DA5BFA47147E415C00F98B1E /* Frameworks */, DA5BFA45147E415C00F98B1E /* Products */, ); @@ -1898,6 +1915,7 @@ DA95D59C14DF063C008D1B94 /* libInAppSettingsKit.a */, DAD3127115528CD200A3F9ED /* libLocalytics.a */, DA4425CB1557BED40052177D /* libiCloudStoreManager.a */, + DA829E51159847E0002417D3 /* libFontReplacer.a */, ); name = Products; sourceTree = ""; @@ -1960,6 +1978,16 @@ name = Products; sourceTree = ""; }; + DA829E5D15984812002417D3 /* FontReplacer */ = { + isa = PBXGroup; + children = ( + DA829E5E15984812002417D3 /* UIFont+Replacement.h */, + DA829E5F15984812002417D3 /* UIFont+Replacement.m */, + ); + name = FontReplacer; + path = "External/FontReplacer/UIFont+Replacement"; + sourceTree = ""; + }; DA902B931576C0FB00C38161 /* Avatars */ = { isa = PBXGroup; children = ( @@ -3081,6 +3109,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DA829E4F159847E0002417D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + DA829E6015984813002417D3 /* UIFont+Replacement.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DA95D59A14DF063C008D1B94 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -3222,6 +3258,23 @@ productReference = DA5BFA44147E415C00F98B1E /* MasterPassword.app */; productType = "com.apple.product-type.application"; }; + DA829E50159847E0002417D3 /* FontReplacer */ = { + isa = PBXNativeTarget; + buildConfigurationList = DA829E59159847E0002417D3 /* Build configuration list for PBXNativeTarget "FontReplacer" */; + buildPhases = ( + DA829E4D159847E0002417D3 /* Sources */, + DA829E4E159847E0002417D3 /* Frameworks */, + DA829E4F159847E0002417D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FontReplacer; + productName = FontReplacer; + productReference = DA829E51159847E0002417D3 /* libFontReplacer.a */; + productType = "com.apple.product-type.library.static"; + }; DA95D59B14DF063C008D1B94 /* InAppSettingsKit */ = { isa = PBXNativeTarget; buildConfigurationList = DA95D5A414DF063C008D1B94 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */; @@ -3346,6 +3399,7 @@ DA95D59B14DF063C008D1B94 /* InAppSettingsKit */, DAD3127015528CD200A3F9ED /* Localytics */, DA4425CA1557BED40052177D /* iCloudStoreManager */, + DA829E50159847E0002417D3 /* FontReplacer */, ); }; /* End PBXProject section */ @@ -4088,6 +4142,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DA829E4D159847E0002417D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA829E6115984813002417D3 /* UIFont+Replacement.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DA95D59814DF063C008D1B94 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4260,7 +4322,9 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Maarten Billemont (DWGU95U4ZD)"; + COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4318,7 +4382,9 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont"; + COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "ADHOC=1", @@ -4360,6 +4426,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; name = AdHoc; }; @@ -4372,6 +4439,7 @@ "$(inherited)", "\"$(SRCROOT)/Crashlytics\"", ); + GCC_DYNAMIC_NO_PIC = YES; GCC_PREFIX_HEADER = "MasterPassword/iOS/MasterPassword-Prefix.pch"; INFOPLIST_FILE = "MasterPassword/iOS/MasterPassword-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -4394,6 +4462,7 @@ "$(inherited)", "\"$(SRCROOT)/Crashlytics\"", ); + GCC_DYNAMIC_NO_PIC = YES; GCC_PREFIX_HEADER = "MasterPassword/iOS/MasterPassword-Prefix.pch"; INFOPLIST_FILE = "MasterPassword/iOS/MasterPassword-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -4407,6 +4476,27 @@ }; name = AdHoc; }; + DA829E5A159847E0002417D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; + }; + name = Debug; + }; + DA829E5B159847E0002417D3 /* AdHoc */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; + }; + name = AdHoc; + }; + DA829E5C159847E0002417D3 /* AppStore */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_INHIBIT_ALL_WARNINGS = YES; + }; + name = AppStore; + }; DA95D5A514DF063C008D1B94 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4441,7 +4531,9 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont"; + COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "APPSTORE=1", @@ -4483,6 +4575,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; name = AppStore; }; @@ -4495,6 +4588,7 @@ "$(inherited)", "\"$(SRCROOT)/Crashlytics\"", ); + GCC_DYNAMIC_NO_PIC = YES; GCC_PREFIX_HEADER = "MasterPassword/iOS/MasterPassword-Prefix.pch"; INFOPLIST_FILE = "MasterPassword/iOS/MasterPassword-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -4699,6 +4793,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = AdHoc; }; + DA829E59159847E0002417D3 /* Build configuration list for PBXNativeTarget "FontReplacer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA829E5A159847E0002417D3 /* Debug */, + DA829E5B159847E0002417D3 /* AdHoc */, + DA829E5C159847E0002417D3 /* AppStore */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = AdHoc; + }; DA95D5A414DF063C008D1B94 /* Build configuration list for PBXNativeTarget "InAppSettingsKit" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/MasterPassword.sketch/Data b/MasterPassword.sketch/Data index 13b830aa..99338d57 100644 Binary files a/MasterPassword.sketch/Data and b/MasterPassword.sketch/Data differ diff --git a/MasterPassword.sketch/QuickLook/Preview.pdf b/MasterPassword.sketch/QuickLook/Preview.pdf deleted file mode 100644 index 206948bb..00000000 Binary files a/MasterPassword.sketch/QuickLook/Preview.pdf and /dev/null differ diff --git a/MasterPassword.sketch/QuickLook/Preview.png b/MasterPassword.sketch/QuickLook/Preview.png new file mode 100644 index 00000000..d91d6ac7 Binary files /dev/null and b/MasterPassword.sketch/QuickLook/Preview.png differ diff --git a/MasterPassword.sketch/QuickLook/Thumbnail.jpg b/MasterPassword.sketch/QuickLook/Thumbnail.jpg deleted file mode 100644 index 1ecd367c..00000000 Binary files a/MasterPassword.sketch/QuickLook/Thumbnail.jpg and /dev/null differ diff --git a/MasterPassword.sketch/QuickLook/Thumbnail.png b/MasterPassword.sketch/QuickLook/Thumbnail.png new file mode 100644 index 00000000..b50fb03d Binary files /dev/null and b/MasterPassword.sketch/QuickLook/Thumbnail.png differ diff --git a/Resources/Icon-72.png b/Resources/Icon-72.png index 9667e67e..37d9023b 100644 Binary files a/Resources/Icon-72.png and b/Resources/Icon-72.png differ diff --git a/Resources/Icon-72@2x.png b/Resources/Icon-72@2x.png index 2d5f054a..d883e64c 100644 Binary files a/Resources/Icon-72@2x.png and b/Resources/Icon-72@2x.png differ diff --git a/Resources/Icon-Small-50.png b/Resources/Icon-Small-50.png index 7e1b0e53..d2a0235f 100644 Binary files a/Resources/Icon-Small-50.png and b/Resources/Icon-Small-50.png differ diff --git a/Resources/Icon-Small-50@2x.png b/Resources/Icon-Small-50@2x.png index af942827..34963c9e 100644 Binary files a/Resources/Icon-Small-50@2x.png and b/Resources/Icon-Small-50@2x.png differ diff --git a/Resources/Icon-Small.png b/Resources/Icon-Small.png index ae16fb9c..6efdc9ed 100644 Binary files a/Resources/Icon-Small.png and b/Resources/Icon-Small.png differ diff --git a/Resources/Icon-Small@2x.png b/Resources/Icon-Small@2x.png index 3c595ce1..5e293869 100644 Binary files a/Resources/Icon-Small@2x.png and b/Resources/Icon-Small@2x.png differ diff --git a/Resources/Icon.png b/Resources/Icon.png index d85ad0a1..5c0744fe 100644 Binary files a/Resources/Icon.png and b/Resources/Icon.png differ diff --git a/Resources/Icon@2x.png b/Resources/Icon@2x.png index bf4bb72a..25b5e9cd 100644 Binary files a/Resources/Icon@2x.png and b/Resources/Icon@2x.png differ diff --git a/Resources/iTunesArtwork.png b/Resources/iTunesArtwork.png index 67bb3337..2087b52d 100644 Binary files a/Resources/iTunesArtwork.png and b/Resources/iTunesArtwork.png differ