From 86835381beea27bccf95e3a1b7d308246474dcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 31 Oct 2023 00:22:54 +0100
Subject: [PATCH] Add "%" on repartition charts, reduce axis titles font size
---
android/gradle.properties | 4 ++--
fastlane/metadata/android/en-US/changelogs/16.txt | 1 +
fastlane/metadata/android/fr-FR/changelogs/16.txt | 1 +
lib/ui/widgets/charts/custom_bar_chart.dart | 14 +++++++++-----
lib/ui/widgets/charts/custom_line_chart.dart | 9 +++++----
.../widgets/main_screen/counts_by_day_chart.dart | 3 +++
.../widgets/main_screen/counts_by_hour_chart.dart | 3 +++
pubspec.yaml | 2 +-
8 files changed, 25 insertions(+), 12 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/16.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/16.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 957c40b..777ac2d 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.15
-app.versionCode=15
+app.versionName=0.0.16
+app.versionCode=16
diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt
new file mode 100644
index 0000000..980f687
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/16.txt
@@ -0,0 +1 @@
+Add "%" in repartition charts, reduce font size in axis titles.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/16.txt b/fastlane/metadata/android/fr-FR/changelogs/16.txt
new file mode 100644
index 0000000..3e761ac
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/16.txt
@@ -0,0 +1 @@
+Ajout du "%" dans les graphiques de réparition, réduction de la taille des textes sur les axes.
diff --git a/lib/ui/widgets/charts/custom_bar_chart.dart b/lib/ui/widgets/charts/custom_bar_chart.dart
index a718813..606b7bd 100644
--- a/lib/ui/widgets/charts/custom_bar_chart.dart
+++ b/lib/ui/widgets/charts/custom_bar_chart.dart
@@ -10,6 +10,8 @@ class CustomBarChart extends StatelessWidget {
final double chartHeight = 120.0;
final double verticalTicksInterval = 10;
+ final String verticalAxisTitleSuffix = '';
+ final double titleFontSize = 10;
@override
Widget build(BuildContext context) {
@@ -139,14 +141,16 @@ class CustomBarChart extends StatelessWidget {
}
Widget getVerticalTitlesWidget(double value, TitleMeta meta) {
+ String suffix =
+ this.verticalAxisTitleSuffix != '' ? ' ' + this.verticalAxisTitleSuffix : '';
return SideTitleWidget(
axisSide: meta.axisSide,
space: 4,
child: Text(
- value.toInt().toString(),
- style: const TextStyle(
+ value.toInt().toString() + suffix,
+ style: TextStyle(
color: AppColors.mainTextColor1,
- fontSize: 12,
+ fontSize: this.titleFontSize,
),
),
);
@@ -165,9 +169,9 @@ class CustomBarChart extends StatelessWidget {
turns: new AlwaysStoppedAnimation(-30 / 360),
child: Text(
text,
- style: const TextStyle(
+ style: TextStyle(
color: AppColors.mainTextColor1,
- fontSize: 11,
+ fontSize: this.titleFontSize,
),
),
),
diff --git a/lib/ui/widgets/charts/custom_line_chart.dart b/lib/ui/widgets/charts/custom_line_chart.dart
index 2debb0b..472ba53 100644
--- a/lib/ui/widgets/charts/custom_line_chart.dart
+++ b/lib/ui/widgets/charts/custom_line_chart.dart
@@ -9,6 +9,7 @@ class CustomLineChart extends StatelessWidget {
CustomLineChart({super.key});
final double chartHeight = 120.0;
+ final double titleFontSize = 10;
@override
Widget build(BuildContext context) {
@@ -56,9 +57,9 @@ class CustomLineChart extends StatelessWidget {
space: 4,
child: Text(
value.toInt().toString(),
- style: const TextStyle(
+ style: TextStyle(
color: AppColors.mainTextColor1,
- fontSize: 12,
+ fontSize: this.titleFontSize,
),
),
);
@@ -77,9 +78,9 @@ class CustomLineChart extends StatelessWidget {
turns: new AlwaysStoppedAnimation(-30 / 360),
child: Text(
text,
- style: const TextStyle(
+ style: TextStyle(
color: AppColors.mainTextColor1,
- fontSize: 11,
+ fontSize: this.titleFontSize,
),
),
),
diff --git a/lib/ui/widgets/main_screen/counts_by_day_chart.dart b/lib/ui/widgets/main_screen/counts_by_day_chart.dart
index e6eca84..a29117b 100644
--- a/lib/ui/widgets/main_screen/counts_by_day_chart.dart
+++ b/lib/ui/widgets/main_screen/counts_by_day_chart.dart
@@ -11,6 +11,9 @@ class CountsByDayCardContentChart extends CustomBarChart {
CountsByDayCardContentChart({super.key, required this.chartData});
+ final double verticalTicksInterval = 5;
+ final String verticalAxisTitleSuffix = '%';
+
@override
Widget build(BuildContext context) {
return Container(
diff --git a/lib/ui/widgets/main_screen/counts_by_hour_chart.dart b/lib/ui/widgets/main_screen/counts_by_hour_chart.dart
index 81182f4..bf61e6a 100644
--- a/lib/ui/widgets/main_screen/counts_by_hour_chart.dart
+++ b/lib/ui/widgets/main_screen/counts_by_hour_chart.dart
@@ -11,6 +11,9 @@ class CountsByHourCardContentChart extends CustomBarChart {
CountsByHourCardContentChart({super.key, required this.chartData});
+ final double verticalTicksInterval = 5;
+ final String verticalAxisTitleSuffix = '%';
+
@override
Widget build(BuildContext context) {
return Container(
diff --git a/pubspec.yaml b/pubspec.yaml
index b56f499..9a70a64 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.15+15
+version: 0.0.16+16
environment:
sdk: '^3.0.0'
--
GitLab