Merge pull request #585 from getlantern/ox/buildInfo

Build Info PR Suggestions
getlantern · Nov 29, 2021 · 3188be1 · 3188be1
2 parents c6dd3ae + 4b1f440
commit 3188be1
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 39 deletions.
diff --git a/assets/locales/en.po b/assets/locales/en.po
@@ -74,6 +74,12 @@ msgstr "Proxy everything"
 msgid "proxy_everything_is"
 msgstr "Proxy everything is %s"
 
+msgid "version_number"
+msgstr "Version %s"
+
+msgid "build_number"
+msgstr "Build %s"
+
 msgid "language"
 msgstr "Language"
 

diff --git a/lib/account/settings.dart b/lib/account/settings.dart
@@ -1,13 +1,15 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:intl/intl.dart';
 import 'package:lantern/common/common.dart';
-import 'package:lantern/common/package_info.dart';
 import 'package:lantern/core/router/router.gr.dart';
 import 'package:lantern/messaging/messaging_model.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class Settings extends StatelessWidget {
   Settings({Key? key}) : super(key: key);
 
+  final packageInfo = PackageInfo.fromPlatform();
+
   void openInfoProxyAll(BuildContext context) {
     showInfoDialog(context,
         title: 'proxy_all'.i18n,
@@ -118,23 +120,39 @@ class Settings extends StatelessWidget {
                     ],
                   )),
           //* Build version
-          Expanded(
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Container(
-                  padding:
-                      const EdgeInsetsDirectional.only(bottom: 8.0, end: 8.0),
-                  child: getVersion(),
-                ),
-                Container(
-                  padding:
-                      const EdgeInsetsDirectional.only(bottom: 8.0, end: 8.0),
-                  child: getBuildNumber(),
+          FutureBuilder<PackageInfo>(
+            future: packageInfo,
+            builder: (context, snapshot) {
+              if (!snapshot.hasData) {
+                return Container();
+              }
+              return Expanded(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Container(
+                      padding: const EdgeInsetsDirectional.only(
+                          bottom: 8.0, end: 8.0),
+                      child: CText(
+                          'version_number'
+                              .i18n
+                              .fill([snapshot.data?.version ?? '']),
+                          style: tsOverline.copiedWith(color: pink4)),
+                    ),
+                    Container(
+                      padding: const EdgeInsetsDirectional.only(
+                          bottom: 8.0, end: 8.0),
+                      child: CText(
+                          'build_number'
+                              .i18n
+                              .fill([snapshot.data?.buildNumber ?? '']),
+                          style: tsOverline.copiedWith(color: pink4)),
+                    ),
+                  ],
                 ),
-              ],
-            ),
+              );
+            },
           ),
         ],
       ),

diff --git a/lib/app.dart b/lib/app.dart
@@ -3,11 +3,11 @@ import 'dart:ui';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:lantern/event_manager.dart';
 import 'package:lantern/common/common.dart';
 import 'package:lantern/common/session_model.dart';
 import 'package:lantern/common/ui/audio.dart';
 import 'package:lantern/core/router/router.gr.dart';
+import 'package:lantern/event_manager.dart';
 import 'package:lantern/messaging/messaging.dart';
 import 'package:lantern/vpn/vpn_model.dart';
 import 'package:loader_overlay/loader_overlay.dart';
@@ -18,6 +18,8 @@ final globalRouter = AppRouter(navigatorKey);
 class LanternApp extends StatelessWidget {
   LanternApp({Key? key}) : super(key: key);
 
+  final translations = Localization.loadTranslations();
+
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
@@ -32,8 +34,11 @@ class LanternApp extends StatelessWidget {
       ],
       // We typically don't use FutureBuilder, but it's okay here
       child: FutureBuilder(
-          future: Localization.loadTranslations(),
+          future: translations,
           builder: (BuildContext context, AsyncSnapshot<void> snapshot) {
+            if (!snapshot.hasData) {
+              return Container();
+            }
             return GlobalLoaderOverlay(
               overlayColor: Colors.black,
               overlayOpacity: 0.6,

diff --git a/lib/common/package_info.dart b/lib/common/package_info.dart
diff --git a/lib/i18n/i18n.dart b/lib/i18n/i18n.dart
@@ -7,9 +7,11 @@ extension Localization on String {
 
   static TranslationsByLocale translations = Translations.byLocale(locale);
 
-  static Future<void> loadTranslations() async {
-    translations +=
-        await GettextImporter().fromAssetDirectory('assets/locales');
+  static Future<TranslationsByLocale> loadTranslations() {
+    return GettextImporter().fromAssetDirectory('assets/locales').then((value) {
+      translations += value;
+      return translations;
+    });
   }
 
   String get i18n =>