Merge branch '11-improve-global-statistics-widget' into 'master'

Resolve "Improve global statistics widget"

Closes #11

See merge request !7

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.5
-app.versionCode=5
+app.versionName=0.0.6
+app.versionCode=6

assets/translations/en.json

@@ -2,11 +2,9 @@
   "app_name": "Scrobbles",
 
   "global_statistics": "Global statistics",
-  "statistics_total_scrobbles_count": "Total scrobbles count:",
-  "statistics_last_scrobble": "Last scrobble: ",
+  "statistics_total_scrobbles_count": "Total scrobbles count: {count}",
+  "statistics_last_scrobble": "Last scrobble: {datetime}",
   "statistics_selected_period": "On last {daysCount} days:",
-  "statistics_recent_scrobbles_count": "Scrobbles:",
-  "statistics_discoveries": "Discoveries:",
-  "statistics_discoveries_artists": "artists",
-  "statistics_discoveries_tracks": "tracks"
+  "statistics_recent_scrobbles_count": "Scrobbles: {count}",
+  "statistics_discoveries": "Discoveries: {artistsCount} artists / {tracksCount} tracks"
 }

assets/translations/fr.json

@@ -2,11 +2,9 @@
   "app_name": "Scrobbles",
 
   "global_statistics": "Statistiques globales d'écoutes",
-  "statistics_total_scrobbles_count": "Nombre total d'écoutes :",
-  "statistics_last_scrobble": "Dernière écoute :",
+  "statistics_total_scrobbles_count": "Nombre total d'écoutes : {count}",
+  "statistics_last_scrobble": "Dernière écoute : {datetime}",
   "statistics_selected_period": "Sur les {daysCount} derniers jours:",
-  "statistics_recent_scrobbles_count": "Écoutes :",
-  "statistics_discoveries": "Découvertes :",
-  "statistics_discoveries_artists": "artistes",
-  "statistics_discoveries_tracks": "morceaux"
+  "statistics_recent_scrobbles_count": "Écoutes : {count}",
+  "statistics_discoveries": "Découvertes : {artistsCount} artistes / {tracksCount} morceaux"
 }

fastlane/metadata/android/en-US/changelogs/6.txt

+Improve global statistic bloc

fastlane/metadata/android/fr-FR/changelogs/6.txt

+Amélioration du bloc de statistiques globales

lib/models/statistics.dart

+import 'dart:convert';
+
 class StatisticsData {
   final int totalCount;
   final int recentCount;
@@ -17,14 +19,37 @@ class StatisticsData {
 
   factory StatisticsData.fromJson(Map<String, dynamic> json) {
     return StatisticsData(
-      totalCount: json['totalCount'] as int,
-      recentCount: json['recentCount'] as int,
-      firstPlayedArtistsCount: json['firstPlayedArtistsCount'] as int,
-      firstPlayedTracksCount: json['firstPlayedTracksCount'] as int,
-      selectedPeriod: json['selectedPeriod'] as int,
-      lastScrobble: DateTime.parse(
+      totalCount: json['totalCount'] != null ? json['totalCount'] as int : 0,
+      recentCount: json['recentCount'] != null ? json['recentCount'] as int : 0,
+      firstPlayedArtistsCount:
+          json['firstPlayedArtistsCount'] != null ? json['firstPlayedArtistsCount'] as int : 0,
+      firstPlayedTracksCount:
+          json['firstPlayedTracksCount'] != null ? json['firstPlayedTracksCount'] as int : 0,
+      selectedPeriod: json['selectedPeriod'] != null ? json['selectedPeriod'] as int : 0,
+      lastScrobble: (json['lastScrobble'] != null && json['lastScrobble']['date'] != null)
+          ? DateTime.parse(
               json['lastScrobble']['date'],
-      ),
+            )
+          : DateTime.now(),
     );
   }
+
+  factory StatisticsData.createEmpty() {
+    return StatisticsData.fromJson({});
+  }
+
+  String toString() {
+    Map<String, dynamic> map = {
+      'totalCount': this.totalCount,
+      'recentCount': this.recentCount,
+      'firstPlayedArtistsCount': this.firstPlayedArtistsCount,
+      'firstPlayedTracksCount': this.firstPlayedTracksCount,
+      'selectedPeriod': this.selectedPeriod,
+      'lastScrobble': {
+        'date': this.lastScrobble.toString(),
+      },
+    };
+
+    return jsonEncode(map);
+  }
 }

lib/ui/screens/main_screen.dart

 import 'package:flutter/material.dart';
 
 import '../widgets/header.dart';
-import '../widgets/main_screen/statistics.dart';
+import '../widgets/main_screen/statistics_card.dart';
 
 class MainScreen extends StatelessWidget {
   const MainScreen({super.key});
@@ -15,7 +15,7 @@ class MainScreen extends StatelessWidget {
         physics: const BouncingScrollPhysics(),
         children: <Widget>[
           const Header(text: 'app_name'),
-          const Statistics(),
+          const StatisticsCard(),
           const SizedBox(height: 36),
         ],
       ),

lib/ui/widgets/main_screen/statistics.dart

-import 'package:easy_localization/easy_localization.dart';
-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});
-
-  @override
-  Widget build(BuildContext context) {
-    late Future<StatisticsData> futureAlbum = ScrobblesApi.fetchStatistics();
-
-    return FutureBuilder<StatisticsData>(
-      future: futureAlbum,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          final TextTheme textTheme = Theme.of(context).primaryTextTheme;
-
-          return Card(
-            elevation: 2,
-            shadowColor: Theme.of(context).colorScheme.shadow,
-            color: Theme.of(context).colorScheme.primary,
-            shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.all(Radius.circular(12))),
-            child: Padding(
-              padding: const EdgeInsets.all(12.0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(
-                    tr('global_statistics'),
-                    style: textTheme.titleLarge!.apply(fontWeightDelta: 2),
-                  ),
-                  Text(
-                    tr('statistics_total_scrobbles_count') +
-                        ' ' +
-                        snapshot.data!.totalCount.toString(),
-                    style: textTheme.bodyMedium,
-                  ),
-                  Text(
-                    tr('statistics_last_scrobble') +
-                        ' ' +
-                        DateFormat().format(snapshot.data!.lastScrobble),
-                    style: textTheme.bodyMedium,
-                  ),
-                  Text(
-                    'statistics_selected_period',
-                    style: textTheme.bodyMedium,
-                  ).tr(namedArgs: {'daysCount': snapshot.data!.selectedPeriod.toString()}),
-                  Text(
-                    tr('statistics_recent_scrobbles_count') +
-                        ' ' +
-                        snapshot.data!.recentCount.toString(),
-                    style: textTheme.bodyMedium,
-                  ),
-                  Text(
-                    tr('statistics_discoveries') +
-                        ' ' +
-                        snapshot.data!.firstPlayedArtistsCount.toString() +
-                        ' ' +
-                        tr('statistics_discoveries_artists') +
-                        ' / ' +
-                        snapshot.data!.firstPlayedTracksCount.toString() +
-                        ' ' +
-                        tr('statistics_discoveries_tracks'),
-                    style: textTheme.bodyMedium,
-                  ),
-                ],
-              ),
-            ),
-          );
-        } else if (snapshot.hasError) {
-          return ShowErrorWidget(message: '${snapshot.error}');
-        }
-
-        return const CircularProgressIndicator();
-      },
-    );
-  }
-}

