diff --git a/android/gradle.properties b/android/gradle.properties index 9742e8d9ac872ece07c6ae62a041bc05c2a8fcc6..4878903faeac600353ec559be514de7d30376f55 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.31 -app.versionCode=31 +app.versionName=0.0.32 +app.versionCode=32 diff --git a/fastlane/metadata/android/en-US/changelogs/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..36ae8114cbfcd44358ce709fe602de7124153f82 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/32.txt @@ -0,0 +1 @@ +Improve / uniformize days counts on charts. diff --git a/fastlane/metadata/android/fr-FR/changelogs/32.txt b/fastlane/metadata/android/fr-FR/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..2d5e9ae809ddf18d4c4f1d95d6fe15546aa2c47a --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/32.txt @@ -0,0 +1 @@ +Amélioration / uniformisation des nombres de jours sur les graphiques. diff --git a/lib/config/settings.dart b/lib/config/settings.dart new file mode 100644 index 0000000000000000000000000000000000000000..2c62c87ee0e03f039dc4f6309ed670f4e65d2455 --- /dev/null +++ b/lib/config/settings.dart @@ -0,0 +1,8 @@ +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; +} diff --git a/lib/ui/widgets/cards/counts_by_day.dart b/lib/ui/widgets/cards/counts_by_day.dart index 98c6cfef40b4af7f06c6c4b557c2c377f189537b..8110b8dd47a54aca7726d5907052a67611d11aff 100644 --- a/lib/ui/widgets/cards/counts_by_day.dart +++ b/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(), diff --git a/lib/ui/widgets/cards/counts_by_hour.dart b/lib/ui/widgets/cards/counts_by_hour.dart index 595818e2c78dd023d540c312bff90be8d6d230a0..c255143892df915a1de1dae601999f529fa519c6 100644 --- a/lib/ui/widgets/cards/counts_by_hour.dart +++ b/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(), diff --git a/lib/ui/widgets/cards/discoveries.dart b/lib/ui/widgets/cards/discoveries.dart index fb3baf5cf9386084d3624fa02ac72b3eb7de42df..ffa3e8ca21c2bf14be20a19ba55b433256163a66 100644 --- a/lib/ui/widgets/cards/discoveries.dart +++ b/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(), diff --git a/lib/ui/widgets/cards/statistics_recent.dart b/lib/ui/widgets/cards/statistics_recent.dart index 9a14c8af7854054e2b5dfe64a7d4aad842b83973..a8f83a0a1e0b233ad45b814c31dc842456a323d3 100644 --- a/lib/ui/widgets/cards/statistics_recent.dart +++ b/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>( diff --git a/lib/ui/widgets/cards/timeline.dart b/lib/ui/widgets/cards/timeline.dart index a7b20d44c2f99a346ebd52b9749a617153f85b34..92fbda834dcfc11f80e253f319e26b1704a9ddef 100644 --- a/lib/ui/widgets/cards/timeline.dart +++ b/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(), diff --git a/lib/ui/widgets/cards/top_artists.dart b/lib/ui/widgets/cards/top_artists.dart index 7e05208ed4c1c054a644fe9d3f1cbf5dc1122407..568cbd7f1ee3506e6d224f7eab9ba8b510c2a353 100644 --- a/lib/ui/widgets/cards/top_artists.dart +++ b/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(), diff --git a/lib/ui/widgets/update_data.dart b/lib/ui/widgets/update_data.dart index 7bc41016e1ca6fbed5b03c969f30ab25b157dbff..9e10bdff2642aa54f4e8bfd53db7bcef3ce75e06 100644 --- a/lib/ui/widgets/update_data.dart +++ b/lib/ui/widgets/update_data.dart @@ -1,6 +1,7 @@ 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), ], ), ); diff --git a/pubspec.yaml b/pubspec.yaml index a76c11d6766afd8ae1153b80103de06fe158e82a..0740c141d27102bfba40d60380e757f1c972706d 100644 --- a/pubspec.yaml +++ b/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'