chore: use fvm github action (#69)

* chore: use fvm github action

* webkit2gtk-4.1

* libwebkit2gtk-4.1-dev

* fvm for snap

* -

* .

* b

* s

* mkdir

* y

* Plug shared-memory, needed for webkit

* historyvisibilitytest

* snap: fixed command

* Don't connect to shared-memory, but add connection for network-status.
This is required for the portal check in webkit.

* no webview for windows and linux

---------

Co-authored-by: Ken VanDine <ken.vandine@canonical.com>

Author: Feichtmeier

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.29.2"
+  "flutter": "3.32.4"
 }

.github/workflows/ci.yaml

@@ -4,51 +4,36 @@ on:
   pull_request:
     branches: [main]
 
-env:
-  FLUTTER_VERSION: '3.29.2'
-
 jobs:
   analyze:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{env.FLUTTER_VERSION}}
+      - uses: kuhnroyal/flutter-fvm-config-action/setup@v3
       - run: flutter pub get
       - run: flutter analyze --fatal-infos
 
   format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{env.FLUTTER_VERSION}}
+      - uses: kuhnroyal/flutter-fvm-config-action/setup@v3
       - run: flutter pub get
       - run: dart format --set-exit-if-changed .
 
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{env.FLUTTER_VERSION}}
+      - uses: kuhnroyal/flutter-fvm-config-action/setup@v3
       - run: flutter test
 
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{env.FLUTTER_VERSION}}
+      - uses: kuhnroyal/flutter-fvm-config-action/setup@v3
       - run: sudo apt update
-      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev libsqlite3-dev libolm-dev libolm3 libcrypto++-dev libsecret-1-dev libjsoncpp-dev libnotify-dev
+      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev libsqlite3-dev libolm-dev libolm3 libcrypto++-dev libsecret-1-dev libjsoncpp-dev libnotify-dev libwebkit2gtk-4.1-dev
       - run: flutter pub get
       - run: flutter build linux -v

.metadata

@@ -4,35 +4,20 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "b0850beeb25f6d5b10426284f506557f66181b36"
-  channel: "[user-branch]"
+  revision: "6fba2447e95c451518584c35e25f5433f14d888c"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
-    - platform: android
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
-    - platform: ios
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
-    - platform: linux
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
-    - platform: macos
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
+      base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
     - platform: web
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
-    - platform: windows
-      create_revision: b0850beeb25f6d5b10426284f506557f66181b36
-      base_revision: b0850beeb25f6d5b10426284f506557f66181b36
+      create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
+      base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
 
   # User provided section
 

analysis_options.yaml

@@ -15,4 +15,4 @@ linter:
     unnecessary_parenthesis: true
     unnecessary_await_in_return: true
     unnecessary_late: true
-    unnecessary_breaks: true
+    unnecessary_breaks: true

l10n.yaml

@@ -2,4 +2,6 @@ arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 nullable-getter: false
-untranslated-messages-file: needs_translation.json
+untranslated-messages-file: needs_translation.json
+synthetic-package: false
+format: true

lib/app/view/app.dart

@@ -3,7 +3,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../l10n/l10n.dart';
+import '../../l10n/app_localizations.dart';
 import '../../settings/settings_model.dart';
 import '../app_config.dart';
 
