feat:implementacion grafica 2.0

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.