Skip to content

Commit

Permalink
Load locale on startup (#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
Airyzz authored Dec 9, 2023
1 parent 1354fa6 commit 3a764af
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 32 deletions.
18 changes: 12 additions & 6 deletions commet/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:commet/config/platform_utils.dart';
import 'package:commet/config/preferences.dart';
import 'package:commet/debug/log.dart';
import 'package:commet/diagnostic/diagnostics.dart';
import 'package:commet/generated/l10n/messages_all_locales.dart';
import 'package:commet/ui/pages/bubble/bubble_page.dart';
import 'package:commet/ui/pages/fatal_error/fatal_error_page.dart';
import 'package:commet/ui/pages/login/login_page.dart';
Expand All @@ -20,9 +21,12 @@ import 'package:commet/utils/event_bus.dart';
import 'package:commet/utils/scaled_app.dart';
import 'package:commet/utils/shortcuts_manager.dart';
import 'package:commet/utils/window_management.dart';
import 'package:flutter/foundation.dart';

import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:media_kit/media_kit.dart';

import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:provider/provider.dart';
import 'package:receive_intent/receive_intent.dart';
import 'package:sqflite_common_ffi/sqflite_ffi.dart';
Expand Down Expand Up @@ -147,12 +151,17 @@ Future<void> initNecessary() async {
Future<void> initGuiRequirements() async {
isHeadless = false;

var locale = PlatformDispatcher.instance.locale;

MediaKit.ensureInitialized();

Future.wait([
WindowManagement.init(),
UnicodeEmojis.load(),
initializeMessages(locale.languageCode)
]);

Intl.defaultLocale = locale.languageCode;
}

/// Initializes gui requirements and launches the gui
Expand Down Expand Up @@ -218,15 +227,12 @@ class App extends StatelessWidget {
title: 'Commet',
theme: theme,
navigatorKey: navigator,
localizationsDelegates: const [
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
localizationsDelegates: T.localizationsDelegates,
builder: (context, child) => Provider<ClientManager>(
create: (context) => clientManager,
child: child,
),
supportedLocales: T.supportedLocales,
home: AppView(
clientManager: clientManager,
initialClientId: initialClientId,
Expand Down
24 changes: 0 additions & 24 deletions commet/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.17.2"
color:
dependency: transitive
description:
name: color
sha256: ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb
url: "https://pub.dev"
source: hosted
version: "3.0.0"
console:
dependency: transitive
description:
Expand Down Expand Up @@ -403,22 +395,6 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_gen:
dependency: "direct main"
description:
name: flutter_gen
sha256: "0815a61633ac5f0365dd07cb501982718dbac8905dd7a7c34e50a1f3516155bb"
url: "https://pub.dev"
source: hosted
version: "5.3.2"
flutter_gen_core:
dependency: transitive
description:
name: flutter_gen_core
sha256: "8b4ff1d45d125e576e26ea99d15e0419bb3c45b53696e022880866b78bb6b830"
url: "https://pub.dev"
source: hosted
version: "5.3.2"
flutter_highlighter:
dependency: "direct main"
description:
Expand Down
1 change: 0 additions & 1 deletion commet/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies:
#fcm_shared_isolate: ^0.1.0
file_picker: ^5.2.10
flutter_blurhash: ^0.7.0
flutter_gen: ^5.3.1
flutter_markdown: ^0.6.9+1
flutter_olm: ^1.2.0
flutter_openssl_crypto: ^0.1.0
Expand Down
2 changes: 1 addition & 1 deletion commet/scripts/apply_google_services.patch
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ index 819350f..054e21c 100644
+ fcm_shared_isolate: ^0.1.0
file_picker: ^5.2.10
flutter_blurhash: ^0.7.0
flutter_gen: ^5.3.1
flutter_markdown: ^0.6.9+1

0 comments on commit 3a764af

Please sign in to comment.