@@ -28,33 +28,30 @@ class App extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) => MaterialApp(
-        themeMode: themeMode ??
-            watchPropertyValue(
-              (SettingsModel m) => ThemeMode.values[m.themModeIndex],
-            ),
-        theme: lightTheme?.copyWith(
-          pageTransitionsTheme: pTT,
+    themeMode:
+        themeMode ??
+        watchPropertyValue(
+          (SettingsModel m) => ThemeMode.values[m.themModeIndex],
         ),
-        darkTheme: darkTheme?.copyWith(
-          pageTransitionsTheme: pTT,
-        ),
-        highContrastTheme: highContrastTheme,
-        highContrastDarkTheme: highContrastDarkTheme,
-        debugShowCheckedModeBanner: false,
-        title: AppConfig.kAppTitle,
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        scrollBehavior: const MaterialScrollBehavior().copyWith(
-          dragDevices: {
-            PointerDeviceKind.mouse,
-            PointerDeviceKind.touch,
-            PointerDeviceKind.stylus,
-            PointerDeviceKind.unknown,
-            PointerDeviceKind.trackpad,
-          },
-        ),
-        home: child,
-      );
+    theme: lightTheme?.copyWith(pageTransitionsTheme: pTT),
+    darkTheme: darkTheme?.copyWith(pageTransitionsTheme: pTT),
+    highContrastTheme: highContrastTheme,
+    highContrastDarkTheme: highContrastDarkTheme,
+    debugShowCheckedModeBanner: false,
+    title: AppConfig.kAppTitle,
+    localizationsDelegates: AppLocalizations.localizationsDelegates,
+    supportedLocales: AppLocalizations.supportedLocales,
+    scrollBehavior: const MaterialScrollBehavior().copyWith(
+      dragDevices: {
+        PointerDeviceKind.mouse,
+        PointerDeviceKind.touch,
+        PointerDeviceKind.stylus,
+        PointerDeviceKind.unknown,
+        PointerDeviceKind.trackpad,
+      },
+    ),
+    home: child,
+  );
 }
 
 final pTT = PageTransitionsTheme(

lib/app/view/nebuchadnezzar.dart

@@ -1,17 +1,15 @@
-import 'dart:io';
-
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:system_theme/system_theme_builder.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../common/platforms.dart';
 import 'wait_for_registration_page.dart';
 
 class Nebuchadnezzar extends StatelessWidget {
   const Nebuchadnezzar({super.key});
 
   @override
-  Widget build(BuildContext context) => !kIsWeb && Platform.isLinux
+  Widget build(BuildContext context) => Platforms.isLinux
       ? YaruTheme(
           builder: (context, yaru, child) => WaitForRegistrationPage(
             lightTheme: yaru.theme,

lib/app/view/splash_page.dart

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../common/view/common_widgets.dart';
-import '../../common/view/ui_constants.dart';
-import '../../settings/view/chat_settings_logout_button.dart';
 
 class SplashPage extends StatelessWidget {
   const SplashPage({super.key, this.title});
@@ -17,14 +15,8 @@ class SplashPage extends StatelessWidget {
         title: title,
         border: BorderSide.none,
         backgroundColor: Colors.transparent,
-        actions: const [
-          Flexible(child: ChatSettingsLogoutButton()),
-          SizedBox(width: kSmallPadding),
-        ],
-      ),
-      body: const Center(
-        child: Progress(),
       ),
+      body: const Center(child: Progress()),
     );
   }
 }

lib/app/view/wait_for_registration_page.dart

@@ -37,24 +37,24 @@ class _WaitForRegistrationPageState extends State<WaitForRegistrationPage> {
 
   @override
   Widget build(BuildContext context) => FutureBuilder(
-        future: _registrationReady,
-        builder: (context, snapshot) => snapshot.hasData
-            ? App(
-                lightTheme: widget.lightTheme,
-                darkTheme: widget.darkTheme,
-                highContrastDarkTheme: widget.highContrastDarkTheme,
-                highContrastTheme: widget.highContrastTheme,
-                child: (!di<AuthenticationModel>().isLogged)
-                    ? const ChatLoginPage()
-                    : const CheckEncryptionSetupPage(),
-              )
-            : App(
-                themeMode: ThemeMode.system,
-                lightTheme: widget.lightTheme,
-                darkTheme: widget.darkTheme,
-                highContrastDarkTheme: widget.highContrastDarkTheme,
-                highContrastTheme: widget.highContrastTheme,
-                child: const SplashPage(),
-              ),
-      );
+    future: _registrationReady,
+    builder: (context, snapshot) => snapshot.hasData
+        ? App(
+            lightTheme: widget.lightTheme,
+            darkTheme: widget.darkTheme,
+            highContrastDarkTheme: widget.highContrastDarkTheme,
+            highContrastTheme: widget.highContrastTheme,
+            child: (!di<AuthenticationModel>().isLogged)
+                ? const ChatLoginPage()
+                : const CheckEncryptionSetupPage(),
+          )
+        : App(
+            themeMode: ThemeMode.system,
+            lightTheme: widget.lightTheme,
+            darkTheme: widget.darkTheme,
+            highContrastDarkTheme: widget.highContrastDarkTheme,
+            highContrastTheme: widget.highContrastTheme,
+            child: const SplashPage(),
+          ),
+  );
 }