# HG changeset patch # User Dennis C. M. # Date 1628178228 -3600 # Node ID 7ab9ed92b470400d6a063bda53d4542f1574f3d9 # Parent 50855a25db8ada9ad46885ceecd515830b381689# Parent 3a54505b899cca0bceaaec5f7f36463be4cd0411 Merge branch 'development' diff -r 50855a25db8a -r 7ab9ed92b470 .gitignore --- a/.gitignore Thu Aug 05 16:33:37 2021 +0100 +++ b/.gitignore Thu Aug 05 16:43:48 2021 +0100 @@ -1,5 +1,6 @@ -# Created by https://www.toptal.com/developers/gitignore/api/macos -# Edit at https://www.toptal.com/developers/gitignore?templates=macos + +# Created by https://www.toptal.com/developers/gitignore/api/xcode,macos,swift +# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,macos,swift ### macOS ### # General @@ -30,11 +31,105 @@ Temporary Items .apdisk -# Fastlane builds -Simoleon.ipa -Simoleon.app.dSYM.zip +### Swift ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# Pods/ +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Accio dependency management +Dependencies/ +.accio/ + +# fastlane +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml fastlane/Preview.html -fastlane/screenshots -report.xml +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Xcode ### +# Xcode +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + -# End of https://www.toptal.com/developers/gitignore/api/macos + + +## Gcc Patch +/*.gcno + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings + +# End of https://www.toptal.com/developers/gitignore/api/xcode,macos,swift diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/project.xcworkspace/contents.xcworkspacedata --- a/Simoleon.xcodeproj/project.xcworkspace/contents.xcworkspacedata Thu Aug 05 16:33:37 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - - - - diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist --- a/Simoleon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist Thu Aug 05 16:33:37 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings --- a/Simoleon.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Thu Aug 05 16:33:37 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded - - - diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved --- a/Simoleon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Thu Aug 05 16:33:37 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "Purchases", - "repositoryURL": "https://github.com/RevenueCat/purchases-ios.git", - "state": { - "branch": null, - "revision": "fd6c25818690e9399bccc713a2b627385b547a8d", - "version": "3.12.2" - } - } - ] - }, - "version": 1 -} diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate Binary file Simoleon.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed diff -r 50855a25db8a -r 7ab9ed92b470 Simoleon.xcodeproj/xcuserdata/dennis.xcuserdatad/xcschemes/xcschememanagement.plist --- a/Simoleon.xcodeproj/xcuserdata/dennis.xcuserdatad/xcschemes/xcschememanagement.plist Thu Aug 05 16:33:37 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ - - - - - SchemeUserState - - SWXMLHashPlayground (Playground) 1.xcscheme - - isShown - - orderHint - 2 - - SWXMLHashPlayground (Playground) 2.xcscheme - - isShown - - orderHint - 3 - - SWXMLHashPlayground (Playground).xcscheme - - isShown - - orderHint - 0 - - Screenshots.xcscheme_^#shared#^_ - - orderHint - 0 - - Simoleon.xcscheme_^#shared#^_ - - orderHint - 1 - - SimoleonWatchOS (Complication).xcscheme_^#shared#^_ - - orderHint - 3 - - SimoleonWatchOS (Notification).xcscheme_^#shared#^_ - - orderHint - 2 - - SimoleonWatchOS.xcscheme_^#shared#^_ - - orderHint - 1 - - - SuppressBuildableAutocreation - - 959F6DE726BBD53500101E53 - - primary - - - 95C5B2232697752600941585 - - primary - - - 95C5B2392697752700941585 - - primary - - - 95C5B2442697752700941585 - - primary - - - - - diff -r 50855a25db8a -r 7ab9ed92b470 fastlane/screenshots/screenshots.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fastlane/screenshots/screenshots.html Thu Aug 05 16:43:48 2021 +0100 @@ -0,0 +1,1781 @@ + + + + fastlane/snapshot + + + + +
+ + +
+

By Language:

+

de-DE

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + de-DE iPad Pro (12.9-inch) + + + + de-DE iPad Pro (12.9-inch) + + + + de-DE iPad Pro (12.9-inch) + + + + de-DE iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + de-DE iPhone 12 Pro Max + + + + de-DE iPhone 12 Pro Max + + + + de-DE iPhone 12 Pro Max + + + + de-DE iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + de-DE iPhone 8 Plus + + + + de-DE iPhone 8 Plus + + + + de-DE iPhone 8 Plus + + + + de-DE iPhone 8 Plus + +
+

