diff --git a/melos.yaml b/melos.yaml index db381a57..fc388bfb 100644 --- a/melos.yaml +++ b/melos.yaml @@ -49,7 +49,7 @@ dependency_overrides: # Mobile/Flutter specific video_player: ^2.10.0 mobile_scanner: ^7.0.1 - flutter_native_splash: ^2.4.6 + flutter_native_splash: ^2.4.7 flutter_launcher_icons: ^0.14.4 image_picker: ^1.1.2 permission_handler: ^12.0.1 diff --git a/mobile-app/android/app/src/main/res/drawable-v21/launch_background.xml b/mobile-app/android/app/src/main/res/drawable-v21/launch_background.xml index bd737e2f..77b1773d 100644 --- a/mobile-app/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/mobile-app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -4,6 +4,6 @@ - + diff --git a/mobile-app/android/app/src/main/res/drawable/launch_background.xml b/mobile-app/android/app/src/main/res/drawable/launch_background.xml index bd737e2f..77b1773d 100644 --- a/mobile-app/android/app/src/main/res/drawable/launch_background.xml +++ b/mobile-app/android/app/src/main/res/drawable/launch_background.xml @@ -4,6 +4,6 @@ - + diff --git a/mobile-app/android/app/src/main/res/values-night-v31/styles.xml b/mobile-app/android/app/src/main/res/values-night-v31/styles.xml index e051d71c..bab4e97c 100644 --- a/mobile-app/android/app/src/main/res/values-night-v31/styles.xml +++ b/mobile-app/android/app/src/main/res/values-night-v31/styles.xml @@ -7,6 +7,7 @@ false shortEdges #141414 + @drawable/android12branding @drawable/android12splash #141414 diff --git a/mobile-app/android/app/src/main/res/values-v31/styles.xml b/mobile-app/android/app/src/main/res/values-v31/styles.xml index 271e57e4..8b3483f4 100644 --- a/mobile-app/android/app/src/main/res/values-v31/styles.xml +++ b/mobile-app/android/app/src/main/res/values-v31/styles.xml @@ -7,6 +7,7 @@ false shortEdges #141414 + @drawable/android12branding @drawable/android12splash #141414 diff --git a/mobile-app/assets/v2/android12_branding_800x320.png b/mobile-app/assets/v2/android12_branding_800x320.png new file mode 100644 index 00000000..f0763943 Binary files /dev/null and b/mobile-app/assets/v2/android12_branding_800x320.png differ diff --git a/mobile-app/assets/v2/android12_icon_empty_1152.png b/mobile-app/assets/v2/android12_icon_empty_1152.png new file mode 100644 index 00000000..400ed45b Binary files /dev/null and b/mobile-app/assets/v2/android12_icon_empty_1152.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage.png b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage.png new file mode 100644 index 00000000..c75b8c18 Binary files /dev/null and b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@2x.png b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@2x.png new file mode 100644 index 00000000..936acca6 Binary files /dev/null and b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@3x.png b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@3x.png new file mode 100644 index 00000000..1e94fbbe Binary files /dev/null and b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/BrandingImage@3x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json new file mode 100644 index 00000000..12712275 --- /dev/null +++ b/mobile-app/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "BrandingImage.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "BrandingImage@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "BrandingImage@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png index c75b8c18..e815fd62 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png index 936acca6..e815fd62 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png index 1e94fbbe..e815fd62 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard index cd4b3ded..28fbd156 100644 --- a/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -16,19 +16,20 @@ - - - + + + - + + + - + @@ -40,7 +41,8 @@ - + + diff --git a/mobile-app/lib/main.dart b/mobile-app/lib/main.dart index 426b64bc..64aa58a1 100644 --- a/mobile-app/lib/main.dart +++ b/mobile-app/lib/main.dart @@ -17,11 +17,10 @@ void main() async { WidgetsFlutterBinding.ensureInitialized(); // Enable edge-to-edge display SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( - systemNavigationBarColor: Colors.transparent, - statusBarColor: Colors.transparent, - )); - + SystemChrome.setSystemUIOverlayStyle( + const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent, statusBarColor: Colors.transparent), + ); + await dotenv.load(); // Initialize Supabase diff --git a/mobile-app/pubspec.yaml b/mobile-app/pubspec.yaml index af133dd3..92b9400e 100644 --- a/mobile-app/pubspec.yaml +++ b/mobile-app/pubspec.yaml @@ -159,13 +159,16 @@ flutter: flutter_native_splash: background_image: assets/v2/welcome_screen_bg_image.jpg - image: assets/v2/quantus_white_logo.png - android_gravity: bottom - ios_content_mode: bottom + branding: assets/v2/quantus_white_logo.png + branding_mode: bottom + branding_bottom_padding_android: 88 + branding_bottom_padding_ios: 88 android: true ios: true android_12: - image: assets/v2/quantus_white_logo.png + image: assets/v2/android12_icon_empty_1152.png color: "#141414" icon_background_color: "#141414" + branding: assets/v2/android12_branding_800x320.png + branding_bottom_padding: 88