Merge branch '38-fix-days-counts' into 'master'

Resolve "Fix days counts"

Closes #38

See merge request !33

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.31
-app.versionCode=31
+app.versionName=0.0.32
+app.versionCode=32

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

+Improve / uniformize days counts on charts.

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

+Amélioration / uniformisation des nombres de jours sur les graphiques.

lib/config/settings.dart

+class Settings {
+  static const int countsByDayDaysCount = 21;
+  static const int countsByHourDaysCount = 21;
+  static const int discoveriesDaysCount = 14;
+  static const int statisticsRecentDaysCount = 21;
+  static const int timelineDaysCount = 14;
+  static const int topArtistsDaysCount = 14;
+}

lib/ui/widgets/cards/counts_by_day.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_counts_by_day_cubit.dart';
 import 'package:scrobbles/models/counts_by_day.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -14,7 +15,7 @@ class CardCountsByDay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 21;
+    final int daysCount = Settings.countsByDayDaysCount;
 
     return BlocProvider<DataCountsByDayCubit>(
       create: (BuildContext context) => DataCountsByDayCubit(),

lib/ui/widgets/cards/counts_by_hour.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_counts_by_hour_cubit.dart';
 import 'package:scrobbles/models/counts_by_hour.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -14,7 +15,7 @@ class CardCountsByHour extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 21;
+    final int daysCount = Settings.countsByHourDaysCount;
 
     return BlocProvider<DataCountsByHourCubit>(
       create: (BuildContext context) => DataCountsByHourCubit(),

lib/ui/widgets/cards/discoveries.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_discoveries_cubit.dart';
 import 'package:scrobbles/models/discoveries.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -15,7 +16,7 @@ class CardDiscoveries extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 14;
+    final int daysCount = Settings.discoveriesDaysCount;
 
     return BlocProvider<DataDiscoveriesCubit>(
       create: (BuildContext context) => DataDiscoveriesCubit(),

lib/ui/widgets/cards/statistics_recent.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_statistics_recent_cubit.dart';
 import 'package:scrobbles/models/statistics_recent.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -14,7 +15,7 @@ class CardStatisticsRecent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 21;
+    final int daysCount = Settings.statisticsRecentDaysCount;
 
     // data context
     return BlocProvider<DataStatisticsRecentCubit>(

lib/ui/widgets/cards/timeline.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_timeline_cubit.dart';
 import 'package:scrobbles/models/timeline.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -15,7 +16,7 @@ class CardTimeline extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 14;
+    final int daysCount = Settings.timelineDaysCount;
 
     return BlocProvider<DataTimelineCubit>(
       create: (BuildContext context) => DataTimelineCubit(),

lib/ui/widgets/cards/top_artists.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_top_artists_cubit.dart';
 import 'package:scrobbles/models/topartists.dart';
 import 'package:scrobbles/ui/widgets/card_content.dart';
@@ -14,7 +15,7 @@ class CardTopArtists extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int daysCount = 14;
+    final int daysCount = Settings.topArtistsDaysCount;
 
     return BlocProvider<DataTopArtistsCubit>(
       create: (BuildContext context) => DataTopArtistsCubit(),

lib/ui/widgets/update_data.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+import 'package:scrobbles/config/settings.dart';
 import 'package:scrobbles/cubit/data_counts_by_day_cubit.dart';
 import 'package:scrobbles/cubit/data_counts_by_hour_cubit.dart';
 import 'package:scrobbles/cubit/data_discoveries_cubit.dart';
@@ -21,7 +22,6 @@ import 'package:scrobbles/ui/widgets/error.dart';
 class UpdateData extends StatelessWidget {
   const UpdateData({super.key});
 
-  final int daysCount = 21;
   final Widget loading = const Text('⏳');
   final Widget done = const Text('');
 
@@ -31,13 +31,13 @@ class UpdateData extends StatelessWidget {
       padding: EdgeInsets.all(4),
       child: Stack(
         children: [
-          updateCountsByDay(daysCount),
-          updateCountsByHour(daysCount),
-          updateDiscoveries(daysCount),
+          updateCountsByDay(Settings.countsByDayDaysCount),
+          updateCountsByHour(Settings.countsByHourDaysCount),
+          updateDiscoveries(Settings.discoveriesDaysCount),
           updateStatisticsGlobal(),
-          updateStatisticsRecent(daysCount),
-          updateTimeline(daysCount),
-          updateTopArtists(daysCount),
+          updateStatisticsRecent(Settings.statisticsRecentDaysCount),
+          updateTimeline(Settings.timelineDaysCount),
+          updateTopArtists(Settings.topArtistsDaysCount),
         ],
       ),
     );

pubspec.yaml

@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.31+31
+version: 0.0.32+32
 
 environment:
   sdk: '^3.0.0'