en-GB

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + en-GB iPad Pro (12.9-inch) + + + + en-GB iPad Pro (12.9-inch) + + + + en-GB iPad Pro (12.9-inch) + + + + en-GB iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + en-GB iPhone 12 Pro Max + + + + en-GB iPhone 12 Pro Max + + + + en-GB iPhone 12 Pro Max + + + + en-GB iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + en-GB iPhone 8 Plus + + + + en-GB iPhone 8 Plus + + + + en-GB iPhone 8 Plus + + + + en-GB iPhone 8 Plus + +
+

en-US

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + en-US iPad Pro (12.9-inch) + + + + en-US iPad Pro (12.9-inch) + + + + en-US iPad Pro (12.9-inch) + + + + en-US iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + en-US iPhone 12 Pro Max + + + + en-US iPhone 12 Pro Max + + + + en-US iPhone 12 Pro Max + + + + en-US iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + en-US iPhone 8 Plus + + + + en-US iPhone 8 Plus + + + + en-US iPhone 8 Plus + + + + en-US iPhone 8 Plus + +
+

es-ES

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + es-ES iPad Pro (12.9-inch) + + + + es-ES iPad Pro (12.9-inch) + + + + es-ES iPad Pro (12.9-inch) + + + + es-ES iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + es-ES iPhone 12 Pro Max + + + + es-ES iPhone 12 Pro Max + + + + es-ES iPhone 12 Pro Max + + + + es-ES iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + es-ES iPhone 8 Plus + + + + es-ES iPhone 8 Plus + + + + es-ES iPhone 8 Plus + + + + es-ES iPhone 8 Plus + +
+

fr-FR

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + fr-FR iPad Pro (12.9-inch) + + + + fr-FR iPad Pro (12.9-inch) + + + + fr-FR iPad Pro (12.9-inch) + + + + fr-FR iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + fr-FR iPhone 12 Pro Max + + + + fr-FR iPhone 12 Pro Max + + + + fr-FR iPhone 12 Pro Max + + + + fr-FR iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + fr-FR iPhone 8 Plus + + + + fr-FR iPhone 8 Plus + + + + fr-FR iPhone 8 Plus + + + + fr-FR iPhone 8 Plus + +
+

it

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + it iPad Pro (12.9-inch) + + + + it iPad Pro (12.9-inch) + + + + it iPad Pro (12.9-inch) + + + + it iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + it iPhone 12 Pro Max + + + + it iPhone 12 Pro Max + + + + it iPhone 12 Pro Max + + + + it iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + it iPhone 8 Plus + + + + it iPhone 8 Plus + + + + it iPhone 8 Plus + + + + it iPhone 8 Plus + +
+

nl-NL

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + nl-NL iPad Pro (12.9-inch) + + + + nl-NL iPad Pro (12.9-inch) + + + + nl-NL iPad Pro (12.9-inch) + + + + nl-NL iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + nl-NL iPhone 12 Pro Max + + + + nl-NL iPhone 12 Pro Max + + + + nl-NL iPhone 12 Pro Max + + + + nl-NL iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + nl-NL iPhone 8 Plus + + + + nl-NL iPhone 8 Plus + + + + nl-NL iPhone 8 Plus + + + + nl-NL iPhone 8 Plus + +
+

pt-PT

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + pt-PT iPad Pro (12.9-inch) + + + + pt-PT iPad Pro (12.9-inch) + + + + pt-PT iPad Pro (12.9-inch) + + + + pt-PT iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + pt-PT iPhone 12 Pro Max + + + + pt-PT iPhone 12 Pro Max + + + + pt-PT iPhone 12 Pro Max + + + + pt-PT iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + pt-PT iPhone 8 Plus + + + + pt-PT iPhone 8 Plus + + + + pt-PT iPhone 8 Plus + + + + pt-PT iPhone 8 Plus + +
+

ru

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + ru iPad Pro (12.9-inch) + + + + ru iPad Pro (12.9-inch) + + + + ru iPad Pro (12.9-inch) + + + + ru iPad Pro (12.9-inch) + +
+ iPhone 12 Pro Max +
+ + ru iPhone 12 Pro Max + + + + ru iPhone 12 Pro Max + + + + ru iPhone 12 Pro Max + + + + ru iPhone 12 Pro Max + +
+ iPhone 8 Plus +
+ + ru iPhone 8 Plus + + + + ru iPhone 8 Plus + + + + ru iPhone 8 Plus + + + + ru iPhone 8 Plus + +
+
+

