chore(router): migrate to go_router v5

[skip ci]
This commit is contained in:
Jagandeep Brar
2022-09-22 11:09:23 -04:00
committed by GitHub
parent 863972cf86
commit 2ab098962d
7 changed files with 20 additions and 33 deletions

View File

@@ -6,7 +6,7 @@ import 'package:lunasea/widgets/ui.dart';
extension DateTimeExtension on DateTime {
String _formatted(String format) {
final locale = LunaLanguage.current.languageTag;
final locale = LunaLanguage.current().languageTag;
return DateFormat(format, locale).format(this.toLocal());
}

View File

@@ -36,14 +36,14 @@ Future<void> main() async {
await LunaLocalization().initialize();
await LunaMemoryStore().initialize();
// Run application
return runApp(const LunaOS());
return runApp(const LunaBIOS());
},
(error, stack) => LunaLogger().critical(error, stack),
);
}
class LunaOS extends StatelessWidget {
const LunaOS({
class LunaBIOS extends StatelessWidget {
const LunaBIOS({
Key? key,
}) : super(key: key);

View File

@@ -23,8 +23,8 @@ enum BIOSRoutes with LunaRoutesMixin {
GoRoute get routes {
switch (this) {
case BIOSRoutes.HOME:
return redirect(redirect: (_) {
Future.microtask(LunaBIOS().boot);
return redirect(redirect: (context, _) {
LunaOS().boot(context);
return DashboardRoutes.HOME.path;
});
}

View File

@@ -1,3 +1,4 @@
import 'package:flutter/material.dart';
import 'package:lunasea/database/tables/bios.dart';
import 'package:lunasea/firebase/firestore.dart';
import 'package:lunasea/firebase/messaging.dart';
@@ -7,14 +8,12 @@ import 'package:lunasea/system/quick_actions/quick_actions.dart';
import 'package:lunasea/widgets/sheets/changelog/sheet.dart';
import 'package:lunasea/widgets/sheets/database_corruption/sheet.dart';
class LunaBIOS {
Future<void> boot() async {
LunaLanguage.current.use();
class LunaOS {
Future<void> boot(BuildContext context) async {
LunaLanguage.current(context).use(context);
_initNotifications();
if (LunaQuickActions.isSupported) LunaQuickActions().initialize();
await _healthCheck();
BIOSDatabase.FIRST_BOOT.update(false);
Future.microtask(_healthCheck);
}
Future<void> _initNotifications() async {
@@ -42,5 +41,7 @@ class LunaBIOS {
if (!firstBoot && !isLatest.item1) {
ChangelogSheet().show();
}
BIOSDatabase.FIRST_BOOT.update(false);
}
}

View File

@@ -44,8 +44,8 @@ enum LunaLanguage {
final String name;
const LunaLanguage(this.languageTag, this.locale, this.name);
static LunaLanguage get current {
final locale = LunaState.context.locale;
static LunaLanguage current([BuildContext? context]) {
final locale = (context ?? LunaState.context).locale;
return fromLocale(locale) ?? LunaLanguage.ENGLISH;
}
@@ -57,8 +57,8 @@ enum LunaLanguage {
return null;
}
Future<void> use() async {
await LunaState.context.setLocale(locale);
Future<void> use([BuildContext? context]) async {
await (context ?? LunaState.context).setLocale(locale);
Intl.defaultLocale = languageTag;
}
@@ -66,21 +66,7 @@ enum LunaLanguage {
switch (this) {
case LunaLanguage.ENGLISH:
return true;
case LunaLanguage.CATALAN:
case LunaLanguage.CHINESE_SIMPLIFIED:
case LunaLanguage.CROATIAN:
case LunaLanguage.DUTCH:
case LunaLanguage.FRENCH:
case LunaLanguage.GERMAN:
case LunaLanguage.HUNGARIAN:
case LunaLanguage.ITALIAN:
case LunaLanguage.NORWEGIAN_BOKMAL:
case LunaLanguage.PORTUGUESE:
case LunaLanguage.RUSSIAN:
case LunaLanguage.SWEDISH:
case LunaLanguage.SPANISH:
case LunaLanguage.TURKISH:
case LunaLanguage.VIETNAMESE:
default:
return LunaFlavor.BETA.isRunningFlavor();
}
}

View File

@@ -559,7 +559,7 @@ packages:
name: go_router
url: "https://pub.dartlang.org"
source: hosted
version: "4.4.1"
version: "5.0.1"
google_nav_bar:
dependency: "direct main"
description:

View File

@@ -30,7 +30,7 @@ dependencies:
flutter_cache_manager: ^3.3.0
flutter_riverpod: ^2.0.0-dev.9
flutter_spinkit: ^5.1.0
go_router: ^4.4.1
go_router: ^5.0.1
google_nav_bar: ^5.0.6
hive: ^2.2.3
hive_flutter: ^1.1.0