diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..0fc241c --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + // Use IntelliSense para saber los atributos posibles. + // Mantenga el puntero para ver las descripciones de los existentes atributos. + // Para más información, visite: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "prosappco", + "request": "launch", + "type": "dart" + }, + { + "name": "prosappco (profile mode)", + "request": "launch", + "type": "dart", + "flutterMode": "profile" + }, + { + "name": "prosappco (release mode)", + "request": "launch", + "type": "dart", + "flutterMode": "release" + } + ] +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d327db..2609de6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -70,7 +70,9 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation platform('com.google.firebase:firebase-bom:31.3.0') + //implementation platform('com.google.firebase:firebase-bom:31.3.0') implementation 'com.google.firebase:firebase-analytics-ktx' + mplementation(platform("com.google.firebase:firebase-bom:32.2.2")) + androidTestImplementation("com.google.firebase:firebase-appcheck-debug-testing") // coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/android/app/src/main/res/drawable-v21/bg_color.xml b/android/app/src/main/res/drawable-v21/bg_color.xml new file mode 100644 index 0000000..a98be74 --- /dev/null +++ b/android/app/src/main/res/drawable-v21/bg_color.xml @@ -0,0 +1,4 @@ + + + + diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml index 0b08322..01b3599 100644 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -1,7 +1,7 @@ - + diff --git a/android/app/src/main/res/drawable/bg_color.xml b/android/app/src/main/res/drawable/bg_color.xml new file mode 100644 index 0000000..a98be74 --- /dev/null +++ b/android/app/src/main/res/drawable/bg_color.xml @@ -0,0 +1,4 @@ + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 1119b3a..8dbf352 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,7 +1,7 @@ - + diff --git a/android/app/src/main/res/mipmap-hdpi/splash.gif b/android/app/src/main/res/mipmap-hdpi/splash.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/splash.gif and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/splash.png b/android/app/src/main/res/mipmap-hdpi/splash.png new file mode 100644 index 0000000..9ce5a18 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/splash.gif b/android/app/src/main/res/mipmap-mdpi/splash.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/splash.gif and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/splash.png b/android/app/src/main/res/mipmap-mdpi/splash.png new file mode 100644 index 0000000..9ce5a18 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/splash.png b/android/app/src/main/res/mipmap-xhdpi/splash.png new file mode 100644 index 0000000..9ce5a18 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/splashgif.gif b/android/app/src/main/res/mipmap-xhdpi/splashgif.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/splashgif.gif and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash.gif b/android/app/src/main/res/mipmap-xxhdpi/splash.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/splash.gif and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash.png b/android/app/src/main/res/mipmap-xxhdpi/splash.png new file mode 100644 index 0000000..9ce5a18 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/splash.gif b/android/app/src/main/res/mipmap-xxxhdpi/splash.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/splash.gif and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/splash.png b/android/app/src/main/res/mipmap-xxxhdpi/splash.png new file mode 100644 index 0000000..9ce5a18 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/values/color.xml b/android/app/src/main/res/values/color.xml new file mode 100644 index 0000000..0a9ee07 --- /dev/null +++ b/android/app/src/main/res/values/color.xml @@ -0,0 +1,4 @@ + + + #ffffff + \ No newline at end of file diff --git a/images/splash.png b/images/splash.png new file mode 100644 index 0000000..e0b0d7c Binary files /dev/null and b/images/splash.png differ diff --git a/images/splashgif.gif b/images/splashgif.gif deleted file mode 100644 index f8d83a0..0000000 Binary files a/images/splashgif.gif and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..d5ebd3d 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,122 @@ { "images" : [ { - "size" : "20x20", + "filename" : "Icon-192 (1).png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "iphone", "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "iphone", "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "iphone", "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", - "idiom" : "iphone", "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", - "idiom" : "ipad", "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", - "idiom" : "ipad", "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", - "idiom" : "ipad", "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", - "idiom" : "ipad", "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", - "idiom" : "ipad", "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", - "idiom" : "ios-marketing", "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-192 (1).png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-192 (1).png new file mode 100644 index 0000000..789cb0f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-192 (1).png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 0bedcf2..4fe1854 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "Icon-maskable-512.png", "idiom" : "universal", - "filename" : "LaunchImage.png", "scale" : "1x" }, { + "filename" : "Icon-maskable-512 1.png", "idiom" : "universal", - "filename" : "LaunchImage@2x.png", "scale" : "2x" }, { + "filename" : "Icon-maskable-512 2.png", "idiom" : "universal", - "filename" : "LaunchImage@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 1.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 1.png new file mode 100644 index 0000000..742dd71 Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 1.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 2.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 2.png new file mode 100644 index 0000000..742dd71 Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512 2.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512.png new file mode 100644 index 0000000..742dd71 Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-maskable-512.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index f2e259c..67a2939 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,9 @@ - - + + + - - + + @@ -14,12 +15,14 @@ + - + + - + @@ -28,10 +31,10 @@ - + - + diff --git a/lib/main.dart b/lib/main.dart index d1178e1..b12f649 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'package:animated_splash_screen/animated_splash_screen.dart'; -import 'package:audioplayers/audioplayers.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; @@ -27,6 +26,7 @@ import 'package:prosappco/src/services/local_notifications.dart'; import 'firebase_options.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter_web_plugins/url_strategy.dart'; +import 'package:flutter/foundation.dart' show kIsWeb; // Importa kIsWeb Future _firebaseMessagingBackgroundHandler(RemoteMessage message) async { await Firebase.initializeApp(); @@ -122,28 +122,21 @@ class SplashScreen extends StatefulWidget { } class _SplashScreenState extends State { - // AudioPlayer audioPlayer = AudioPlayer(); - - // @override - // void initState() { - // super.initState(); - // playSound(); - // } - - // void playSound() async { - // await audioPlayer.play(UrlSource('images/sonido.mp3')); - // } @override Widget build(BuildContext context) { - return AnimatedSplashScreen.withScreenFunction( - splash: 'images/splashgif.gif', - screenFunction: () async { - return const LoginScreen(); - }, - splashTransition: SplashTransition.rotationTransition, - duration: 80000, - ); + if (kIsWeb) { // Verifica si se está ejecutando en web + return AnimatedSplashScreen.withScreenFunction( + splash: 'images/splash.png', + screenFunction: () async { + return const LoginScreen(); + }, + splashTransition: SplashTransition.rotationTransition, + duration: 80000, + ); + } else { + return const LoginScreen(); // En otras plataformas, solo muestra LoginScreen + } } } diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index b749bfe..9ce5a18 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 88cfd48..e0b0d7c 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png index eb9b4d7..0455fbf 100644 Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png index d69c566..742dd71 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