diff --git a/images/finamp_cropped.png b/images/finamp_cropped.png index 948f8c439..648735656 100644 Binary files a/images/finamp_cropped.png and b/images/finamp_cropped.png differ diff --git a/images/finamp_cropped.svg b/images/finamp_cropped.svg new file mode 100644 index 000000000..57fc195b6 --- /dev/null +++ b/images/finamp_cropped.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/lib/components/LoginScreen/login_authentication_page.dart b/lib/components/LoginScreen/login_authentication_page.dart index 8f1f71b7e..40e34da62 100644 --- a/lib/components/LoginScreen/login_authentication_page.dart +++ b/lib/components/LoginScreen/login_authentication_page.dart @@ -6,6 +6,7 @@ import 'package:finamp/models/jellyfin_models.dart'; import 'package:finamp/services/jellyfin_api_helper.dart'; import 'package:flutter/material.dart' hide ConnectionState; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tabler_icons/flutter_tabler_icons.dart'; import 'package:get_it/get_it.dart'; import 'package:logging/logging.dart'; @@ -59,8 +60,8 @@ class _LoginAuthenticationPageState extends State { children: [ Padding( padding: const EdgeInsets.only(top: 32.0, bottom: 20.0), - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 75, height: 75, ), diff --git a/lib/components/LoginScreen/login_server_selection_page.dart b/lib/components/LoginScreen/login_server_selection_page.dart index b17b921c7..b670d7939 100644 --- a/lib/components/LoginScreen/login_server_selection_page.dart +++ b/lib/components/LoginScreen/login_server_selection_page.dart @@ -3,6 +3,7 @@ import 'package:finamp/models/jellyfin_models.dart'; import 'package:finamp/services/jellyfin_api_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tabler_icons/flutter_tabler_icons.dart'; import 'package:get_it/get_it.dart'; import 'package:logging/logging.dart'; @@ -80,8 +81,8 @@ class _LoginServerSelectionPageState extends State { padding: const EdgeInsets.only(top: 32.0, bottom: 20.0), child: Hero( tag: "finamp_logo", - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 75, height: 75, ), diff --git a/lib/components/LoginScreen/login_splash_page.dart b/lib/components/LoginScreen/login_splash_page.dart index 5ae0491b4..3f781ef99 100644 --- a/lib/components/LoginScreen/login_splash_page.dart +++ b/lib/components/LoginScreen/login_splash_page.dart @@ -1,5 +1,6 @@ import 'package:finamp/components/Buttons/cta_large.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tabler_icons/flutter_tabler_icons.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -24,8 +25,8 @@ class LoginSplashPage extends StatelessWidget { padding: const EdgeInsets.only(top: 80.0, bottom: 40.0), child: Hero( tag: "finamp_logo", - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 150, height: 150, ), diff --git a/lib/components/LoginScreen/login_user_selection_page.dart b/lib/components/LoginScreen/login_user_selection_page.dart index b74be569f..7041416ce 100644 --- a/lib/components/LoginScreen/login_user_selection_page.dart +++ b/lib/components/LoginScreen/login_user_selection_page.dart @@ -3,6 +3,7 @@ import 'package:finamp/components/LoginScreen/login_server_selection_page.dart'; import 'package:finamp/models/jellyfin_models.dart'; import 'package:finamp/services/jellyfin_api_helper.dart'; import 'package:flutter/material.dart' hide ConnectionState; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tabler_icons/flutter_tabler_icons.dart'; import 'package:get_it/get_it.dart'; import 'package:logging/logging.dart'; @@ -65,8 +66,8 @@ class _LoginUserSelectionPageState extends State { children: [ Padding( padding: const EdgeInsets.only(top: 32.0, bottom: 20.0), - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 75, height: 75, ), diff --git a/lib/components/MusicScreen/music_screen_drawer.dart b/lib/components/MusicScreen/music_screen_drawer.dart index b64a476cb..e7396988b 100644 --- a/lib/components/MusicScreen/music_screen_drawer.dart +++ b/lib/components/MusicScreen/music_screen_drawer.dart @@ -2,6 +2,7 @@ import 'package:finamp/screens/playback_history_screen.dart'; import 'package:finamp/screens/queue_restore_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tabler_icons/flutter_tabler_icons.dart'; import 'package:get_it/get_it.dart'; @@ -37,8 +38,8 @@ class MusicScreenDrawer extends StatelessWidget { alignment: Alignment.topCenter, child: Padding( padding: const EdgeInsets.all(16.0), - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 56, height: 56, ), diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 4947b8d9c..2e503b2b7 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -3,6 +3,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:locale_names/locale_names.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -59,8 +60,8 @@ class SettingsScreen extends StatelessWidget { applicationVersion: packageInfo.version, applicationIcon: Padding( padding: const EdgeInsets.only(top: 8.0), - child: Image.asset( - 'images/finamp_cropped.png', + child: SvgPicture.asset( + 'images/finamp_cropped.svg', width: 56, height: 56, ), diff --git a/pubspec.lock b/pubspec.lock index 220a43769..9d0b32ebf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -564,6 +564,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.5" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + url: "https://pub.dev" + source: hosted + version: "2.0.10+1" flutter_tabler_icons: dependency: "direct main" description: @@ -1599,6 +1607,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" vector_graphics_codec: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5c26f4395..a4381d184 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -105,6 +105,7 @@ dependencies: wakelock_plus: ^1.2.8 battery_plus: ^6.0.2 focus_on_it: ^2.0.1 + flutter_svg: ^2.0.10+1 dev_dependencies: flutter_test: @@ -143,6 +144,7 @@ flutter: - images/finamp.png - images/album_white.png - images/finamp_cropped.png + - images/finamp_cropped.svg - images/jellyfin-icon-transparent.png # - images/a_dot_ham.jpeg