From a815ab72b1db549c2e52ec140359c16f2a322f21 Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Fri, 29 Mar 2024 21:47:11 +0100 Subject: [PATCH 1/5] display text vertically for game phases --- lib/src/view/analysis/analysis_screen.dart | 3 +++ pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart index 48100a1ee8..fafed174eb 100644 --- a/lib/src/view/analysis/analysis_screen.dart +++ b/lib/src/view/analysis/analysis_screen.dart @@ -1142,6 +1142,9 @@ class AcplChart extends ConsumerWidget { label: VerticalLineLabel( style: const TextStyle(fontSize: 10), labelResolver: (line) => label, + padding: const EdgeInsets.all(2.0), + alignment: Alignment.topRight, + direction: LabelDirection.vertical, show: true, ), ); diff --git a/pubspec.lock b/pubspec.lock index 408b72e001..ad85f145ec 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -485,10 +485,10 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d" + sha256: "2b7c1f5d867da9a054661641c8f499c55c47c39acccb97b3bc673f5fa9a39e74" url: "https://pub.dev" source: hosted - version: "0.66.2" + version: "0.67.0" flutter: dependency: "direct main" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 64d78e16d0..e3c9b5bb3b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: firebase_core: ^2.15.0 firebase_crashlytics: ^3.3.4 firebase_messaging: ^14.7.8 - fl_chart: ^0.66.0 + fl_chart: ^0.67.0 flutter: sdk: flutter flutter_appauth: ^6.0.0 From 6520c51da83b02c4d15b2589c54213c3d6d004df Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Sat, 30 Mar 2024 00:30:33 +0100 Subject: [PATCH 2/5] remove space between chart and stats --- lib/src/view/analysis/analysis_screen.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart index fafed174eb..90e09120a8 100644 --- a/lib/src/view/analysis/analysis_screen.dart +++ b/lib/src/view/analysis/analysis_screen.dart @@ -847,8 +847,6 @@ class ServerAnalysisSummary extends ConsumerWidget { child: WaitingForServerAnalysis(), ), AcplChart(options), - // may be removed if game phases text is displayed vertically instead of horizontally - const SizedBox(height: 10.0), Center( child: SizedBox( width: math.min(MediaQuery.sizeOf(context).width, 500), From 0422c0b6e67eaaf90a6d81a57254c63cf79a81e7 Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Sat, 30 Mar 2024 19:46:41 +0100 Subject: [PATCH 3/5] change padding --- lib/src/view/analysis/analysis_screen.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart index 90e09120a8..e320e27367 100644 --- a/lib/src/view/analysis/analysis_screen.dart +++ b/lib/src/view/analysis/analysis_screen.dart @@ -1140,7 +1140,7 @@ class AcplChart extends ConsumerWidget { label: VerticalLineLabel( style: const TextStyle(fontSize: 10), labelResolver: (line) => label, - padding: const EdgeInsets.all(2.0), + padding: const EdgeInsets.only(right: 1), alignment: Alignment.topRight, direction: LabelDirection.vertical, show: true, From 7a0c664b2a34aecba6a604205c5f2d64ea66a22d Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Sat, 30 Mar 2024 19:47:20 +0100 Subject: [PATCH 4/5] add opacity to text color --- lib/src/view/analysis/analysis_screen.dart | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart index e320e27367..3a9d1eb1ac 100644 --- a/lib/src/view/analysis/analysis_screen.dart +++ b/lib/src/view/analysis/analysis_screen.dart @@ -1138,7 +1138,14 @@ class AcplChart extends ConsumerWidget { color: const Color(0xFF707070), strokeWidth: 0.5, label: VerticalLineLabel( - style: const TextStyle(fontSize: 10), + style: TextStyle( + fontSize: 10, + color: Theme.of(context) + .textTheme + .labelMedium + ?.color + ?.withOpacity(0.2), + ), labelResolver: (line) => label, padding: const EdgeInsets.only(right: 1), alignment: Alignment.topRight, From b8121e3cc931d767a8878ee62a5a06587c6f4d2a Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Sat, 30 Mar 2024 20:00:07 +0100 Subject: [PATCH 5/5] tweak opacity value --- lib/src/view/analysis/analysis_screen.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/view/analysis/analysis_screen.dart b/lib/src/view/analysis/analysis_screen.dart index 3a9d1eb1ac..427b7676cc 100644 --- a/lib/src/view/analysis/analysis_screen.dart +++ b/lib/src/view/analysis/analysis_screen.dart @@ -1144,7 +1144,7 @@ class AcplChart extends ConsumerWidget { .textTheme .labelMedium ?.color - ?.withOpacity(0.2), + ?.withOpacity(0.3), ), labelResolver: (line) => label, padding: const EdgeInsets.only(right: 1),