lib/ui/widgets/main_screen/statistics_card.dart

+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+
+import '../../../models/statistics.dart';
+import '../../../network/scrobbles_api.dart';
+import '../../../ui/widgets/error.dart';
+import '../../../ui/widgets/main_screen/statistics_content.dart';
+
+class StatisticsCard extends StatelessWidget {
+  const StatisticsCard({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    late Future<StatisticsData> futureAlbum = ScrobblesApi.fetchStatistics();
+
+    return FutureBuilder<StatisticsData>(
+      future: futureAlbum,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return ShowErrorWidget(message: '${snapshot.error}');
+        }
+
+        return Card(
+          elevation: 2,
+          shadowColor: Theme.of(context).colorScheme.shadow,
+          color: Theme.of(context).colorScheme.primary,
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(12),
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(12.0),
+            child: StatisticsContent(
+              statistics: snapshot.hasData
+                  ? StatisticsData.fromJson(jsonDecode(snapshot.data.toString()))
+                  : StatisticsData.createEmpty(),
+              isLoading: !snapshot.hasData,
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

lib/ui/widgets/main_screen/statistics_content.dart

+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+import '../../../models/statistics.dart';
+
+class StatisticsContent extends StatelessWidget {
+  final StatisticsData statistics;
+  final bool isLoading;
+
+  const StatisticsContent({super.key, required this.statistics, required this.isLoading});
+
+  @override
+  Widget build(BuildContext context) {
+    final TextTheme textTheme = Theme.of(context).primaryTextTheme;
+
+    final String placeholder = '⏳';
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Text(
+          'global_statistics',
+          style: textTheme.titleLarge!.apply(fontWeightDelta: 2),
+        ).tr(),
+        Text(
+          'statistics_total_scrobbles_count',
+          style: textTheme.bodyMedium,
+        ).tr(
+          namedArgs: {
+            'count': this.isLoading ? placeholder : this.statistics.totalCount.toString(),
+          },
+        ),
+        Text(
+          'statistics_last_scrobble',
+          style: textTheme.bodyMedium,
+        ).tr(
+          namedArgs: {
+            'datetime': this.isLoading
+                ? placeholder
+                : DateFormat().format(this.statistics.lastScrobble),
+          },
+        ),
+        Text(
+          'statistics_selected_period',
+          style: textTheme.bodyMedium,
+        ).tr(
+          namedArgs: {
+            'daysCount':
+                this.isLoading ? placeholder : this.statistics.selectedPeriod.toString(),
+          },
+        ),
+        Text(
+          'statistics_recent_scrobbles_count',
+          style: textTheme.bodyMedium,
+        ).tr(
+          namedArgs: {
+            'count': this.isLoading ? placeholder : this.statistics.recentCount.toString(),
+          },
+        ),
+        Text(
+          'statistics_discoveries',
+          style: textTheme.bodyMedium,
+        ).tr(
+          namedArgs: {
+            'artistsCount': this.isLoading
+                ? placeholder
+                : this.statistics.firstPlayedArtistsCount.toString(),
+            'tracksCount': this.isLoading
+                ? placeholder
+                : this.statistics.firstPlayedTracksCount.toString(),
+          },
+        ),
+      ],
+    );
+  }
+}

pubspec.yaml

@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.5+5
+version: 0.0.6+6
 
 environment:
   sdk: '^3.0.0'