diff --git a/.gitignore b/.gitignore index 79c113f..bae103c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,18 @@ migrate_working_dir/ **/doc/api/ **/ios/Flutter/.last_build_id .dart_tool/ +<<<<<<< HEAD .flutter-plugins +======= +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 .flutter-plugins-dependencies .pub-cache/ .pub/ /build/ +<<<<<<< HEAD +======= +/coverage/ +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # Symbolication related app.*.symbols diff --git a/.metadata b/.metadata index 5b39692..6254cb1 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,11 @@ # This file should be version controlled and should not be manually edited. version: +<<<<<<< HEAD revision: "d8a9f9a52e5af486f80d932e838ee93861ffd863" +======= + revision: "559ffa3f75e7402d65a8def9c28389a9b2e6fe42" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 channel: "stable" project_type: app @@ -13,6 +17,7 @@ project_type: app migration: platforms: - platform: root +<<<<<<< HEAD create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 - platform: android @@ -33,6 +38,28 @@ migration: - platform: windows create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 +======= + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: android + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: ios + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: linux + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: macos + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: web + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + - platform: windows + create_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 + base_revision: 559ffa3f75e7402d65a8def9c28389a9b2e6fe42 +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # User provided section diff --git a/README.md b/README.md index 2c8a8ae..b7773ed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD # flutter_application_1 +======= +# recoleccion_residuos +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 A new Flutter project. @@ -8,8 +12,14 @@ This project is a starting point for a Flutter application. A few resources to get you started if this is your first Flutter project: +<<<<<<< HEAD - [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) - [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) +======= +- [Learn Flutter](https://docs.flutter.dev/get-started/learn-flutter) +- [Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Flutter learning resources](https://docs.flutter.dev/reference/learning-resources) +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 For help getting started with Flutter development, view the [online documentation](https://docs.flutter.dev/), which offers tutorials, diff --git a/android/.gitignore b/android/.gitignore index 55afd91..8efb429 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,6 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +<<<<<<< HEAD +======= +.cxx/ +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # Remember to never publicly share your keystore. # See https://flutter.dev/to/reference-keystore diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..4d50c72 --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.recoleccion_residuos" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.recoleccion_residuos" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f2daf87..76a4e23 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,10 @@ >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> ("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/android/gradle.properties b/android/gradle.properties index 2597170..e264a67 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,12 @@ +<<<<<<< HEAD org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +======= +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b5fc5a7..7a1aae0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +<<<<<<< HEAD distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +======= +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..c21f0c5 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.0.1" apply false + id("org.jetbrains.kotlin.android") version "2.3.20" apply false +} + +include(":app") diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 7c56964..00399f3 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -20,7 +20,10 @@ ???? CFBundleVersion 1.0 +<<<<<<< HEAD MinimumOSVersion 12.0 +======= +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6669684..1198271 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -11,6 +11,11 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; +<<<<<<< HEAD +======= + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -47,6 +52,11 @@ 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; +<<<<<<< HEAD +======= + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; @@ -62,6 +72,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( +<<<<<<< HEAD +======= + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -79,6 +93,10 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD +======= + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -116,6 +134,10 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, +<<<<<<< HEAD +======= + 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; @@ -157,6 +179,12 @@ dependencies = ( ); name = Runner; +<<<<<<< HEAD +======= + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -190,6 +218,12 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; +<<<<<<< HEAD +======= + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -270,6 +304,10 @@ files = ( 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, +<<<<<<< HEAD +======= + 7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -346,7 +384,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD IPHONEOS_DEPLOYMENT_TARGET = 12.0; +======= + IPHONEOS_DEPLOYMENT_TARGET = 13.0; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -368,7 +410,11 @@ "$(inherited)", "@executable_path/Frameworks", ); +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -384,7 +430,11 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -401,7 +451,11 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -416,7 +470,11 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -472,7 +530,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD IPHONEOS_DEPLOYMENT_TARGET = 12.0; +======= + IPHONEOS_DEPLOYMENT_TARGET = 13.0; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -523,7 +585,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD IPHONEOS_DEPLOYMENT_TARGET = 12.0; +======= + IPHONEOS_DEPLOYMENT_TARGET = 13.0; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -547,7 +613,11 @@ "$(inherited)", "@executable_path/Frameworks", ); +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -569,7 +639,11 @@ "$(inherited)", "@executable_path/Frameworks", ); +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -611,6 +685,23 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +<<<<<<< HEAD +======= + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e3ca5d..8375b8b 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,27 @@ +<<<<<<< HEAD +======= + + + + + + + + + + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 shouldUseLaunchSchemeArgsEnv = "YES"> >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" +<<<<<<< HEAD +======= + enableGPUValidationMode = "1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 allowLocationSimulation = "YES"> diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 6266644..952e08c 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -2,12 +2,25 @@ import Flutter import UIKit @main +<<<<<<< HEAD @objc class AppDelegate: FlutterAppDelegate { +======= +@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate { +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 override func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { +<<<<<<< HEAD GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } +======= + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 6dc955a..0234a16 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,10 +2,19 @@ +<<<<<<< HEAD CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName Flutter Application 1 +======= + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Recoleccion Residuos +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +22,11 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName +<<<<<<< HEAD flutter_application_1 +======= + recoleccion_residuos +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 CFBundlePackageType APPL CFBundleShortVersionString @@ -24,6 +37,32 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS +<<<<<<< HEAD +======= + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,9 +80,12 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight +<<<<<<< HEAD CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents +======= +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/ios/Runner/SceneDelegate.swift b/ios/Runner/SceneDelegate.swift new file mode 100644 index 0000000..b9ce8ea --- /dev/null +++ b/ios/Runner/SceneDelegate.swift @@ -0,0 +1,6 @@ +import Flutter +import UIKit + +class SceneDelegate: FlutterSceneDelegate { + +} diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 900e421..9e37962 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,10 +4,17 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. +<<<<<<< HEAD set(BINARY_NAME "flutter_application_1") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID set(APPLICATION_ID "com.example.flutter_application_1") +======= +set(BINARY_NAME "recoleccion_residuos") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.recoleccion_residuos") +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc index 98b2273..157f39e 100644 --- a/linux/runner/my_application.cc +++ b/linux/runner/my_application.cc @@ -14,6 +14,14 @@ struct _MyApplication { G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) +<<<<<<< HEAD +======= +// Called when first Flutter frame received. +static void first_frame_cb(MyApplication* self, FlView* view) { + gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); +} + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 // Implements GApplication::activate. static void my_application_activate(GApplication* application) { MyApplication* self = MY_APPLICATION(application); @@ -40,6 +48,7 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); +<<<<<<< HEAD gtk_header_bar_set_title(header_bar, "flutter_application_1"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); @@ -57,22 +66,64 @@ static void my_application_activate(GApplication* application) { gtk_widget_show(GTK_WIDGET(view)); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); +======= + gtk_header_bar_set_title(header_bar, "recoleccion_residuos"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "recoleccion_residuos"); + } + + gtk_window_set_default_size(window, 1280, 720); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments( + project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + GdkRGBA background_color; + // Background defaults to black, override it here if necessary, e.g. #00000000 + // for transparent. + gdk_rgba_parse(&background_color, "#000000"); + fl_view_set_background_color(view, &background_color); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + // Show the window when Flutter renders. + // Requires the view to be realized so we can start rendering. + g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), + self); + gtk_widget_realize(GTK_WIDGET(view)); + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 fl_register_plugins(FL_PLUGIN_REGISTRY(view)); gtk_widget_grab_focus(GTK_WIDGET(view)); } // Implements GApplication::local_command_line. +<<<<<<< HEAD static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { +======= +static gboolean my_application_local_command_line(GApplication* application, + gchar*** arguments, + int* exit_status) { +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MyApplication* self = MY_APPLICATION(application); // Strip out the first argument as it is the binary name. self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); g_autoptr(GError) error = nullptr; if (!g_application_register(application, nullptr, &error)) { +<<<<<<< HEAD g_warning("Failed to register: %s", error->message); *exit_status = 1; return TRUE; +======= + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 } g_application_activate(application); @@ -83,7 +134,11 @@ static gboolean my_application_local_command_line(GApplication* application, gch // Implements GApplication::startup. static void my_application_startup(GApplication* application) { +<<<<<<< HEAD //MyApplication* self = MY_APPLICATION(object); +======= + // MyApplication* self = MY_APPLICATION(object); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 // Perform any actions required at application startup. @@ -92,7 +147,11 @@ static void my_application_startup(GApplication* application) { // Implements GApplication::shutdown. static void my_application_shutdown(GApplication* application) { +<<<<<<< HEAD //MyApplication* self = MY_APPLICATION(object); +======= + // MyApplication* self = MY_APPLICATION(object); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 // Perform any actions required at application shutdown. @@ -108,7 +167,12 @@ static void my_application_dispose(GObject* object) { static void my_application_class_init(MyApplicationClass* klass) { G_APPLICATION_CLASS(klass)->activate = my_application_activate; +<<<<<<< HEAD G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; +======= + G_APPLICATION_CLASS(klass)->local_command_line = + my_application_local_command_line; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 G_APPLICATION_CLASS(klass)->startup = my_application_startup; G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; G_OBJECT_CLASS(klass)->dispose = my_application_dispose; @@ -124,7 +188,12 @@ MyApplication* my_application_new() { g_set_prgname(APPLICATION_ID); return MY_APPLICATION(g_object_new(my_application_get_type(), +<<<<<<< HEAD "application-id", APPLICATION_ID, "flags", G_APPLICATION_NON_UNIQUE, nullptr)); +======= + "application-id", APPLICATION_ID, "flags", + G_APPLICATION_NON_UNIQUE, nullptr)); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 } diff --git a/linux/runner/my_application.h b/linux/runner/my_application.h index 72271d5..c923061 100644 --- a/linux/runner/my_application.h +++ b/linux/runner/my_application.h @@ -3,7 +3,14 @@ #include +<<<<<<< HEAD G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, +======= +G_DECLARE_FINAL_TYPE(MyApplication, + my_application, + MY, + APPLICATION, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 GtkApplication) /** diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 724bb2a..c42ab79 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,13 @@ import FlutterMacOS import Foundation +<<<<<<< HEAD import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) +======= + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 2e7fb95..622d2f1 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -27,6 +27,10 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +<<<<<<< HEAD +======= + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -64,7 +68,11 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; +<<<<<<< HEAD 33CC10ED2044A3C60003C045 /* flutter_application_1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "flutter_application_1.app"; sourceTree = BUILT_PRODUCTS_DIR; }; +======= + 33CC10ED2044A3C60003C045 /* recoleccion_residuos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "recoleccion_residuos.app"; sourceTree = BUILT_PRODUCTS_DIR; }; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -76,6 +84,10 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; +<<<<<<< HEAD +======= + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -92,6 +104,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( +<<<<<<< HEAD +======= + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 ); runOnlyForDeploymentPostprocessing = 0; }; @@ -131,7 +147,11 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD 33CC10ED2044A3C60003C045 /* flutter_application_1.app */, +======= + 33CC10ED2044A3C60003C045 /* recoleccion_residuos.app */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -151,6 +171,10 @@ 33CEB47122A05771004F2AC0 /* Flutter */ = { isa = PBXGroup; children = ( +<<<<<<< HEAD +======= + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, @@ -216,8 +240,16 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; +<<<<<<< HEAD productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* flutter_application_1.app */; +======= + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* recoleccion_residuos.app */; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -260,6 +292,12 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; +<<<<<<< HEAD +======= + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -385,10 +423,17 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_application_1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_application_1"; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/recoleccion_residuos.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/recoleccion_residuos"; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 }; name = Debug; }; @@ -399,10 +444,17 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_application_1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_application_1"; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/recoleccion_residuos.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/recoleccion_residuos"; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 }; name = Release; }; @@ -413,10 +465,17 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; +<<<<<<< HEAD PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/flutter_application_1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/flutter_application_1"; +======= + PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/recoleccion_residuos.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/recoleccion_residuos"; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 }; name = Profile; }; @@ -461,7 +520,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD MACOSX_DEPLOYMENT_TARGET = 10.14; +======= + MACOSX_DEPLOYMENT_TARGET = 10.15; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -543,7 +606,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD MACOSX_DEPLOYMENT_TARGET = 10.14; +======= + MACOSX_DEPLOYMENT_TARGET = 10.15; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -593,7 +660,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; +<<<<<<< HEAD MACOSX_DEPLOYMENT_TARGET = 10.14; +======= + MACOSX_DEPLOYMENT_TARGET = 10.15; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -700,6 +771,23 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +<<<<<<< HEAD +======= + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 369e632..9909050 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,27 @@ +<<<<<<< HEAD +======= + + + + + + + + + + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 BlueprintName = "Runner" ReferencedContainer = "container:Runner.xcodeproj"> @@ -31,7 +56,11 @@ >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 BlueprintName = "Runner" ReferencedContainer = "container:Runner.xcodeproj"> @@ -59,13 +88,21 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" +<<<<<<< HEAD +======= + enableGPUValidationMode = "1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 allowLocationSimulation = "YES"> >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 BlueprintName = "Runner" ReferencedContainer = "container:Runner.xcodeproj"> @@ -82,7 +119,11 @@ >>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 BlueprintName = "Runner" ReferencedContainer = "container:Runner.xcodeproj"> diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 8092559..ec804f6 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,17 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. +<<<<<<< HEAD PRODUCT_NAME = flutter_application_1 // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1 +======= +PRODUCT_NAME = recoleccion_residuos + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.recoleccionResiduos +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2026 com.example. All rights reserved. diff --git a/pubspec.lock b/pubspec.lock index f4f6d58..ac023dd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,6 +5,7 @@ packages: dependency: transitive description: name: async +<<<<<<< HEAD sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted @@ -17,42 +18,77 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.4" +======= + sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37 + url: "https://pub.dev" + source: hosted + version: "2.13.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 boolean_selector: dependency: transitive description: name: boolean_selector +<<<<<<< HEAD sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" url: "https://pub.dev" source: hosted version: "2.1.1" +======= + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 characters: dependency: transitive description: name: characters +<<<<<<< HEAD sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted version: "1.3.0" +======= + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + url: "https://pub.dev" + source: hosted + version: "1.4.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 clock: dependency: transitive description: name: clock +<<<<<<< HEAD sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.dev" source: hosted version: "1.1.1" +======= + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 collection: dependency: transitive description: name: collection +<<<<<<< HEAD sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted version: "1.19.0" +======= + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 cupertino_icons: dependency: "direct main" description: name: cupertino_icons +<<<<<<< HEAD sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted @@ -65,10 +101,17 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.8" +======= + sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd" + url: "https://pub.dev" + source: hosted + version: "1.0.9" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 fake_async: dependency: transitive description: name: fake_async +<<<<<<< HEAD sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.dev" source: hosted @@ -89,11 +132,18 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.1" +======= + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" +<<<<<<< HEAD flutter_bloc: dependency: "direct main" description: @@ -102,19 +152,29 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" +======= +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 flutter_lints: dependency: "direct dev" description: name: flutter_lints +<<<<<<< HEAD sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted version: "5.0.0" +======= + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" + url: "https://pub.dev" + source: hosted + version: "6.0.0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" +<<<<<<< HEAD flutter_web_plugins: dependency: transitive description: flutter @@ -128,34 +188,58 @@ packages: url: "https://pub.dev" source: hosted version: "13.2.5" +======= +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 leak_tracker: dependency: transitive description: name: leak_tracker +<<<<<<< HEAD sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted version: "10.0.7" +======= + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing +<<<<<<< HEAD sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted version: "3.0.8" +======= + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing +<<<<<<< HEAD sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted version: "3.0.1" +======= + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 lints: dependency: transitive description: name: lints +<<<<<<< HEAD sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted @@ -168,26 +252,47 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" +======= + sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" + url: "https://pub.dev" + source: hosted + version: "6.1.0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 matcher: dependency: transitive description: name: matcher +<<<<<<< HEAD sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted version: "0.12.16+1" +======= + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + url: "https://pub.dev" + source: hosted + version: "0.12.19" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 material_color_utilities: dependency: transitive description: name: material_color_utilities +<<<<<<< HEAD sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted version: "0.11.1" +======= + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 meta: dependency: transitive description: name: meta +<<<<<<< HEAD sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted @@ -200,10 +305,17 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" +======= + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" + url: "https://pub.dev" + source: hosted + version: "1.18.0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 path: dependency: transitive description: name: path +<<<<<<< HEAD sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted @@ -312,6 +424,12 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.1" +======= + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 sky_engine: dependency: transitive description: flutter @@ -321,62 +439,112 @@ packages: dependency: transitive description: name: source_span +<<<<<<< HEAD sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted version: "1.10.0" +======= + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" + source: hosted + version: "1.10.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 stack_trace: dependency: transitive description: name: stack_trace +<<<<<<< HEAD sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted version: "1.12.0" +======= + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 stream_channel: dependency: transitive description: name: stream_channel +<<<<<<< HEAD sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted version: "2.1.2" +======= + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 string_scanner: dependency: transitive description: name: string_scanner +<<<<<<< HEAD sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted version: "1.3.0" +======= + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 term_glyph: dependency: transitive description: name: term_glyph +<<<<<<< HEAD sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.dev" source: hosted version: "1.2.1" +======= + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 test_api: dependency: transitive description: name: test_api +<<<<<<< HEAD sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted version: "0.7.3" +======= + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" + url: "https://pub.dev" + source: hosted + version: "0.7.11" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 vector_math: dependency: transitive description: name: vector_math +<<<<<<< HEAD sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.dev" source: hosted version: "2.1.4" +======= + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + url: "https://pub.dev" + source: hosted + version: "2.2.0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 vm_service: dependency: transitive description: name: vm_service +<<<<<<< HEAD sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted @@ -400,3 +568,12 @@ packages: sdks: dart: ">=3.6.0 <4.0.0" flutter: ">=3.27.0" +======= + sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360" + url: "https://pub.dev" + source: hosted + version: "15.2.0" +sdks: + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/pubspec.yaml b/pubspec.yaml index 552c0cf..8c1cfb2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,16 @@ +<<<<<<< HEAD name: flutter_application_1 description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev +======= +name: recoleccion_residuos +description: "A new Flutter project." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -19,6 +27,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: +<<<<<<< HEAD sdk: ">=3.0.0 <4.0.0" dependencies: @@ -29,6 +38,23 @@ dependencies: go_router: ^13.0.0 equatable: ^2.0.5 shared_preferences: ^2.2.0 +======= + sdk: ^3.12.0 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 dev_dependencies: flutter_test: @@ -39,13 +65,21 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. +<<<<<<< HEAD flutter_lints: ^5.0.0 +======= + flutter_lints: ^6.0.0 +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter packages. flutter: +<<<<<<< HEAD +======= + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. diff --git a/test/widget_test.dart b/test/widget_test.dart index e69304c..335c474 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,6 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +<<<<<<< HEAD // Use a local test app to avoid depending on external package imports // which may not exist in the test environment. class MyApp extends StatefulWidget { @@ -36,6 +37,9 @@ class _MyAppState extends State { ); } } +======= +import 'package:recoleccion_residuos/main.dart'; +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/index.html b/web/index.html index 34a4134..d56e6a2 100644 --- a/web/index.html +++ b/web/index.html @@ -23,16 +23,35 @@ +<<<<<<< HEAD +======= + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 +<<<<<<< HEAD flutter_application_1 +======= + recoleccion_residuos + + + + +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 diff --git a/web/manifest.json b/web/manifest.json index dd8e066..9d8d200 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,11 @@ { +<<<<<<< HEAD "name": "flutter_application_1", "short_name": "flutter_application_1", +======= + "name": "recoleccion_residuos", + "short_name": "recoleccion_residuos", +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 8cc860b..463ed36 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,18 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) +<<<<<<< HEAD project(flutter_application_1 LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. set(BINARY_NAME "flutter_application_1") +======= +project(recoleccion_residuos LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "recoleccion_residuos") +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 55bf283..b3d92f4 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -90,12 +90,21 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" +<<<<<<< HEAD VALUE "FileDescription", "flutter_application_1" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "flutter_application_1" "\0" VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" VALUE "OriginalFilename", "flutter_application_1.exe" "\0" VALUE "ProductName", "flutter_application_1" "\0" +======= + VALUE "FileDescription", "recoleccion_residuos" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "recoleccion_residuos" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "recoleccion_residuos.exe" "\0" + VALUE "ProductName", "recoleccion_residuos" "\0" +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index bb23060..595a3bd 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,11 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); +<<<<<<< HEAD if (!window.Create(L"flutter_application_1", origin, size)) { +======= + if (!window.Create(L"recoleccion_residuos", origin, size)) { +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp index 3a0b465..f4f6064 100644 --- a/windows/runner/utils.cpp +++ b/windows/runner/utils.cpp @@ -45,6 +45,7 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { if (utf16_string == nullptr) { return std::string(); } +<<<<<<< HEAD unsigned int target_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, nullptr, 0, nullptr, nullptr) @@ -52,6 +53,19 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { int input_length = (int)wcslen(utf16_string); std::string utf8_string; if (target_length == 0 || target_length > utf8_string.max_size()) { +======= + // First, find the length of the string with a safe upper bound (CWE-126). + // UNICODE_STRING_MAX_CHARS (32767) is the maximum length of a UNICODE_STRING. + int input_length = static_cast(wcsnlen(utf16_string, UNICODE_STRING_MAX_CHARS)); + // Now use that bounded length to determine the required buffer size. + // When an explicit length is passed, WideCharToMultiByte does not include + // the null terminator in its returned size. + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, nullptr, 0, nullptr, nullptr); + std::string utf8_string; + if (target_length == 0 || static_cast(target_length) > utf8_string.max_size()) { +>>>>>>> ffb5bdb346bb7ba0556931b52a489d47eca0d902 return utf8_string; } utf8_string.resize(target_length);