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

Merge branch '59-improve-day-hour-scatter-chart' into 'master'

Resolve "Improve day/hour scatter chart"

Closes #59

See merge request !54
parents a4376b52 069ee10c
No related branches found
No related tags found
1 merge request!54Resolve "Improve day/hour scatter chart"
Pipeline #5031 passed
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
Improve day/hour distribution chart + update dependencies.
Amélioration du graphique de répartition jour/heure + mise à jour des dépendances.
......@@ -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,
),
));
});
});
......
......@@ -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:
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment