redesign app phase 1

lib/components/AddDownloadLocationScreen/custom_download_location_form.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 
 import '../../models/finamp_models.dart';

lib/components/AddToPlaylistScreen/new_playlist_dialog.dart

@@ -1,6 +1,6 @@
 import 'package:finamp/models/jellyfin_models.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/finamp_user_helper.dart';

lib/components/AlbumScreen/album_screen_content.dart

@@ -2,7 +2,7 @@ import 'package:finamp/components/AlbumScreen/sync_album_or_playlist_button.dart
 import 'package:finamp/services/downloads_helper.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:flutter_sticky_header/flutter_sticky_header.dart';
 import 'package:get_it/get_it.dart';
 

lib/components/AlbumScreen/album_screen_content_flexible_space_bar.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/AlbumScreen/delete_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
 

lib/components/AlbumScreen/download_dialog.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
 

lib/components/AlbumScreen/item_info.dart

@@ -1,6 +1,6 @@
 import 'package:finamp/components/artists_text_spans.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../models/jellyfin_models.dart';
 import '../print_duration.dart';

lib/components/AlbumScreen/playlist_name_edit_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../models/jellyfin_models.dart';
 import 'playlist_name_edit_dialog.dart';

lib/components/AlbumScreen/playlist_name_edit_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/AlbumScreen/song_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:mini_music_visualizer/mini_music_visualizer.dart';
 

lib/components/AlbumScreen/sync_album_or_playlist_button.dart

