Skip to content

Commit

Permalink
Merge pull request #904 from edeuss/fix-blurry-login-logo
Browse files Browse the repository at this point in the history
feat: replace blurry png logo with svg
  • Loading branch information
Chaphasilor authored Sep 30, 2024
2 parents ee78769 + 88d8dc0 commit 8b007b2
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 12 deletions.
Binary file modified images/finamp_cropped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions images/finamp_cropped.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions lib/components/LoginScreen/login_authentication_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -60,8 +61,8 @@ class _LoginAuthenticationPageState extends State<LoginAuthenticationPage> {
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,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/components/LoginScreen/login_server_selection_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -81,8 +82,8 @@ class _LoginServerSelectionPageState extends State<LoginServerSelectionPage> {
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,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/components/LoginScreen/login_splash_page.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -25,8 +26,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,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/components/LoginScreen/login_user_selection_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -66,8 +67,8 @@ class _LoginUserSelectionPageState extends State<LoginUserSelectionPage> {
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,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/components/MusicScreen/music_screen_drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/screens/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
),
Expand Down
16 changes: 16 additions & 0 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 8b007b2

Please sign in to comment.