diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 4a56c42..78542a2 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -13,6 +13,7 @@ dependencies { implementation project(':capacitor-dialog') implementation project(':capacitor-haptics') implementation project(':capacitor-keyboard') + implementation project(':capacitor-splash-screen') implementation project(':capacitor-status-bar') } diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 0c6ebfd..df9affe 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -14,5 +14,8 @@ project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/ include ':capacitor-keyboard' project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android') +include ':capacitor-splash-screen' +project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android') + include ':capacitor-status-bar' project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android') diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-1024@2x.png b/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-1024@2x.png new file mode 100644 index 0000000..50d3ed7 Binary files /dev/null and b/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-1024@2x.png differ diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index adf6ba0..0000000 Binary files a/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json index 9b7d382..8799b66 100644 --- a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "AppIcon-512@2x.png", + "filename" : "AppIcon-1024@2x.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json index d7d96a6..7bc4fe5 100644 --- a/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json +++ b/ios/App/App/Assets.xcassets/Splash.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "splash-landscape@1x.png", "idiom" : "universal", - "filename" : "splash-2732x2732-2.png", "scale" : "1x" }, { + "filename" : "splash-landscape@2x.png", "idiom" : "universal", - "filename" : "splash-2732x2732-1.png", "scale" : "2x" }, { + "filename" : "splash-landscape@3x.png", "idiom" : "universal", - "filename" : "splash-2732x2732.png", "scale" : "3x" } ], "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/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-landscape@1x.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@1x.png new file mode 100644 index 0000000..2e3b8ba Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@1x.png differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@2x.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@2x.png new file mode 100644 index 0000000..2e3b8ba Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@2x.png differ diff --git a/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@3x.png b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@3x.png new file mode 100644 index 0000000..2e3b8ba Binary files /dev/null and b/ios/App/App/Assets.xcassets/Splash.imageset/splash-landscape@3x.png differ diff --git a/ios/App/Podfile b/ios/App/Podfile index 69c1972..7cda665 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -15,6 +15,7 @@ def capacitor_pods pod 'CapacitorDialog', :path => '../../node_modules/@capacitor/dialog' pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics' pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard' + pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' end diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index f9eee49..02dff82 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -25,6 +25,8 @@ PODS: - Capacitor - CapacitorKeyboard (5.0.2): - Capacitor + - CapacitorSplashScreen (5.0.2): + - Capacitor - CapacitorStatusBar (5.0.2): - Capacitor - FirebaseAppCheckInterop (10.10.0) @@ -73,6 +75,7 @@ DEPENDENCIES: - "CapacitorFirebaseAuthentication/Google (from `../../node_modules/@capacitor-firebase/authentication`)" - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)" - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)" + - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)" - "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)" SPEC REPOS: @@ -101,6 +104,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/haptics" CapacitorKeyboard: :path: "../../node_modules/@capacitor/keyboard" + CapacitorSplashScreen: + :path: "../../node_modules/@capacitor/splash-screen" CapacitorStatusBar: :path: "../../node_modules/@capacitor/status-bar" @@ -112,6 +117,7 @@ SPEC CHECKSUMS: CapacitorFirebaseAuthentication: f2e3c2a7488b87078025855588670840f93a721e CapacitorHaptics: 864585542a435bd41eaabf7f30d9ff5ec03024d3 CapacitorKeyboard: e628d4e66d621c69e449945ebabded17c5b9c2e8 + CapacitorSplashScreen: bd2a056394ba0b8807e7bb3e746424f67c426e03 CapacitorStatusBar: 48f2899f6846cc7d8431b251ebfc58e1c10e3d58 FirebaseAppCheckInterop: 7d3521f56872cf74a01792c0a095a30e054ff6ae FirebaseAuth: 28e6fff787467cd15ab51c8c7aa904003b2f57aa @@ -123,6 +129,6 @@ SPEC CHECKSUMS: GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef -PODFILE CHECKSUM: c3ab1574d20a76c5b3fe3c086022e7c73a4e21eb +PODFILE CHECKSUM: 9a19ff50409d024bca91266c62454036ebb27258 COCOAPODS: 1.12.1 diff --git a/src/App.vue b/src/App.vue index 33b7485..dc1a88a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,9 +12,12 @@ import { initializeSettings } from '@/composables/useSettings' import { windowIsMobile } from '@/utils/helpers' import SideBar from '@/components/SideBar.vue' import { useWindowSize } from '@vueuse/core' +import { SplashScreen } from '@capacitor/splash-screen' initializeSettings() +onMounted(() => SplashScreen.hide()) + const sideBarCollapsed = ref(windowIsMobile()) const { width } = useWindowSize() diff --git a/src/main.ts b/src/main.ts index 7ebaabb..49d3b7c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,9 +7,6 @@ import { usePreferredDark, useFavicon } from '@vueuse/core' import { initializeFirebase } from '@/composables/useFirebase' import { StatusBar, Style } from '@capacitor/status-bar' import { Keyboard } from '@capacitor/keyboard' -import { SplashScreen } from '@capacitor/splash-screen' - -SplashScreen.hide() if (Capacitor.isNativePlatform()) { StatusBar.setStyle({ style: Style.Dark })