@@ -4,7 +4,7 @@ import 'package:finamp/services/sync_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 class SyncAlbumOrPlaylistButton extends StatefulWidget {
   const SyncAlbumOrPlaylistButton({

lib/components/ArtistScreen/artist_download_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
 

lib/components/ArtistScreen/artist_play_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 
 import '../../models/jellyfin_models.dart';

lib/components/ArtistScreen/artist_shuffle_button.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 
 import '../../models/jellyfin_models.dart';

lib/components/AudioServiceSettingsScreen/buffer_duration_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../services/finamp_settings_helper.dart';
 

lib/components/AudioServiceSettingsScreen/song_shuffle_item_count_editor.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../services/finamp_settings_helper.dart';
 

lib/components/AudioServiceSettingsScreen/stop_foreground_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/finamp_settings_helper.dart';

lib/components/DownloadsErrorScreen/download_error_list.dart

@@ -1,7 +1,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/downloads_helper.dart';

lib/components/DownloadsErrorScreen/download_error_list_tile.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/finamp_models.dart';

lib/components/DownloadsScreen/download_error_screen_button.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../screens/downloads_error_screen.dart';

lib/components/DownloadsScreen/download_missing_images_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/downloads_helper.dart';

lib/components/DownloadsScreen/downloaded_albums_list.dart

@@ -1,5 +1,5 @@
 import 'package:finamp/services/jellyfin_api_helper.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 

lib/components/DownloadsScreen/downloads_overview.dart

@@ -2,7 +2,7 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:finamp/services/downloads_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/download_update_stream.dart';

lib/components/DownloadsScreen/sync_downloaded_playlists.dart

@@ -4,7 +4,7 @@ import 'package:finamp/services/downloads_helper.dart';
 import 'package:finamp/services/jellyfin_api_helper.dart';
 import 'package:finamp/services/sync_helper.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';

lib/components/InteractionSettingsScreen/FastScrollSelector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/InteractionSettingsScreen/disable_gestures.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/InteractionSettingsScreen/swipe_insert_queue_next_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/finamp_settings_helper.dart';

lib/components/LanguageSelectionScreen/language_list.dart

@@ -2,7 +2,7 @@ import 'dart:collection';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:locale_names/locale_names.dart';
 
 import '../../services/locale_helper.dart';

lib/components/LayoutSettingsScreen/content_grid_view_cross_axis_count_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../services/finamp_settings_helper.dart';
 

lib/components/LayoutSettingsScreen/content_view_type_dropdown_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/LayoutSettingsScreen/hide_song_artists_if_same_as_album_artists_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/LayoutSettingsScreen/show_cover_as_player_background_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/LayoutSettingsScreen/show_text_on_grid_view_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/finamp_models.dart';

lib/components/LayoutSettingsScreen/theme_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/theme_mode_helper.dart';

lib/components/LogsScreen/copy_logs_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/finamp_logs_helper.dart';

lib/components/LogsScreen/log_tile.dart

@@ -2,7 +2,7 @@ import 'package:clipboard/clipboard.dart';
 import 'package:finamp/services/censored_log.dart';
 import 'package:finamp/services/contains_login.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:logging/logging.dart';
 
 import '../error_snackbar.dart';

lib/components/LogsScreen/share_logs_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/finamp_logs_helper.dart';

lib/components/MusicScreen/album_item.dart

@@ -2,7 +2,7 @@ import 'package:finamp/components/MusicScreen/album_item_list_tile.dart';
 import 'package:finamp/services/downloads_helper.dart';
 import 'package:finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/MusicScreen/album_item_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/MusicScreen/music_screen_drawer.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:url_launcher/url_launcher.dart';
 

lib/components/MusicScreen/offline_mode_switch_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/finamp_settings_helper.dart';

lib/components/MusicScreen/sort_by_menu_button.dart

@@ -1,6 +1,6 @@
 import 'package:finamp/models/finamp_models.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../models/jellyfin_models.dart';
 import '../../services/finamp_settings_helper.dart';

lib/components/MusicScreen/sort_order_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/PlayerScreen/add_to_playlist_button.dart

@@ -1,6 +1,6 @@
 import 'package:audio_service/audio_service.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';

lib/components/PlayerScreen/playback_mode.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:audio_service/audio_service.dart';
 import 'package:get_it/get_it.dart';
 

lib/components/PlayerScreen/player_buttons.dart

@@ -1,7 +1,7 @@
 import 'package:audio_service/audio_service.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 import '../../services/music_player_background_task.dart';
 
@@ -15,6 +15,8 @@ class PlayerButtons extends StatelessWidget {
       stream: audioHandler.playbackState,
       builder: (context, snapshot) {
         final PlaybackState? playbackState = snapshot.data;
+        final colorScheme = Theme.of(context).colorScheme;
+
         return Row(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -28,41 +30,39 @@ class PlayerButtons extends StatelessWidget {
                 playbackState == null
                     ? AudioServiceShuffleMode.none
                     : playbackState.shuffleMode,
-                Theme.of(context).colorScheme.secondary,
+                colorScheme.primary,
               ),
               onPressed: playbackState != null
                   ? () async {
                       if (playbackState.shuffleMode ==
                           AudioServiceShuffleMode.all) {
-                        await audioHandler
-                            .setShuffleMode(AudioServiceShuffleMode.none);
+                        await audioHandler.setShuffleMode(
+                          AudioServiceShuffleMode.none,
+                        );
                       } else {
-                        await audioHandler
-                            .setShuffleMode(AudioServiceShuffleMode.all);
+                        await audioHandler.setShuffleMode(
+                          AudioServiceShuffleMode.all,
+                        );
                       }
                     }
                   : null,
-              iconSize: 20,
+              iconSize: 22,
             ),
             IconButton(
               tooltip: AppLocalizations.of(context)!.skipToPrevious,
-              icon: const Icon(Icons.skip_previous),
+              icon: const Icon(Icons.skip_previous_rounded),
               onPressed: playbackState != null
                   ? () async => await audioHandler.skipToPrevious()
                   : null,
-              iconSize: 36,
+              iconSize: 38,
+              style: IconButton.styleFrom(
+                backgroundColor: colorScheme.surfaceVariant.withOpacity(0.44),
+              ),
             ),
-            SizedBox(
-              height: 56,
-              width: 56,
-              child: FloatingActionButton(
+            SizedBox.square(
+              dimension: 68,
+              child: IconButton.filled(
                 tooltip: AppLocalizations.of(context)!.togglePlayback,
-                // We set a heroTag because otherwise the play button on AlbumScreenContent will do hero widget stuff
-                heroTag: "PlayerScreenFAB",
-                backgroundColor: Theme.of(context).colorScheme.primary,
-                foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                splashColor:
-                    Theme.of(context).colorScheme.onPrimary.withOpacity(0.24),
                 onPressed: playbackState != null
                     ? () async {
                         if (playbackState.playing) {
@@ -72,21 +72,25 @@ class PlayerButtons extends StatelessWidget {
                         }
                       }
                     : null,
-                child: Icon(
+                icon: Icon(
                   playbackState == null || playbackState.playing
                       ? Icons.pause
                       : Icons.play_arrow,
-                  size: 36,
+                  size: 42,
                 ),
               ),
             ),
             IconButton(
-                tooltip: AppLocalizations.of(context)!.skipToNext,
-                icon: const Icon(Icons.skip_next),
-                onPressed: playbackState != null
-                    ? () async => audioHandler.skipToNext()
-                    : null,
-                iconSize: 36),
+              tooltip: AppLocalizations.of(context)!.skipToNext,
+              icon: const Icon(Icons.skip_next_rounded),
+              onPressed: playbackState != null
+                  ? () async => audioHandler.skipToNext()
+                  : null,
+              iconSize: 38,
+              style: IconButton.styleFrom(
+                backgroundColor: colorScheme.surfaceVariant.withOpacity(0.44),
+              ),
+            ),
             IconButton(
               tooltip: playbackState?.repeatMode == AudioServiceRepeatMode.all
                   ? AppLocalizations.of(context)!.loopModeAllTooltip
@@ -97,26 +101,29 @@ class PlayerButtons extends StatelessWidget {
                 playbackState == null
                     ? AudioServiceRepeatMode.none
                     : playbackState.repeatMode,
-                Theme.of(context).colorScheme.secondary,
+                colorScheme.primary,
               ),
               onPressed: playbackState != null
                   ? () async {
                       // Cyles from none -> all -> one
                       if (playbackState.repeatMode ==
                           AudioServiceRepeatMode.none) {
-                        await audioHandler
-                            .setRepeatMode(AudioServiceRepeatMode.all);
+                        await audioHandler.setRepeatMode(
+                          AudioServiceRepeatMode.all,
+                        );
                       } else if (playbackState.repeatMode ==
                           AudioServiceRepeatMode.all) {
-                        await audioHandler
-                            .setRepeatMode(AudioServiceRepeatMode.one);
+                        await audioHandler.setRepeatMode(
+                          AudioServiceRepeatMode.one,
+                        );
                       } else {
-                        await audioHandler
-                            .setRepeatMode(AudioServiceRepeatMode.none);
+                        await audioHandler.setRepeatMode(
+                          AudioServiceRepeatMode.none,
+                        );
                       }
                     }
                   : null,
-              iconSize: 20,
+              iconSize: 22,
             ),
           ],
         );
@@ -125,7 +132,9 @@ class PlayerButtons extends StatelessWidget {
   }
 
   Widget _getRepeatingIcon(
-      AudioServiceRepeatMode repeatMode, Color iconColour) {
+    AudioServiceRepeatMode repeatMode,
+    Color iconColour,
+  ) {
     if (repeatMode == AudioServiceRepeatMode.all) {
       return Icon(Icons.repeat, color: iconColour);
     } else if (repeatMode == AudioServiceRepeatMode.one) {
@@ -136,7 +145,9 @@ class PlayerButtons extends StatelessWidget {
   }
 
   Icon _getShufflingIcon(
-      AudioServiceShuffleMode shuffleMode, Color iconColour) {
+    AudioServiceShuffleMode shuffleMode,
+    Color iconColour,
+  ) {
     if (shuffleMode == AudioServiceShuffleMode.all) {
       return Icon(Icons.shuffle, color: iconColour);
     } else {

lib/components/PlayerScreen/queue_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'queue_list.dart';
 
 class QueueButton extends StatelessWidget {

lib/components/PlayerScreen/queue_list.dart

@@ -1,6 +1,6 @@
 import 'package:audio_service/audio_service.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:rxdart/rxdart.dart';
 

lib/components/PlayerScreen/sleep_timer_button.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/music_player_background_task.dart';

lib/components/PlayerScreen/sleep_timer_cancel_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/music_player_background_task.dart';

lib/components/PlayerScreen/sleep_timer_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../services/music_player_background_task.dart';

lib/components/PlayerScreen/song_name.dart

@@ -4,7 +4,7 @@ import 'package:finamp/screens/artist_screen.dart';
 import 'package:finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../screens/album_screen.dart';

lib/components/SettingsScreen/logout_list_tile.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../screens/splash_screen.dart';

lib/components/TranscodingSettingsScreen/bitrate_selector.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/finamp_settings_helper.dart';

lib/components/TranscodingSettingsScreen/transcode_switch.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:hive/hive.dart';
 
 import '../../services/finamp_settings_helper.dart';

lib/components/UserSelector/private_user_sign_in.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../screens/logs_screen.dart';

lib/components/ViewSelector/no_music_libraries_message.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 class NoMusicLibrariesMessage extends StatelessWidget {
   const NoMusicLibrariesMessage({

lib/components/error_snackbar.dart

@@ -1,6 +1,6 @@
 import 'package:chopper/chopper.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 
 /// Snackbar with error icon for displaying errors
 ScaffoldFeatureController<SnackBar, SnackBarClosedReason> errorSnackbar(

lib/components/favourite_button.dart

@@ -3,7 +3,7 @@ import 'package:finamp/models/jellyfin_models.dart';
 import 'package:finamp/services/jellyfin_api_helper.dart';
 import 'package:finamp/services/music_player_background_task.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:finamp/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 
 class FavoriteButton extends StatefulWidget {

lib/components/now_playing_bar.dart

@@ -13,15 +13,16 @@ import '../screens/player_screen.dart';
 import 'PlayerScreen/progress_slider.dart';
 
 class NowPlayingBar extends StatelessWidget {
-  const NowPlayingBar({
-    Key? key,
-  }) : super(key: key);
+  const NowPlayingBar({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    // BottomNavBar's default elevation is 8 (https://api.flutter.dev/flutter/material/BottomNavigationBar/elevation.html)
-    const elevation = 8.0;
-    final color = Theme.of(context).bottomNavigationBarTheme.backgroundColor;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final barColor = Color.alphaBlend(
+      colorScheme.primary.withOpacity(0.08),
+      colorScheme.surface,
+    );
 
     final audioHandler = GetIt.instance<MusicPlayerBackgroundTask>();
 
@@ -41,106 +42,151 @@ class NowPlayingBar extends StatelessWidget {
             // the now playing bar.
             if (snapshot.data!.mediaItem != null) {
               final item = BaseItemDto.fromJson(
-                  snapshot.data!.mediaItem!.extras!["itemJson"]);
+                snapshot.data!.mediaItem!.extras!["itemJson"],
+              );
 
-              return Material(
-                color: color,
-                elevation: elevation,
-                child: SafeArea(
-                  child: SizedBox(
-                    width: MediaQuery.of(context).size.width,
-                    child: Stack(
-                      children: [
-                        const ProgressSlider(
-                          allowSeeking: false,
-                          showBuffer: false,
-                          showDuration: false,
-                          showPlaceholder: false,
-                        ),
-                        Dismissible(
-                          key: const Key("NowPlayingBar"),
-                          direction: FinampSettingsHelper.finampSettings.disableGesture ? DismissDirection.none : DismissDirection.horizontal,
-                          confirmDismiss: (direction) async {
-                            if (direction == DismissDirection.endToStart) {
-                              audioHandler.skipToNext();
-                            } else {
-                              audioHandler.skipToPrevious();
-                            }
-                            return false;
-                          },
-                          background: const Padding(
-                            padding: EdgeInsets.symmetric(horizontal: 16.0),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                AspectRatio(
-                                  aspectRatio: 1,
-                                  child: FittedBox(
-                                    fit: BoxFit.fitHeight,
-                                    child: Padding(
-                                      padding:
-                                          EdgeInsets.symmetric(vertical: 8.0),
-                                      child: Icon(Icons.skip_previous),
+              return SafeArea(
+                minimum: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    color: barColor,
+                    borderRadius: BorderRadius.circular(28),
+                    border: Border.all(
+                      color: colorScheme.outlineVariant.withOpacity(0.45),
+                    ),
+                    boxShadow: [
+                      BoxShadow(
+                        color: colorScheme.shadow.withOpacity(0.16),
+                        blurRadius: 24,
+                        offset: const Offset(0, 10),
+                      ),
+                    ],
+                  ),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(28),
+                    child: Material(
+                      color: Colors.transparent,
+                      child: SizedBox(
+                        width: MediaQuery.of(context).size.width,
+                        height: 78,
+                        child: Stack(
+                          children: [
+                            Align(
+                              alignment: Alignment.topCenter,
+                              child: Opacity(
+                                opacity: 0.9,
+                                child: const ProgressSlider(
+                                  allowSeeking: false,
+                                  showBuffer: false,
+                                  showDuration: false,
+                                  showPlaceholder: false,
+                                ),
+                              ),
+                            ),
+                            Dismissible(
+                              key: const Key("NowPlayingBar"),
+                              direction:
+                                  FinampSettingsHelper
+                                      .finampSettings
+                                      .disableGesture
+                                  ? DismissDirection.none
+                                  : DismissDirection.horizontal,
+                              confirmDismiss: (direction) async {
+                                if (direction == DismissDirection.endToStart) {
+                                  audioHandler.skipToNext();
+                                } else {
+                                  audioHandler.skipToPrevious();
+                                }
+                                return false;
+                              },
+                              background: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 20,
+                                ),
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Icon(
+                                      Icons.skip_previous,
+                                      color: colorScheme.primary,
                                     ),
+                                    Icon(
+                                      Icons.skip_next,
+                                      color: colorScheme.primary,
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              child: ListTile(
+                                contentPadding: const EdgeInsets.fromLTRB(
+                                  12,
+                                  8,
+                                  8,
+                                  8,
+                                ),
+                                minLeadingWidth: 0,
+                                onTap: () => Navigator.of(
+                                  context,
+                                ).pushNamed(PlayerScreen.routeName),
+                                leading: SizedBox(
+                                  height: 54,
+                                  width: 54,
+                                  child: ClipRRect(
+                                    borderRadius: BorderRadius.circular(16),
+                                    child: AlbumImage(item: item),
                                   ),
                                 ),
-                                AspectRatio(
-                                  aspectRatio: 1,
-                                  child: FittedBox(
-                                    fit: BoxFit.fitHeight,
-                                    child: Padding(
-                                      padding:
-                                          EdgeInsets.symmetric(vertical: 8.0),
-                                      child: Icon(Icons.skip_next),
-                                    ),
+                                title: Text(
+                                  snapshot.data!.mediaItem!.title,
+                                  softWrap: false,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.fade,
+                                  style: theme.textTheme.titleMedium?.copyWith(
+                                    fontWeight: FontWeight.w700,
                                   ),
                                 ),
-                              ],
-                            ),
-                          ),
-                          child: ListTile(
-                            onTap: () => Navigator.of(context)
-                                .pushNamed(PlayerScreen.routeName),
-                            leading: AlbumImage(item: item),
-                            title: Text(
-                              snapshot.data!.mediaItem!.title,
-                              softWrap: false,
-                              maxLines: 1,
-                              overflow: TextOverflow.fade,
-                            ),
-                            subtitle: Text(
-                              processArtist(
-                                  snapshot.data!.mediaItem!.artist, context),
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                            trailing: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                if (snapshot
-                                        .data!.playbackState.processingState !=
-                                    AudioProcessingState.idle)
-                                  IconButton(
-                                    // We have a key here because otherwise the
-                                    // InkWell moves over to the play/pause button
-                                    key: const ValueKey("StopButton"),
-                                    icon: const Icon(Icons.stop),
-                                    onPressed: () => audioHandler.stop(),
+                                subtitle: Text(
+                                  processArtist(
+                                    snapshot.data!.mediaItem!.artist,
+                                    context,
                                   ),
-                                playing
-                                    ? IconButton(
-                                        icon: const Icon(Icons.pause),
-                                        onPressed: () => audioHandler.pause(),
-                                      )
-                                    : IconButton(
-                                        icon: const Icon(Icons.play_arrow),
-                                        onPressed: () => audioHandler.play(),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: theme.textTheme.bodySmall?.copyWith(
+                                    color: colorScheme.onSurfaceVariant,
+                                  ),
+                                ),
+                                trailing: Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    if (snapshot
+                                            .data!
+                                            .playbackState
+                                            .processingState !=
+                                        AudioProcessingState.idle)
+                                      IconButton(
+                                        key: const ValueKey("StopButton"),
+                                        icon: const Icon(Icons.stop_rounded),
+                                        onPressed: () => audioHandler.stop(),
                                       ),
-                              ],
+                                    IconButton.filled(
+                                      icon: Icon(
+                                        playing
+                                            ? Icons.pause_rounded
+                                            : Icons.play_arrow_rounded,
+                                      ),
+                                      onPressed: playing
+                                          ? () => audioHandler.pause()
+                                          : () => audioHandler.play(),
+                                    ),
+                                  ],
+                                ),
+                              ),
                             ),
-                          ),
+                          ],
                         ),
-                      ],
+                      ),
                     ),
                   ),
                 ),
@@ -155,4 +201,4 @@ class NowPlayingBar extends StatelessWidget {
       ),
     );
   }
-}
+}