By Screen:

+

iPad Pro (12.9-inch) (5th generation)-1Launch-force_landscapeleft

+
+ + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + de-DE iPad Pro (12.9-inch) + +
de-DE
+
+ + en-GB iPad Pro (12.9-inch) + +
en-GB
+
+ + en-US iPad Pro (12.9-inch) + +
en-US
+
+ + es-ES iPad Pro (12.9-inch) + +
es-ES
+
+ + fr-FR iPad Pro (12.9-inch) + +
fr-FR
+
+ + it iPad Pro (12.9-inch) + +
it
+
+ + nl-NL iPad Pro (12.9-inch) + +
nl-NL
+
+ + pt-PT iPad Pro (12.9-inch) + +
pt-PT
+
+ + ru iPad Pro (12.9-inch) + +
ru
+
+

iPad Pro (12.9-inch) (5th generation)-2CurrencySelector-force_landscapeleft

+
+ + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + de-DE iPad Pro (12.9-inch) + +
de-DE
+
+ + en-GB iPad Pro (12.9-inch) + +
en-GB
+
+ + en-US iPad Pro (12.9-inch) + +
en-US
+
+ + es-ES iPad Pro (12.9-inch) + +
es-ES
+
+ + fr-FR iPad Pro (12.9-inch) + +
fr-FR
+
+ + it iPad Pro (12.9-inch) + +
it
+
+ + nl-NL iPad Pro (12.9-inch) + +
nl-NL
+
+ + pt-PT iPad Pro (12.9-inch) + +
pt-PT
+
+ + ru iPad Pro (12.9-inch) + +
ru
+
+

iPad Pro (12.9-inch) (5th generation)-3Amount-force_landscapeleft

+
+ + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + de-DE iPad Pro (12.9-inch) + +
de-DE
+
+ + en-GB iPad Pro (12.9-inch) + +
en-GB
+
+ + en-US iPad Pro (12.9-inch) + +
en-US
+
+ + es-ES iPad Pro (12.9-inch) + +
es-ES
+
+ + fr-FR iPad Pro (12.9-inch) + +
fr-FR
+
+ + it iPad Pro (12.9-inch) + +
it
+
+ + nl-NL iPad Pro (12.9-inch) + +
nl-NL
+
+ + pt-PT iPad Pro (12.9-inch) + +
pt-PT
+
+ + ru iPad Pro (12.9-inch) + +
ru
+
+

iPad Pro (12.9-inch) (5th generation)-4Favorites-force_landscapeleft

+
+ + + + + + + + + + + + + + + +
+ iPad Pro (12.9-inch) +
+ + de-DE iPad Pro (12.9-inch) + +
de-DE
+
+ + en-GB iPad Pro (12.9-inch) + +
en-GB
+
+ + en-US iPad Pro (12.9-inch) + +
en-US
+
+ + es-ES iPad Pro (12.9-inch) + +
es-ES
+
+ + fr-FR iPad Pro (12.9-inch) + +
fr-FR
+
+ + it iPad Pro (12.9-inch) + +
it
+
+ + nl-NL iPad Pro (12.9-inch) + +
nl-NL
+
+ + pt-PT iPad Pro (12.9-inch) + +
pt-PT
+
+ + ru iPad Pro (12.9-inch) + +
ru
+
+

1Launch

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPhone 12 Pro Max +
+ + de-DE iPhone 12 Pro Max + +
de-DE
+
+ + en-GB iPhone 12 Pro Max + +
en-GB
+
+ + en-US iPhone 12 Pro Max + +
en-US
+
+ + es-ES iPhone 12 Pro Max + +
es-ES
+
+ + fr-FR iPhone 12 Pro Max + +
fr-FR
+
+ + it iPhone 12 Pro Max + +
it
+
+ + nl-NL iPhone 12 Pro Max + +
nl-NL
+
+ + pt-PT iPhone 12 Pro Max + +
pt-PT
+
+ + ru iPhone 12 Pro Max + +
ru
+
+ iPhone 8 Plus +
+ + de-DE iPhone 8 Plus + +
de-DE
+
+ + en-GB iPhone 8 Plus + +
en-GB
+
+ + en-US iPhone 8 Plus + +
en-US
+
+ + es-ES iPhone 8 Plus + +
es-ES
+
+ + fr-FR iPhone 8 Plus + +
fr-FR
+
+ + it iPhone 8 Plus + +
it
+
+ + nl-NL iPhone 8 Plus + +
nl-NL
+
+ + pt-PT iPhone 8 Plus + +
pt-PT
+
+ + ru iPhone 8 Plus + +
ru
+
+

