Skip to content
Snippets Groups Projects
Commit ad8e7248 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '48-fix-get-heatmap-from-cache' into 'master'

Resolve "Fix get heatmap from cache"

Closes #48

See merge request !45
parents 5d7777cc 21f58667
No related branches found
No related tags found
1 merge request!45Resolve "Fix get heatmap from cache"
Pipeline #4709 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.43 app.versionName=0.0.44
app.versionCode=43 app.versionCode=44
Fix parse heatmap data.
Correction sur le traitement des données de la heatmap.
...@@ -13,10 +13,6 @@ class DataHeatmapCubit extends HydratedCubit<DataHeatmapState> { ...@@ -13,10 +13,6 @@ class DataHeatmapCubit extends HydratedCubit<DataHeatmapState> {
emit(state); emit(state);
} }
HeatmapData? getValue() {
return state.heatmap;
}
void update(HeatmapData? heatmapData) { void update(HeatmapData? heatmapData) {
if ((heatmapData != null) && (state.heatmap.toString() != heatmapData.toString())) { if ((heatmapData != null) && (state.heatmap.toString() != heatmapData.toString())) {
setValue(heatmapData); setValue(heatmapData);
......
...@@ -31,9 +31,8 @@ class HeatmapData { ...@@ -31,9 +31,8 @@ class HeatmapData {
this.data.keys.forEach((day) { this.data.keys.forEach((day) {
Map<String, int> dayMap = {}; Map<String, int> dayMap = {};
this.data.keys.forEach((hour) { this.data[day]?.forEach((hour, count) {
int? value = this.data[day]?[hour]; dayMap[hour.toString()] = count;
dayMap[hour.toString()] = value != null ? value.toInt() : 0;
}); });
map[day.toString()] = dayMap; map[day.toString()] = dayMap;
}); });
......
...@@ -30,7 +30,7 @@ class CardHeatmap extends StatelessWidget { ...@@ -30,7 +30,7 @@ class CardHeatmap extends StatelessWidget {
'daysCount': daysCount.toString(), 'daysCount': daysCount.toString(),
}, },
), ),
loader: updateCountsByHour(daysCount), loader: updateHeatmapData(daysCount),
content: ChartHeatmap( content: ChartHeatmap(
chartData: heatmap, chartData: heatmap,
), ),
...@@ -39,7 +39,7 @@ class CardHeatmap extends StatelessWidget { ...@@ -39,7 +39,7 @@ class CardHeatmap extends StatelessWidget {
); );
} }
Widget updateCountsByHour(int daysCount) { Widget updateHeatmapData(int daysCount) {
final Widget loading = const Text('⏳'); final Widget loading = const Text('⏳');
final Widget done = const Text(''); final Widget done = const Text('');
......
import 'dart:math';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:fl_chart/fl_chart.dart'; import 'package:fl_chart/fl_chart.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
......
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:unicons/unicons.dart';
import 'package:scrobbles/config/default_settings.dart'; import 'package:scrobbles/config/default_settings.dart';
import 'package:scrobbles/cubit/settings_cubit.dart'; import 'package:scrobbles/cubit/settings_cubit.dart';
......
...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts ...@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none' publish_to: 'none'
version: 0.0.43+43 version: 0.0.44+44
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment