From 8b7054c7e8ac426dd1b9de151df0b6305ad8cb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 3 Nov 2023 18:08:25 +0100
Subject: [PATCH] Remove tooltips on charts
---
android/gradle.properties | 4 +--
.../metadata/android/en-US/changelogs/19.txt | 1 +
.../metadata/android/fr-FR/changelogs/19.txt | 1 +
lib/ui/widgets/charts/custom_bar_chart.dart | 28 +------------------
lib/ui/widgets/charts/custom_line_chart.dart | 24 ----------------
.../timeline_chart_eclecticism.dart | 2 +-
pubspec.yaml | 2 +-
7 files changed, 7 insertions(+), 55 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/19.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/19.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 30298b3..6c1d873 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.18
-app.versionCode=18
+app.versionName=0.0.19
+app.versionCode=19
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
new file mode 100644
index 0000000..76c033c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -0,0 +1 @@
+Remove tooltips on charts.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/19.txt b/fastlane/metadata/android/fr-FR/changelogs/19.txt
new file mode 100644
index 0000000..5adbc09
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/19.txt
@@ -0,0 +1 @@
+Suppression des infobulles sur les graphiques.
diff --git a/lib/ui/widgets/charts/custom_bar_chart.dart b/lib/ui/widgets/charts/custom_bar_chart.dart
index 2d0e851..97ea930 100644
--- a/lib/ui/widgets/charts/custom_bar_chart.dart
+++ b/lib/ui/widgets/charts/custom_bar_chart.dart
@@ -30,7 +30,7 @@ class CustomBarChart extends StatelessWidget {
borderData: getBorderData(),
gridData: getGridData(),
titlesData: getTitlesData(),
- barTouchData: getBarTouchData(),
+ barTouchData: BarTouchData(enabled: false),
maxY: getNextRoundNumber(getMaxCountsValue(), this.verticalTicksInterval),
),
);
@@ -199,30 +199,4 @@ class CustomBarChart extends StatelessWidget {
),
);
}
-
- BarTouchData getBarTouchData() {
- return BarTouchData(
- enabled: true,
- touchTooltipData: BarTouchTooltipData(
- tooltipBgColor: Colors.transparent,
- tooltipPadding: EdgeInsets.zero,
- tooltipMargin: 2,
- getTooltipItem: (
- BarChartGroupData group,
- int groupIndex,
- BarChartRodData rod,
- int rodIndex,
- ) {
- return BarTooltipItem(
- rod.toY.round().toString(),
- const TextStyle(
- color: AppColors.mainTextColor2,
- fontWeight: FontWeight.bold,
- fontSize: 10,
- ),
- );
- },
- ),
- );
- }
}
diff --git a/lib/ui/widgets/charts/custom_line_chart.dart b/lib/ui/widgets/charts/custom_line_chart.dart
index 53034a9..01a48a9 100644
--- a/lib/ui/widgets/charts/custom_line_chart.dart
+++ b/lib/ui/widgets/charts/custom_line_chart.dart
@@ -94,28 +94,4 @@ class CustomLineChart extends StatelessWidget {
Widget getHorizontalTitlesWidget(double value, TitleMeta meta) {
return Text('');
}
-
- LineTouchData getLineTouchDataEclecticism() {
- return LineTouchData(
- handleBuiltInTouches: true,
- touchTooltipData: LineTouchTooltipData(
- tooltipBgColor: Colors.transparent,
- tooltipPadding: EdgeInsets.all(8),
- tooltipMargin: 2,
- getTooltipItems: (List<LineBarSpot> touchedSpots) {
- return touchedSpots.map((LineBarSpot touchedSpot) {
- final textStyle = TextStyle(
- color: AppColors.mainTextColor2,
- fontWeight: FontWeight.bold,
- fontSize: 10,
- );
- return LineTooltipItem(
- touchedSpot.y.toString(),
- textStyle,
- );
- }).toList();
- },
- ),
- );
- }
}
diff --git a/lib/ui/widgets/main_screen/timeline_chart_eclecticism.dart b/lib/ui/widgets/main_screen/timeline_chart_eclecticism.dart
index 9db1699..71e358e 100644
--- a/lib/ui/widgets/main_screen/timeline_chart_eclecticism.dart
+++ b/lib/ui/widgets/main_screen/timeline_chart_eclecticism.dart
@@ -23,7 +23,7 @@ class ChartTimelineEclecticism extends CustomLineChart {
borderData: getBorderData(),
gridData: getGridData(),
titlesData: getTitlesData(),
- lineTouchData: getLineTouchDataEclecticism(),
+ lineTouchData: const LineTouchData(enabled: false),
minX: horizontalScale['min'],
maxX: horizontalScale['max'],
maxY: 100,
diff --git a/pubspec.yaml b/pubspec.yaml
index bc1e877..e633b49 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.18+18
+version: 0.0.19+19
environment:
sdk: '^3.0.0'
--
GitLab