diff --git a/.vscode/launch.json b/.vscode/launch.json
index fc0507c..ed97e25 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,19 +7,22 @@
{
"name": "flutter_project",
"request": "launch",
- "type": "dart"
+ "type": "dart",
+ "program": "lib/main/main.dart"
},
{
"name": "flutter_project (profile mode)",
"request": "launch",
"type": "dart",
- "flutterMode": "profile"
+ "flutterMode": "profile",
+ "program": "lib/main.dart"
},
{
"name": "flutter_project (release mode)",
"request": "launch",
"type": "dart",
- "flutterMode": "release"
+ "flutterMode": "release",
+ "program": "lib/main.dart"
}
]
-}
\ No newline at end of file
+}
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 399f698..84e09d0 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -4,4 +4,5 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
+
diff --git a/lib/contenedores_event.dart b/lib/BloC/contenedores_event.dart
similarity index 52%
rename from lib/contenedores_event.dart
rename to lib/BloC/contenedores_event.dart
index c23dfd8..afc36f2 100644
--- a/lib/contenedores_event.dart
+++ b/lib/BloC/contenedores_event.dart
@@ -12,10 +12,13 @@ class MyBloc extends Cubit {
}
Future launchAemetURL() async {
- const url = 'https://www.aemet.es/es/eltiempo/prediccion/municipios/caspe-id50074';
- if (await canLaunch(url)) {
- await launch(url);
- } else {
- throw 'Could not launch $url';
- }
-}
\ No newline at end of file
+
+ const urlString = 'https://www.aemet.es/es/eltiempo/prediccion/municipios/caspe-id50074';
+ final url = Uri.parse(urlString);
+
+ if (await canLaunchUrl(url)) {
+ await launchUrl(url);
+ } else {
+ throw 'Could not launch $urlString';
+ }
+}
diff --git a/lib/app_bar b/lib/bars/app_bar
similarity index 92%
rename from lib/app_bar
rename to lib/bars/app_bar
index 993fbc2..f766588 100644
--- a/lib/app_bar
+++ b/lib/bars/app_bar
@@ -8,7 +8,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
return AppBar(
title: const Text(''),
centerTitle: true,
- backgroundColor: Color.fromARGB(255, 194, 218, 230),
+ backgroundColor: Color.fromARGB(255, 78, 169, 6),
flexibleSpace: Container(
padding: const EdgeInsets.all(8.0),
child: Center(
diff --git a/lib/bottom_bar b/lib/bars/bottom_bar
similarity index 100%
rename from lib/bottom_bar
rename to lib/bars/bottom_bar
diff --git a/lib/contenedores_bloc.dart b/lib/contenedores_bloc.dart
deleted file mode 100644
index 217d7e0..0000000
--- a/lib/contenedores_bloc.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'dart:async';
-import 'package:flutter\_bloc/flutter\_bloc.dart';
-
-
-import 'package:flutter_project/contenedores_event.dart';
-import 'package:flutter_project/contenedores_state.dart';
-
-
-/*
-class ContenedoresBloc extends Bloc {
- ContenedoresBloc() : super(const ContenedoresState()) {
- on((event, emit) {
- emit(ContenedoresState(currentContenedor: event.contenedor));
- });
- }
-}*/
\ No newline at end of file
diff --git a/lib/contenedores_state.dart b/lib/contenedores_state.dart
deleted file mode 100644
index a9c34e0..0000000
--- a/lib/contenedores_state.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// This class represents the state of the ContenedoresBloc
-/*import 'package:flutter_project/contenedores_event.dart';
-
-class ContenedoresState {
- final Contenedor? currentContenedor;
-
- const ContenedoresState({this.currentContenedor});
-}*/
\ No newline at end of file
diff --git a/lib/my_home_page.dart b/lib/homePage/my_home_page.dart
similarity index 91%
rename from lib/my_home_page.dart
rename to lib/homePage/my_home_page.dart
index a9b0c8b..2a4577d 100644
--- a/lib/my_home_page.dart
+++ b/lib/homePage/my_home_page.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
-import 'package:flutter_project/app_bar';
-import 'package:flutter_project/bottom_bar';
-import 'package:flutter_project/contenedores_event.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:flutter_project/bars/app_bar';
+import 'package:flutter_project/bars/bottom_bar';
+import 'package:flutter_project/BloC/contenedores_event.dart';
+import 'package:flutter_project/pregon/pregon';
+
@@ -54,7 +54,12 @@ class MyHomePage extends StatelessWidget {
),
),
InkWell(
- onTap: () {},
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) => const Pregon()),
+ );
+ },
child: SizedBox(
width: 300.0,
child: Padding(
diff --git a/lib/main.dart b/lib/main/main.dart
similarity index 86%
rename from lib/main.dart
rename to lib/main/main.dart
index 3cc0d33..f5351b1 100644
--- a/lib/main.dart
+++ b/lib/main/main.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_project/contenedores_event.dart';
-import 'my_home_page.dart';
+import 'package:flutter_project/BloC/contenedores_event.dart';
+import '../homePage/my_home_page.dart';
void main() {
runApp(
diff --git a/lib/pregon/pregon b/lib/pregon/pregon
new file mode 100644
index 0000000..085b0d1
--- /dev/null
+++ b/lib/pregon/pregon
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_project/bars/app_bar';
+import 'package:flutter_project/bars/bottom_bar';
+
+class Pregon extends StatelessWidget {
+ const Pregon({Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+
+ List datos = ['Dia 1', 'Dia 2', 'Dia 3'];
+
+ return Scaffold(
+ appBar: const CustomAppBar(),
+ bottomNavigationBar: const CustomBottomBar(),
+ body: ListView.builder(
+ itemCount: datos.length,
+ itemBuilder: (context, index) {
+ return Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Container(
+ padding: const EdgeInsets.all(16.0),
+ decoration: BoxDecoration(
+ color: Colors.grey[200],
+ borderRadius: BorderRadius.circular(10.0),
+ ),
+ child: Text(
+ datos[index],
+ style: const TextStyle(
+ fontSize: 18.0,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ );
+ },
+ ),
+);
+
+}
+}
diff --git a/pubspec.lock b/pubspec.lock
index 7e8934f..ffe0b4a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: bloc
- sha256: "6f1b87b6eca9041d5672b6e29273cd1594db48ebb66fd2471066e9f3c3a516bd"
+ sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
url: "https://pub.dev"
source: hosted
- version: "7.2.1"
+ version: "8.1.4"
boolean_selector:
dependency: transitive
description:
@@ -82,10 +82,10 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
- sha256: cdd1351ced09eeb46cfa7946e095b7679344af927415ca9cd972928fa6d5b23f
+ sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2
url: "https://pub.dev"
source: hosted
- version: "7.3.3"
+ version: "8.1.5"
flutter_lints:
dependency: "direct dev"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b96da84..2ca5cc8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -31,7 +31,7 @@ dependencies:
flutter:
sdk: flutter
url_launcher: ^6.0.12
- flutter_bloc: ^7.0.0
+ flutter_bloc: ^8.1.5
flutter_svg: ^2.0.10+1
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 4eee978..707a605 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -8,7 +8,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_project/main.dart';
+import 'package:flutter_project/main/main.dart';
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {