Merge pull request #255 from provokateurin/refactor/logo-loading

tool,neon,app: Refactor logo loading

packages/app/lib/branding.dart

@@ -1,12 +1,6 @@
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:neon/neon.dart';
 
 Branding getNeonBranding() => Branding(
       name: 'Nextcloud Neon',
       legalese: 'Copyright © 2023, provokateurin\nUnder GPLv3 license',
-      buildLogo: (final context, final size) => SvgPicture.asset(
-        'assets/logo_neon.svg',
-        width: size.width,
-        height: size.height,
-      ),
     );

packages/app/linux/my_application.cc

@@ -53,7 +53,7 @@ static void my_application_activate(GApplication* application) {
   g_autoptr(FlDartProject) project = fl_dart_project_new();
 
   g_autoptr(GError) error = nullptr;
-  gtk_window_set_icon_from_file(window, g_strconcat(fl_dart_project_get_assets_path(project), "/assets/logo_neon.svg", NULL), &error);
+  gtk_window_set_icon_from_file(window, g_strconcat(fl_dart_project_get_assets_path(project), "/assets/logo.svg", NULL), &error);
   if (error != nullptr) {
      g_warning("Failed to set icon: %s", error->message);
   }

packages/app/pubspec.lock

@@ -256,7 +256,7 @@ packages:
     source: hosted
     version: "2.0.9"
   flutter_svg:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_svg
       sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"

packages/app/pubspec.yaml

@@ -10,7 +10,6 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_native_splash: ^2.2.0+1
-  flutter_svg: ^1.1.6
   neon:
     path: ../neon/neon
   neon_files:

packages/neon/neon/lib/src/app.dart

@@ -133,7 +133,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
         _globalOptions.systemTrayEnabled.stream.listen((final enabled) async {
           if (enabled) {
             // TODO: This works on Linux, but maybe not on macOS or Windows
-            await tray.trayManager.setIcon('assets/logo_neon.svg');
+            await tray.trayManager.setIcon('assets/logo.svg');
             if (mounted) {
               await tray.trayManager.setContextMenu(
                 tray.Menu(

packages/neon/neon/lib/src/pages/login.dart

@@ -172,9 +172,10 @@ class _LoginPageState extends State<LoginPage> {
                               height: MediaQuery.of(context).size.height / 2,
                               child: Column(
                                 children: [
-                                  Provider.of<Branding>(context, listen: false).buildLogo(
+                                  SvgPicture.asset(
-                                    context,
+                                    'assets/logo.svg',
-                                    const Size(100, 100),
+                                    width: 100,
+                                    height: 100,
                                   ),
                                   Text(
                                     Provider.of<Branding>(context, listen: false).name,

packages/neon/neon/lib/src/pages/settings.dart

@@ -222,9 +222,10 @@ class _SettingsPageState extends State<SettingsPage> {
                           showLicensePage(
                             context: context,
                             applicationName: branding.name,
-                            applicationIcon: branding.buildLogo(
+                            applicationIcon: SvgPicture.asset(
-                              context,
+                              'assets/logo.svg',
-                              const Size(100, 100),
+                              width: 100,
+                              height: 100,
                             ),
                             applicationLegalese: branding.legalese,
                             applicationVersion: Provider.of<PackageInfo>(context, listen: false).version,

packages/neon/neon/lib/src/utils/branding.dart

@@ -3,13 +3,10 @@ part of '../../neon.dart';
 class Branding {
   Branding({
     required this.name,
-    required this.buildLogo,
     this.legalese,
   });
 
   final String name;
 
-  final Widget Function(BuildContext, Size) buildLogo;
-
   final String? legalese;
 }

packages/neon/neon/lib/src/utils/push_utils.dart

@@ -27,7 +27,7 @@ class PushUtils {
         android: const AndroidInitializationSettings('@mipmap/ic_launcher'),
         linux: LinuxInitializationSettings(
           defaultActionName: 'Open',
-          defaultIcon: AssetsLinuxIcon('assets/logo_neon.svg'),
+          defaultIcon: AssetsLinuxIcon('assets/logo.svg'),
         ),
       ),
       onDidReceiveNotificationResponse: onDidReceiveNotificationResponse,

tool/generate-neon.sh

@@ -60,16 +60,16 @@ copy_nextcloud_app_svg notifications external/nextcloud-notifications
   cd packages/app
 
   # Neon logo
-  wget https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/cable-data.svg -O assets/logo_neon.svg
+  wget https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/cable-data.svg -O assets/logo.svg
-  sed -i "s/<path /<path fill=\"$color\" /g" assets/logo_neon.svg
+  sed -i "s/<path /<path fill=\"$color\" /g" assets/logo.svg
 
   # Splash screens
-  inkscape assets/logo_neon.svg -o img/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp
+  inkscape assets/logo.svg -o img/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp
   convert -size 1152x1152 xc:none img/splash_icon.png -gravity center -composite img/splash_icon_android_12.png # 1152px at xxxhdpi is 288dp
   exiftool -overwrite_original -all= img/splash_icon_android_12.png # To remove timestamps
 
   # Android launcher icons
-  export_mipmap_icon_all "assets/logo_neon.svg" "ic_launcher" &
+  export_mipmap_icon_all "assets/logo.svg" "ic_launcher" &
   for id in files news notes notifications; do
     export_mipmap_icon_all "../neon/neon_$id/assets/app.svg" "app_$id" &
   done