Skip to content

Commit

Permalink
fix: Change location of ensureInitialized.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathrunet
mathrunet committed May 12, 2023
1 parent afbc9e0 commit ec05e69
Show file tree
Hide file tree
Showing 3 changed files with 233 additions and 281 deletions.
301 changes: 137 additions & 164 deletions packages/masamune/example/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,213 +377,187 @@ packages:
source: hosted
version: "6.6.2"
katana:
dependency: transitive
dependency: "direct overridden"
description:
name: katana
sha256: "99e37bec02e32244b575b8459d7c5108297376e4f36d7da1a40ab22fb701e97d"
url: "https://pub.dev"
source: hosted
version: "1.0.14"
path: "../../katana"
relative: true
source: path
version: "2.0.0"
katana_auth:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_auth
sha256: "950d217b7b5cd2539c519d4c52dd1f6e35d9c3634bba0dec97a37ef1246ff195"
url: "https://pub.dev"
source: hosted
version: "1.2.16"
path: "../../katana_auth"
relative: true
source: path
version: "2.0.0"
katana_form:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_form
sha256: "9bba68f5528322bed88809b11ffbbe38f4db496e9cc65596718525b3ad62a1a5"
url: "https://pub.dev"
source: hosted
version: "1.4.9"
path: "../../katana_form"
relative: true
source: path
version: "2.0.3"
katana_functions:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_functions
sha256: "5dca964b2a90f708616130a90f1ab60ed0b631c34f114658918e7bb844861260"
url: "https://pub.dev"
source: hosted
version: "1.1.26"
path: "../../katana_functions"
relative: true
source: path
version: "2.0.0"
katana_indicator:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_indicator
sha256: fd3b5ec1c58d16dd4ed4a51a054b5d87978568631d715349e6dfc6019d24cff6
url: "https://pub.dev"
source: hosted
version: "1.1.20"
path: "../../katana_indicator"
relative: true
source: path
version: "2.0.0"
katana_listenables:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_listenables
sha256: "4911de12ee3782e1fa2eea55c17583de970ab6be152cd2ab9cbafcc9032c657e"
url: "https://pub.dev"
source: hosted
version: "1.2.26"
path: "../../katana_listenables"
relative: true
source: path
version: "2.0.0"
katana_listenables_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_listenables_annotation
sha256: "5d951e5f9d7d063f8a9aa35ff028cd5a97252555bc6d15e7936fe7d150958bcd"
url: "https://pub.dev"
source: hosted
version: "1.2.24"
path: "../../katana_listenables_annotation"
relative: true
source: path
version: "2.0.0"
katana_listenables_builder:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_listenables_builder
sha256: ccb67c508804e3a79186002dcbe2b26d4646090860301635272ca5efe9bb25c9
url: "https://pub.dev"
source: hosted
version: "1.2.25"
path: "../../katana_listenables_builder"
relative: true
source: path
version: "2.0.0"
katana_localization:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_localization
sha256: "6356dfddb9faeb0280a296b1ca5d1041cc89c57f73b7c21c360e7ad8cc7bbd06"
url: "https://pub.dev"
source: hosted
version: "1.1.39"
path: "../../katana_localization"
relative: true
source: path
version: "2.0.1"
katana_localization_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_localization_annotation
sha256: "279896bd9addbceea57a096d74d40ed695cbf1617f8e70ca2ab764e3db3a950b"
url: "https://pub.dev"
source: hosted
version: "1.1.37"
path: "../../katana_localization_annotation"
relative: true
source: path
version: "2.0.1"
katana_localization_builder:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_localization_builder
sha256: "47da8fd684705c0395707151d4a822fc45d2ca74ba8a1c21e3be057bb4070b0c"
url: "https://pub.dev"
source: hosted
version: "1.1.39"
path: "../../katana_localization_builder"
relative: true
source: path
version: "2.0.1"
katana_logger:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_logger
sha256: d88af3581346cda2544a4147a613decc1d82b1b23f971bae68785df2b7859a40
url: "https://pub.dev"
source: hosted
version: "1.2.12"
path: "../../katana_logger"
relative: true
source: path
version: "2.0.0"
katana_model:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_model
sha256: d55f0f85ab3c006043e9d89bb4429e6f24815d9ed39b60dfacaaea67529b7d45
url: "https://pub.dev"
source: hosted
version: "1.7.11"
path: "../../katana_model"
relative: true
source: path
version: "2.0.0"
katana_prefs:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_prefs
sha256: cc7a5d32409f56a997b2205f121410d7ff38a3581e78bfeb65dcf900a49f39fb
url: "https://pub.dev"
source: hosted
version: "1.1.26"
path: "../../katana_prefs"
relative: true
source: path
version: "2.0.0"
katana_prefs_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_prefs_annotation
sha256: "3c3895f1a181b1274df4c0353ac9d34a19fba8a639035755fe08caad196d10f0"
url: "https://pub.dev"
source: hosted
version: "1.1.20"
path: "../../katana_prefs_annotation"
relative: true
source: path
version: "2.0.0"
katana_prefs_builder:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_prefs_builder
sha256: "52f945304a97f2854d520044e38c28ac46861e7121d81fff1b7ab897059f41fd"
url: "https://pub.dev"
source: hosted
version: "1.1.29"
path: "../../katana_prefs_builder"
relative: true
source: path
version: "2.0.0"
katana_router:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_router
sha256: "2d699c07854d1cd74c00ecf47a7c26d819e4f9e4b29fbcfa83a976e0dd117aab"
url: "https://pub.dev"
source: hosted
version: "1.11.22"
path: "../../katana_router"
relative: true
source: path
version: "2.0.1"
katana_router_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_router_annotation
sha256: "59c344826af1219f7de56da0fc06509330e259521ee7ef4cbd421b25edd98b12"
url: "https://pub.dev"
source: hosted
version: "1.11.16"
path: "../../katana_router_annotation"
relative: true
source: path
version: "2.0.1"
katana_router_builder:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_router_builder
sha256: "0ee4fce0b0faecdf583a4e93049a6966389ec98e690e70d5d89c9b2f29a85fec"
url: "https://pub.dev"
source: hosted
version: "1.11.20"
path: "../../katana_router_builder"
relative: true
source: path
version: "2.0.1"
katana_scoped:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_scoped
sha256: a094adef424930cecef7f89a12621fba77511c0e45ce08c622f86d94984c0618
url: "https://pub.dev"
source: hosted
version: "1.11.7"
path: "../../katana_scoped"
relative: true
source: path
version: "2.0.0"
katana_shorten:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_shorten
sha256: "79e8c435d10e35215275c08e1321b26eccc2cd237f7b9de723c1fce794e11c55"
url: "https://pub.dev"
source: hosted
version: "1.2.17"
path: "../../katana_shorten"
relative: true
source: path
version: "2.0.0"
katana_storage:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_storage
sha256: b678120f14e3a6cc407248d80725990729582fe69e98f63f83049d147434eecb
url: "https://pub.dev"
source: hosted
version: "1.1.20"
path: "../../katana_storage"
relative: true
source: path
version: "2.0.0"
katana_theme:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_theme
sha256: fcdab151f86959072698ed291b9ec65ec38a41641f4e37351949a073cf83f74f
url: "https://pub.dev"
source: hosted
version: "1.4.13"
path: "../../katana_theme"
relative: true
source: path
version: "2.0.0"
katana_theme_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_theme_annotation
sha256: "1dab61c8fa3506fa51ad1159559261733bdf78283fe6d92603d7a2b778d47867"
url: "https://pub.dev"
source: hosted
version: "1.4.11"
path: "../../katana_theme_annotation"
relative: true
source: path
version: "2.0.0"
katana_theme_builder:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_theme_builder
sha256: ffe17510880d95b6af57b890797cab54774999c108766849f5f4940ea6a3c47a
url: "https://pub.dev"
source: hosted
version: "1.4.12"
path: "../../katana_theme_builder"
relative: true
source: path
version: "2.0.0"
katana_ui:
dependency: transitive
dependency: "direct overridden"
description:
name: katana_ui
sha256: "0d877bb2d26d1c7dcdd30f4a7b917f5c3c4d0ac4d5a18f0241c7def7e7a94263"
url: "https://pub.dev"
source: hosted
version: "1.2.13"
path: "../../katana_ui"
relative: true
source: path
version: "2.0.0"
lints:
dependency: transitive
description:
Expand All @@ -606,22 +580,21 @@ packages:
path: ".."
relative: true
source: path
version: "1.12.9"
version: "2.0.5"
masamune_annotation:
dependency: transitive
dependency: "direct overridden"
description:
name: masamune_annotation
sha256: "239a573ec512c94ee164fb7cd0ec307403026c27c6e9d7a58b256ae0fa0e9dae"
url: "https://pub.dev"
source: hosted
version: "1.5.2"
path: "../../masamune_annotation"
relative: true
source: path
version: "2.0.0"
masamune_builder:
dependency: "direct dev"
description:
path: "../../masamune_builder"
relative: true
source: path
version: "1.5.7"
version: "2.0.2"
matcher:
dependency: transitive
description:
Expand Down
5 changes: 3 additions & 2 deletions packages/masamune/lib/src/masamune_app.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Future<void> runMasamuneApp(
if (setPathUrlStrategy) {
AppRouter.setPathUrlStrategy();
}
WidgetsFlutterBinding.ensureInitialized();
final useRunZonedGuarded = masamuneAdapters.any((e) => e.runZonedGuarded);
if (useRunZonedGuarded) {
runZonedGuarded(() async {
WidgetsFlutterBinding.ensureInitialized();
for (final adapter in masamuneAdapters) {
await adapter.onPreRunApp();
}
Expand Down Expand Up @@ -562,11 +562,12 @@ class MasamuneApp extends StatelessWidget {
navigatorObservers.add(observer);
}
}
final aa = localize?.delegates();
return MaterialApp.router(
routerConfig: routerConfig,
locale: localize?.locale,
supportedLocales: localize?.supportedLocales() ?? kDefaultLocales,
localizationsDelegates: localize?.delegates(),
localizationsDelegates: aa,
localeResolutionCallback: localize?.localeResolutionCallback(),
theme: theme?.toThemeData(brightness: Brightness.light),
darkTheme: theme?.toThemeData(brightness: Brightness.dark),
Expand Down
Loading

0 comments on commit ec05e69

Please sign in to comment.