From 21f586678bb8d42b20a9d64640251bcc5cd41701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 5 Dec 2023 16:09:34 +0100
Subject: [PATCH] Fix parse heatmap data

---
 android/gradle.properties                         | 4 ++--
 fastlane/metadata/android/en-US/changelogs/44.txt | 1 +
 fastlane/metadata/android/fr-FR/changelogs/44.txt | 1 +
 lib/cubit/data_heatmap_cubit.dart                 | 4 ----
 lib/models/heatmap.dart                           | 5 ++---
 lib/ui/widgets/cards/heatmap.dart                 | 4 ++--
 lib/ui/widgets/charts/heatmap.dart                | 2 --
 lib/ui/widgets/settings_form.dart                 | 1 -
 pubspec.yaml                                      | 2 +-
 9 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/44.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/44.txt

diff --git a/android/gradle.properties b/android/gradle.properties
index 94a75b2..7e6b4cd 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.43
-app.versionCode=43
+app.versionName=0.0.44
+app.versionCode=44
diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
new file mode 100644
index 0000000..3110299
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -0,0 +1 @@
+Fix parse heatmap data.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/44.txt b/fastlane/metadata/android/fr-FR/changelogs/44.txt
new file mode 100644
index 0000000..0150596
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/44.txt
@@ -0,0 +1 @@
+Correction sur le traitement des données de la heatmap.
diff --git a/lib/cubit/data_heatmap_cubit.dart b/lib/cubit/data_heatmap_cubit.dart
index 646ba62..7cd9192 100644
--- a/lib/cubit/data_heatmap_cubit.dart
+++ b/lib/cubit/data_heatmap_cubit.dart
@@ -13,10 +13,6 @@ class DataHeatmapCubit extends HydratedCubit<DataHeatmapState> {
     emit(state);
   }
 
-  HeatmapData? getValue() {
-    return state.heatmap;
-  }
-
   void update(HeatmapData? heatmapData) {
     if ((heatmapData != null) && (state.heatmap.toString() != heatmapData.toString())) {
       setValue(heatmapData);
diff --git a/lib/models/heatmap.dart b/lib/models/heatmap.dart
index a29537b..81a06ee 100644
--- a/lib/models/heatmap.dart
+++ b/lib/models/heatmap.dart
@@ -31,9 +31,8 @@ class HeatmapData {
 
     this.data.keys.forEach((day) {
       Map<String, int> dayMap = {};
-      this.data.keys.forEach((hour) {
-        int? value = this.data[day]?[hour];
-        dayMap[hour.toString()] = value != null ? value.toInt() : 0;
+      this.data[day]?.forEach((hour, count) {
+        dayMap[hour.toString()] = count;
       });
       map[day.toString()] = dayMap;
     });
diff --git a/lib/ui/widgets/cards/heatmap.dart b/lib/ui/widgets/cards/heatmap.dart
index 06b5a0a..bbfdf4f 100644
--- a/lib/ui/widgets/cards/heatmap.dart
+++ b/lib/ui/widgets/cards/heatmap.dart
@@ -30,7 +30,7 @@ class CardHeatmap extends StatelessWidget {
               'daysCount': daysCount.toString(),
             },
           ),
-          loader: updateCountsByHour(daysCount),
+          loader: updateHeatmapData(daysCount),
           content: ChartHeatmap(
             chartData: heatmap,
           ),
@@ -39,7 +39,7 @@ class CardHeatmap extends StatelessWidget {
     );
   }
 
-  Widget updateCountsByHour(int daysCount) {
+  Widget updateHeatmapData(int daysCount) {
     final Widget loading = const Text('⏳');
     final Widget done = const Text('');
 
diff --git a/lib/ui/widgets/charts/heatmap.dart b/lib/ui/widgets/charts/heatmap.dart
index 1f4874e..98483f5 100644
--- a/lib/ui/widgets/charts/heatmap.dart
+++ b/lib/ui/widgets/charts/heatmap.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/ui/widgets/settings_form.dart b/lib/ui/widgets/settings_form.dart
index d51262d..1046f86 100644
--- a/lib/ui/widgets/settings_form.dart
+++ b/lib/ui/widgets/settings_form.dart
@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:unicons/unicons.dart';
 
 import 'package:scrobbles/config/default_settings.dart';
 import 'package:scrobbles/cubit/settings_cubit.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 70ab3de..78f61dc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.43+43
+version: 0.0.44+44
 
 environment:
   sdk: '^3.0.0'
-- 
GitLab