v2.4.2

android/app/build.gradle

@@ -26,7 +26,18 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
+
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -52,10 +63,10 @@ android {
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
 
-            minifyEnabled true
-            useProguard true
+            //minifyEnabled true
+            //useProguard true
 
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
@@ -65,7 +76,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"    
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

android/app/src/main/AndroidManifest.xml

@@ -8,8 +8,8 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application
-        android:name="io.flutter.app.FlutterApplication"
+    <application        
+        android:name="${applicationName}"
         android:label="Precio Luz"
         android:icon="@mipmap/ic_launcher">
         <activity

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

lib/pages/about.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import '../widgets/read_file.dart';
+
 import '../widgets/head.dart';
+import '../widgets/read_file.dart';
 
 class About extends StatelessWidget {
   @override
@@ -16,7 +17,7 @@ class About extends StatelessWidget {
                 const Head(),
                 const Icon(Icons.code, size: 60, color: Color(0xFF1565C0)),
                 Text(
-                  'Versión 2.4.1', // VERSION
+                  'Versión 2.4.2', // VERSION
                   style: Theme.of(context).textTheme.bodyText1,
                 ),
                 Text(

lib/pages/donate.dart

@@ -2,6 +2,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show Clipboard, ClipboardData;
 import 'package:url_launcher/url_launcher.dart';
+
 import '../utils/constantes.dart';
 import '../widgets/head.dart';
 
@@ -14,14 +15,22 @@ class DonationPage extends StatelessWidget {
     const String urlPayPal = 'https://www.paypal.com/donate?hosted_button_id=986PSAHLH6N4L';
     const String urlGitHub = 'https://github.com/Webierta/precio-luz/issues';
 
-    void _launchURL(String url) async {
+    /* void _launchURL(String url) async {
       if (await canLaunch(url)) {
         await launch(url);
       } else {
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(
           content: Text('Could not launch PayPal payment website.'),
         ));
       }
+    } */
+
+    Future<void> _launchURL(String url) async {
+      if (!await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication)) {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          content: Text('Could not launch $url'),
+        ));
+      }
     }
 
     return Scaffold(

lib/pages/home.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:hive/hive.dart';
+// import 'package:hive/hive.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:intl/intl.dart';
 
-import '../widgets/confirm_delete.dart';
-import '../utils/constantes.dart';
 import '../services/database.dart';
-import '../services/datos_generacion.dart';
 import '../services/datos.dart';
+import '../services/datos_generacion.dart';
+import '../utils/constantes.dart';
 import '../utils/estados.dart';
 import '../widgets/appbar.dart';
+import '../widgets/confirm_delete.dart';
 import 'resultados.dart';
 
 class Home extends StatefulWidget {

lib/services/datos.dart

@@ -2,10 +2,11 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'package:xml/xml.dart';
+
 import 'package:http/http.dart' as http;
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:xml/xml.dart';
 
 import '../utils/estados.dart';
 import 'datos_json.dart';
@@ -35,7 +36,7 @@ class Datos {
     Map<String, String> headers = {
       'Accept': 'application/json; application/vnd.esios-api-v1+json',
       'Host': 'api.esios.ree.es',
-      'Authorization': 'Token token="$token"',
+      'x-api-key': token,
       'Cookie': '',
     };
     try {

lib/widgets/datos_hoy.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
-import '../utils/estados.dart';
 import '../services/datos.dart';
+import '../utils/estados.dart';
 import '../utils/tarifa.dart';
 
 class DatosHoy extends StatelessWidget {
@@ -13,7 +13,7 @@ class DatosHoy extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final now = DateTime.now().toLocal();
-    final today = DateTime(now.year, now.month, now.day);
+    //final today = DateTime(now.year, now.month, now.day);
     DateTime fechaData = DateFormat('dd/MM/yyyy').parse(fecha);
     fechaData = DateTime(fechaData.year, fechaData.month, fechaData.day, now.hour, now.minute);
 

lib/widgets/fab.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
+
 import '../utils/constantes.dart';
 import 'head.dart';
 
@@ -9,14 +10,21 @@ class Fab extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    void _launchURL(String url) async {
+    /* void _launchURL(String url) async {
       if (await canLaunch(url)) {
         await launch(url);
       } else {
         ScaffoldMessenger.of(context).showSnackBar(SnackBar(
           content: Text('Could not launch PayPal payment website.'),
         ));
       }
+    } */
+    Future<void> _launchURL(String url) async {
+      if (!await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication)) {
+        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          content: Text('Could not launch $url'),
+        ));
+      }
     }
 
     openDialog() {

lib/widgets/grafico_main.dart

@@ -1,9 +1,9 @@
-import 'package:flutter/material.dart';
 import 'package:charts_painter/chart.dart';
+import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
-import '../utils/constantes.dart';
 import '../services/datos.dart';
+import '../utils/constantes.dart';
 
 class GraficoMain extends StatelessWidget {
   final Datos dataHoy;
@@ -17,10 +17,9 @@ class GraficoMain extends StatelessWidget {
     double altoScreen = MediaQuery.of(context).size.height;
 
     final now = DateTime.now().toLocal();
-    final today = DateTime(now.year, now.month, now.day);
+    //final today = DateTime(now.year, now.month, now.day);
     DateTime fechaData = DateFormat('dd/MM/yyyy').parse(fecha);
-    fechaData = DateTime(
-        fechaData.year, fechaData.month, fechaData.day, now.hour, now.minute);
+    fechaData = DateTime(fechaData.year, fechaData.month, fechaData.day, now.hour, now.minute);
 
     //DateTime hoy = today == fechaData ? now : fechaData;
     /*DateTime hoy = DateTime(today.year, today.month, today.day)

pubspec.yaml

@@ -1,7 +1,7 @@
 name: precio_luz
 description: Detailed information by hours on the price of electricity in Spain (PVPC) for efficient management of electricity consumption.
 
-version: 2.4.1+24
+version: 2.4.2+25
 
 environment:
   sdk: ">=2.6.0 <3.0.0"