From 3dfc469429737f42692404754f3c19c6ee373b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 28 Feb 2024 16:09:02 +0100
Subject: [PATCH] Avoid print calls in production code
---
android/gradle.properties | 4 ++--
fastlane/metadata/android/en-US/changelogs/55.txt | 1 +
fastlane/metadata/android/fr-FR/changelogs/55.txt | 1 +
lib/ui/widgets/abstracts/custom_chart.dart | 3 +--
lib/ui/widgets/charts/counts_by_day.dart | 8 +++-----
lib/ui/widgets/charts/counts_by_hour.dart | 8 +++-----
lib/ui/widgets/error.dart | 4 +++-
lib/utils/tools.dart | 7 +++++++
pubspec.lock | 4 ++--
pubspec.yaml | 2 +-
10 files changed, 24 insertions(+), 18 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/55.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/55.txt
create mode 100644 lib/utils/tools.dart
diff --git a/android/gradle.properties b/android/gradle.properties
index 39d5a5e..f012e12 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.54
-app.versionCode=54
+app.versionName=0.0.55
+app.versionCode=55
diff --git a/fastlane/metadata/android/en-US/changelogs/55.txt b/fastlane/metadata/android/en-US/changelogs/55.txt
new file mode 100644
index 0000000..52f2179
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/55.txt
@@ -0,0 +1 @@
+Avoid print calls in production code.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/55.txt b/fastlane/metadata/android/fr-FR/changelogs/55.txt
new file mode 100644
index 0000000..8537dac
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/55.txt
@@ -0,0 +1 @@
+Supprime les appels à print dans le code de production.
diff --git a/lib/ui/widgets/abstracts/custom_chart.dart b/lib/ui/widgets/abstracts/custom_chart.dart
index dd294c4..e0e69fb 100644
--- a/lib/ui/widgets/abstracts/custom_chart.dart
+++ b/lib/ui/widgets/abstracts/custom_chart.dart
@@ -216,8 +216,7 @@ class CustomChart extends StatelessWidget {
}
Widget getVerticalTitlesWidgetWithValue(double value, TitleMeta meta) {
- String suffix =
- verticalAxisTitleSuffix != '' ? ' $verticalAxisTitleSuffix' : '';
+ String suffix = verticalAxisTitleSuffix != '' ? ' $verticalAxisTitleSuffix' : '';
return SideTitleWidget(
axisSide: meta.axisSide,
diff --git a/lib/ui/widgets/charts/counts_by_day.dart b/lib/ui/widgets/charts/counts_by_day.dart
index ebded1d..e571aa9 100644
--- a/lib/ui/widgets/charts/counts_by_day.dart
+++ b/lib/ui/widgets/charts/counts_by_day.dart
@@ -43,11 +43,9 @@ class ChartCountsByDay extends CustomBarChart {
double maxValue = 0;
for (var key in chartData.data.keys) {
- double? counts = chartData.data[key];
- if (counts != null) {
- if (counts > maxValue) {
- maxValue = counts;
- }
+ double counts = chartData.data[key] ?? 0;
+ if (counts > maxValue) {
+ maxValue = counts;
}
}
diff --git a/lib/ui/widgets/charts/counts_by_hour.dart b/lib/ui/widgets/charts/counts_by_hour.dart
index fc42389..4bc2bf8 100644
--- a/lib/ui/widgets/charts/counts_by_hour.dart
+++ b/lib/ui/widgets/charts/counts_by_hour.dart
@@ -45,11 +45,9 @@ class ChartCountsByHour extends CustomBarChart {
double maxValue = 0;
for (var key in chartData.data.keys) {
- double? counts = chartData.data[key];
- if (counts != null) {
- if (counts > maxValue) {
- maxValue = counts;
- }
+ double counts = chartData.data[key] ?? 0;
+ if (counts > maxValue) {
+ maxValue = counts;
}
}
diff --git a/lib/ui/widgets/error.dart b/lib/ui/widgets/error.dart
index 2a68880..aa3d5cd 100644
--- a/lib/ui/widgets/error.dart
+++ b/lib/ui/widgets/error.dart
@@ -1,6 +1,8 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
+import 'package:scrobbles/utils/tools.dart';
+
class ShowErrorWidget extends StatelessWidget {
const ShowErrorWidget({super.key, required this.message});
@@ -8,7 +10,7 @@ class ShowErrorWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- print(message);
+ printlog(message);
return Text(
'âš ï¸ ${tr(message)}',
diff --git a/lib/utils/tools.dart b/lib/utils/tools.dart
new file mode 100644
index 0000000..fd48b2b
--- /dev/null
+++ b/lib/utils/tools.dart
@@ -0,0 +1,7 @@
+import 'package:flutter/foundation.dart';
+
+void printlog(String message) {
+ if (!kReleaseMode) {
+ debugPrint(message);
+ }
+}
diff --git a/pubspec.lock b/pubspec.lock
index f0f67d8..5e1b487 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -300,10 +300,10 @@ packages:
dependency: transitive
description:
name: provider
- sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+ sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
url: "https://pub.dev"
source: hosted
- version: "6.1.1"
+ version: "6.1.2"
shared_preferences:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5696fef..25fa803 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.54+54
+version: 0.0.55+55
environment:
sdk: '^3.0.0'
--
GitLab