refactor: fixed scaling

Floating-Dartists · Dec 20, 2023 · 2d98005 · 2d98005
1 parent bf0cc78
commit 2d98005
Show file tree

Hide file tree

Showing 26 changed files with 10 additions and 3 deletions.
diff --git a/lib/src/components/buttons/primary.dart b/lib/src/components/buttons/primary.dart
@@ -31,7 +31,8 @@ class DSFRPrimaryButton extends DSFRGroupeableButton {
     final dsfrTypography = dsfrTheme.typography;
     final dsfrButtonStyle = dsfrTheme.buttonStyle;
 
-    final scale = MediaQuery.textScalerOf(context).textScaleFactor;
+    final scale = MediaQuery.textScalerOf(context)
+        .scale(dsfrTypography.medium.fontSize ?? 1);
     final double gap =
         scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
 

diff --git a/lib/src/components/buttons/secondary.dart b/lib/src/components/buttons/secondary.dart
@@ -30,7 +30,8 @@ class DSFRSecondaryButton extends DSFRGroupeableButton {
     final dsfrColors = dsfrTheme.colors;
     final dsfrButtonStyle = dsfrTheme.buttonStyle;
 
-    final scale = MediaQuery.textScalerOf(context).textScaleFactor;
+    final scale = MediaQuery.textScalerOf(context)
+        .scale(dsfrTypography.medium.fontSize ?? 1);
     final double gap =
         scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
 

diff --git a/lib/src/components/buttons/tertiary.dart b/lib/src/components/buttons/tertiary.dart
@@ -33,7 +33,8 @@ class DSFRTertiaryButton extends DSFRBaseButton {
     final dsfrColors = dsfrTheme.colors;
     final dsfrTypography = dsfrTheme.typography;
 
-    final scale = MediaQuery.textScalerOf(context).textScaleFactor;
+    final scale = MediaQuery.textScalerOf(context)
+        .scale(dsfrTypography.medium.fontSize ?? 1);
     final double gap =
         scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
 

diff --git a/lib/src/dsfr_app.dart b/lib/src/dsfr_app.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
 import '../flutter_dsfr.dart';
 
 /// An application that uses the french government design system.
@@ -232,6 +233,7 @@ class _DSFRAppState extends State<DSFRApp> {
     if (useDarkTheme) {
       colors = const DSFRColors.dark();
       theme = ThemeData(
+        useMaterial3: false,
         fontFamily: 'Marianne',
         brightness: Brightness.dark,
         extensions: [
@@ -241,6 +243,7 @@ class _DSFRAppState extends State<DSFRApp> {
     } else {
       colors = const DSFRColors.light();
       theme = ThemeData(
+        useMaterial3: false,
         fontFamily: 'Marianne',
         brightness: Brightness.light,
         extensions: [

diff --git a/test/components/alerts/goldens/ci/alert_dark.png b/test/components/alerts/goldens/ci/alert_dark.png
diff --git a/test/components/alerts/goldens/ci/alert_light.png b/test/components/alerts/goldens/ci/alert_light.png
diff --git a/test/components/badges/goldens/ci/badge_dark.png b/test/components/badges/goldens/ci/badge_dark.png
diff --git a/test/components/badges/goldens/ci/badge_light.png b/test/components/badges/goldens/ci/badge_light.png
diff --git a/test/components/buttons/goldens/ci/france_connect_button.png b/test/components/buttons/goldens/ci/france_connect_button.png
diff --git a/test/components/buttons/goldens/ci/france_connect_button_dark.png b/test/components/buttons/goldens/ci/france_connect_button_dark.png
diff --git a/test/components/buttons/goldens/ci/primary_button_dark.png b/test/components/buttons/goldens/ci/primary_button_dark.png
diff --git a/test/components/buttons/goldens/ci/primary_button_light.png b/test/components/buttons/goldens/ci/primary_button_light.png
diff --git a/test/components/buttons/goldens/ci/radio_button_dark.png b/test/components/buttons/goldens/ci/radio_button_dark.png
diff --git a/test/components/buttons/goldens/ci/radio_button_light.png b/test/components/buttons/goldens/ci/radio_button_light.png
diff --git a/test/components/buttons/goldens/ci/radio_group_light.png b/test/components/buttons/goldens/ci/radio_group_light.png
diff --git a/test/components/buttons/goldens/ci/radio_rich_light.png b/test/components/buttons/goldens/ci/radio_rich_light.png
diff --git a/test/components/buttons/goldens/ci/secondary_button_dark.png b/test/components/buttons/goldens/ci/secondary_button_dark.png
diff --git a/test/components/buttons/goldens/ci/secondary_button_light.png b/test/components/buttons/goldens/ci/secondary_button_light.png
diff --git a/test/components/buttons/goldens/ci/tertiary_button_dark.png b/test/components/buttons/goldens/ci/tertiary_button_dark.png
diff --git a/test/components/buttons/goldens/ci/tertiary_button_light.png b/test/components/buttons/goldens/ci/tertiary_button_light.png
diff --git a/test/components/buttons_group/goldens/ci/buttons_group_horizontal.png b/test/components/buttons_group/goldens/ci/buttons_group_horizontal.png
diff --git a/test/components/buttons_group/goldens/ci/buttons_group_vertical.png b/test/components/buttons_group/goldens/ci/buttons_group_vertical.png
diff --git a/test/components/logo/goldens/ci/logo.png b/test/components/logo/goldens/ci/logo.png
diff --git a/test/flutter_test_config.dart b/test/flutter_test_config.dart
@@ -16,6 +16,7 @@ Future<void> testExecutable(FutureOr<void> Function() testMain) async {
       theme: ThemeData(
         fontFamily: 'Marianne',
         brightness: Brightness.light,
+        useMaterial3: false,
         extensions: const [
           DSFRThemeData(colors: DSFRColors.light()),
         ],

diff --git a/test/theme/goldens/ci/radius.png b/test/theme/goldens/ci/radius.png
diff --git a/test/theme/goldens/ci/typography.png b/test/theme/goldens/ci/typography.png