diff --git a/forui/lib/src/foundation/focused_outline.dart b/forui/lib/src/foundation/focused_outline.dart index c8baf8b76..20509ee29 100644 --- a/forui/lib/src/foundation/focused_outline.dart +++ b/forui/lib/src/foundation/focused_outline.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// An outline around a focused widget that does not affect its layout. /// diff --git a/forui/lib/src/foundation/tappable.dart b/forui/lib/src/foundation/tappable.dart index 9ce68372e..33c54cd5c 100644 --- a/forui/lib/src/foundation/tappable.dart +++ b/forui/lib/src/foundation/tappable.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal extension Touch on Never { diff --git a/forui/lib/src/localizations/localization.dart b/forui/lib/src/localizations/localization.dart index 8ccb6544f..6bc4e19f7 100644 --- a/forui/lib/src/localizations/localization.dart +++ b/forui/lib/src/localizations/localization.dart @@ -1,8 +1,7 @@ +import 'package:forui/forui.dart'; import 'package:intl/intl.dart'; import 'package:meta/meta.dart'; -import 'package:forui/forui.dart'; - /// Localizations for date and time formatting. extension FDateTimeLocalizations on FLocalizations { /// The first day of the week, in ISO 8601 style, where the first day of the week, i. e. index 1, is Monday. diff --git a/forui/lib/src/localizations/localizations.dart b/forui/lib/src/localizations/localizations.dart index f79a71b32..9446c40c7 100644 --- a/forui/lib/src/localizations/localizations.dart +++ b/forui/lib/src/localizations/localizations.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; + import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:intl/intl.dart' as intl; -import 'package:forui/src/localizations/localization.dart'; import 'localizations_af.dart'; import 'localizations_am.dart'; import 'localizations_ar.dart'; @@ -145,7 +145,7 @@ abstract class FLocalizations { final String localeName; static FLocalizations of(BuildContext context) { - return Localizations.of(context, FLocalizations) ?? DefaultLocalizations(); + return Localizations.of(context, FLocalizations)!; } static const LocalizationsDelegate delegate = _FLocalizationsDelegate(); diff --git a/forui/lib/src/localizations/localizations_de.dart b/forui/lib/src/localizations/localizations_de.dart index ea369d24b..bbb792063 100644 --- a/forui/lib/src/localizations/localizations_de.dart +++ b/forui/lib/src/localizations/localizations_de.dart @@ -65,7 +65,7 @@ class FLocalizationsDe extends FLocalizations { /// The translations for German, as used in Switzerland (`de_CH`). class FLocalizationsDeCh extends FLocalizationsDe { - FLocalizationsDeCh(): super('de_CH'); + FLocalizationsDeCh() : super('de_CH'); @override String get dialogLabel => 'Dialogfeld'; diff --git a/forui/lib/src/localizations/localizations_en.dart b/forui/lib/src/localizations/localizations_en.dart index 564ab36ca..3651b7c09 100644 --- a/forui/lib/src/localizations/localizations_en.dart +++ b/forui/lib/src/localizations/localizations_en.dart @@ -65,7 +65,7 @@ class FLocalizationsEn extends FLocalizations { /// The translations for English, as used in Australia (`en_AU`). class FLocalizationsEnAu extends FLocalizationsEn { - FLocalizationsEnAu(): super('en_AU'); + FLocalizationsEnAu() : super('en_AU'); @override String get dialogLabel => 'Dialogue'; @@ -84,7 +84,7 @@ class FLocalizationsEnAu extends FLocalizationsEn { /// The translations for English, as used in Canada (`en_CA`). class FLocalizationsEnCa extends FLocalizationsEn { - FLocalizationsEnCa(): super('en_CA'); + FLocalizationsEnCa() : super('en_CA'); @override String get dialogLabel => 'Dialog'; @@ -103,7 +103,7 @@ class FLocalizationsEnCa extends FLocalizationsEn { /// The translations for English, as used in the United Kingdom (`en_GB`). class FLocalizationsEnGb extends FLocalizationsEn { - FLocalizationsEnGb(): super('en_GB'); + FLocalizationsEnGb() : super('en_GB'); @override String get dialogLabel => 'Dialogue'; @@ -122,7 +122,7 @@ class FLocalizationsEnGb extends FLocalizationsEn { /// The translations for English, as used in Ireland (`en_IE`). class FLocalizationsEnIe extends FLocalizationsEn { - FLocalizationsEnIe(): super('en_IE'); + FLocalizationsEnIe() : super('en_IE'); @override String get dialogLabel => 'Dialogue'; @@ -141,7 +141,7 @@ class FLocalizationsEnIe extends FLocalizationsEn { /// The translations for English, as used in India (`en_IN`). class FLocalizationsEnIn extends FLocalizationsEn { - FLocalizationsEnIn(): super('en_IN'); + FLocalizationsEnIn() : super('en_IN'); @override String get dialogLabel => 'Dialogue'; @@ -160,7 +160,7 @@ class FLocalizationsEnIn extends FLocalizationsEn { /// The translations for English, as used in New Zealand (`en_NZ`). class FLocalizationsEnNz extends FLocalizationsEn { - FLocalizationsEnNz(): super('en_NZ'); + FLocalizationsEnNz() : super('en_NZ'); @override String get dialogLabel => 'Dialogue'; @@ -179,7 +179,7 @@ class FLocalizationsEnNz extends FLocalizationsEn { /// The translations for English, as used in Singapore (`en_SG`). class FLocalizationsEnSg extends FLocalizationsEn { - FLocalizationsEnSg(): super('en_SG'); + FLocalizationsEnSg() : super('en_SG'); @override String get dialogLabel => 'Dialogue'; @@ -198,7 +198,7 @@ class FLocalizationsEnSg extends FLocalizationsEn { /// The translations for English, as used in South Africa (`en_ZA`). class FLocalizationsEnZa extends FLocalizationsEn { - FLocalizationsEnZa(): super('en_ZA'); + FLocalizationsEnZa() : super('en_ZA'); @override String get dialogLabel => 'Dialogue'; diff --git a/forui/lib/src/localizations/localizations_es.dart b/forui/lib/src/localizations/localizations_es.dart index 6853862c9..40a8fa347 100644 --- a/forui/lib/src/localizations/localizations_es.dart +++ b/forui/lib/src/localizations/localizations_es.dart @@ -65,7 +65,7 @@ class FLocalizationsEs extends FLocalizations { /// The translations for Spanish Castilian, as used in Latin America and the Caribbean (`es_419`). class FLocalizationsEs419 extends FLocalizationsEs { - FLocalizationsEs419(): super('es_419'); + FLocalizationsEs419() : super('es_419'); @override String get dialogLabel => 'Diálogo'; @@ -84,7 +84,7 @@ class FLocalizationsEs419 extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Argentina (`es_AR`). class FLocalizationsEsAr extends FLocalizationsEs { - FLocalizationsEsAr(): super('es_AR'); + FLocalizationsEsAr() : super('es_AR'); @override String get dialogLabel => 'Diálogo'; @@ -103,7 +103,7 @@ class FLocalizationsEsAr extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Bolivia (`es_BO`). class FLocalizationsEsBo extends FLocalizationsEs { - FLocalizationsEsBo(): super('es_BO'); + FLocalizationsEsBo() : super('es_BO'); @override String get dialogLabel => 'Diálogo'; @@ -122,7 +122,7 @@ class FLocalizationsEsBo extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Chile (`es_CL`). class FLocalizationsEsCl extends FLocalizationsEs { - FLocalizationsEsCl(): super('es_CL'); + FLocalizationsEsCl() : super('es_CL'); @override String get dialogLabel => 'Diálogo'; @@ -141,7 +141,7 @@ class FLocalizationsEsCl extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Colombia (`es_CO`). class FLocalizationsEsCo extends FLocalizationsEs { - FLocalizationsEsCo(): super('es_CO'); + FLocalizationsEsCo() : super('es_CO'); @override String get dialogLabel => 'Diálogo'; @@ -160,7 +160,7 @@ class FLocalizationsEsCo extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Costa Rica (`es_CR`). class FLocalizationsEsCr extends FLocalizationsEs { - FLocalizationsEsCr(): super('es_CR'); + FLocalizationsEsCr() : super('es_CR'); @override String get dialogLabel => 'Diálogo'; @@ -179,7 +179,7 @@ class FLocalizationsEsCr extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in the Dominican Republic (`es_DO`). class FLocalizationsEsDo extends FLocalizationsEs { - FLocalizationsEsDo(): super('es_DO'); + FLocalizationsEsDo() : super('es_DO'); @override String get dialogLabel => 'Diálogo'; @@ -198,7 +198,7 @@ class FLocalizationsEsDo extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Ecuador (`es_EC`). class FLocalizationsEsEc extends FLocalizationsEs { - FLocalizationsEsEc(): super('es_EC'); + FLocalizationsEsEc() : super('es_EC'); @override String get dialogLabel => 'Diálogo'; @@ -217,7 +217,7 @@ class FLocalizationsEsEc extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Guatemala (`es_GT`). class FLocalizationsEsGt extends FLocalizationsEs { - FLocalizationsEsGt(): super('es_GT'); + FLocalizationsEsGt() : super('es_GT'); @override String get dialogLabel => 'Diálogo'; @@ -236,7 +236,7 @@ class FLocalizationsEsGt extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Honduras (`es_HN`). class FLocalizationsEsHn extends FLocalizationsEs { - FLocalizationsEsHn(): super('es_HN'); + FLocalizationsEsHn() : super('es_HN'); @override String get dialogLabel => 'Diálogo'; @@ -255,7 +255,7 @@ class FLocalizationsEsHn extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Mexico (`es_MX`). class FLocalizationsEsMx extends FLocalizationsEs { - FLocalizationsEsMx(): super('es_MX'); + FLocalizationsEsMx() : super('es_MX'); @override String get dialogLabel => 'Diálogo'; @@ -274,7 +274,7 @@ class FLocalizationsEsMx extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Nicaragua (`es_NI`). class FLocalizationsEsNi extends FLocalizationsEs { - FLocalizationsEsNi(): super('es_NI'); + FLocalizationsEsNi() : super('es_NI'); @override String get dialogLabel => 'Diálogo'; @@ -293,7 +293,7 @@ class FLocalizationsEsNi extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Panama (`es_PA`). class FLocalizationsEsPa extends FLocalizationsEs { - FLocalizationsEsPa(): super('es_PA'); + FLocalizationsEsPa() : super('es_PA'); @override String get dialogLabel => 'Diálogo'; @@ -312,7 +312,7 @@ class FLocalizationsEsPa extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Peru (`es_PE`). class FLocalizationsEsPe extends FLocalizationsEs { - FLocalizationsEsPe(): super('es_PE'); + FLocalizationsEsPe() : super('es_PE'); @override String get dialogLabel => 'Diálogo'; @@ -331,7 +331,7 @@ class FLocalizationsEsPe extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Puerto Rico (`es_PR`). class FLocalizationsEsPr extends FLocalizationsEs { - FLocalizationsEsPr(): super('es_PR'); + FLocalizationsEsPr() : super('es_PR'); @override String get dialogLabel => 'Diálogo'; @@ -350,7 +350,7 @@ class FLocalizationsEsPr extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Paraguay (`es_PY`). class FLocalizationsEsPy extends FLocalizationsEs { - FLocalizationsEsPy(): super('es_PY'); + FLocalizationsEsPy() : super('es_PY'); @override String get dialogLabel => 'Diálogo'; @@ -369,7 +369,7 @@ class FLocalizationsEsPy extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in El Salvador (`es_SV`). class FLocalizationsEsSv extends FLocalizationsEs { - FLocalizationsEsSv(): super('es_SV'); + FLocalizationsEsSv() : super('es_SV'); @override String get dialogLabel => 'Diálogo'; @@ -388,7 +388,7 @@ class FLocalizationsEsSv extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in the United States (`es_US`). class FLocalizationsEsUs extends FLocalizationsEs { - FLocalizationsEsUs(): super('es_US'); + FLocalizationsEsUs() : super('es_US'); @override String get dialogLabel => 'Diálogo'; @@ -407,7 +407,7 @@ class FLocalizationsEsUs extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Uruguay (`es_UY`). class FLocalizationsEsUy extends FLocalizationsEs { - FLocalizationsEsUy(): super('es_UY'); + FLocalizationsEsUy() : super('es_UY'); @override String get dialogLabel => 'Diálogo'; @@ -426,7 +426,7 @@ class FLocalizationsEsUy extends FLocalizationsEs { /// The translations for Spanish Castilian, as used in Venezuela (`es_VE`). class FLocalizationsEsVe extends FLocalizationsEs { - FLocalizationsEsVe(): super('es_VE'); + FLocalizationsEsVe() : super('es_VE'); @override String get dialogLabel => 'Diálogo'; diff --git a/forui/lib/src/localizations/localizations_fr.dart b/forui/lib/src/localizations/localizations_fr.dart index f17460216..e602f0f20 100644 --- a/forui/lib/src/localizations/localizations_fr.dart +++ b/forui/lib/src/localizations/localizations_fr.dart @@ -65,7 +65,7 @@ class FLocalizationsFr extends FLocalizations { /// The translations for French, as used in Canada (`fr_CA`). class FLocalizationsFrCa extends FLocalizationsFr { - FLocalizationsFrCa(): super('fr_CA'); + FLocalizationsFrCa() : super('fr_CA'); @override String get dialogLabel => 'Boîte de dialogue'; diff --git a/forui/lib/src/localizations/localizations_pt.dart b/forui/lib/src/localizations/localizations_pt.dart index 94fc7dcda..9ac42bd55 100644 --- a/forui/lib/src/localizations/localizations_pt.dart +++ b/forui/lib/src/localizations/localizations_pt.dart @@ -65,7 +65,7 @@ class FLocalizationsPt extends FLocalizations { /// The translations for Portuguese, as used in Portugal (`pt_PT`). class FLocalizationsPtPt extends FLocalizationsPt { - FLocalizationsPtPt(): super('pt_PT'); + FLocalizationsPtPt() : super('pt_PT'); @override String get dialogLabel => 'Caixa de diálogo'; diff --git a/forui/lib/src/localizations/localizations_sr.dart b/forui/lib/src/localizations/localizations_sr.dart index 8a1fec626..65d80df43 100644 --- a/forui/lib/src/localizations/localizations_sr.dart +++ b/forui/lib/src/localizations/localizations_sr.dart @@ -65,7 +65,7 @@ class FLocalizationsSr extends FLocalizations { /// The translations for Serbian, using the Latin script (`sr_Latn`). class FLocalizationsSrLatn extends FLocalizationsSr { - FLocalizationsSrLatn(): super('sr_Latn'); + FLocalizationsSrLatn() : super('sr_Latn'); @override String get dialogLabel => 'Dijalog'; diff --git a/forui/lib/src/localizations/localizations_zh.dart b/forui/lib/src/localizations/localizations_zh.dart index 54636ff42..3052b2c75 100644 --- a/forui/lib/src/localizations/localizations_zh.dart +++ b/forui/lib/src/localizations/localizations_zh.dart @@ -65,7 +65,7 @@ class FLocalizationsZh extends FLocalizations { /// The translations for Chinese, as used in Hong Kong (`zh_HK`). class FLocalizationsZhHk extends FLocalizationsZh { - FLocalizationsZhHk(): super('zh_HK'); + FLocalizationsZhHk() : super('zh_HK'); @override String get dialogLabel => '對話方塊'; @@ -84,7 +84,7 @@ class FLocalizationsZhHk extends FLocalizationsZh { /// The translations for Chinese, as used in Taiwan (`zh_TW`). class FLocalizationsZhTw extends FLocalizationsZh { - FLocalizationsZhTw(): super('zh_TW'); + FLocalizationsZhTw() : super('zh_TW'); @override String get dialogLabel => '對話方塊'; diff --git a/forui/lib/src/theme/color_scheme.dart b/forui/lib/src/theme/color_scheme.dart index 4427b4352..be3fa58ac 100644 --- a/forui/lib/src/theme/color_scheme.dart +++ b/forui/lib/src/theme/color_scheme.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A set of colors that is part of a [FThemeData]. It is used to configure the color properties of Forui widgets. /// diff --git a/forui/lib/src/theme/form_field_style.dart b/forui/lib/src/theme/form_field_style.dart index 18437f3fe..f88e5c39e 100644 --- a/forui/lib/src/theme/form_field_style.dart +++ b/forui/lib/src/theme/form_field_style.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A form field state's style. class FFormFieldStyle with Diagnosticable { diff --git a/forui/lib/src/theme/style.dart b/forui/lib/src/theme/style.dart index 87cce4c4c..0573c091c 100644 --- a/forui/lib/src/theme/style.dart +++ b/forui/lib/src/theme/style.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A set of miscellaneous properties that is part of a [FThemeData]. /// diff --git a/forui/lib/src/theme/theme.dart b/forui/lib/src/theme/theme.dart index 66fd7d208..8bb9ae90c 100644 --- a/forui/lib/src/theme/theme.dart +++ b/forui/lib/src/theme/theme.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// Applies a theme to descendant widgets. /// diff --git a/forui/lib/src/theme/theme_data.dart b/forui/lib/src/theme/theme_data.dart index 149715bc5..c389064e4 100644 --- a/forui/lib/src/theme/theme_data.dart +++ b/forui/lib/src/theme/theme_data.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// Defines the configuration of the overall visual [FTheme] for a widget subtree. /// diff --git a/forui/lib/src/theme/typography.dart b/forui/lib/src/theme/typography.dart index 3be01c4d6..ac62bf15f 100644 --- a/forui/lib/src/theme/typography.dart +++ b/forui/lib/src/theme/typography.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// Definitions for the various typographical styles that are part of a [FThemeData]. /// diff --git a/forui/lib/src/widgets/accordion/accordion.dart b/forui/lib/src/widgets/accordion/accordion.dart index 86f785254..71a8ac4a3 100644 --- a/forui/lib/src/widgets/accordion/accordion.dart +++ b/forui/lib/src/widgets/accordion/accordion.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A vertically stacked set of interactive headings that each reveal a section of content. /// diff --git a/forui/lib/src/widgets/accordion/accordion_controller.dart b/forui/lib/src/widgets/accordion/accordion_controller.dart index 9b3ab61dd..0323e524f 100644 --- a/forui/lib/src/widgets/accordion/accordion_controller.dart +++ b/forui/lib/src/widgets/accordion/accordion_controller.dart @@ -1,8 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A controller that controls which sections are shown and hidden. class FAccordionController extends FChangeNotifier { diff --git a/forui/lib/src/widgets/alert.dart b/forui/lib/src/widgets/alert.dart index c7ef8c146..2dce556b7 100644 --- a/forui/lib/src/widgets/alert.dart +++ b/forui/lib/src/widgets/alert.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// An alert. /// diff --git a/forui/lib/src/widgets/avatar/avatar.dart b/forui/lib/src/widgets/avatar/avatar.dart index eb94165db..cfa3f9c95 100644 --- a/forui/lib/src/widgets/avatar/avatar.dart +++ b/forui/lib/src/widgets/avatar/avatar.dart @@ -1,10 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/avatar/avatar_content.dart'; +import 'package:meta/meta.dart'; /// An image element with a fallback for representing the user. /// diff --git a/forui/lib/src/widgets/avatar/avatar_content.dart b/forui/lib/src/widgets/avatar/avatar_content.dart index ffcda2289..c63d2cb70 100644 --- a/forui/lib/src/widgets/avatar/avatar_content.dart +++ b/forui/lib/src/widgets/avatar/avatar_content.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal final class Content extends StatelessWidget { diff --git a/forui/lib/src/widgets/badge/badge.dart b/forui/lib/src/widgets/badge/badge.dart index 8e1a1cfaf..1922ed0fe 100644 --- a/forui/lib/src/widgets/badge/badge.dart +++ b/forui/lib/src/widgets/badge/badge.dart @@ -1,10 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/badge/badge_content.dart'; +import 'package:meta/meta.dart'; /// A badge. Badges are typically used to draw attention to specific information, such as labels and counts. /// diff --git a/forui/lib/src/widgets/badge/badge_content.dart b/forui/lib/src/widgets/badge/badge_content.dart index 50afed981..f1a2372e9 100644 --- a/forui/lib/src/widgets/badge/badge_content.dart +++ b/forui/lib/src/widgets/badge/badge_content.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal final class Content extends StatelessWidget { diff --git a/forui/lib/src/widgets/badge/badge_styles.dart b/forui/lib/src/widgets/badge/badge_styles.dart index f0fa9fe54..6c6f793f7 100644 --- a/forui/lib/src/widgets/badge/badge_styles.dart +++ b/forui/lib/src/widgets/badge/badge_styles.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// The [FBadgeCustomStyle]s. final class FBadgeStyles with Diagnosticable { diff --git a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart index b6b093ed2..cdbe73b32 100644 --- a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart +++ b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A bottom navigation bar. /// diff --git a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart index 301804d4b..1788e13e7 100644 --- a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart +++ b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A [FBottomNavigationBar] item. class FBottomNavigationBarItem extends StatelessWidget { diff --git a/forui/lib/src/widgets/button/button.dart b/forui/lib/src/widgets/button/button.dart index 6803ba7e6..7f96d5f3a 100644 --- a/forui/lib/src/widgets/button/button.dart +++ b/forui/lib/src/widgets/button/button.dart @@ -1,10 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/button/button_content.dart'; +import 'package:meta/meta.dart'; /// A button. /// diff --git a/forui/lib/src/widgets/button/button_content.dart b/forui/lib/src/widgets/button/button_content.dart index d1f4a232c..d07ea339f 100644 --- a/forui/lib/src/widgets/button/button_content.dart +++ b/forui/lib/src/widgets/button/button_content.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; +import 'package:forui/forui.dart'; import 'package:meta/meta.dart'; import 'package:sugar/sugar.dart'; -import 'package:forui/forui.dart'; - @internal class Content extends StatelessWidget { final Widget? prefix; diff --git a/forui/lib/src/widgets/button/button_spinner.dart b/forui/lib/src/widgets/button/button_spinner.dart index 025ab6011..aeaa242ea 100644 --- a/forui/lib/src/widgets/button/button_spinner.dart +++ b/forui/lib/src/widgets/button/button_spinner.dart @@ -3,9 +3,8 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// An animated spinner icon. /// diff --git a/forui/lib/src/widgets/button/button_styles.dart b/forui/lib/src/widgets/button/button_styles.dart index c3c2048af..cb4b38268 100644 --- a/forui/lib/src/widgets/button/button_styles.dart +++ b/forui/lib/src/widgets/button/button_styles.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// [FButtonCustomStyle]'s style. final class FButtonStyles with Diagnosticable { diff --git a/forui/lib/src/widgets/calendar/calendar.dart b/forui/lib/src/widgets/calendar/calendar.dart index 704304f3c..ecee56922 100644 --- a/forui/lib/src/widgets/calendar/calendar.dart +++ b/forui/lib/src/widgets/calendar/calendar.dart @@ -1,14 +1,13 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/day/day_picker.dart'; import 'package:forui/src/widgets/calendar/day/paged_day_picker.dart'; import 'package:forui/src/widgets/calendar/shared/header.dart'; import 'package:forui/src/widgets/calendar/year_month_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; /// A calendar. /// diff --git a/forui/lib/src/widgets/calendar/calendar_controller.dart b/forui/lib/src/widgets/calendar/calendar_controller.dart index 8a9b8c09a..9d3e1ee47 100644 --- a/forui/lib/src/widgets/calendar/calendar_controller.dart +++ b/forui/lib/src/widgets/calendar/calendar_controller.dart @@ -1,6 +1,5 @@ -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; +import 'package:sugar/sugar.dart'; bool _true(DateTime _) => true; diff --git a/forui/lib/src/widgets/calendar/day/day_picker.dart b/forui/lib/src/widgets/calendar/day/day_picker.dart index de9316fcd..053dbb016 100644 --- a/forui/lib/src/widgets/calendar/day/day_picker.dart +++ b/forui/lib/src/widgets/calendar/day/day_picker.dart @@ -4,11 +4,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/shared/entry.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class DayPicker extends StatefulWidget { diff --git a/forui/lib/src/widgets/calendar/day/paged_day_picker.dart b/forui/lib/src/widgets/calendar/day/paged_day_picker.dart index 617f2ed26..e6d529e00 100644 --- a/forui/lib/src/widgets/calendar/day/paged_day_picker.dart +++ b/forui/lib/src/widgets/calendar/day/paged_day_picker.dart @@ -2,12 +2,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/day/day_picker.dart'; import 'package:forui/src/widgets/calendar/shared/paged_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class PagedDayPicker extends PagedPicker { diff --git a/forui/lib/src/widgets/calendar/month/month_picker.dart b/forui/lib/src/widgets/calendar/month/month_picker.dart index 51f461ce8..0800b7be7 100644 --- a/forui/lib/src/widgets/calendar/month/month_picker.dart +++ b/forui/lib/src/widgets/calendar/month/month_picker.dart @@ -1,13 +1,12 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/day/day_picker.dart'; import 'package:forui/src/widgets/calendar/shared/entry.dart'; import 'package:forui/src/widgets/calendar/year/year_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class MonthPicker extends StatefulWidget { diff --git a/forui/lib/src/widgets/calendar/month/paged_month_picker.dart b/forui/lib/src/widgets/calendar/month/paged_month_picker.dart index 0bea42e31..7c8143073 100644 --- a/forui/lib/src/widgets/calendar/month/paged_month_picker.dart +++ b/forui/lib/src/widgets/calendar/month/paged_month_picker.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/src/widgets/calendar/month/month_picker.dart'; import 'package:forui/src/widgets/calendar/shared/paged_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class PagedMonthPicker extends PagedPicker { diff --git a/forui/lib/src/widgets/calendar/shared/entry.dart b/forui/lib/src/widgets/calendar/shared/entry.dart index 0d95da286..eef576c37 100644 --- a/forui/lib/src/widgets/calendar/shared/entry.dart +++ b/forui/lib/src/widgets/calendar/shared/entry.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; +import 'package:forui/forui.dart'; import 'package:meta/meta.dart'; import 'package:sugar/sugar.dart'; -import 'package:forui/forui.dart'; - /// A calendar day's data. typedef FCalendarDayData = ({ FCalendarDayPickerStyle style, diff --git a/forui/lib/src/widgets/calendar/shared/header.dart b/forui/lib/src/widgets/calendar/shared/header.dart index 4cc47a5c7..d5a23f00a 100644 --- a/forui/lib/src/widgets/calendar/shared/header.dart +++ b/forui/lib/src/widgets/calendar/shared/header.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; +import 'package:forui/forui.dart'; import 'package:meta/meta.dart'; import 'package:sugar/sugar.dart'; -import 'package:forui/forui.dart'; - /// The current picker type. enum FCalendarPickerType { /// The day picker. diff --git a/forui/lib/src/widgets/calendar/shared/paged_picker.dart b/forui/lib/src/widgets/calendar/shared/paged_picker.dart index a42c8b325..191cfd3a2 100644 --- a/forui/lib/src/widgets/calendar/shared/paged_picker.dart +++ b/forui/lib/src/widgets/calendar/shared/paged_picker.dart @@ -2,11 +2,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/src/widgets/calendar/calendar.dart'; import 'package:forui/src/widgets/calendar/shared/header.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal abstract class PagedPicker extends StatefulWidget { diff --git a/forui/lib/src/widgets/calendar/year/paged_year_picker.dart b/forui/lib/src/widgets/calendar/year/paged_year_picker.dart index eac2dec2d..f3e9414a4 100644 --- a/forui/lib/src/widgets/calendar/year/paged_year_picker.dart +++ b/forui/lib/src/widgets/calendar/year/paged_year_picker.dart @@ -1,11 +1,10 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/src/widgets/calendar/shared/paged_picker.dart'; import 'package:forui/src/widgets/calendar/year/year_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class PagedYearPicker extends PagedPicker { diff --git a/forui/lib/src/widgets/calendar/year/year_picker.dart b/forui/lib/src/widgets/calendar/year/year_picker.dart index f5b560b05..4bf574c47 100644 --- a/forui/lib/src/widgets/calendar/year/year_picker.dart +++ b/forui/lib/src/widgets/calendar/year/year_picker.dart @@ -1,12 +1,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/day/day_picker.dart'; import 'package:forui/src/widgets/calendar/shared/entry.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class YearPicker extends StatefulWidget { diff --git a/forui/lib/src/widgets/calendar/year_month_picker.dart b/forui/lib/src/widgets/calendar/year_month_picker.dart index 19a422db6..cb58fc8dd 100644 --- a/forui/lib/src/widgets/calendar/year_month_picker.dart +++ b/forui/lib/src/widgets/calendar/year_month_picker.dart @@ -1,12 +1,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/calendar/month/paged_month_picker.dart'; import 'package:forui/src/widgets/calendar/year/paged_year_picker.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; @internal class YearMonthPicker extends StatefulWidget { diff --git a/forui/lib/src/widgets/card/card.dart b/forui/lib/src/widgets/card/card.dart index 95cf015a1..c621d5953 100644 --- a/forui/lib/src/widgets/card/card.dart +++ b/forui/lib/src/widgets/card/card.dart @@ -1,10 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/card/card_content.dart'; +import 'package:meta/meta.dart'; /// A card. /// diff --git a/forui/lib/src/widgets/card/card_content.dart b/forui/lib/src/widgets/card/card_content.dart index 32626e747..2931d1e6b 100644 --- a/forui/lib/src/widgets/card/card_content.dart +++ b/forui/lib/src/widgets/card/card_content.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal class Content extends StatelessWidget { diff --git a/forui/lib/src/widgets/checkbox.dart b/forui/lib/src/widgets/checkbox.dart index 0730866ce..0d69ac5ee 100644 --- a/forui/lib/src/widgets/checkbox.dart +++ b/forui/lib/src/widgets/checkbox.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A checkbox control that allows the user to toggle between checked and not checked. /// diff --git a/forui/lib/src/widgets/dialog/dialog.dart b/forui/lib/src/widgets/dialog/dialog.dart index 61eb79531..df5291343 100644 --- a/forui/lib/src/widgets/dialog/dialog.dart +++ b/forui/lib/src/widgets/dialog/dialog.dart @@ -2,10 +2,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/dialog/dialog_content.dart'; +import 'package:meta/meta.dart'; /// A modal dialog. /// diff --git a/forui/lib/src/widgets/dialog/dialog_content.dart b/forui/lib/src/widgets/dialog/dialog_content.dart index d1c9e436c..2098e0e55 100644 --- a/forui/lib/src/widgets/dialog/dialog_content.dart +++ b/forui/lib/src/widgets/dialog/dialog_content.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; +import 'package:forui/forui.dart'; import 'package:meta/meta.dart'; import 'package:sugar/sugar.dart'; -import 'package:forui/forui.dart'; - @internal sealed class Content extends StatelessWidget { final FDialogContentStyle style; diff --git a/forui/lib/src/widgets/divider.dart b/forui/lib/src/widgets/divider.dart index 7708fcb82..735a00d17 100644 --- a/forui/lib/src/widgets/divider.dart +++ b/forui/lib/src/widgets/divider.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A divider. /// diff --git a/forui/lib/src/widgets/header/header.dart b/forui/lib/src/widgets/header/header.dart index 22d541665..1c03030be 100644 --- a/forui/lib/src/widgets/header/header.dart +++ b/forui/lib/src/widgets/header/header.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; part 'header_action.dart'; diff --git a/forui/lib/src/widgets/label.dart b/forui/lib/src/widgets/label.dart index d3f341503..41aaf61bf 100644 --- a/forui/lib/src/widgets/label.dart +++ b/forui/lib/src/widgets/label.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// The [FLabel]'s style. typedef FLabelStyle = ({FLabelLayoutStyle layout, FLabelStateStyles state}); diff --git a/forui/lib/src/widgets/line_calendar/calendar_layout.dart b/forui/lib/src/widgets/line_calendar/calendar_layout.dart index 70ece7d04..1ddd3eaab 100644 --- a/forui/lib/src/widgets/line_calendar/calendar_layout.dart +++ b/forui/lib/src/widgets/line_calendar/calendar_layout.dart @@ -2,12 +2,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart' hide Offset; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/rendering.dart'; import 'package:forui/src/widgets/line_calendar/line_calendar_item.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart' hide Offset; @internal class CalendarLayout extends StatefulWidget { diff --git a/forui/lib/src/widgets/line_calendar/line_calendar.dart b/forui/lib/src/widgets/line_calendar/line_calendar.dart index 4b3336e0e..694f31c03 100644 --- a/forui/lib/src/widgets/line_calendar/line_calendar.dart +++ b/forui/lib/src/widgets/line_calendar/line_calendar.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/line_calendar/calendar_layout.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; /// A line calendar displays dates in a single horizontal, scrollable line. /// diff --git a/forui/lib/src/widgets/line_calendar/line_calendar_item.dart b/forui/lib/src/widgets/line_calendar/line_calendar_item.dart index 7d65ed6c7..4f8211ad5 100644 --- a/forui/lib/src/widgets/line_calendar/line_calendar_item.dart +++ b/forui/lib/src/widgets/line_calendar/line_calendar_item.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// The state of a line calendar item used to build a line calendar item. typedef FLineCalendarItemData = ({ diff --git a/forui/lib/src/widgets/popover.dart b/forui/lib/src/widgets/popover.dart index 9ccaf7d06..2e46258f3 100644 --- a/forui/lib/src/widgets/popover.dart +++ b/forui/lib/src/widgets/popover.dart @@ -2,11 +2,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/rendering.dart'; import 'package:forui/src/foundation/tappable.dart'; +import 'package:meta/meta.dart'; /// A controller that controls whether a [FPopover] is shown or hidden. final class FPopoverController extends FChangeNotifier { diff --git a/forui/lib/src/widgets/progress.dart b/forui/lib/src/widgets/progress.dart index 4b95452b2..f7c097737 100644 --- a/forui/lib/src/widgets/progress.dart +++ b/forui/lib/src/widgets/progress.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A progress bar. /// diff --git a/forui/lib/src/widgets/radio.dart b/forui/lib/src/widgets/radio.dart index efb0b0cdf..3fb87291b 100644 --- a/forui/lib/src/widgets/radio.dart +++ b/forui/lib/src/widgets/radio.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A radio button that typically allows the user to choose only one of a predefined set of options. /// diff --git a/forui/lib/src/widgets/resizable/divider.dart b/forui/lib/src/widgets/resizable/divider.dart index feadbc05a..e681dcdea 100644 --- a/forui/lib/src/widgets/resizable/divider.dart +++ b/forui/lib/src/widgets/resizable/divider.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; class _Up extends Intent { const _Up(); diff --git a/forui/lib/src/widgets/resizable/resizable.dart b/forui/lib/src/widgets/resizable/resizable.dart index 56f22b386..88329595a 100644 --- a/forui/lib/src/widgets/resizable/resizable.dart +++ b/forui/lib/src/widgets/resizable/resizable.dart @@ -1,12 +1,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; import 'package:forui/src/widgets/resizable/divider.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart'; /// A resizable allows its children to be resized along either the horizontal or vertical main axis. /// diff --git a/forui/lib/src/widgets/resizable/resizable_controller.dart b/forui/lib/src/widgets/resizable/resizable_controller.dart index f180a2e86..9bd4349b2 100644 --- a/forui/lib/src/widgets/resizable/resizable_controller.dart +++ b/forui/lib/src/widgets/resizable/resizable_controller.dart @@ -1,9 +1,8 @@ import 'dart:collection'; -import 'package:sugar/collection_aggregate.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/resizable/resizable_region_data.dart'; +import 'package:sugar/collection_aggregate.dart'; /// A controller that manages the resizing of regions in a [FResizable]. abstract interface class FResizableController extends FChangeNotifier { diff --git a/forui/lib/src/widgets/resizable/resizable_region_data.dart b/forui/lib/src/widgets/resizable/resizable_region_data.dart index 035449720..64ef60431 100644 --- a/forui/lib/src/widgets/resizable/resizable_region_data.dart +++ b/forui/lib/src/widgets/resizable/resizable_region_data.dart @@ -1,8 +1,7 @@ import 'package:flutter/foundation.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A [FResizableRegion]'s data. final class FResizableRegionData with Diagnosticable { diff --git a/forui/lib/src/widgets/scaffold.dart b/forui/lib/src/widgets/scaffold.dart index abb6b86e2..8b800bd95 100644 --- a/forui/lib/src/widgets/scaffold.dart +++ b/forui/lib/src/widgets/scaffold.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A scaffold. /// diff --git a/forui/lib/src/widgets/select_group/select_group.dart b/forui/lib/src/widgets/select_group/select_group.dart index bbecee656..40d9ae12f 100644 --- a/forui/lib/src/widgets/select_group/select_group.dart +++ b/forui/lib/src/widgets/select_group/select_group.dart @@ -3,10 +3,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/select_group/select_group_item.dart'; +import 'package:meta/meta.dart'; /// A set of items that are treated as a single selection. /// diff --git a/forui/lib/src/widgets/select_group/select_group_controller.dart b/forui/lib/src/widgets/select_group/select_group_controller.dart index c328817b0..80fc9f896 100644 --- a/forui/lib/src/widgets/select_group/select_group_controller.dart +++ b/forui/lib/src/widgets/select_group/select_group_controller.dart @@ -1,8 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A controller for a select group. abstract class FSelectGroupController extends FChangeNotifier { diff --git a/forui/lib/src/widgets/select_group/select_group_item.dart b/forui/lib/src/widgets/select_group/select_group_item.dart index 3f4888eea..875f2ed8c 100644 --- a/forui/lib/src/widgets/select_group/select_group_item.dart +++ b/forui/lib/src/widgets/select_group/select_group_item.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal class FSelectGroupItemData extends InheritedWidget { diff --git a/forui/lib/src/widgets/select_menu_tile.dart b/forui/lib/src/widgets/select_menu_tile.dart index 5e345318e..ca71ca3cb 100644 --- a/forui/lib/src/widgets/select_menu_tile.dart +++ b/forui/lib/src/widgets/select_menu_tile.dart @@ -4,10 +4,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/select_group/select_group_controller.dart'; +import 'package:meta/meta.dart'; /// A tile that, when triggered, displays a list of options for the user to pick from. /// diff --git a/forui/lib/src/widgets/select_tile_group/select_tile.dart b/forui/lib/src/widgets/select_tile_group/select_tile.dart index b117c279b..b973668c1 100644 --- a/forui/lib/src/widgets/select_tile_group/select_tile.dart +++ b/forui/lib/src/widgets/select_tile_group/select_tile.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A tile that represents a selection in a [FSelectTileGroup]. It should only be used in a [FSelectTileGroup]. /// diff --git a/forui/lib/src/widgets/sheet/gesture_detector.dart b/forui/lib/src/widgets/sheet/gesture_detector.dart index 810db3b41..2d0e5245c 100644 --- a/forui/lib/src/widgets/sheet/gesture_detector.dart +++ b/forui/lib/src/widgets/sheet/gesture_detector.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// The sheet's gesture detector. We use a [RawGestureDetector] instead of a [GestureDetector] because the latter /// doesn't allow `onlyAcceptDragOnThreshold` to be configured. diff --git a/forui/lib/src/widgets/sheet/persistent_sheet.dart b/forui/lib/src/widgets/sheet/persistent_sheet.dart index 95a60f2db..c278f2cd6 100644 --- a/forui/lib/src/widgets/sheet/persistent_sheet.dart +++ b/forui/lib/src/widgets/sheet/persistent_sheet.dart @@ -4,10 +4,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/sheet/sheet.dart'; +import 'package:meta/meta.dart'; /// Shows a persistent sheet that appears above the current widget. It should have a [FSheets] or [FScaffold] ancestor. /// diff --git a/forui/lib/src/widgets/sheet/sheet.dart b/forui/lib/src/widgets/sheet/sheet.dart index 194ec447d..774237fa2 100644 --- a/forui/lib/src/widgets/sheet/sheet.dart +++ b/forui/lib/src/widgets/sheet/sheet.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/sheet/gesture_detector.dart'; import 'package:forui/src/widgets/sheet/shifted_sheet.dart'; +import 'package:meta/meta.dart'; @internal class Sheet extends StatefulWidget { diff --git a/forui/lib/src/widgets/sheet/shifted_sheet.dart b/forui/lib/src/widgets/sheet/shifted_sheet.dart index a963a3c10..9ad8c4de8 100644 --- a/forui/lib/src/widgets/sheet/shifted_sheet.dart +++ b/forui/lib/src/widgets/sheet/shifted_sheet.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/src/foundation/rendering.dart'; +import 'package:meta/meta.dart'; /// This is based on Material's _BottomSheetLayoutWithSizeListener. @internal diff --git a/forui/lib/src/widgets/slider/form_field.dart b/forui/lib/src/widgets/slider/form_field.dart index 6a98ccd8c..6496a05b1 100644 --- a/forui/lib/src/widgets/slider/form_field.dart +++ b/forui/lib/src/widgets/slider/form_field.dart @@ -1,13 +1,12 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/slider/inherited_data.dart'; import 'package:forui/src/widgets/slider/inherited_state.dart'; import 'package:forui/src/widgets/slider/slider_render_object.dart'; import 'package:forui/src/widgets/slider/track.dart'; +import 'package:meta/meta.dart'; @internal class SliderFormField extends FormField { diff --git a/forui/lib/src/widgets/slider/inherited_controller.dart b/forui/lib/src/widgets/slider/inherited_controller.dart index 2d4a71dd6..85cd9271c 100644 --- a/forui/lib/src/widgets/slider/inherited_controller.dart +++ b/forui/lib/src/widgets/slider/inherited_controller.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal class InheritedController extends InheritedModel { diff --git a/forui/lib/src/widgets/slider/inherited_data.dart b/forui/lib/src/widgets/slider/inherited_data.dart index 533525716..01d46568b 100644 --- a/forui/lib/src/widgets/slider/inherited_data.dart +++ b/forui/lib/src/widgets/slider/inherited_data.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:collection/collection.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal final class InheritedData extends InheritedWidget { diff --git a/forui/lib/src/widgets/slider/inherited_state.dart b/forui/lib/src/widgets/slider/inherited_state.dart index ddc83e264..eab6a82a9 100644 --- a/forui/lib/src/widgets/slider/inherited_state.dart +++ b/forui/lib/src/widgets/slider/inherited_state.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal class InheritedState extends InheritedWidget { diff --git a/forui/lib/src/widgets/slider/slider.dart b/forui/lib/src/widgets/slider/slider.dart index f4890e0ce..7a703054c 100644 --- a/forui/lib/src/widgets/slider/slider.dart +++ b/forui/lib/src/widgets/slider/slider.dart @@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; import 'package:collection/collection.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/slider/form_field.dart'; import 'package:forui/src/widgets/slider/inherited_controller.dart'; diff --git a/forui/lib/src/widgets/slider/slider_controller.dart b/forui/lib/src/widgets/slider/slider_controller.dart index c0cd6b2dc..6b9ef66ee 100644 --- a/forui/lib/src/widgets/slider/slider_controller.dart +++ b/forui/lib/src/widgets/slider/slider_controller.dart @@ -1,9 +1,8 @@ import 'dart:collection'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/slider/slider_selection.dart'; +import 'package:meta/meta.dart'; /// Possible ways for a user to interact with a slider. enum FSliderInteraction { diff --git a/forui/lib/src/widgets/slider/slider_mark.dart b/forui/lib/src/widgets/slider/slider_mark.dart index 797e6f8c3..06939f140 100644 --- a/forui/lib/src/widgets/slider/slider_mark.dart +++ b/forui/lib/src/widgets/slider/slider_mark.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A mark in a [FSlider]. It is a combination of a tick - a visual indicator along the track, and a label. final class FSliderMark with Diagnosticable { diff --git a/forui/lib/src/widgets/slider/slider_render_object.dart b/forui/lib/src/widgets/slider/slider_render_object.dart index 24caba26b..5738041fb 100644 --- a/forui/lib/src/widgets/slider/slider_render_object.dart +++ b/forui/lib/src/widgets/slider/slider_render_object.dart @@ -3,13 +3,12 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:collection/collection.dart'; -import 'package:meta/meta.dart'; -import 'package:sugar/sugar.dart' hide Offset; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/rendering.dart'; import 'package:forui/src/widgets/slider/inherited_data.dart'; import 'package:forui/src/widgets/slider/inherited_state.dart'; +import 'package:meta/meta.dart'; +import 'package:sugar/sugar.dart' hide Offset; @internal class HorizontalSliderRenderObject extends _SliderRenderObject { diff --git a/forui/lib/src/widgets/slider/slider_selection.dart b/forui/lib/src/widgets/slider/slider_selection.dart index 8ab0eabf3..da86cb033 100644 --- a/forui/lib/src/widgets/slider/slider_selection.dart +++ b/forui/lib/src/widgets/slider/slider_selection.dart @@ -2,9 +2,8 @@ import 'dart:collection'; import 'package:flutter/foundation.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A [FSlider]'s active track/selection. sealed class FSliderSelection with Diagnosticable { diff --git a/forui/lib/src/widgets/slider/slider_styles.dart b/forui/lib/src/widgets/slider/slider_styles.dart index fc5ee8a1b..9b55156c5 100644 --- a/forui/lib/src/widgets/slider/slider_styles.dart +++ b/forui/lib/src/widgets/slider/slider_styles.dart @@ -1,10 +1,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; +import 'package:meta/meta.dart'; /// A slider's styles. final class FSliderStyles with Diagnosticable { diff --git a/forui/lib/src/widgets/slider/thumb.dart b/forui/lib/src/widgets/slider/thumb.dart index 395e87118..f6a28eda7 100644 --- a/forui/lib/src/widgets/slider/thumb.dart +++ b/forui/lib/src/widgets/slider/thumb.dart @@ -2,12 +2,11 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/slider/inherited_controller.dart'; import 'package:forui/src/widgets/slider/inherited_data.dart'; import 'package:forui/src/widgets/slider/inherited_state.dart'; +import 'package:meta/meta.dart'; class _ShrinkIntent extends Intent { const _ShrinkIntent(); diff --git a/forui/lib/src/widgets/slider/track.dart b/forui/lib/src/widgets/slider/track.dart index d56b15fe1..09d8bfcab 100644 --- a/forui/lib/src/widgets/slider/track.dart +++ b/forui/lib/src/widgets/slider/track.dart @@ -2,14 +2,13 @@ import 'dart:math'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; import 'package:forui/src/widgets/slider/inherited_controller.dart'; import 'package:forui/src/widgets/slider/inherited_data.dart'; import 'package:forui/src/widgets/slider/inherited_state.dart'; import 'package:forui/src/widgets/slider/thumb.dart'; +import 'package:meta/meta.dart'; @internal class Track extends StatelessWidget { diff --git a/forui/lib/src/widgets/switch.dart b/forui/lib/src/widgets/switch.dart index 634750618..02ed99c95 100644 --- a/forui/lib/src/widgets/switch.dart +++ b/forui/lib/src/widgets/switch.dart @@ -3,9 +3,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/services.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A control that allows the user to toggle between checked and unchecked. /// diff --git a/forui/lib/src/widgets/tabs/tabs.dart b/forui/lib/src/widgets/tabs/tabs.dart index b0ab8b070..d43609f6c 100644 --- a/forui/lib/src/widgets/tabs/tabs.dart +++ b/forui/lib/src/widgets/tabs/tabs.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; part 'tabs_style.dart'; diff --git a/forui/lib/src/widgets/text_field/field.dart b/forui/lib/src/widgets/text_field/field.dart index 0d6429acb..5e8f700cc 100644 --- a/forui/lib/src/widgets/text_field/field.dart +++ b/forui/lib/src/widgets/text_field/field.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; @internal class Field extends FormField { diff --git a/forui/lib/src/widgets/text_field/text_field.dart b/forui/lib/src/widgets/text_field/text_field.dart index 84f6328fd..d446edb2a 100644 --- a/forui/lib/src/widgets/text_field/text_field.dart +++ b/forui/lib/src/widgets/text_field/text_field.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/text_field/field.dart'; diff --git a/forui/lib/src/widgets/text_field/text_field_state_style.dart b/forui/lib/src/widgets/text_field/text_field_state_style.dart index 58b53092c..66ea289b3 100644 --- a/forui/lib/src/widgets/text_field/text_field_state_style.dart +++ b/forui/lib/src/widgets/text_field/text_field_state_style.dart @@ -1,9 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A [FTextField] state's style. // ignore: avoid_implementing_value_types diff --git a/forui/lib/src/widgets/text_field/text_field_style.dart b/forui/lib/src/widgets/text_field/text_field_style.dart index 935c9949d..634b335f5 100644 --- a/forui/lib/src/widgets/text_field/text_field_style.dart +++ b/forui/lib/src/widgets/text_field/text_field_style.dart @@ -1,9 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// [FTextFieldStyle]'s style. final class FTextFieldStyle with Diagnosticable { diff --git a/forui/lib/src/widgets/tile/tile.dart b/forui/lib/src/widgets/tile/tile.dart index 92df2943c..4316c1b59 100644 --- a/forui/lib/src/widgets/tile/tile.dart +++ b/forui/lib/src/widgets/tile/tile.dart @@ -1,11 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/tile/tile_content.dart'; import 'package:forui/src/widgets/tile/tile_group.dart'; +import 'package:meta/meta.dart'; /// The divider between tiles in a group. enum FTileDivider { diff --git a/forui/lib/src/widgets/tile/tile_content.dart b/forui/lib/src/widgets/tile/tile_content.dart index 6e0605263..b5e6fee96 100644 --- a/forui/lib/src/widgets/tile/tile_content.dart +++ b/forui/lib/src/widgets/tile/tile_content.dart @@ -2,11 +2,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/tile/tile_group.dart'; import 'package:forui/src/widgets/tile/tile_render_object.dart'; +import 'package:meta/meta.dart'; @internal class FTileContent extends StatelessWidget { diff --git a/forui/lib/src/widgets/tile/tile_group.dart b/forui/lib/src/widgets/tile/tile_group.dart index ee44d89da..292434cf0 100644 --- a/forui/lib/src/widgets/tile/tile_group.dart +++ b/forui/lib/src/widgets/tile/tile_group.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A marker interface which denotes that mixed-in widgets can group tiles and be used in a [_MergeTileGroups]. mixin FTileGroupMixin on Widget {} diff --git a/forui/lib/src/widgets/tile/tile_render_object.dart b/forui/lib/src/widgets/tile/tile_render_object.dart index ddfc308ae..9ff7e85f9 100644 --- a/forui/lib/src/widgets/tile/tile_render_object.dart +++ b/forui/lib/src/widgets/tile/tile_render_object.dart @@ -3,10 +3,9 @@ import 'dart:math'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/rendering.dart'; +import 'package:meta/meta.dart'; @internal class TileRenderObject extends MultiChildRenderObjectWidget { diff --git a/forui/lib/src/widgets/tooltip.dart b/forui/lib/src/widgets/tooltip.dart index 52855d620..13fee78df 100644 --- a/forui/lib/src/widgets/tooltip.dart +++ b/forui/lib/src/widgets/tooltip.dart @@ -2,9 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:meta/meta.dart'; - import 'package:forui/forui.dart'; +import 'package:meta/meta.dart'; /// A controller that controls whether a [FPopover] is shown or hidden. class FTooltipController extends FChangeNotifier { diff --git a/forui/test/src/foundation/focused_outline_golden_test.dart b/forui/test/src/foundation/focused_outline_golden_test.dart index 30647ed3e..d8f906e9e 100644 --- a/forui/test/src/foundation/focused_outline_golden_test.dart +++ b/forui/test/src/foundation/focused_outline_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/foundation/focused_outline_test.dart b/forui/test/src/foundation/focused_outline_test.dart index 685c85527..9aaa5e90c 100644 --- a/forui/test/src/foundation/focused_outline_test.dart +++ b/forui/test/src/foundation/focused_outline_test.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/foundation/notifiers_test.dart b/forui/test/src/foundation/notifiers_test.dart index fae2c89e6..e8c8fab03 100644 --- a/forui/test/src/foundation/notifiers_test.dart +++ b/forui/test/src/foundation/notifiers_test.dart @@ -1,7 +1,6 @@ // ignore_for_file: invalid_use_of_protected_member import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/foundation/portal/portal_golden_test.dart b/forui/test/src/foundation/portal/portal_golden_test.dart index 900b49887..e4c7aa2fb 100644 --- a/forui/test/src/foundation/portal/portal_golden_test.dart +++ b/forui/test/src/foundation/portal/portal_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/foundation/portal/portal_shift_test.dart b/forui/test/src/foundation/portal/portal_shift_test.dart index e9585c396..74ca71395 100644 --- a/forui/test/src/foundation/portal/portal_shift_test.dart +++ b/forui/test/src/foundation/portal/portal_shift_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/foundation/portal/portal_shift.dart'; void main() { diff --git a/forui/test/src/foundation/portal/portal_test.dart b/forui/test/src/foundation/portal/portal_test.dart index 5a0c290cb..ef8dbbc95 100644 --- a/forui/test/src/foundation/portal/portal_test.dart +++ b/forui/test/src/foundation/portal/portal_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/foundation/rendering_test.dart b/forui/test/src/foundation/rendering_test.dart index 13b00cc79..64196705a 100644 --- a/forui/test/src/foundation/rendering_test.dart +++ b/forui/test/src/foundation/rendering_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/foundation/rendering.dart'; void main() { diff --git a/forui/test/src/foundation/tappable_test.dart b/forui/test/src/foundation/tappable_test.dart index e06e31118..044c3f9ec 100644 --- a/forui/test/src/foundation/tappable_test.dart +++ b/forui/test/src/foundation/tappable_test.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/foundation/tappable.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/localizations/localization_test.dart b/forui/test/src/localizations/localization_test.dart index a2069d84c..9e63679a1 100644 --- a/forui/test/src/localizations/localization_test.dart +++ b/forui/test/src/localizations/localization_test.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/localizations/localization.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/test_scaffold.dart b/forui/test/src/test_scaffold.dart index 761a20d1a..0d280f83e 100644 --- a/forui/test/src/test_scaffold.dart +++ b/forui/test/src/test_scaffold.dart @@ -2,8 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import 'threshold_file_comparator.dart'; MatchesGoldenFile get isBlueScreen => MatchesGoldenFile.forStringPath(blueScreen, null); diff --git a/forui/test/src/theme/color_scheme_test.dart b/forui/test/src/theme/color_scheme_test.dart index e85934231..1c8d52462 100644 --- a/forui/test/src/theme/color_scheme_test.dart +++ b/forui/test/src/theme/color_scheme_test.dart @@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/theme/theme_test.dart b/forui/test/src/theme/theme_test.dart index fb61d3936..c5f8f6dc3 100644 --- a/forui/test/src/theme/theme_test.dart +++ b/forui/test/src/theme/theme_test.dart @@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; class Foo extends StatelessWidget { diff --git a/forui/test/src/theme/typography_test.dart b/forui/test/src/theme/typography_test.dart index 99f6cf615..c051eef08 100644 --- a/forui/test/src/theme/typography_test.dart +++ b/forui/test/src/theme/typography_test.dart @@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/accordion/accordion_controller_test.dart b/forui/test/src/widgets/accordion/accordion_controller_test.dart index 8e45da598..71be14595 100644 --- a/forui/test/src/widgets/accordion/accordion_controller_test.dart +++ b/forui/test/src/widgets/accordion/accordion_controller_test.dart @@ -2,7 +2,6 @@ import 'package:flutter/animation.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/accordion/accordion_golden_test.dart b/forui/test/src/widgets/accordion/accordion_golden_test.dart index 587bcea90..021be0f07 100644 --- a/forui/test/src/widgets/accordion/accordion_golden_test.dart +++ b/forui/test/src/widgets/accordion/accordion_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/accordion/accordion_test.dart b/forui/test/src/widgets/accordion/accordion_test.dart index ba2585501..45b3cf982 100644 --- a/forui/test/src/widgets/accordion/accordion_test.dart +++ b/forui/test/src/widgets/accordion/accordion_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/alert_golden_test.dart b/forui/test/src/widgets/alert_golden_test.dart index 06e4ab44a..80e666a87 100644 --- a/forui/test/src/widgets/alert_golden_test.dart +++ b/forui/test/src/widgets/alert_golden_test.dart @@ -4,9 +4,9 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/alert.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/avatar_golden_test.dart b/forui/test/src/widgets/avatar_golden_test.dart index 87cce654b..4896b2f1f 100644 --- a/forui/test/src/widgets/avatar_golden_test.dart +++ b/forui/test/src/widgets/avatar_golden_test.dart @@ -6,8 +6,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/badge_golden_test.dart b/forui/test/src/widgets/badge_golden_test.dart index 4b5b8339e..85f6241f3 100644 --- a/forui/test/src/widgets/badge_golden_test.dart +++ b/forui/test/src/widgets/badge_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/widgets/badge/badge.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/bottom_navigation_bar_golden_test.dart b/forui/test/src/widgets/bottom_navigation_bar_golden_test.dart index 77b4dac6f..74e872889 100644 --- a/forui/test/src/widgets/bottom_navigation_bar_golden_test.dart +++ b/forui/test/src/widgets/bottom_navigation_bar_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/button/button_golden_test.dart b/forui/test/src/widgets/button/button_golden_test.dart index af5222fcc..af0d5b977 100644 --- a/forui/test/src/widgets/button/button_golden_test.dart +++ b/forui/test/src/widgets/button/button_golden_test.dart @@ -5,9 +5,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/button/button.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/button/button_spinner_golden_test.dart b/forui/test/src/widgets/button/button_spinner_golden_test.dart index 5632adbd6..b72282deb 100644 --- a/forui/test/src/widgets/button/button_spinner_golden_test.dart +++ b/forui/test/src/widgets/button/button_spinner_golden_test.dart @@ -4,9 +4,9 @@ library; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/button/button.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/calendar/calendar_controller_test.dart b/forui/test/src/widgets/calendar/calendar_controller_test.dart index ba74ddfbd..7bdf3258c 100644 --- a/forui/test/src/widgets/calendar/calendar_controller_test.dart +++ b/forui/test/src/widgets/calendar/calendar_controller_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/calendar/calendar_golden_test.dart b/forui/test/src/widgets/calendar/calendar_golden_test.dart index 83d9bd62a..230c44fb8 100644 --- a/forui/test/src/widgets/calendar/calendar_golden_test.dart +++ b/forui/test/src/widgets/calendar/calendar_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/calendar/calendar_test.dart b/forui/test/src/widgets/calendar/calendar_test.dart index 76843bd90..f6cf9ee1c 100644 --- a/forui/test/src/widgets/calendar/calendar_test.dart +++ b/forui/test/src/widgets/calendar/calendar_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/card_golden_test.dart b/forui/test/src/widgets/card_golden_test.dart index a2d2ff362..8092c992c 100644 --- a/forui/test/src/widgets/card_golden_test.dart +++ b/forui/test/src/widgets/card_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/checkbox_golden_test.dart b/forui/test/src/widgets/checkbox_golden_test.dart index 2660764f0..d142b7b68 100644 --- a/forui/test/src/widgets/checkbox_golden_test.dart +++ b/forui/test/src/widgets/checkbox_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/dialog/dialog_golden_test.dart b/forui/test/src/widgets/dialog/dialog_golden_test.dart index 8336738de..b0c93b3ff 100644 --- a/forui/test/src/widgets/dialog/dialog_golden_test.dart +++ b/forui/test/src/widgets/dialog/dialog_golden_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/divider_golden_test.dart b/forui/test/src/widgets/divider_golden_test.dart index 98aec5430..4ea48992e 100644 --- a/forui/test/src/widgets/divider_golden_test.dart +++ b/forui/test/src/widgets/divider_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/header/nested_header_golden_test.dart b/forui/test/src/widgets/header/nested_header_golden_test.dart index 8b4b1a77b..303aa7883 100644 --- a/forui/test/src/widgets/header/nested_header_golden_test.dart +++ b/forui/test/src/widgets/header/nested_header_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/header/root_header_golden_test.dart b/forui/test/src/widgets/header/root_header_golden_test.dart index faaf8b288..dfd602833 100644 --- a/forui/test/src/widgets/header/root_header_golden_test.dart +++ b/forui/test/src/widgets/header/root_header_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; const title = diff --git a/forui/test/src/widgets/icon_golden_test.dart b/forui/test/src/widgets/icon_golden_test.dart index 912f5590d..6332886dd 100644 --- a/forui/test/src/widgets/icon_golden_test.dart +++ b/forui/test/src/widgets/icon_golden_test.dart @@ -6,8 +6,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/label/label_golden_test.dart b/forui/test/src/widgets/label/label_golden_test.dart index 3a4a0e958..e2a83fcd3 100644 --- a/forui/test/src/widgets/label/label_golden_test.dart +++ b/forui/test/src/widgets/label/label_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/label/label_test.dart b/forui/test/src/widgets/label/label_test.dart index 0f020a3c7..2a1844798 100644 --- a/forui/test/src/widgets/label/label_test.dart +++ b/forui/test/src/widgets/label/label_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/line_calendar_golden_test.dart b/forui/test/src/widgets/line_calendar_golden_test.dart index 172edcda8..ea744d28a 100644 --- a/forui/test/src/widgets/line_calendar_golden_test.dart +++ b/forui/test/src/widgets/line_calendar_golden_test.dart @@ -6,8 +6,8 @@ import 'dart:ui'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/popover/popover_golden_test.dart b/forui/test/src/widgets/popover/popover_golden_test.dart index 08d431b05..47a5730a9 100644 --- a/forui/test/src/widgets/popover/popover_golden_test.dart +++ b/forui/test/src/widgets/popover/popover_golden_test.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/popover/popover_test.dart b/forui/test/src/widgets/popover/popover_test.dart index 410862b28..bb8b49503 100644 --- a/forui/test/src/widgets/popover/popover_test.dart +++ b/forui/test/src/widgets/popover/popover_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/popover_menu/popover_menu_golden_test.dart b/forui/test/src/widgets/popover_menu/popover_menu_golden_test.dart index 7823a96cd..28c3248e2 100644 --- a/forui/test/src/widgets/popover_menu/popover_menu_golden_test.dart +++ b/forui/test/src/widgets/popover_menu/popover_menu_golden_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/popover_menu/popover_menu_test.dart b/forui/test/src/widgets/popover_menu/popover_menu_test.dart index c17081c28..5fe10fff1 100644 --- a/forui/test/src/widgets/popover_menu/popover_menu_test.dart +++ b/forui/test/src/widgets/popover_menu/popover_menu_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/progress_golden_test.dart b/forui/test/src/widgets/progress_golden_test.dart index 0b1313e77..ed09e2884 100644 --- a/forui/test/src/widgets/progress_golden_test.dart +++ b/forui/test/src/widgets/progress_golden_test.dart @@ -2,8 +2,8 @@ library; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/radio_golden_test.dart b/forui/test/src/widgets/radio_golden_test.dart index 93617f99f..a75efd2d3 100644 --- a/forui/test/src/widgets/radio_golden_test.dart +++ b/forui/test/src/widgets/radio_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/resizable/divider_test.dart b/forui/test/src/widgets/resizable/divider_test.dart index 0ddb1a261..0f65ac7ed 100644 --- a/forui/test/src/widgets/resizable/divider_test.dart +++ b/forui/test/src/widgets/resizable/divider_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/resizable/divider.dart'; diff --git a/forui/test/src/widgets/resizable/resizable_controller_test.dart b/forui/test/src/widgets/resizable/resizable_controller_test.dart index 2a2e80361..27bc5aa62 100644 --- a/forui/test/src/widgets/resizable/resizable_controller_test.dart +++ b/forui/test/src/widgets/resizable/resizable_controller_test.dart @@ -1,7 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:sugar/collection.dart'; - import 'package:forui/forui.dart'; +import 'package:sugar/collection.dart'; void main() { late FResizableController controller; diff --git a/forui/test/src/widgets/resizable/resizable_data_test.dart b/forui/test/src/widgets/resizable/resizable_data_test.dart index 2d5c9e29a..7b0a306be 100644 --- a/forui/test/src/widgets/resizable/resizable_data_test.dart +++ b/forui/test/src/widgets/resizable/resizable_data_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/widgets/resizable/resizable_region_data.dart'; void main() { diff --git a/forui/test/src/widgets/resizable/resizable_golden_test.dart b/forui/test/src/widgets/resizable/resizable_golden_test.dart index 023978711..5678b5f56 100644 --- a/forui/test/src/widgets/resizable/resizable_golden_test.dart +++ b/forui/test/src/widgets/resizable/resizable_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/resizable/resizable_region_test.dart b/forui/test/src/widgets/resizable/resizable_region_test.dart index 7f74d0153..69b8d9ab9 100644 --- a/forui/test/src/widgets/resizable/resizable_region_test.dart +++ b/forui/test/src/widgets/resizable/resizable_region_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; Widget stub(BuildContext context, FResizableRegionData data, Widget? child) => child!; diff --git a/forui/test/src/widgets/resizable/resizable_test.dart b/forui/test/src/widgets/resizable/resizable_test.dart index aae68204c..f452090cb 100644 --- a/forui/test/src/widgets/resizable/resizable_test.dart +++ b/forui/test/src/widgets/resizable/resizable_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart' hide VerticalDivider; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; import 'package:forui/src/widgets/resizable/divider.dart'; diff --git a/forui/test/src/widgets/scaffold_golden_test.dart b/forui/test/src/widgets/scaffold_golden_test.dart index f1109f066..78493376e 100644 --- a/forui/test/src/widgets/scaffold_golden_test.dart +++ b/forui/test/src/widgets/scaffold_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_group/select_group_controller_test.dart b/forui/test/src/widgets/select_group/select_group_controller_test.dart index 6b7d32ffe..56a80dc14 100644 --- a/forui/test/src/widgets/select_group/select_group_controller_test.dart +++ b/forui/test/src/widgets/select_group/select_group_controller_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/select_group/select_group_golden_test.dart b/forui/test/src/widgets/select_group/select_group_golden_test.dart index dcec51191..ce4724f0b 100644 --- a/forui/test/src/widgets/select_group/select_group_golden_test.dart +++ b/forui/test/src/widgets/select_group/select_group_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_menu_tile/select_menu_tile_golden_test.dart b/forui/test/src/widgets/select_menu_tile/select_menu_tile_golden_test.dart index 46405116e..d6bcd2d34 100644 --- a/forui/test/src/widgets/select_menu_tile/select_menu_tile_golden_test.dart +++ b/forui/test/src/widgets/select_menu_tile/select_menu_tile_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_menu_tile/select_menu_tile_test.dart b/forui/test/src/widgets/select_menu_tile/select_menu_tile_test.dart index 7c3f37a3b..67a176a40 100644 --- a/forui/test/src/widgets/select_menu_tile/select_menu_tile_test.dart +++ b/forui/test/src/widgets/select_menu_tile/select_menu_tile_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_tile_group/select_tile_golden_test.dart b/forui/test/src/widgets/select_tile_group/select_tile_golden_test.dart index cfe51506c..8a48a0c21 100644 --- a/forui/test/src/widgets/select_tile_group/select_tile_golden_test.dart +++ b/forui/test/src/widgets/select_tile_group/select_tile_golden_test.dart @@ -5,9 +5,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/select_tile_group/select_tile.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_tile_group/select_tile_group_golden_test.dart b/forui/test/src/widgets/select_tile_group/select_tile_group_golden_test.dart index 87df12d88..4cc272b75 100644 --- a/forui/test/src/widgets/select_tile_group/select_tile_group_golden_test.dart +++ b/forui/test/src/widgets/select_tile_group/select_tile_group_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/select_tile_group/select_tile_group_test.dart b/forui/test/src/widgets/select_tile_group/select_tile_group_test.dart index f0444ce54..101d8317f 100644 --- a/forui/test/src/widgets/select_tile_group/select_tile_group_test.dart +++ b/forui/test/src/widgets/select_tile_group/select_tile_group_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/sheet/modal_sheet_golden_test.dart b/forui/test/src/widgets/sheet/modal_sheet_golden_test.dart index e5bf803f7..9f3f80cb2 100644 --- a/forui/test/src/widgets/sheet/modal_sheet_golden_test.dart +++ b/forui/test/src/widgets/sheet/modal_sheet_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/sheet/modal_sheet_test.dart b/forui/test/src/widgets/sheet/modal_sheet_test.dart index 91606b011..5e04a6068 100644 --- a/forui/test/src/widgets/sheet/modal_sheet_test.dart +++ b/forui/test/src/widgets/sheet/modal_sheet_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/sheet/persistent_sheet_golden_test.dart b/forui/test/src/widgets/sheet/persistent_sheet_golden_test.dart index 7d17ca50a..bb3562373 100644 --- a/forui/test/src/widgets/sheet/persistent_sheet_golden_test.dart +++ b/forui/test/src/widgets/sheet/persistent_sheet_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/sheet/persistent_sheet_test.dart b/forui/test/src/widgets/sheet/persistent_sheet_test.dart index 86806ba3e..dc34c896e 100644 --- a/forui/test/src/widgets/sheet/persistent_sheet_test.dart +++ b/forui/test/src/widgets/sheet/persistent_sheet_test.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/sheet/persistent_sheet.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_controller_test.dart b/forui/test/src/widgets/slider/slider_controller_test.dart index 29213175e..9d76bf00f 100644 --- a/forui/test/src/widgets/slider/slider_controller_test.dart +++ b/forui/test/src/widgets/slider/slider_controller_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_golden_test.dart b/forui/test/src/widgets/slider/slider_golden_test.dart index 9723ea784..6e72e510a 100644 --- a/forui/test/src/widgets/slider/slider_golden_test.dart +++ b/forui/test/src/widgets/slider/slider_golden_test.dart @@ -5,10 +5,10 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart' hide Thumb; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/foundation/tappable.dart'; import 'package:forui/src/widgets/slider/thumb.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_mark_test.dart b/forui/test/src/widgets/slider/slider_mark_test.dart index 4663447ac..7c7123301 100644 --- a/forui/test/src/widgets/slider/slider_mark_test.dart +++ b/forui/test/src/widgets/slider/slider_mark_test.dart @@ -1,7 +1,6 @@ import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_selection_test.dart b/forui/test/src/widgets/slider/slider_selection_test.dart index 8440cb343..2b5290fed 100644 --- a/forui/test/src/widgets/slider/slider_selection_test.dart +++ b/forui/test/src/widgets/slider/slider_selection_test.dart @@ -1,7 +1,6 @@ import 'dart:collection'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/src/widgets/slider/slider_selection.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_test.dart b/forui/test/src/widgets/slider/slider_test.dart index 71c8feace..573f94bee 100644 --- a/forui/test/src/widgets/slider/slider_test.dart +++ b/forui/test/src/widgets/slider/slider_test.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart' hide Thumb; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; import 'package:forui/src/widgets/slider/thumb.dart'; import 'package:forui/src/widgets/slider/track.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/slider/slider_tooltips_controller_test.dart b/forui/test/src/widgets/slider/slider_tooltips_controller_test.dart index ebbd44091..e6d2a7ad3 100644 --- a/forui/test/src/widgets/slider/slider_tooltips_controller_test.dart +++ b/forui/test/src/widgets/slider/slider_tooltips_controller_test.dart @@ -1,10 +1,10 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:forui/forui.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; -import 'package:forui/forui.dart'; import 'slider_tooltips_controller_test.mocks.dart'; @GenerateNiceMocks([MockSpec()]) diff --git a/forui/test/src/widgets/switch_golden_test.dart b/forui/test/src/widgets/switch_golden_test.dart index d2d202cfa..754b3791f 100644 --- a/forui/test/src/widgets/switch_golden_test.dart +++ b/forui/test/src/widgets/switch_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/cupertino.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tabs/tabs_golden_test.dart b/forui/test/src/widgets/tabs/tabs_golden_test.dart index 11709682a..656412ea4 100644 --- a/forui/test/src/widgets/tabs/tabs_golden_test.dart +++ b/forui/test/src/widgets/tabs/tabs_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tabs/tabs_test.dart b/forui/test/src/widgets/tabs/tabs_test.dart index e78f428d6..a16815458 100644 --- a/forui/test/src/widgets/tabs/tabs_test.dart +++ b/forui/test/src/widgets/tabs/tabs_test.dart @@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/text_field/text_field_golden_test.dart b/forui/test/src/widgets/text_field/text_field_golden_test.dart index 2d7964001..7869e827d 100644 --- a/forui/test/src/widgets/text_field/text_field_golden_test.dart +++ b/forui/test/src/widgets/text_field/text_field_golden_test.dart @@ -4,8 +4,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; const _longText = diff --git a/forui/test/src/widgets/text_field/text_field_test.dart b/forui/test/src/widgets/text_field/text_field_test.dart index 924d3efe2..e86e53dfe 100644 --- a/forui/test/src/widgets/text_field/text_field_test.dart +++ b/forui/test/src/widgets/text_field/text_field_test.dart @@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tile/tile_golden_test.dart b/forui/test/src/widgets/tile/tile_golden_test.dart index 9793291cb..d46e42411 100644 --- a/forui/test/src/widgets/tile/tile_golden_test.dart +++ b/forui/test/src/widgets/tile/tile_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tile/tile_group_golden_test.dart b/forui/test/src/widgets/tile/tile_group_golden_test.dart index 3e3efb13e..59af0ef6e 100644 --- a/forui/test/src/widgets/tile/tile_group_golden_test.dart +++ b/forui/test/src/widgets/tile/tile_group_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tile/tile_group_merge_golden_test.dart b/forui/test/src/widgets/tile/tile_group_merge_golden_test.dart index d6f20f761..01ef1d03f 100644 --- a/forui/test/src/widgets/tile/tile_group_merge_golden_test.dart +++ b/forui/test/src/widgets/tile/tile_group_merge_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tile/tile_test.dart b/forui/test/src/widgets/tile/tile_test.dart index 2227f800d..fc5eb1ce9 100644 --- a/forui/test/src/widgets/tile/tile_test.dart +++ b/forui/test/src/widgets/tile/tile_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tooltip/tooltip_golden_test.dart b/forui/test/src/widgets/tooltip/tooltip_golden_test.dart index be8587323..aa2baa79d 100644 --- a/forui/test/src/widgets/tooltip/tooltip_golden_test.dart +++ b/forui/test/src/widgets/tooltip/tooltip_golden_test.dart @@ -5,8 +5,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() { diff --git a/forui/test/src/widgets/tooltip/tooltip_test.dart b/forui/test/src/widgets/tooltip/tooltip_test.dart index eb0edefc7..2a7d1d6a1 100644 --- a/forui/test/src/widgets/tooltip/tooltip_test.dart +++ b/forui/test/src/widgets/tooltip/tooltip_test.dart @@ -2,8 +2,8 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:forui/forui.dart'; + import '../../test_scaffold.dart'; void main() {