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

Add "%" on repartition charts, reduce axis titles font size

parent 604b3b71
No related branches found
No related tags found
1 merge request!17Resolve "Add "%" on repartition charts"
Pipeline #4499 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.15 app.versionName=0.0.16
app.versionCode=15 app.versionCode=16
Add "%" in repartition charts, reduce font size in axis titles.
Ajout du "%" dans les graphiques de réparition, réduction de la taille des textes sur les axes.
...@@ -10,6 +10,8 @@ class CustomBarChart extends StatelessWidget { ...@@ -10,6 +10,8 @@ class CustomBarChart extends StatelessWidget {
final double chartHeight = 120.0; final double chartHeight = 120.0;
final double verticalTicksInterval = 10; final double verticalTicksInterval = 10;
final String verticalAxisTitleSuffix = '';
final double titleFontSize = 10;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -139,14 +141,16 @@ class CustomBarChart extends StatelessWidget { ...@@ -139,14 +141,16 @@ class CustomBarChart extends StatelessWidget {
} }
Widget getVerticalTitlesWidget(double value, TitleMeta meta) { Widget getVerticalTitlesWidget(double value, TitleMeta meta) {
String suffix =
this.verticalAxisTitleSuffix != '' ? ' ' + this.verticalAxisTitleSuffix : '';
return SideTitleWidget( return SideTitleWidget(
axisSide: meta.axisSide, axisSide: meta.axisSide,
space: 4, space: 4,
child: Text( child: Text(
value.toInt().toString(), value.toInt().toString() + suffix,
style: const TextStyle( style: TextStyle(
color: AppColors.mainTextColor1, color: AppColors.mainTextColor1,
fontSize: 12, fontSize: this.titleFontSize,
), ),
), ),
); );
...@@ -165,9 +169,9 @@ class CustomBarChart extends StatelessWidget { ...@@ -165,9 +169,9 @@ class CustomBarChart extends StatelessWidget {
turns: new AlwaysStoppedAnimation(-30 / 360), turns: new AlwaysStoppedAnimation(-30 / 360),
child: Text( child: Text(
text, text,
style: const TextStyle( style: TextStyle(
color: AppColors.mainTextColor1, color: AppColors.mainTextColor1,
fontSize: 11, fontSize: this.titleFontSize,
), ),
), ),
), ),
......
...@@ -9,6 +9,7 @@ class CustomLineChart extends StatelessWidget { ...@@ -9,6 +9,7 @@ class CustomLineChart extends StatelessWidget {
CustomLineChart({super.key}); CustomLineChart({super.key});
final double chartHeight = 120.0; final double chartHeight = 120.0;
final double titleFontSize = 10;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -56,9 +57,9 @@ class CustomLineChart extends StatelessWidget { ...@@ -56,9 +57,9 @@ class CustomLineChart extends StatelessWidget {
space: 4, space: 4,
child: Text( child: Text(
value.toInt().toString(), value.toInt().toString(),
style: const TextStyle( style: TextStyle(
color: AppColors.mainTextColor1, color: AppColors.mainTextColor1,
fontSize: 12, fontSize: this.titleFontSize,
), ),
), ),
); );
...@@ -77,9 +78,9 @@ class CustomLineChart extends StatelessWidget { ...@@ -77,9 +78,9 @@ class CustomLineChart extends StatelessWidget {
turns: new AlwaysStoppedAnimation(-30 / 360), turns: new AlwaysStoppedAnimation(-30 / 360),
child: Text( child: Text(
text, text,
style: const TextStyle( style: TextStyle(
color: AppColors.mainTextColor1, color: AppColors.mainTextColor1,
fontSize: 11, fontSize: this.titleFontSize,
), ),
), ),
), ),
......
...@@ -11,6 +11,9 @@ class CountsByDayCardContentChart extends CustomBarChart { ...@@ -11,6 +11,9 @@ class CountsByDayCardContentChart extends CustomBarChart {
CountsByDayCardContentChart({super.key, required this.chartData}); CountsByDayCardContentChart({super.key, required this.chartData});
final double verticalTicksInterval = 5;
final String verticalAxisTitleSuffix = '%';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
......
...@@ -11,6 +11,9 @@ class CountsByHourCardContentChart extends CustomBarChart { ...@@ -11,6 +11,9 @@ class CountsByHourCardContentChart extends CustomBarChart {
CountsByHourCardContentChart({super.key, required this.chartData}); CountsByHourCardContentChart({super.key, required this.chartData});
final double verticalTicksInterval = 5;
final String verticalAxisTitleSuffix = '%';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
......
...@@ -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.15+15 version: 0.0.16+16
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.
Finish editing this message first!
Please register or to comment