From 88f5ae5664ad9c391e64388cfe88d621aa733977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Thu, 30 Nov 2023 15:41:46 +0100
Subject: [PATCH] Fix display while fetching data
---
android/gradle.properties | 4 +-
.../metadata/android/en-US/changelogs/37.txt | 1 +
.../metadata/android/fr-FR/changelogs/37.txt | 1 +
lib/cubit/data_counts_by_day_cubit.dart | 2 +-
lib/cubit/data_counts_by_hour_cubit.dart | 2 +-
lib/cubit/data_discoveries_cubit.dart | 2 +-
lib/cubit/data_statistics_global_cubit.dart | 3 +-
lib/cubit/data_statistics_recent_cubit.dart | 3 +-
lib/cubit/data_timeline_cubit.dart | 2 +-
lib/cubit/data_top_artists_cubit.dart | 2 +-
lib/network/scrobbles.dart | 14 ------
.../widgets/abstracts/custom_bar_chart.dart | 3 +-
.../widgets/abstracts/custom_line_chart.dart | 3 +-
lib/ui/widgets/cards/counts_by_day.dart | 5 +--
lib/ui/widgets/cards/counts_by_hour.dart | 5 +--
lib/ui/widgets/cards/discoveries.dart | 8 +---
lib/ui/widgets/cards/statistics_global.dart | 6 +--
lib/ui/widgets/cards/statistics_recent.dart | 1 -
lib/ui/widgets/cards/timeline.dart | 8 +---
lib/ui/widgets/cards/top_artists.dart | 5 +--
lib/ui/widgets/charts/counts_by_day.dart | 27 ++++++------
lib/ui/widgets/charts/counts_by_hour.dart | 27 ++++++------
.../widgets/charts/discoveries_artists.dart | 25 +++++------
lib/ui/widgets/charts/discoveries_tracks.dart | 25 +++++------
lib/ui/widgets/charts/timeline_counts.dart | 25 +++++------
.../widgets/charts/timeline_eclecticism.dart | 33 +++++++-------
lib/ui/widgets/charts/top_artists.dart | 43 ++++++++-----------
lib/ui/widgets/content/statistics_global.dart | 20 +++------
lib/ui/widgets/content/statistics_recent.dart | 15 ++-----
pubspec.yaml | 2 +-
30 files changed, 126 insertions(+), 196 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/37.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/37.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 1f1e18f..9b5bace 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.36
-app.versionCode=36
+app.versionName=0.0.37
+app.versionCode=37
diff --git a/fastlane/metadata/android/en-US/changelogs/37.txt b/fastlane/metadata/android/en-US/changelogs/37.txt
new file mode 100644
index 0000000..3e5052a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37.txt
@@ -0,0 +1 @@
+Display data while fetching API.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/37.txt b/fastlane/metadata/android/fr-FR/changelogs/37.txt
new file mode 100644
index 0000000..2c1efe5
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/37.txt
@@ -0,0 +1 @@
+Affichage des données pendant le chargement.
diff --git a/lib/cubit/data_counts_by_day_cubit.dart b/lib/cubit/data_counts_by_day_cubit.dart
index cb5b780..ab40a21 100644
--- a/lib/cubit/data_counts_by_day_cubit.dart
+++ b/lib/cubit/data_counts_by_day_cubit.dart
@@ -18,7 +18,7 @@ class DataCountsByDayCubit extends HydratedCubit<DataCountsByDayState> {
}
void update(CountsByDayData? countsByDay) {
- if (state.countsByDay.toString() != countsByDay.toString()) {
+ if ((countsByDay != null) && (state.countsByDay.toString() != countsByDay.toString())) {
setValue(countsByDay);
}
}
diff --git a/lib/cubit/data_counts_by_hour_cubit.dart b/lib/cubit/data_counts_by_hour_cubit.dart
index fae6517..83cd2d3 100644
--- a/lib/cubit/data_counts_by_hour_cubit.dart
+++ b/lib/cubit/data_counts_by_hour_cubit.dart
@@ -18,7 +18,7 @@ class DataCountsByHourCubit extends HydratedCubit<DataCountsByHourState> {
}
void update(CountsByHourData? countsByHour) {
- if (state.countsByHour.toString() != countsByHour.toString()) {
+ if ((countsByHour != null) && (state.countsByHour.toString() != countsByHour.toString())) {
setValue(countsByHour);
}
}
diff --git a/lib/cubit/data_discoveries_cubit.dart b/lib/cubit/data_discoveries_cubit.dart
index f2037ab..dabda77 100644
--- a/lib/cubit/data_discoveries_cubit.dart
+++ b/lib/cubit/data_discoveries_cubit.dart
@@ -18,7 +18,7 @@ class DataDiscoveriesCubit extends HydratedCubit<DataDiscoveriesState> {
}
void update(DiscoveriesData? discoveries) {
- if (state.discoveries.toString() != discoveries.toString()) {
+ if ((discoveries != null) && (state.discoveries.toString() != discoveries.toString())) {
setValue(discoveries);
}
}
diff --git a/lib/cubit/data_statistics_global_cubit.dart b/lib/cubit/data_statistics_global_cubit.dart
index 5962e2c..49e9292 100644
--- a/lib/cubit/data_statistics_global_cubit.dart
+++ b/lib/cubit/data_statistics_global_cubit.dart
@@ -18,7 +18,8 @@ class DataStatisticsGlobalCubit extends HydratedCubit<DataStatisticsGlobalState>
}
void update(StatisticsGlobalData? statisticsGlobal) {
- if (state.statisticsGlobal.toString() != statisticsGlobal.toString()) {
+ if ((statisticsGlobal != null) &&
+ (state.statisticsGlobal.toString() != statisticsGlobal.toString())) {
setValue(statisticsGlobal);
}
}
diff --git a/lib/cubit/data_statistics_recent_cubit.dart b/lib/cubit/data_statistics_recent_cubit.dart
index 945e038..da24b13 100644
--- a/lib/cubit/data_statistics_recent_cubit.dart
+++ b/lib/cubit/data_statistics_recent_cubit.dart
@@ -18,7 +18,8 @@ class DataStatisticsRecentCubit extends HydratedCubit<DataStatisticsRecentState>
}
void update(StatisticsRecentData? statisticsRecent) {
- if (state.statisticsRecent.toString() != statisticsRecent.toString()) {
+ if ((statisticsRecent != null) &&
+ (state.statisticsRecent.toString() != statisticsRecent.toString())) {
setValue(statisticsRecent);
}
}
diff --git a/lib/cubit/data_timeline_cubit.dart b/lib/cubit/data_timeline_cubit.dart
index 1dadcfe..692dfcb 100644
--- a/lib/cubit/data_timeline_cubit.dart
+++ b/lib/cubit/data_timeline_cubit.dart
@@ -18,7 +18,7 @@ class DataTimelineCubit extends HydratedCubit<DataTimelineState> {
}
void update(TimelineData? timeline) {
- if (state.timeline.toString() != timeline.toString()) {
+ if ((timeline != null) && (state.timeline.toString() != timeline.toString())) {
setValue(timeline);
}
}
diff --git a/lib/cubit/data_top_artists_cubit.dart b/lib/cubit/data_top_artists_cubit.dart
index 713f659..98fe17a 100644
--- a/lib/cubit/data_top_artists_cubit.dart
+++ b/lib/cubit/data_top_artists_cubit.dart
@@ -18,7 +18,7 @@ class DataTopArtistsCubit extends HydratedCubit<DataTopArtistsState> {
}
void update(TopArtistsData? topArtists) {
- if (state.topArtists.toString() != topArtists.toString()) {
+ if ((topArtists != null) && (state.topArtists.toString() != topArtists.toString())) {
setValue(topArtists);
}
}
diff --git a/lib/network/scrobbles.dart b/lib/network/scrobbles.dart
index e107c29..7da32f9 100644
--- a/lib/network/scrobbles.dart
+++ b/lib/network/scrobbles.dart
@@ -14,11 +14,9 @@ class ScrobblesApi {
static Future<StatisticsGlobalData> fetchGlobalStatistics() async {
final String url = baseUrl + '/stats';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return StatisticsGlobalData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -27,11 +25,9 @@ class ScrobblesApi {
static Future<StatisticsRecentData> fetchRecentStatistics(int daysCount) async {
final String url = baseUrl + '/' + daysCount.toString() + '/stats';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return StatisticsRecentData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -40,11 +36,9 @@ class ScrobblesApi {
static Future<TimelineData> fetchTimeline(int daysCount) async {
final String url = baseUrl + '/data/' + daysCount.toString() + '/timeline';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return TimelineData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -53,11 +47,9 @@ class ScrobblesApi {
static Future<CountsByDayData> fetchCountsByDay(int daysCount) async {
final String url = baseUrl + '/data/' + daysCount.toString() + '/counts-by-day';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return CountsByDayData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -66,11 +58,9 @@ class ScrobblesApi {
static Future<CountsByHourData> fetchCountsByHour(int daysCount) async {
final String url = baseUrl + '/data/' + daysCount.toString() + '/counts-by-hour';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return CountsByHourData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -79,11 +69,9 @@ class ScrobblesApi {
static Future<DiscoveriesData> fetchDiscoveries(int daysCount) async {
final String url = baseUrl + '/data/' + daysCount.toString() + '/news';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return DiscoveriesData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
@@ -92,11 +80,9 @@ class ScrobblesApi {
static Future<TopArtistsData> fetchTopArtists(int daysCount) async {
final String url = baseUrl + '/data/' + daysCount.toString() + '/top-artists';
- print('fetching ' + url);
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
- print('ok - fetched ' + url);
return TopArtistsData.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
} else {
throw Exception('Failed to get data from API.');
diff --git a/lib/ui/widgets/abstracts/custom_bar_chart.dart b/lib/ui/widgets/abstracts/custom_bar_chart.dart
index 1ccfafb..e986c84 100644
--- a/lib/ui/widgets/abstracts/custom_bar_chart.dart
+++ b/lib/ui/widgets/abstracts/custom_bar_chart.dart
@@ -6,9 +6,8 @@ import 'package:scrobbles/config/app_colors.dart';
import 'package:scrobbles/utils/color_extensions.dart';
class CustomBarChart extends StatelessWidget {
- CustomBarChart({super.key});
+ const CustomBarChart({super.key});
- final Widget placeholder = Text('â³');
final double chartHeight = 150.0;
final double verticalTicksInterval = 10;
final String verticalAxisTitleSuffix = '';
diff --git a/lib/ui/widgets/abstracts/custom_line_chart.dart b/lib/ui/widgets/abstracts/custom_line_chart.dart
index 5e1a90c..e91e553 100644
--- a/lib/ui/widgets/abstracts/custom_line_chart.dart
+++ b/lib/ui/widgets/abstracts/custom_line_chart.dart
@@ -4,9 +4,8 @@ import 'package:flutter/material.dart';
import 'package:scrobbles/config/app_colors.dart';
class CustomLineChart extends StatelessWidget {
- CustomLineChart({super.key});
+ const CustomLineChart({super.key});
- final Widget placeholder = Text('â³');
final double chartHeight = 150.0;
final double titleFontSize = 10;
diff --git a/lib/ui/widgets/cards/counts_by_day.dart b/lib/ui/widgets/cards/counts_by_day.dart
index f92a433..5db1b69 100644
--- a/lib/ui/widgets/cards/counts_by_day.dart
+++ b/lib/ui/widgets/cards/counts_by_day.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -32,8 +30,7 @@ class CardCountsByDay extends StatelessWidget {
),
loader: updateCountsByDay(daysCount),
content: ChartCountsByDay(
- chartData: CountsByDayData.fromJson(jsonDecode(state.countsByDay.toString())),
- isLoading: false,
+ chartData: CountsByDayData.fromJson(state.countsByDay?.toJson()),
),
);
},
diff --git a/lib/ui/widgets/cards/counts_by_hour.dart b/lib/ui/widgets/cards/counts_by_hour.dart
index f24d837..3421747 100644
--- a/lib/ui/widgets/cards/counts_by_hour.dart
+++ b/lib/ui/widgets/cards/counts_by_hour.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -32,8 +30,7 @@ class CardCountsByHour extends StatelessWidget {
),
loader: updateCountsByHour(daysCount),
content: ChartCountsByHour(
- chartData: CountsByHourData.fromJson(jsonDecode(state.countsByHour.toString())),
- isLoading: false,
+ chartData: CountsByHourData.fromJson(state.countsByHour?.toJson()),
),
);
},
diff --git a/lib/ui/widgets/cards/discoveries.dart b/lib/ui/widgets/cards/discoveries.dart
index 1177798..5256cca 100644
--- a/lib/ui/widgets/cards/discoveries.dart
+++ b/lib/ui/widgets/cards/discoveries.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -44,8 +42,7 @@ class CardDiscoveries extends StatelessWidget {
).tr(),
const SizedBox(height: 8),
ChartDiscoveriesArtists(
- chartData: DiscoveriesData.fromJson(jsonDecode(state.discoveries.toString())),
- isLoading: false,
+ chartData: DiscoveriesData.fromJson(state.discoveries?.toJson()),
),
const SizedBox(height: 8),
Text(
@@ -54,8 +51,7 @@ class CardDiscoveries extends StatelessWidget {
).tr(),
const SizedBox(height: 8),
ChartDiscoveriesTracks(
- chartData: DiscoveriesData.fromJson(jsonDecode(state.discoveries.toString())),
- isLoading: false,
+ chartData: DiscoveriesData.fromJson(state.discoveries?.toJson()),
),
],
),
diff --git a/lib/ui/widgets/cards/statistics_global.dart b/lib/ui/widgets/cards/statistics_global.dart
index bca1aa9..467173d 100644
--- a/lib/ui/widgets/cards/statistics_global.dart
+++ b/lib/ui/widgets/cards/statistics_global.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -23,9 +21,7 @@ class CardStatisticsGlobal extends StatelessWidget {
title: 'global_statistics'.tr(),
loader: updateStatisticsGlobal(),
content: ContentStatisticsGlobal(
- statistics:
- StatisticsGlobalData.fromJson(jsonDecode(state.statisticsGlobal.toString())),
- isLoading: false,
+ statistics: StatisticsGlobalData.fromJson(state.statisticsGlobal?.toJson()),
),
);
},
diff --git a/lib/ui/widgets/cards/statistics_recent.dart b/lib/ui/widgets/cards/statistics_recent.dart
index 0d9dc26..f5d4b3f 100644
--- a/lib/ui/widgets/cards/statistics_recent.dart
+++ b/lib/ui/widgets/cards/statistics_recent.dart
@@ -34,7 +34,6 @@ class CardStatisticsRecent extends StatelessWidget {
content: ContentStatisticsRecent(
statistics: StatisticsRecentData.fromJson(
jsonDecode(dataState.statisticsRecent.toString())),
- isLoading: false,
),
);
},
diff --git a/lib/ui/widgets/cards/timeline.dart b/lib/ui/widgets/cards/timeline.dart
index 50540ac..b1a69b3 100644
--- a/lib/ui/widgets/cards/timeline.dart
+++ b/lib/ui/widgets/cards/timeline.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -35,12 +33,10 @@ class CardTimeline extends StatelessWidget {
content: Stack(
children: [
ChartTimelineCounts(
- chartData: TimelineData.fromJson(jsonDecode(state.timeline.toString())),
- isLoading: false,
+ chartData: TimelineData.fromJson(state.timeline?.toJson()),
),
ChartTimelineEclecticism(
- chartData: TimelineData.fromJson(jsonDecode(state.timeline.toString())),
- isLoading: false,
+ chartData: TimelineData.fromJson(state.timeline?.toJson()),
),
],
),
diff --git a/lib/ui/widgets/cards/top_artists.dart b/lib/ui/widgets/cards/top_artists.dart
index 1e352cf..24a8585 100644
--- a/lib/ui/widgets/cards/top_artists.dart
+++ b/lib/ui/widgets/cards/top_artists.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -32,8 +30,7 @@ class CardTopArtists extends StatelessWidget {
),
loader: updateTopArtists(daysCount),
content: ChartTopArtists(
- chartData: TopArtistsData.fromJson(jsonDecode(state.topArtists.toString())),
- isLoading: false,
+ chartData: TopArtistsData.fromJson(state.topArtists?.toJson()),
),
);
},
diff --git a/lib/ui/widgets/charts/counts_by_day.dart b/lib/ui/widgets/charts/counts_by_day.dart
index 9fb3721..ba2398f 100644
--- a/lib/ui/widgets/charts/counts_by_day.dart
+++ b/lib/ui/widgets/charts/counts_by_day.dart
@@ -8,9 +8,8 @@ import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
class ChartCountsByDay extends CustomBarChart {
final CountsByDayData chartData;
- final bool isLoading;
- ChartCountsByDay({super.key, required this.chartData, required this.isLoading});
+ const ChartCountsByDay({super.key, required this.chartData});
final double verticalTicksInterval = 5;
final String verticalAxisTitleSuffix = '%';
@@ -25,19 +24,17 @@ class ChartCountsByDay extends CustomBarChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LayoutBuilder(
- builder: (context, constraints) {
- final double maxWidth = constraints.maxWidth;
- final int barsCount = this.chartData.data.keys.length;
-
- return getBarChart(
- barWidth: this.getBarWidth(maxWidth, barsCount),
- backgroundColor: Theme.of(context).colorScheme.onSurface,
- );
- },
- ),
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ final double maxWidth = constraints.maxWidth;
+ final int barsCount = this.chartData.data.keys.length;
+
+ return getBarChart(
+ barWidth: this.getBarWidth(maxWidth, barsCount),
+ backgroundColor: Theme.of(context).colorScheme.onSurface,
+ );
+ },
+ ),
);
}
diff --git a/lib/ui/widgets/charts/counts_by_hour.dart b/lib/ui/widgets/charts/counts_by_hour.dart
index de66a75..179e5b5 100644
--- a/lib/ui/widgets/charts/counts_by_hour.dart
+++ b/lib/ui/widgets/charts/counts_by_hour.dart
@@ -8,9 +8,8 @@ import 'package:scrobbles/utils/color_extensions.dart';
class ChartCountsByHour extends CustomBarChart {
final CountsByHourData chartData;
- final bool isLoading;
- ChartCountsByHour({super.key, required this.chartData, required this.isLoading});
+ const ChartCountsByHour({super.key, required this.chartData});
final double verticalTicksInterval = 5;
final String verticalAxisTitleSuffix = '%';
@@ -25,19 +24,17 @@ class ChartCountsByHour extends CustomBarChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LayoutBuilder(
- builder: (context, constraints) {
- final double maxWidth = constraints.maxWidth;
- final int barsCount = this.chartData.data.keys.length;
-
- return getBarChart(
- barWidth: this.getBarWidth(maxWidth, barsCount),
- backgroundColor: Theme.of(context).colorScheme.onSurface,
- );
- },
- ),
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ final double maxWidth = constraints.maxWidth;
+ final int barsCount = this.chartData.data.keys.length;
+
+ return getBarChart(
+ barWidth: this.getBarWidth(maxWidth, barsCount),
+ backgroundColor: Theme.of(context).colorScheme.onSurface,
+ );
+ },
+ ),
);
}
diff --git a/lib/ui/widgets/charts/discoveries_artists.dart b/lib/ui/widgets/charts/discoveries_artists.dart
index 96a5a78..e3994f5 100644
--- a/lib/ui/widgets/charts/discoveries_artists.dart
+++ b/lib/ui/widgets/charts/discoveries_artists.dart
@@ -8,9 +8,8 @@ import 'package:scrobbles/utils/color_extensions.dart';
class ChartDiscoveriesArtists extends CustomBarChart {
final DiscoveriesData chartData;
- final bool isLoading;
- ChartDiscoveriesArtists({super.key, required this.chartData, required this.isLoading});
+ const ChartDiscoveriesArtists({super.key, required this.chartData});
@override
Widget build(BuildContext context) {
@@ -22,19 +21,17 @@ class ChartDiscoveriesArtists extends CustomBarChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LayoutBuilder(
- builder: (context, constraints) {
- final double maxWidth = constraints.maxWidth;
- final int barsCount = this.chartData.data.keys.length;
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ final double maxWidth = constraints.maxWidth;
+ final int barsCount = this.chartData.data.keys.length;
- return getBarChart(
- barWidth: this.getBarWidth(maxWidth, barsCount),
- backgroundColor: Theme.of(context).colorScheme.onSurface,
- );
- },
- ),
+ return getBarChart(
+ barWidth: this.getBarWidth(maxWidth, barsCount),
+ backgroundColor: Theme.of(context).colorScheme.onSurface,
+ );
+ },
+ ),
);
}
diff --git a/lib/ui/widgets/charts/discoveries_tracks.dart b/lib/ui/widgets/charts/discoveries_tracks.dart
index 44d9d6f..2436fcf 100644
--- a/lib/ui/widgets/charts/discoveries_tracks.dart
+++ b/lib/ui/widgets/charts/discoveries_tracks.dart
@@ -8,9 +8,8 @@ import 'package:scrobbles/utils/color_extensions.dart';
class ChartDiscoveriesTracks extends CustomBarChart {
final DiscoveriesData chartData;
- final bool isLoading;
- ChartDiscoveriesTracks({super.key, required this.chartData, required this.isLoading});
+ const ChartDiscoveriesTracks({super.key, required this.chartData});
@override
Widget build(BuildContext context) {
@@ -22,19 +21,17 @@ class ChartDiscoveriesTracks extends CustomBarChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LayoutBuilder(
- builder: (context, constraints) {
- final double maxWidth = constraints.maxWidth;
- final int barsCount = this.chartData.data.keys.length;
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ final double maxWidth = constraints.maxWidth;
+ final int barsCount = this.chartData.data.keys.length;
- return getBarChart(
- barWidth: this.getBarWidth(maxWidth, barsCount),
- backgroundColor: Theme.of(context).colorScheme.onSurface,
- );
- },
- ),
+ return getBarChart(
+ barWidth: this.getBarWidth(maxWidth, barsCount),
+ backgroundColor: Theme.of(context).colorScheme.onSurface,
+ );
+ },
+ ),
);
}
diff --git a/lib/ui/widgets/charts/timeline_counts.dart b/lib/ui/widgets/charts/timeline_counts.dart
index 5b7399f..84fb8bd 100644
--- a/lib/ui/widgets/charts/timeline_counts.dart
+++ b/lib/ui/widgets/charts/timeline_counts.dart
@@ -7,9 +7,8 @@ import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
class ChartTimelineCounts extends CustomBarChart {
final TimelineData chartData;
- final bool isLoading;
- ChartTimelineCounts({super.key, required this.chartData, required this.isLoading});
+ const ChartTimelineCounts({super.key, required this.chartData});
final double verticalTicksInterval = 50;
@@ -23,19 +22,17 @@ class ChartTimelineCounts extends CustomBarChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LayoutBuilder(
- builder: (context, constraints) {
- final double maxWidth = constraints.maxWidth;
- final int barsCount = this.chartData.data.keys.length;
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ final double maxWidth = constraints.maxWidth;
+ final int barsCount = this.chartData.data.keys.length;
- return getBarChart(
- barWidth: this.getBarWidth(maxWidth, barsCount),
- backgroundColor: Theme.of(context).colorScheme.onSurface,
- );
- },
- ),
+ return getBarChart(
+ barWidth: this.getBarWidth(maxWidth, barsCount),
+ backgroundColor: Theme.of(context).colorScheme.onSurface,
+ );
+ },
+ ),
);
}
diff --git a/lib/ui/widgets/charts/timeline_eclecticism.dart b/lib/ui/widgets/charts/timeline_eclecticism.dart
index dea2a0d..273aad8 100644
--- a/lib/ui/widgets/charts/timeline_eclecticism.dart
+++ b/lib/ui/widgets/charts/timeline_eclecticism.dart
@@ -8,9 +8,8 @@ import 'package:scrobbles/utils/color_extensions.dart';
class ChartTimelineEclecticism extends CustomLineChart {
final TimelineData chartData;
- final bool isLoading;
- ChartTimelineEclecticism({super.key, required this.chartData, required this.isLoading});
+ const ChartTimelineEclecticism({super.key, required this.chartData});
@override
Widget build(BuildContext context) {
@@ -24,22 +23,20 @@ class ChartTimelineEclecticism extends CustomLineChart {
return Container(
height: this.chartHeight,
- child: this.isLoading
- ? this.placeholder
- : LineChart(
- LineChartData(
- lineBarsData: getDataEclecticism(),
- borderData: getBorderData(),
- gridData: getGridData(),
- titlesData: getTitlesData(),
- lineTouchData: const LineTouchData(enabled: false),
- minX: horizontalScale['min'],
- maxX: horizontalScale['max'],
- maxY: 100,
- minY: 0,
- ),
- duration: const Duration(milliseconds: 250),
- ),
+ child: LineChart(
+ LineChartData(
+ lineBarsData: getDataEclecticism(),
+ borderData: getBorderData(),
+ gridData: getGridData(),
+ titlesData: getTitlesData(),
+ lineTouchData: const LineTouchData(enabled: false),
+ minX: horizontalScale['min'],
+ maxX: horizontalScale['max'],
+ maxY: 100,
+ minY: 0,
+ ),
+ duration: const Duration(milliseconds: 250),
+ ),
);
}
diff --git a/lib/ui/widgets/charts/top_artists.dart b/lib/ui/widgets/charts/top_artists.dart
index 5b0de9c..f6a9957 100644
--- a/lib/ui/widgets/charts/top_artists.dart
+++ b/lib/ui/widgets/charts/top_artists.dart
@@ -7,38 +7,33 @@ import 'package:scrobbles/utils/color_extensions.dart';
class ChartTopArtists extends StatelessWidget {
final TopArtistsData chartData;
- final bool isLoading;
- ChartTopArtists({super.key, required this.chartData, required this.isLoading});
-
- final Widget placeholder = Text('â³');
+ const ChartTopArtists({super.key, required this.chartData});
@override
Widget build(BuildContext context) {
return AspectRatio(
aspectRatio: 2.1,
- child: this.isLoading
- ? this.placeholder
- : Row(
- children: <Widget>[
- Expanded(
- child: AspectRatio(
- aspectRatio: 1,
- child: PieChart(
- PieChartData(
- sections: getPieChartData(),
- sectionsSpace: 2,
- centerSpaceRadius: 40,
- startDegreeOffset: -45,
- pieTouchData: PieTouchData(enabled: false),
- borderData: FlBorderData(show: false),
- ),
- ),
- ),
+ child: Row(
+ children: <Widget>[
+ Expanded(
+ child: AspectRatio(
+ aspectRatio: 1,
+ child: PieChart(
+ PieChartData(
+ sections: getPieChartData(),
+ sectionsSpace: 2,
+ centerSpaceRadius: 40,
+ startDegreeOffset: -45,
+ pieTouchData: PieTouchData(enabled: false),
+ borderData: FlBorderData(show: false),
),
- buildLegendWidget(),
- ],
+ ),
),
+ ),
+ buildLegendWidget(),
+ ],
+ ),
);
}
diff --git a/lib/ui/widgets/content/statistics_global.dart b/lib/ui/widgets/content/statistics_global.dart
index c68d249..49c0203 100644
--- a/lib/ui/widgets/content/statistics_global.dart
+++ b/lib/ui/widgets/content/statistics_global.dart
@@ -5,10 +5,8 @@ import 'package:scrobbles/models/statistics_global.dart';
class ContentStatisticsGlobal extends StatelessWidget {
final StatisticsGlobalData statistics;
- final bool isLoading;
- const ContentStatisticsGlobal(
- {super.key, required this.statistics, required this.isLoading});
+ const ContentStatisticsGlobal({super.key, required this.statistics});
@override
Widget build(BuildContext context) {
@@ -24,11 +22,9 @@ class ContentStatisticsGlobal extends StatelessWidget {
style: textTheme.bodyMedium,
).tr(
namedArgs: {
- 'count': this.isLoading
- ? placeholder
- : (this.statistics.totalCount != null
- ? this.statistics.totalCount.toString()
- : ''),
+ 'count': this.statistics.totalCount != null
+ ? this.statistics.totalCount.toString()
+ : placeholder,
},
),
Text(
@@ -36,11 +32,9 @@ class ContentStatisticsGlobal extends StatelessWidget {
style: textTheme.bodyMedium,
).tr(
namedArgs: {
- 'datetime': this.isLoading
- ? placeholder
- : (this.statistics.lastScrobble != null
- ? DateFormat().format(this.statistics.lastScrobble ?? DateTime.now())
- : ''),
+ 'datetime': this.statistics.lastScrobble != null
+ ? DateFormat().format(this.statistics.lastScrobble ?? DateTime.now())
+ : placeholder,
},
),
],
diff --git a/lib/ui/widgets/content/statistics_recent.dart b/lib/ui/widgets/content/statistics_recent.dart
index cecbff9..f79aef9 100644
--- a/lib/ui/widgets/content/statistics_recent.dart
+++ b/lib/ui/widgets/content/statistics_recent.dart
@@ -5,15 +5,12 @@ import 'package:scrobbles/models/statistics_recent.dart';
class ContentStatisticsRecent extends StatelessWidget {
final StatisticsRecentData statistics;
- final bool isLoading;
- const ContentStatisticsRecent(
- {super.key, required this.statistics, required this.isLoading});
+ const ContentStatisticsRecent({super.key, required this.statistics});
@override
Widget build(BuildContext context) {
final TextTheme textTheme = Theme.of(context).primaryTextTheme;
- const String placeholder = 'â³';
return Column(
mainAxisSize: MainAxisSize.min,
@@ -28,13 +25,9 @@ class ContentStatisticsRecent extends StatelessWidget {
style: textTheme.bodyMedium,
).tr(
namedArgs: {
- 'count': this.isLoading ? placeholder : this.statistics.recentCount.toString(),
- 'artistsCount': this.isLoading
- ? placeholder
- : this.statistics.firstPlayedArtistsCount.toString(),
- 'tracksCount': this.isLoading
- ? placeholder
- : this.statistics.firstPlayedTracksCount.toString(),
+ 'count': this.statistics.recentCount.toString(),
+ 'artistsCount': this.statistics.firstPlayedArtistsCount.toString(),
+ 'tracksCount': this.statistics.firstPlayedTracksCount.toString(),
},
),
],
diff --git a/pubspec.yaml b/pubspec.yaml
index 39544e3..0b954c9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.36+36
+version: 0.0.37+37
environment:
sdk: '^3.0.0'
--
GitLab