Skip to content

Commit

Permalink
fix: Fixed a bug in ensureInitialized.
Browse files Browse the repository at this point in the history
  • Loading branch information
mathrunet committed May 13, 2023
1 parent 1fd1416 commit d3452b5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
15 changes: 13 additions & 2 deletions packages/masamune/lib/src/masamune_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Future<void> runMasamuneApp(
}
});
} else {
WidgetsFlutterBinding.ensureInitialized();
for (final adapter in masamuneAdapters) {
await adapter.onPreRunApp();
}
Expand Down Expand Up @@ -177,6 +178,7 @@ class MasamuneApp extends StatelessWidget {
this.builder,
this.onBuildAppFilters,
this.masamuneAdapters = const <MasamuneAdapter>[],
this.localizationsDelegates,
});

/// You can specify the plug-in adapter used by Masamune Framework.
Expand Down Expand Up @@ -380,6 +382,11 @@ class MasamuneApp extends StatelessWidget {
final List<Widget Function(BuildContext context, Widget app)>?
onBuildAppFilters;

/// Define a list of [LocalizationsDelegate].
///
/// [LocalizationsDelegate]のリストを定義します。
final List<LocalizationsDelegate<dynamic>>? localizationsDelegates;

@override
Widget build(BuildContext context) {
var child = _buildAppFunctions(
Expand Down Expand Up @@ -534,7 +541,9 @@ class MasamuneApp extends StatelessWidget {
return MaterialApp(
locale: localize?.locale,
supportedLocales: localize?.supportedLocales() ?? kDefaultLocales,
localizationsDelegates: localize?.delegates(),
localizationsDelegates:
localize?.delegates(localizationsDelegates ?? const []) ??
localizationsDelegates,
localeResolutionCallback: localize?.localeResolutionCallback(),
theme: theme?.toThemeData(brightness: Brightness.light),
darkTheme: theme?.toThemeData(brightness: Brightness.dark),
Expand Down Expand Up @@ -566,7 +575,9 @@ class MasamuneApp extends StatelessWidget {
routerConfig: routerConfig,
locale: localize?.locale,
supportedLocales: localize?.supportedLocales() ?? kDefaultLocales,
localizationsDelegates: localize?.delegates(),
localizationsDelegates:
localize?.delegates(localizationsDelegates ?? const []) ??
localizationsDelegates,
localeResolutionCallback: localize?.localeResolutionCallback(),
theme: theme?.toThemeData(brightness: Brightness.light),
darkTheme: theme?.toThemeData(brightness: Brightness.dark),
Expand Down
4 changes: 2 additions & 2 deletions packages/masamune/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,14 @@ packages:
path: "../katana_localization"
relative: true
source: path
version: "2.0.2"
version: "2.0.3"
katana_localization_annotation:
dependency: "direct overridden"
description:
path: "../katana_localization_annotation"
relative: true
source: path
version: "2.0.2"
version: "2.0.3"
katana_logger:
dependency: "direct main"
description:
Expand Down

0 comments on commit d3452b5

Please sign in to comment.