fix: Se arreglaron los conflictos con dependencias

Browse Source

...

This commit is contained in:

Moisés Méndez

2026-05-22 17:50:56 -06:00

parent c7547b5921

commit 83be5a1a40

130 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

recoleccion_residuos/.gitignore → .gitignore vendored

0

recoleccion_residuos/.metadata → .metadata

0

recoleccion_residuos/README.md → README.md

0

recoleccion_residuos/analysis_options.yaml → analysis_options.yaml

0

recoleccion_residuos/android/.gitignore → android/.gitignore vendored

0

recoleccion_residuos/android/app/build.gradle.kts → android/app/build.gradle.kts

0

recoleccion_residuos/android/app/src/debug/AndroidManifest.xml → android/app/src/debug/AndroidManifest.xml

0

recoleccion_residuos/android/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml

0

recoleccion_residuos/android/app/src/main/kotlin/com/example/recoleccion_residuos/MainActivity.kt → android/app/src/main/kotlin/com/example/recoleccion_residuos/MainActivity.kt

0

recoleccion_residuos/android/app/src/main/res/drawable-v21/launch_background.xml → android/app/src/main/res/drawable-v21/launch_background.xml

0

recoleccion_residuos/android/app/src/main/res/drawable/launch_background.xml → android/app/src/main/res/drawable/launch_background.xml

0

recoleccion_residuos/android/app/src/main/res/mipmap-hdpi/ic_launcher.png → android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 544 B After Width:  |  Height:  |  Size: 544 B

0

recoleccion_residuos/android/app/src/main/res/mipmap-mdpi/ic_launcher.png → android/app/src/main/res/mipmap-mdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 442 B After Width:  |  Height:  |  Size: 442 B

0

recoleccion_residuos/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png → android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 721 B After Width:  |  Height:  |  Size: 721 B

0

recoleccion_residuos/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png → android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

recoleccion_residuos/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png → android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

recoleccion_residuos/android/app/src/main/res/values-night/styles.xml → android/app/src/main/res/values-night/styles.xml

0

recoleccion_residuos/android/app/src/main/res/values/styles.xml → android/app/src/main/res/values/styles.xml

0

recoleccion_residuos/android/app/src/profile/AndroidManifest.xml → android/app/src/profile/AndroidManifest.xml

0

recoleccion_residuos/android/build.gradle.kts → android/build.gradle.kts

0

recoleccion_residuos/android/gradle.properties → android/gradle.properties

0

recoleccion_residuos/android/gradle/wrapper/gradle-wrapper.properties → android/gradle/wrapper/gradle-wrapper.properties vendored

0

recoleccion_residuos/android/settings.gradle.kts → android/settings.gradle.kts

0

recoleccion_residuos/ios/.gitignore → ios/.gitignore vendored

0

recoleccion_residuos/ios/Flutter/AppFrameworkInfo.plist → ios/Flutter/AppFrameworkInfo.plist

0

recoleccion_residuos/ios/Flutter/Debug.xcconfig → ios/Flutter/Debug.xcconfig

0

recoleccion_residuos/ios/Flutter/Release.xcconfig → ios/Flutter/Release.xcconfig

0

recoleccion_residuos/ios/Runner.xcodeproj/project.pbxproj → ios/Runner.xcodeproj/project.pbxproj

0

recoleccion_residuos/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata → ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated

0

recoleccion_residuos/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

0

recoleccion_residuos/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings → ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

0

recoleccion_residuos/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme → ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

0

recoleccion_residuos/ios/Runner.xcworkspace/contents.xcworkspacedata → ios/Runner.xcworkspace/contents.xcworkspacedata generated

0

recoleccion_residuos/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

0

recoleccion_residuos/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings → ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

0

recoleccion_residuos/ios/Runner/AppDelegate.swift → ios/Runner/AppDelegate.swift

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json → ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 11 KiB

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 295 B After Width:  |  Height:  |  Size: 295 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 406 B After Width:  |  Height:  |  Size: 406 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 450 B After Width:  |  Height:  |  Size: 450 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 282 B After Width:  |  Height:  |  Size: 282 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 462 B After Width:  |  Height:  |  Size: 462 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 704 B After Width:  |  Height:  |  Size: 704 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 406 B After Width:  |  Height:  |  Size: 406 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 586 B After Width:  |  Height:  |  Size: 586 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 862 B After Width:  |  Height:  |  Size: 862 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 862 B After Width:  |  Height:  |  Size: 862 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 762 B After Width:  |  Height:  |  Size: 762 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

recoleccion_residuos/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png → ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

recoleccion_residuos/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json → ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json vendored

0

