Merge branch '58-swap-vertical-titles-in-main-timeline-chart' into 'master'

Resolve "Swap vertical titles in main timeline chart"

Closes #58

See merge request !53

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.50
-app.versionCode=50
+app.versionName=0.0.51
+app.versionCode=51

fastlane/metadata/android/en-US/changelogs/51.txt

+Improve vertical axis legends.

fastlane/metadata/android/fr-FR/changelogs/51.txt

+Amélioration des axes verticaux des graphiques.

lib/ui/widgets/abstracts/custom_bar_chart.dart

@@ -89,47 +89,15 @@ class CustomBarChart extends CustomChart {
     );
   }
 
-  FlTitlesData getTitlesData() {
-    const AxisTitles none = const AxisTitles(
-      sideTitles: SideTitles(showTitles: false),
-    );
-
-    final AxisTitles verticalTitles = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 35,
-        getTitlesWidget: getVerticalTitlesWidget,
-        interval: this.verticalTicksInterval,
-      ),
-    );
-
-    final AxisTitles verticalSpacer = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 35,
-        getTitlesWidget: getVerticalTitlesSpacerWidget,
-        interval: this.verticalTicksInterval,
-      ),
-    );
-
-    final AxisTitles horizontalTitles = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 20,
-        getTitlesWidget: getHorizontalTitlesWidget,
-      ),
-    );
+  Widget getHorizontalTitlesWidget(double value, TitleMeta meta) {
+    return getHorizontalTitlesWidgetWithDate(value, meta);
+  }
 
-    return FlTitlesData(
-      show: true,
-      bottomTitles: horizontalTitles,
-      leftTitles: verticalTitles,
-      topTitles: none,
-      rightTitles: verticalSpacer,
-    );
+  Widget getVerticalLeftTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesWidgetWithValue(value, meta);
   }
 
-  Widget getHorizontalTitlesWidget(double value, TitleMeta meta) {
-    return getHorizontalTitlesWidgetWithDate(value, meta);
+  Widget getVerticalRightTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesWidgetWithValue(value, meta);
   }
 }

lib/ui/widgets/abstracts/custom_chart.dart

@@ -95,8 +95,42 @@ class CustomChart extends StatelessWidget {
   }
 
   FlTitlesData getTitlesData() {
+    const AxisTitles none = const AxisTitles(
+      sideTitles: SideTitles(showTitles: false),
+    );
+
+    final AxisTitles verticalTitlesLeft = AxisTitles(
+      sideTitles: SideTitles(
+        showTitles: true,
+        reservedSize: 35,
+        getTitlesWidget: getVerticalLeftTitlesWidget,
+        interval: this.verticalTicksInterval,
+      ),
+    );
+
+    final AxisTitles verticalTitleRight = AxisTitles(
+      sideTitles: SideTitles(
+        showTitles: true,
+        reservedSize: 35,
+        getTitlesWidget: getVerticalRightTitlesWidget,
+        interval: this.verticalTicksInterval,
+      ),
+    );
+
+    final AxisTitles horizontalTitles = AxisTitles(
+      sideTitles: SideTitles(
+        showTitles: true,
+        reservedSize: 20,
+        getTitlesWidget: getHorizontalTitlesWidget,
+      ),
+    );
+
     return FlTitlesData(
-      show: false,
+      show: true,
+      bottomTitles: horizontalTitles,
+      leftTitles: verticalTitlesLeft,
+      topTitles: none,
+      rightTitles: verticalTitleRight,
     );
   }
 
@@ -104,6 +138,14 @@ class CustomChart extends StatelessWidget {
     return Text('');
   }
 
+  Widget getVerticalLeftTitlesWidget(double value, TitleMeta meta) {
+    return Text('');
+  }
+
+  Widget getVerticalRightTitlesWidget(double value, TitleMeta meta) {
+    return Text('');
+  }
+
   Widget getHorizontalTitlesWidgetWithDate(double value, TitleMeta meta) {
     final DateFormat formatter = DateFormat('dd/MM');
 
@@ -173,7 +215,7 @@ class CustomChart extends StatelessWidget {
     );
   }
 
-  Widget getVerticalTitlesWidget(double value, TitleMeta meta) {
+  Widget getVerticalTitlesWidgetWithValue(double value, TitleMeta meta) {
     String suffix =
         this.verticalAxisTitleSuffix != '' ? ' ' + this.verticalAxisTitleSuffix : '';
 

lib/ui/widgets/abstracts/custom_line_chart.dart

@@ -34,42 +34,11 @@ class CustomLineChart extends CustomChart {
     };
   }
 
-  FlTitlesData getTitlesData() {
-    const AxisTitles none = const AxisTitles(
-      sideTitles: SideTitles(showTitles: false),
-    );
-
-    final AxisTitles verticalTitles = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 35,
-        getTitlesWidget: getVerticalTitlesWidget,
-        interval: this.verticalTicksInterval,
-      ),
-    );
-
-    final AxisTitles verticalSpacer = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 35,
-        getTitlesWidget: getVerticalTitlesSpacerWidget,
-      ),
-    );
-
-    final AxisTitles horizontalTitles = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        reservedSize: 20,
-        getTitlesWidget: getHorizontalTitlesWidget,
-      ),
-    );
+  Widget getVerticalLeftTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesWidgetWithValue(value, meta);
+  }
 
-    return FlTitlesData(
-      show: true,
-      bottomTitles: horizontalTitles,
-      leftTitles: verticalSpacer,
-      topTitles: none,
-      rightTitles: verticalTitles,
-    );
+  Widget getVerticalRightTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesWidgetWithValue(value, meta);
   }
 }

lib/ui/widgets/charts/heatmap.dart

@@ -92,7 +92,7 @@ class ChartHeatmap extends CustomChart {
       sideTitles: SideTitles(
         showTitles: true,
         reservedSize: 40,
-        getTitlesWidget: getVerticalTitlesWidget,
+        getTitlesWidget: getVerticalTitlesWidgetWithValue,
         interval: 1,
       ),
     );
@@ -115,7 +115,7 @@ class ChartHeatmap extends CustomChart {
     );
   }
 
-  Widget getVerticalTitlesWidget(double value, TitleMeta meta) {
+  Widget getVerticalTitlesWidgetWithValue(double value, TitleMeta meta) {
     final String dayShortName = getDayShortName(8 - value.toInt());
 
     return SideTitleWidget(

lib/ui/widgets/charts/timeline_counts.dart

@@ -74,4 +74,8 @@ class ChartTimelineCounts extends CustomBarChart {
 
     return data;
   }
+
+  Widget getVerticalLeftTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesSpacerWidget(value, meta);
+  }
 }

lib/ui/widgets/charts/timeline_eclecticism.dart

@@ -72,4 +72,8 @@ class ChartTimelineEclecticism extends CustomLineChart {
       ),
     ];
   }
+
+  Widget getVerticalRightTitlesWidget(double value, TitleMeta meta) {
+    return getVerticalTitlesSpacerWidget(value, meta);
+  }
 }

lib/ui/widgets/charts/top_artists_stream.dart

@@ -11,6 +11,7 @@ class ChartTopArtistsStream extends CustomLineChart {
   const ChartTopArtistsStream({super.key, required this.chartData});
 
   final double verticalTicksInterval = 10;
+  final String verticalAxisTitleSuffix = '%';
 
   @override
   Widget build(BuildContext context) {

pubspec.yaml

@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.50+50
+version: 0.0.51+51
 
 environment:
   sdk: '^3.0.0'