2CurrencySelector

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPhone 12 Pro Max +
+ + de-DE iPhone 12 Pro Max + +
de-DE
+
+ + en-GB iPhone 12 Pro Max + +
en-GB
+
+ + en-US iPhone 12 Pro Max + +
en-US
+
+ + es-ES iPhone 12 Pro Max + +
es-ES
+
+ + fr-FR iPhone 12 Pro Max + +
fr-FR
+
+ + it iPhone 12 Pro Max + +
it
+
+ + nl-NL iPhone 12 Pro Max + +
nl-NL
+
+ + pt-PT iPhone 12 Pro Max + +
pt-PT
+
+ + ru iPhone 12 Pro Max + +
ru
+
+ iPhone 8 Plus +
+ + de-DE iPhone 8 Plus + +
de-DE
+
+ + en-GB iPhone 8 Plus + +
en-GB
+
+ + en-US iPhone 8 Plus + +
en-US
+
+ + es-ES iPhone 8 Plus + +
es-ES
+
+ + fr-FR iPhone 8 Plus + +
fr-FR
+
+ + it iPhone 8 Plus + +
it
+
+ + nl-NL iPhone 8 Plus + +
nl-NL
+
+ + pt-PT iPhone 8 Plus + +
pt-PT
+
+ + ru iPhone 8 Plus + +
ru
+
+

3Amount

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPhone 12 Pro Max +
+ + de-DE iPhone 12 Pro Max + +
de-DE
+
+ + en-GB iPhone 12 Pro Max + +
en-GB
+
+ + en-US iPhone 12 Pro Max + +
en-US
+
+ + es-ES iPhone 12 Pro Max + +
es-ES
+
+ + fr-FR iPhone 12 Pro Max + +
fr-FR
+
+ + it iPhone 12 Pro Max + +
it
+
+ + nl-NL iPhone 12 Pro Max + +
nl-NL
+
+ + pt-PT iPhone 12 Pro Max + +
pt-PT
+
+ + ru iPhone 12 Pro Max + +
ru
+
+ iPhone 8 Plus +
+ + de-DE iPhone 8 Plus + +
de-DE
+
+ + en-GB iPhone 8 Plus + +
en-GB
+
+ + en-US iPhone 8 Plus + +
en-US
+
+ + es-ES iPhone 8 Plus + +
es-ES
+
+ + fr-FR iPhone 8 Plus + +
fr-FR
+
+ + it iPhone 8 Plus + +
it
+
+ + nl-NL iPhone 8 Plus + +
nl-NL
+
+ + pt-PT iPhone 8 Plus + +
pt-PT
+
+ + ru iPhone 8 Plus + +
ru
+
+

4Favorites

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ iPhone 12 Pro Max +
+ + de-DE iPhone 12 Pro Max + +
de-DE
+
+ + en-GB iPhone 12 Pro Max + +
en-GB
+
+ + en-US iPhone 12 Pro Max + +
en-US
+
+ + es-ES iPhone 12 Pro Max + +
es-ES
+
+ + fr-FR iPhone 12 Pro Max + +
fr-FR
+
+ + it iPhone 12 Pro Max + +
it
+
+ + nl-NL iPhone 12 Pro Max + +
nl-NL
+
+ + pt-PT iPhone 12 Pro Max + +
pt-PT
+
+ + ru iPhone 12 Pro Max + +
ru
+
+ iPhone 8 Plus +
+ + de-DE iPhone 8 Plus + +
de-DE
+
+ + en-GB iPhone 8 Plus + +
en-GB
+
+ + en-US iPhone 8 Plus + +
en-US
+
+ + es-ES iPhone 8 Plus + +
es-ES
+
+ + fr-FR iPhone 8 Plus + +
fr-FR
+
+ + it iPhone 8 Plus + +
it
+
+ + nl-NL iPhone 8 Plus + +
nl-NL
+
+ + pt-PT iPhone 8 Plus + +
pt-PT
+
+ + ru iPhone 8 Plus + +
ru
+
+
+
+ +
+
+ + +