diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index cbb48b7..8c321f7 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -32,6 +32,6 @@ - + diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index a344c3e..844a7ce 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -12,9 +12,9 @@ 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; 504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; }; 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; - 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; + ED4E37622B8FF2E900FF8755 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -123,7 +123,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 920; - LastUpgradeCheck = 920; + LastUpgradeCheck = 1420; TargetAttributes = { 504EC3031FED79650016851F = { CreatedOnToolsVersion = 9.2; @@ -155,7 +155,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */, + ED4E37622B8FF2E900FF8755 /* LaunchScreen.storyboard in Resources */, 50B271D11FEDC1A000F3C39B /* public in Resources */, 504EC30F1FED79650016851F /* Assets.xcassets in Resources */, 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, @@ -247,6 +247,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -254,8 +255,10 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -304,6 +307,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -311,8 +315,10 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -345,18 +351,22 @@ baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 24TXZ384X3; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Nutrition Planner"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.0.12; + MARKETING_VERSION = 1.0.13; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.adeptry.nutritionplanner; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -368,17 +378,21 @@ baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 24TXZ384X3; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Nutrition Planner"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.0.12; + MARKETING_VERSION = 1.0.13; PRODUCT_BUNDLE_IDENTIFIER = com.adeptry.nutritionplanner; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/ios/App/App/Assets.xcassets/Contents.json b/ios/App/App/Assets.xcassets/Contents.json index da4a164..73c0059 100644 --- a/ios/App/App/Assets.xcassets/Contents.json +++ b/ios/App/App/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json index 84a416d..f53f1f4 100644 --- a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json +++ b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json @@ -1,56 +1,22 @@ { - "images": [ + "images" : [ { - "idiom": "universal", - "filename": "Default@1x~universal~anyany.png", - "scale": "1x" + "filename" : "splash.jpeg", + "idiom" : "universal" }, { - "idiom": "universal", - "filename": "Default@2x~universal~anyany.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "Default@3x~universal~anyany.png", - "scale": "3x" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal", - "scale": "1x", - "filename": "Default@1x~universal~anyany-dark.png" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "idiom": "universal", - "scale": "2x", - "filename": "Default@2x~universal~anyany-dark.png" - }, - { - "appearances": [ + "appearances" : [ { - "appearance": "luminosity", - "value": "dark" + "appearance" : "luminosity", + "value" : "dark" } ], - "idiom": "universal", - "scale": "3x", - "filename": "Default@3x~universal~anyany-dark.png" + "filename" : "splash-dark.jpeg", + "idiom" : "universal" } ], - "info": { - "version": 1, - "author": "xcode" + "info" : { + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png deleted file mode 100644 index d7eb7fa..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany-dark.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png deleted file mode 100644 index c1dc6ca..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png deleted file mode 100644 index d7eb7fa..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany-dark.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png deleted file mode 100644 index c1dc6ca..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png deleted file mode 100644 index d7eb7fa..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany-dark.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png b/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png deleted file mode 100644 index c1dc6ca..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png deleted file mode 100644 index 33ea6c9..0000000 Binary files a/ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-dark.jpeg b/ios/App/App/Assets.xcassets/Splash.imageset/splash-dark.jpeg new file mode 100644 index 0000000..c9431c6 Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/splash-dark.jpeg differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash.jpeg b/ios/App/App/Assets.xcassets/Splash.imageset/splash.jpeg new file mode 100644 index 0000000..c9431c6 Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/splash.jpeg differ diff --git a/ios/App/App/Base.lproj/LaunchScreen.storyboard b/ios/App/App/Base.lproj/LaunchScreen.storyboard index e7ae5d7..d072e2d 100644 --- a/ios/App/App/Base.lproj/LaunchScreen.storyboard +++ b/ios/App/App/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - + diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 2512cb1..23d8af2 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -20,12 +20,19 @@ $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + LSRequiresIPhoneOS LSSupportsOpeningDocumentsInPlace UIFileSharingEnabled + UILaunchScreen + + UIImageName + Splash + UILaunchStoryboardName LaunchScreen.storyboard UIMainStoryboardFile @@ -37,7 +44,7 @@ UIRequiresFullScreen UIStatusBarStyle - UIStatusBarStyleDefault + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/package-lock.json b/package-lock.json index a86a687..f930e34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "nutrition-planner", - "version": "1.0.12", + "version": "1.0.13", "lockfileVersion": 3, "requires": true, "packages": { "": { - "version": "1.0.12", + "version": "1.0.13", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/resources/splash-dark.jpeg b/resources/splash-dark.jpeg new file mode 100644 index 0000000..17889a9 Binary files /dev/null and b/resources/splash-dark.jpeg differ diff --git a/resources/splash-dark.png b/resources/splash-dark.png index bfff13b..133fe02 100644 Binary files a/resources/splash-dark.png and b/resources/splash-dark.png differ diff --git a/resources/splash.jpeg b/resources/splash.jpeg new file mode 100644 index 0000000..17889a9 Binary files /dev/null and b/resources/splash.jpeg differ diff --git a/resources/splash.png b/resources/splash.png index bfff13b..133fe02 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/src/renderer/i18n/dictionaries/fr.json b/src/renderer/i18n/dictionaries/fr.json index 005a910..d3fe5ed 100644 --- a/src/renderer/i18n/dictionaries/fr.json +++ b/src/renderer/i18n/dictionaries/fr.json @@ -73,6 +73,7 @@ "privacy": "Confidentialité", "protein": "Protéine", "proteinTarget": "Objectif de protéines", + "reload": "Recharger", "remove": "Réinitialiser", "saturatedFat": "Graisse saturée", "sedentary": "Sédentaire",