diff --git a/android/gradle.properties b/android/gradle.properties index 630329d24574bec561a762a8792e510540d42a5c..b87ac7c88e3a98a757a90bff89e63fb14b2f355b 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.51 -app.versionCode=51 +app.versionName=0.0.52 +app.versionCode=52 diff --git a/fastlane/metadata/android/en-US/changelogs/52.txt b/fastlane/metadata/android/en-US/changelogs/52.txt new file mode 100644 index 0000000000000000000000000000000000000000..1b4ca6b2699b98001b849ab9a127206e1cb8e793 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/52.txt @@ -0,0 +1 @@ +Improve day/hour distribution chart + update dependencies. diff --git a/fastlane/metadata/android/fr-FR/changelogs/52.txt b/fastlane/metadata/android/fr-FR/changelogs/52.txt new file mode 100644 index 0000000000000000000000000000000000000000..420843e6b8ff56448aab722cb471cd22bbf33576 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/52.txt @@ -0,0 +1 @@ +Amélioration du graphique de répartition jour/heure + mise à jour des dépendances. diff --git a/lib/ui/widgets/charts/heatmap.dart b/lib/ui/widgets/charts/heatmap.dart index 4d867bd75f5da61933c449beb7d7e41e1d651916..b274fc2853694c255b1c4bdf8bf5ec4189888b73 100644 --- a/lib/ui/widgets/charts/heatmap.dart +++ b/lib/ui/widgets/charts/heatmap.dart @@ -45,7 +45,10 @@ class ChartHeatmap extends CustomChart { } Color getColorFromNormalizedValue(double value) { - return baseColor.darken(1 + (darkenAmount * (1 - value)).toInt()); + Color colorFrom = Colors.white; + Color colorTo = Colors.pink; + + return Color.lerp(colorFrom, colorTo, value) ?? colorFrom; } int getMaxCount() { @@ -74,8 +77,11 @@ class ChartHeatmap extends CustomChart { spots.add(ScatterSpot( hour.toDouble(), 8 - day.toDouble(), - color: getColorFromNormalizedValue(normalizedValue), - radius: scale * normalizedValue, + dotPainter: FlDotSquarePainter( + color: getColorFromNormalizedValue(normalizedValue), + size: 12, + strokeWidth: 0, + ), )); }); }); diff --git a/pubspec.lock b/pubspec.lock index 059e47c85830a0ce74ba93abafc64db3e9860b5a..afdb62534217d42cfb47e64e6e38018bade04df7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -101,10 +101,10 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: "5a74434cc83bf64346efb562f1a06eefaf1bcb530dc3d96a104f631a1eff8d79" + sha256: fe6fec7d85975a99c73b9515a69a6e291364accfa0e4a5b3ce6de814d74b9a1c url: "https://pub.dev" source: hosted - version: "0.65.0" + version: "0.66.0" flutter: dependency: "direct main" description: flutter @@ -164,10 +164,10 @@ packages: dependency: "direct main" description: name: hydrated_bloc - sha256: "24994e61f64904d911683cce1a31dc4ef611619da5253f1de2b7b8fc6f79a118" + sha256: c925e49704c052a8f249226ae7603f86bfa776b910816390763b956c71d2cbaf url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "9.1.3" intl: dependency: transitive description: @@ -228,10 +228,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: @@ -369,10 +369,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.0+1" term_glyph: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1478ee09bd4a55b1e3f0f73e1f821c6f788533fc..76d2f8c12006e6f2fd439cae404a1b752c4a0e21 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Display scrobbles data and charts publish_to: 'none' -version: 0.0.51+51 +version: 0.0.52+52 environment: sdk: '^3.0.0' @@ -14,7 +14,7 @@ dependencies: easy_localization: ^3.0.1 equatable: ^2.0.5 - fl_chart: ^0.65.0 + fl_chart: ^0.66.0 flutter_bloc: ^8.1.1 http: ^1.1.0 path_provider: ^2.0.11