diff --git a/android/gradle.properties b/android/gradle.properties index 30298b3b3f04073678e48519b8c043edba635df8..6c1d873456149a8611e43a05ae56e4f50c73274f 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 0000000000000000000000000000000000000000..76c033cdde0ce1c0d096669641581702e093a2e1 --- /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 0000000000000000000000000000000000000000..5adbc0917609529104368d6d788643d812300897 --- /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 2d0e8514648418feb5f7fb9660f67d9069a55c3a..97ea9301f46eb505cb58d798a947afaa4cfc3e39 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 53034a9a281d46fc8fa8509e597fde7ffa92a995..01a48a9c7151a5702a56b578c7681e4a9e69cfe1 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 9db1699a2448e02dd0bd8a2afa0caa6d210089ab..71e358e478067c805203df528b190593e12e67c0 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 bc1e87753d708d59ba5c2888361a20e3a8bff230..e633b4982b095480b6affd192838b989c6c892d0 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'