From 1cea2441d22f4cf4c746045fcd758b02f5a9980a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 26 Oct 2023 10:49:58 +0200
Subject: [PATCH] Improve error display, add widget
---
android/gradle.properties | 4 ++--
.../metadata/android/en-US/changelogs/4.txt | 1 +
.../metadata/android/fr-FR/changelogs/4.txt | 1 +
lib/ui/widgets/error.dart | 17 +++++++++++++++++
lib/ui/widgets/main_screen/statistics.dart | 3 ++-
pubspec.yaml | 2 +-
6 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/4.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/4.txt
create mode 100644 lib/ui/widgets/error.dart
diff --git a/android/gradle.properties b/android/gradle.properties
index db7a1ee..14eed39 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=0.0.3
-app.versionCode=3
+app.versionName=0.0.4
+app.versionCode=4
diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt
new file mode 100644
index 0000000..a07b59a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4.txt
@@ -0,0 +1 @@
+Improve display error message
diff --git a/fastlane/metadata/android/fr-FR/changelogs/4.txt b/fastlane/metadata/android/fr-FR/changelogs/4.txt
new file mode 100644
index 0000000..2a8e372
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/4.txt
@@ -0,0 +1 @@
+Amélioration de l'affichage d'un message d'erreur
diff --git a/lib/ui/widgets/error.dart b/lib/ui/widgets/error.dart
new file mode 100644
index 0000000..e65f242
--- /dev/null
+++ b/lib/ui/widgets/error.dart
@@ -0,0 +1,17 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+class ShowErrorWidget extends StatelessWidget {
+ const ShowErrorWidget({super.key, required this.message});
+
+ final String message;
+
+ @override
+ Widget build(BuildContext context) {
+ return Text(
+ '⚠️ ' + tr(message),
+ textAlign: TextAlign.start,
+ style: TextStyle(color: Colors.red),
+ );
+ }
+}
diff --git a/lib/ui/widgets/main_screen/statistics.dart b/lib/ui/widgets/main_screen/statistics.dart
index fbe556a..c0b555b 100644
--- a/lib/ui/widgets/main_screen/statistics.dart
+++ b/lib/ui/widgets/main_screen/statistics.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import '../../../models/statistics.dart';
import '../../../network/scrobbles_api.dart';
+import '../../../ui/widgets/error.dart';
class Statistics extends StatelessWidget {
const Statistics({super.key});
@@ -66,7 +67,7 @@ class Statistics extends StatelessWidget {
),
);
} else if (snapshot.hasError) {
- return Text('${snapshot.error}');
+ return ShowErrorWidget(message: '${snapshot.error}');
}
return const CircularProgressIndicator();
diff --git a/pubspec.yaml b/pubspec.yaml
index f44e24e..973a1df 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.3+3
+version: 0.0.4+4
environment:
sdk: '^3.0.0'
--
GitLab