recoleccion_residuos/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png → ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png vendored

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 B After Width:  |  Height:  |  Size: 68 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png → ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png vendored

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 B After Width:  |  Height:  |  Size: 68 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png → ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png vendored

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 B After Width:  |  Height:  |  Size: 68 B

0

recoleccion_residuos/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md → ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md vendored

0

recoleccion_residuos/ios/Runner/Base.lproj/LaunchScreen.storyboard → ios/Runner/Base.lproj/LaunchScreen.storyboard

0

recoleccion_residuos/ios/Runner/Base.lproj/Main.storyboard → ios/Runner/Base.lproj/Main.storyboard

0

recoleccion_residuos/ios/Runner/Info.plist → ios/Runner/Info.plist

0

recoleccion_residuos/ios/Runner/Runner-Bridging-Header.h → ios/Runner/Runner-Bridging-Header.h

0

recoleccion_residuos/ios/Runner/SceneDelegate.swift → ios/Runner/SceneDelegate.swift

0

recoleccion_residuos/ios/RunnerTests/RunnerTests.swift → ios/RunnerTests/RunnerTests.swift

0

recoleccion_residuos/lib/main.dart → lib/main.dart

0

recoleccion_residuos/linux/.gitignore → linux/.gitignore vendored

0

recoleccion_residuos/linux/CMakeLists.txt → linux/CMakeLists.txt

0

recoleccion_residuos/linux/flutter/CMakeLists.txt → linux/flutter/CMakeLists.txt

0

recoleccion_residuos/linux/flutter/generated_plugin_registrant.cc → linux/flutter/generated_plugin_registrant.cc

0

recoleccion_residuos/linux/flutter/generated_plugin_registrant.h → linux/flutter/generated_plugin_registrant.h

0

recoleccion_residuos/linux/flutter/generated_plugins.cmake → linux/flutter/generated_plugins.cmake

0

recoleccion_residuos/linux/runner/CMakeLists.txt → linux/runner/CMakeLists.txt

0

recoleccion_residuos/linux/runner/main.cc → linux/runner/main.cc

0

recoleccion_residuos/linux/runner/my_application.cc → linux/runner/my_application.cc

0

recoleccion_residuos/linux/runner/my_application.h → linux/runner/my_application.h

0

recoleccion_residuos/macos/.gitignore → macos/.gitignore vendored

0

recoleccion_residuos/macos/Flutter/Flutter-Debug.xcconfig → macos/Flutter/Flutter-Debug.xcconfig

0

recoleccion_residuos/macos/Flutter/Flutter-Release.xcconfig → macos/Flutter/Flutter-Release.xcconfig

0

recoleccion_residuos/macos/Flutter/GeneratedPluginRegistrant.swift → macos/Flutter/GeneratedPluginRegistrant.swift

0

recoleccion_residuos/macos/Runner.xcodeproj/project.pbxproj → macos/Runner.xcodeproj/project.pbxproj

0

recoleccion_residuos/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

0

recoleccion_residuos/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme → macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

0

recoleccion_residuos/macos/Runner.xcworkspace/contents.xcworkspacedata → macos/Runner.xcworkspace/contents.xcworkspacedata generated

0

recoleccion_residuos/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

0

recoleccion_residuos/macos/Runner/AppDelegate.swift → macos/Runner/AppDelegate.swift

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json → macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 101 KiB After Width:  |  Height:  |  Size: 101 KiB

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 5.5 KiB

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 520 B After Width:  |  Height:  |  Size: 520 B

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 36 KiB

0

recoleccion_residuos/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png → macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.2 KiB

0

recoleccion_residuos/macos/Runner/Base.lproj/MainMenu.xib → macos/Runner/Base.lproj/MainMenu.xib

0

recoleccion_residuos/macos/Runner/Configs/AppInfo.xcconfig → macos/Runner/Configs/AppInfo.xcconfig

0

recoleccion_residuos/macos/Runner/Configs/Debug.xcconfig → macos/Runner/Configs/Debug.xcconfig

0

recoleccion_residuos/macos/Runner/Configs/Release.xcconfig → macos/Runner/Configs/Release.xcconfig

0

recoleccion_residuos/macos/Runner/Configs/Warnings.xcconfig → macos/Runner/Configs/Warnings.xcconfig

0

recoleccion_residuos/macos/Runner/DebugProfile.entitlements → macos/Runner/DebugProfile.entitlements

0

recoleccion_residuos/macos/Runner/Info.plist → macos/Runner/Info.plist

0

recoleccion_residuos/macos/Runner/MainFlutterWindow.swift → macos/Runner/MainFlutterWindow.swift

Some files were not shown because too many files have changed in this diff Show More