diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 960599ef..862a349e 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -66,7 +66,6 @@ 93D39E5F7F6D7F5C0FAD090F /* MPTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D72239990DDAC2D75B0 /* MPTypes.m */; }; 93D39EAA4D064193074D3021 /* MPFixable.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A813CA9D7E192261ED2 /* MPFixable.m */; }; 93D39F8A9254177891F38705 /* MPSetupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A28369954D147E239BA /* MPSetupViewController.m */; }; - DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */; }; 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 */; }; @@ -389,6 +388,8 @@ DAEFB01F19BCBD9E00525079 /* UIView+LayoutGone.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEFB01D19BCBD9E00525079 /* UIView+LayoutGone.h */; }; DAF4EF50190A81E400023C90 /* NSManagedObject+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DAF4EF4E190A81E400023C90 /* NSManagedObject+Pearl.m */; }; 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 */; }; @@ -1602,6 +1603,8 @@ DAEFB01D19BCBD9E00525079 /* UIView+LayoutGone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+LayoutGone.h"; sourceTree = ""; }; DAF4EF4E190A81E400023C90 /* NSManagedObject+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObject+Pearl.m"; sourceTree = ""; }; 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 = ""; }; @@ -1695,7 +1698,7 @@ DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */, DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */, DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */, - DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */, + DAFC1F702439795100D1CD66 /* CoreServices.framework in Frameworks */, DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */, DAE2725919C93B80007C5262 /* libInAppSettingsKit.a in Frameworks */, DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */, @@ -1979,6 +1982,7 @@ DA5BFA47147E415C00F98B1E /* Frameworks */ = { isa = PBXGroup; children = ( + DAFC1F6F2439795000D1CD66 /* CoreServices.framework */, DAB7AE5C1F3D752900C856B1 /* libjson-c.a */, DA6701B716406A4100B61001 /* Accounts.framework */, DA6701DF16406BB400B61001 /* AdSupport.framework */, @@ -3002,6 +3006,7 @@ 93D3990E0CD1B5CF9FBB2C07 /* MPWebViewController.m */, DABD3BF91711E2DC00CF925C /* Settings.bundle */, DAAA1D4023CD145000F3DF56 /* Storyboard.storyboard */, + DAFC1F72243989FB00D1CD66 /* Launch Screen.storyboard */, ); path = iOS; sourceTree = ""; @@ -3641,6 +3646,7 @@ DA67460D18DE7F0C00DFE240 /* Exo2.0-Thin.otf in Resources */, DA4522451902355C008F650A /* icon_book@2x.png in Resources */, DA32D04919D2F417004F3F0E /* thumb_fuel@2x.png in Resources */, + DAFC1F73243989FB00D1CD66 /* Launch Screen.storyboard in Resources */, DABD39371711E29700CF925C /* avatar-0.png in Resources */, DABD39381711E29700CF925C /* avatar-0@2x.png in Resources */, DAA1764819D8B82B0044227B /* mpw_new.png in Resources */, @@ -3857,7 +3863,7 @@ }; DA3C4EB32439438B00A6C4A8 /* Upload Sentry dSYM */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputFileListPaths = ( @@ -3869,9 +3875,10 @@ ); outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = "/bin/sh -e"; shellScript = "if hash sentry-cli 2>/dev/null; then\n if ! ERROR=$(SENTRY_ORG=lyndir SENTRY_PROJECT=masterpassword-ios sentry-cli upload-dif --log-level info \"$DWARF_DSYM_FOLDER_PATH\" 2>&1 >/dev/null); then\n echo >&2 \"warning: sentry-cli: $ERROR\"\n fi\nelse\n echo >&2 \"warning: sentry-cli not installed: try brew install getsentry/tools/sentry-cli\"\nfi\n"; + showEnvVarsInLog = 0; }; DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */ = { isa = PBXShellScriptBuildPhase; @@ -4408,7 +4415,6 @@ baseConfigurationReference = E4F11DB2CE85A9CF2A0C79B2 /* Pods-MasterPassword-iOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; @@ -4452,7 +4458,6 @@ baseConfigurationReference = FFFCFF8FBD5549B1EFF8806D /* Pods-MasterPassword-iOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO; CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements; diff --git a/platform-darwin/Resources/Media/ios/icon.sketch b/platform-darwin/Resources/Media/ios/icon.sketch index 87c88d12..e12f1dcc 100644 Binary files a/platform-darwin/Resources/Media/ios/icon.sketch and b/platform-darwin/Resources/Media/ios/icon.sketch differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-320.png b/platform-darwin/Resources/Media/ios/icon/Icon-320.png index a7648ca0..195f5eeb 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-320.png and b/platform-darwin/Resources/Media/ios/icon/Icon-320.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-60.png b/platform-darwin/Resources/Media/ios/icon/Icon-60.png index 766a89a9..ec97f877 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-60.png and b/platform-darwin/Resources/Media/ios/icon/Icon-60.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-60@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-60@2x.png index 9f145391..5697cd58 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-60@2x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-60@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-60@3x.png b/platform-darwin/Resources/Media/ios/icon/Icon-60@3x.png index 48a2fe34..bfbbe36c 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-60@3x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-60@3x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-64.png b/platform-darwin/Resources/Media/ios/icon/Icon-64.png index e7e1488b..0f912fa5 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-64.png and b/platform-darwin/Resources/Media/ios/icon/Icon-64.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-76.png b/platform-darwin/Resources/Media/ios/icon/Icon-76.png index 4cc62cf6..7e6f8e92 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-76.png and b/platform-darwin/Resources/Media/ios/icon/Icon-76.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-76@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-76@2x.png index f7cc6ad5..7431440a 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-76@2x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-76@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-83@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-83@2x.png new file mode 100644 index 00000000..de81cfa1 Binary files /dev/null and b/platform-darwin/Resources/Media/ios/icon/Icon-83@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-20.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20.png new file mode 100644 index 00000000..5d6c049f Binary files /dev/null and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@2x.png new file mode 100644 index 00000000..5c2e061e Binary files /dev/null and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@3x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@3x.png new file mode 100644 index 00000000..633bbd5b Binary files /dev/null and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-20@3x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40.png index 31bf902a..73db5340 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@2x.png index aa35b72f..aaf7ab6e 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@2x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@3x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@3x.png index 827bcd8e..5f926be5 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@3x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small-40@3x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small.png index 96977370..5292647e 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small@2x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small@2x.png index ed752ea8..406620e9 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small@2x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small@2x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/Icon-Small@3x.png b/platform-darwin/Resources/Media/ios/icon/Icon-Small@3x.png index 2b6dc676..287ee2c5 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/Icon-Small@3x.png and b/platform-darwin/Resources/Media/ios/icon/Icon-Small@3x.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/iTunesArtwork.png b/platform-darwin/Resources/Media/ios/icon/iTunesArtwork.png index 586347c4..3d6d945f 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/iTunesArtwork.png and b/platform-darwin/Resources/Media/ios/icon/iTunesArtwork.png differ diff --git a/platform-darwin/Resources/Media/ios/icon/iTunesArtwork@2x.png b/platform-darwin/Resources/Media/ios/icon/iTunesArtwork@2x.png index 7b71c27d..36df4de9 100644 Binary files a/platform-darwin/Resources/Media/ios/icon/iTunesArtwork@2x.png and b/platform-darwin/Resources/Media/ios/icon/iTunesArtwork@2x.png differ diff --git a/platform-darwin/Scripts/genassets b/platform-darwin/Scripts/genassets index 78fa6158..45f0235d 100755 --- a/platform-darwin/Scripts/genassets +++ b/platform-darwin/Scripts/genassets @@ -9,6 +9,7 @@ export PATH+=:/usr/local/bin # icons format: [pixel size]@[scale]@[idiom]@[os]:[filename] -- if os is "anything lower", omit it icons=( + 1024@1@ios-marketing@:iTunesArtwork@2x.png # Mac 16@1@mac@: 32@2@mac@: @@ -24,6 +25,8 @@ icons=( 180@3@iphone@8.0:Icon-60@3x.png 120@3@iphone@8.0:Icon-Small-40@3x.png 120@2@iphone@7.0:Icon-60@2x.png + 40@2@iphone@7.0:Icon-Small-20@2x.png + 60@3@iphone@7.0:Icon-Small-20@3x.png 80@2@iphone@7.0:Icon-Small-40@2x.png # 114@2@iphone@:Icon@2x.png 87@3@iphone@:Icon-Small@3x.png @@ -31,8 +34,11 @@ icons=( # 57@1@iphone@:Icon.png # 29@1@iphone@:Icon-Small.png # iPad - 76@1@ipad@7.0:Icon-76.png +# 76@1@ipad@7.0:Icon-76.png 152@2@ipad@7.0:Icon-76@2x.png + 167@2@ipad@9.0:Icon-83@2x.png + 20@1@ipad@7.0:Icon-Small-20.png + 40@2@ipad@7.0:Icon-Small-20@2x.png 40@1@ipad@7.0:Icon-Small-40.png 80@2@ipad@7.0:Icon-Small-40@2x.png 29@1@ipad@:Icon-Small.png @@ -47,10 +53,10 @@ splashes=( 414-736@3@iphone@8.0 375-667@2@iphone@8.0 320-568@2@iphone@7.0 - 320-568@2@iphone@ +# 320-568@2@iphone@ 320-480@2@iphone@7.0 - 320-480@2@iphone@ - 320-480@@iphone@ +# 320-480@2@iphone@ +# 320-480@@iphone@ ) copyImage() { @@ -90,7 +96,7 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] || for icon in "${icons[@]}"; do IFS=: read icon filename <<< "$icon" IFS=@ read px scale idiom os <<< "$icon" - pt=$(( px / scale )) + pt=$(printf '%g' "$(bc <<< "scale=1; $px / $scale")") suffix= [[ $scale != 1 ]] && suffix=@${scale}x @@ -102,7 +108,7 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] || fi imageProps=$(copyImage "$source" "$appiconset/$filename") - printf '%s{"size":"%dx%d","filename":"%s","scale":"%sx"' \ + printf '%s{"size":"%sx%s","filename":"%s","scale":"%sx"' \ "$comma" "$pt" "$pt" "$filename" "$scale" [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom" [[ $os ]] && printf ',"minimum-system-version":"%s"' "$os" diff --git a/platform-darwin/Source/iOS/Launch Screen.storyboard b/platform-darwin/Source/iOS/Launch Screen.storyboard new file mode 100644 index 00000000..d7f56841 --- /dev/null +++ b/platform-darwin/Source/iOS/Launch Screen.storyboard @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-darwin/Source/iOS/MasterPassword-Info.plist b/platform-darwin/Source/iOS/MasterPassword-Info.plist index 81e6a289..137988f3 100644 --- a/platform-darwin/Source/iOS/MasterPassword-Info.plist +++ b/platform-darwin/Source/iOS/MasterPassword-Info.plist @@ -41,6 +41,8 @@ [auto] LSRequiresIPhoneOS + LSSupportsOpeningDocumentsInPlace + NSHumanReadableCopyright © 2011-2020 UIAppFonts @@ -57,6 +59,8 @@ remote-notification + UILaunchStoryboardName + Launch Screen UIMainStoryboardFile Storyboard UIStatusBarHidden