diff --git a/android/gradle.properties b/android/gradle.properties index 957c40bc42f3a742d2266dc3a403ad014458ba3f..777ac2de0980e935649cf32bd85097eaf789185a 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 0000000000000000000000000000000000000000..980f687d87e626f41cb7954fa186104c83eadeba --- /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 0000000000000000000000000000000000000000..3e761acbedd67161f0f0bec17647751de6a7c358 --- /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 a718813dfb0acc4472ef15090c2ca9494908ef6d..606b7bd09b87fe56920aa5c49ba949075c94a2f9 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 2debb0bf838910abeadad0b29408bef76ed9b4af..472ba539f36d65edbedd35e53a9ab5de70a6c9c9 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 e6eca846120a4470604340fe95a2dc5932179f27..a29117bad54efe2fef3dc4012a18253633e4377a 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 81182f4ce5cd1652d9625636a80b3b64dbdc55cf..bf61e6ae621ca0d20d12f693177754a10fe6fb56 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 b56f49996ca8def60802d5fde607fa0d4154dfb2..9a70a6477a52b11f65feca6bd7e840f1f11f6aac 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'