refactor: moved fonts

Floating-Dartists · Dec 20, 2023 · 766f619 · 766f619
1 parent faac7c7
commit 766f619
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/lib/flutter_dsfr.dart b/lib/flutter_dsfr.dart
@@ -1,6 +1,5 @@
 library flutter_dsfr;
 
-export 'fonts/fonts.dart';
 export 'src/components/accordion/accordion.dart';
 export 'src/components/accordion/accordion_data.dart';
 export 'src/components/alerts/alert.dart';
@@ -23,6 +22,7 @@ export 'src/components/buttons_group/buttons_group.dart';
 export 'src/components/radio_group/radio_group.dart';
 export 'src/components/radio_group/radio_group_form_field.dart';
 export 'src/dsfr_app.dart';
+export 'src/fonts.dart';
 export 'src/theme/button_style.dart';
 export 'src/theme/colors.dart';
 export 'src/theme/icons.dart';

diff --git a/lib/fonts/fonts.dart → lib/src/fonts.dart b/lib/fonts/fonts.dart → lib/src/fonts.dart
diff --git a/lib/src/theme/typography.dart b/lib/src/theme/typography.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../fonts/fonts.dart';
+import '../../flutter_dsfr.dart';
 import '../utils/named_property.dart';
 
 @immutable

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,11 +4,14 @@ version: 0.0.1
 homepage: https://github.com/TesteurManiak/flutter_dsfr
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
+  flutter_localizations:
+    sdk: flutter
 
 dev_dependencies:
   alchemist: ^0.7.0
@@ -17,7 +20,7 @@ dev_dependencies:
     sdk: flutter
 
 flutter:
-  uses-material-design: true
+  generate: true
   fonts:
     - family: Marianne
       fonts:

diff --git a/test/utils/font.dart b/test/utils/font.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/services.dart';
-import 'package:flutter_dsfr/fonts/fonts.dart';
+import 'package:flutter_dsfr/src/fonts.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 /// This loads fonts for the test runner.