diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart
index 2c8e0a0..d261ca3 100644
--- a/lib/generated/intl/messages_all.dart
+++ b/lib/generated/intl/messages_all.dart
@@ -25,17 +25,17 @@ import 'messages_ru.dart' as messages_ru;
 import 'messages_tr.dart' as messages_tr;
 import 'messages_zh-Hans.dart' as messages_zh_hans;
 
-typedef Future<dynamic> LibraryLoader();
+typedef LibraryLoader = Future<dynamic> Function();
 Map<String, LibraryLoader> _deferredLibraries = {
-  'el': () => new Future.value(null),
-  'en': () => new Future.value(null),
-  'es': () => new Future.value(null),
-  'fr': () => new Future.value(null),
-  'it': () => new Future.value(null),
-  'pt': () => new Future.value(null),
-  'ru': () => new Future.value(null),
-  'tr': () => new Future.value(null),
-  'zh_Hans': () => new Future.value(null),
+  'el': () => Future.value(null),
+  'en': () => Future.value(null),
+  'es': () => Future.value(null),
+  'fr': () => Future.value(null),
+  'it': () => Future.value(null),
+  'pt': () => Future.value(null),
+  'ru': () => Future.value(null),
+  'tr': () => Future.value(null),
+  'zh_Hans': () => Future.value(null),
 };
 
 MessageLookupByLibrary? _findExact(String localeName) {
@@ -69,13 +69,13 @@ Future<bool> initializeMessages(String localeName) async {
       localeName, (locale) => _deferredLibraries[locale] != null,
       onFailure: (_) => null);
   if (availableLocale == null) {
-    return new Future.value(false);
+    return Future.value(false);
   }
   var lib = _deferredLibraries[availableLocale];
-  await (lib == null ? new Future.value(false) : lib());
-  initializeInternalMessageLookup(() => new CompositeMessageLookup());
+  await (lib == null ? Future.value(false) : lib());
+  initializeInternalMessageLookup(() => CompositeMessageLookup());
   messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
-  return new Future.value(true);
+  return Future.value(true);
 }
 
 bool _messagesExistFor(String locale) {
diff --git a/lib/generated/intl/messages_el.dart b/lib/generated/intl/messages_el.dart
index e9dfe27..89ad283 100644
--- a/lib/generated/intl/messages_el.dart
+++ b/lib/generated/intl/messages_el.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'el';
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 8fa8c8f..16ab085 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart
index bb12442..c7780c6 100644
--- a/lib/generated/intl/messages_es.dart
+++ b/lib/generated/intl/messages_es.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'es';
diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart
index 616bf32..06505d0 100644
--- a/lib/generated/intl/messages_fr.dart
+++ b/lib/generated/intl/messages_fr.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'fr';
diff --git a/lib/generated/intl/messages_it.dart b/lib/generated/intl/messages_it.dart
index c4f0739..1826a0c 100644
--- a/lib/generated/intl/messages_it.dart
+++ b/lib/generated/intl/messages_it.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'it';
diff --git a/lib/generated/intl/messages_pt.dart b/lib/generated/intl/messages_pt.dart
index 1591ad8..a5b6d0a 100644
--- a/lib/generated/intl/messages_pt.dart
+++ b/lib/generated/intl/messages_pt.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pt';
diff --git a/lib/generated/intl/messages_ru.dart b/lib/generated/intl/messages_ru.dart
index 62b750c..e7c56ea 100644
--- a/lib/generated/intl/messages_ru.dart
+++ b/lib/generated/intl/messages_ru.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ru';
diff --git a/lib/generated/intl/messages_tr.dart b/lib/generated/intl/messages_tr.dart
index 98fe831..a2ea47c 100644
--- a/lib/generated/intl/messages_tr.dart
+++ b/lib/generated/intl/messages_tr.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'tr';
diff --git a/lib/generated/intl/messages_zh-Hans.dart b/lib/generated/intl/messages_zh-Hans.dart
index edfa328..1e444d9 100644
--- a/lib/generated/intl/messages_zh-Hans.dart
+++ b/lib/generated/intl/messages_zh-Hans.dart
@@ -13,9 +13,10 @@
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 
-final messages = new MessageLookup();
+final messages = MessageLookup();
 
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
+typedef MessageIfAbsent = String Function(
+    String messageStr, List<dynamic> args);
 
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'zh_Hans';
diff --git a/lib/home/download_list.dart b/lib/home/download_list.dart
index efd8280..4ef3bec 100644
--- a/lib/home/download_list.dart
+++ b/lib/home/download_list.dart
@@ -54,12 +54,12 @@ Widget _downloadButton(EpisodeTask task, BuildContext context) {
     case 6:
       return Row(mainAxisSize: MainAxisSize.min, children: [
         IconButton(
-            splashRadius: 20,
+          splashRadius: 20,
           icon: Icon(Icons.play_circle_filled),
           onPressed: () => downloader.resumeTask(task.episode!),
         ),
         IconButton(
-            splashRadius: 20,
+          splashRadius: 20,
           icon: Icon(Icons.close),
           onPressed: () => downloader.delTask(task.episode!),
         ),
diff --git a/lib/local_storage/sqflite_localpodcast.dart b/lib/local_storage/sqflite_localpodcast.dart
index a782248..9785d2d 100644
--- a/lib/local_storage/sqflite_localpodcast.dart
+++ b/lib/local_storage/sqflite_localpodcast.dart
@@ -15,6 +15,7 @@ import '../type/podcastlocal.dart';
 import '../type/sub_history.dart';
 
 enum Filter { downloaded, liked, search, all }
+
 const localFolderId = "46e48103-06c7-4fe1-a0b1-68aa7205b7f0";
 
 class DBHelper {
diff --git a/lib/playlists/playlist_home.dart b/lib/playlists/playlist_home.dart
index 055dc74..287734c 100644
--- a/lib/playlists/playlist_home.dart
+++ b/lib/playlists/playlist_home.dart
@@ -964,7 +964,7 @@ class __NewPlaylistState extends State<_NewPlaylist> {
       final image = img.decodeImage(metadata.albumArt!)!;
       final thumbnail = img.copyResize(image, width: 300);
       var uuid = Uuid().v4();
-      File("${dir.path}/$uuid.png")..writeAsBytesSync(img.encodePng(thumbnail));
+      File("${dir.path}/$uuid.png").writeAsBytesSync(img.encodePng(thumbnail));
       imagePath = "${dir.path}/$uuid.png";
       primaryColor = await _getColor(File(imagePath));
     }
diff --git a/lib/podcasts/podcast_settings.dart b/lib/podcasts/podcast_settings.dart
index 4611c82..d8557fb 100644
--- a/lib/podcasts/podcast_settings.dart
+++ b/lib/podcasts/podcast_settings.dart
@@ -404,7 +404,7 @@ class _PodcastSettingState extends State<PodcastSetting> {
             ));
         var image = img.decodeImage(imageResponse.data!)!;
         thumbnail = img.copyResize(image, width: 300);
-        File(filePath)..writeAsBytesSync(img.encodePng(thumbnail));
+        File(filePath).writeAsBytesSync(img.encodePng(thumbnail));
         _dbHelper.updatePodcastImage(
             id: widget.podcastLocal!.id, filePath: filePath);
         print('saved image');
diff --git a/lib/service/search_api.dart b/lib/service/search_api.dart
index 4015ec5..ef3f272 100644
--- a/lib/service/search_api.dart
+++ b/lib/service/search_api.dart
@@ -28,7 +28,7 @@ class ListenNotesSearch {
 
   Future<SearchPodcast<dynamic>?> searchPodcasts(
       {String? searchText, int? nextOffset}) async {
-    if(!_validApi) return null;
+    if (!_validApi) return null;
     var url = "${_baseUrl}search?q="
         "${Uri.encodeComponent(searchText!)}${"&sort_by_date=0&type=podcast&offset=$nextOffset"}";
     var response = await _dio.get(url,
@@ -37,28 +37,29 @@ class ListenNotesSearch {
           'Accept': "application/json"
         }));
     Map searchResultMap = jsonDecode(response.toString());
-    var searchResult = SearchPodcast.fromJson(searchResultMap as Map<String, dynamic>);
+    var searchResult =
+        SearchPodcast.fromJson(searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 
   Future<SearchEpisodes<dynamic>?> fetchEpisode(
       {String? id, int? nextEpisodeDate}) async {
-    if(!_validApi) return null;
-    var url =
-        "${_baseUrl}podcasts/$id?next_episode_pub_date=$nextEpisodeDate";
+    if (!_validApi) return null;
+    var url = "${_baseUrl}podcasts/$id?next_episode_pub_date=$nextEpisodeDate";
     var response = await _dio.get(url,
         options: Options(headers: {
           'X-ListenAPI-Key': "$_apiKey",
           'Accept': "application/json"
         }));
     Map searchResultMap = jsonDecode(response.toString());
-    var searchResult = SearchEpisodes.fromJson(searchResultMap as Map<String, dynamic>);
+    var searchResult =
+        SearchEpisodes.fromJson(searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 
   Future<SearchTopPodcast<dynamic>?> fetchBestPodcast(
       {String? genre, int? page, String region = 'us'}) async {
-    if(!_validApi) return null;
+    if (!_validApi) return null;
     var url =
         "${_baseUrl}best_podcasts?genre_id=$genre&page=$page&region=$region";
     var response = await Dio().get(url,
@@ -67,7 +68,8 @@ class ListenNotesSearch {
           'Accept': "application/json"
         }));
     Map searchResultMap = jsonDecode(response.toString());
-    var searchResult = SearchTopPodcast.fromJson(searchResultMap as Map<String, dynamic>);
+    var searchResult =
+        SearchTopPodcast.fromJson(searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 }
@@ -81,7 +83,8 @@ class ItunesSearch {
         .get(url, options: Options(headers: {'Accept': "application/json"}));
     print(response.toString());
     Map searchResultMap = jsonDecode(response.toString());
-    final searchResult = ItunesSearchResult.fromJson(searchResultMap as Map<String, dynamic>);
+    final searchResult =
+        ItunesSearchResult.fromJson(searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 }
@@ -121,7 +124,8 @@ class PodcastsIndexSearch {
     final headers = _initSearch();
     final response = await _dio.get(url, options: Options(headers: headers));
     Map searchResultMap = jsonDecode(response.toString());
-    final searchResult = PodcastIndexSearchResult.fromJson(searchResultMap as Map<String, dynamic>);
+    final searchResult = PodcastIndexSearchResult.fromJson(
+        searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 
@@ -130,7 +134,8 @@ class PodcastsIndexSearch {
     final headers = _initSearch();
     final response = await _dio.get(url, options: Options(headers: headers));
     Map searchResultMap = jsonDecode(response.toString());
-    final searchResult = IndexEpisodeResult.fromJson(searchResultMap as Map<String, dynamic>);
+    final searchResult =
+        IndexEpisodeResult.fromJson(searchResultMap as Map<String, dynamic>);
     return searchResult;
   }
 }
diff --git a/lib/state/podcast_group.dart b/lib/state/podcast_group.dart
index 592caaf..d85e47c 100644
--- a/lib/state/podcast_group.dart
+++ b/lib/state/podcast_group.dart
@@ -660,7 +660,7 @@ Future<void> subIsolateEntryPoint(SendPort sendPort) async {
         }
         var uuid = Uuid().v4();
         File("${dir.path}/$uuid.png")
-          ..writeAsBytesSync(img.encodePng(thumbnail!));
+            .writeAsBytesSync(img.encodePng(thumbnail!));
         var imagePath = "${dir.path}/$uuid.png";
         var primaryColor = await _getColor(File(imagePath));
         var author = p.itunes!.author ?? p.author ?? '';
diff --git a/lib/state/search_state.dart b/lib/state/search_state.dart
index 2d0d452..e7bfb9d 100644
--- a/lib/state/search_state.dart
+++ b/lib/state/search_state.dart
@@ -22,7 +22,8 @@ class SearchState extends ChangeNotifier {
     notifyListeners();
   }
 
-  bool isSubscribed(OnlinePodcast? podcast) => _subscribedList.contains(podcast);
+  bool isSubscribed(OnlinePodcast? podcast) =>
+      _subscribedList.contains(podcast);
 
   void clearSelect() {
     _selectedPodcast = null;
@@ -33,7 +34,7 @@ class SearchState extends ChangeNotifier {
     _subscribedList.clear();
   }
 
-  void clearGenre(){
+  void clearGenre() {
     _genre = null;
     notifyListeners();
   }
diff --git a/lib/type/chapter.dart b/lib/type/chapter.dart
index 5df7826..cdd23fc 100644
--- a/lib/type/chapter.dart
+++ b/lib/type/chapter.dart
@@ -38,4 +38,4 @@ class Chapters {
     data['url'] = url;
     return data;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/type/episodebrief.dart b/lib/type/episodebrief.dart
index 0a4d8d7..0ae2b1e 100644
--- a/lib/type/episodebrief.dart
+++ b/lib/type/episodebrief.dart
@@ -56,7 +56,8 @@ class EpisodeBrief extends Equatable {
         artist: feedTitle,
         album: feedTitle,
         duration: Duration.zero,
-        artUri: Uri.parse(imagePath == '' ? episodeImage! : 'file://$imagePath'),
+        artUri:
+            Uri.parse(imagePath == '' ? episodeImage! : 'file://$imagePath'),
         extras: {
           'skipSecondsStart': skipSecondsStart,
           'skipSecondsEnd': skipSecondsEnd
@@ -69,8 +70,9 @@ class EpisodeBrief extends Equatable {
         : File(episodeImage!).existsSync()
             ? FileImage(File(episodeImage!))
             : ((episodeImage != '')
-                ? CachedNetworkImageProvider(episodeImage!)
-                : AssetImage('assets/avatar_backup.png')) as ImageProvider<Object>;
+                    ? CachedNetworkImageProvider(episodeImage!)
+                    : AssetImage('assets/avatar_backup.png'))
+                as ImageProvider<Object>;
   }
 
   Color backgroudColor(BuildContext context) {
@@ -79,7 +81,7 @@ class EpisodeBrief extends Equatable {
         ? primaryColor!.colorizedark()
         : primaryColor!.colorizeLight();
   }
-  
+
   Color cardColor(BuildContext context) {
     final schema = ColorScheme.fromSeed(
       seedColor: primaryColor!.colorizedark(),
diff --git a/lib/util/cache_manager.dart b/lib/util/cache_manager.dart
index 0dc39e1..3fa3114 100644
--- a/lib/util/cache_manager.dart
+++ b/lib/util/cache_manager.dart
@@ -14,7 +14,9 @@ class CustomCacheManager extends CacheManager with ImageCacheManager {
 
   @override
   Future<FileInfo> downloadFile(String url,
-      {String? key, Map<String, String>? authHeaders, bool force = false}) async {
+      {String? key,
+      Map<String, String>? authHeaders,
+      bool force = false}) async {
     var file;
     try {
       file = await super
@@ -41,9 +43,7 @@ class CustomCacheManager extends CacheManager with ImageCacheManager {
           withProgress: withProgress,
           maxHeight: maxHeight,
           maxWidth: maxWidth);
-    } catch (e) {
-      
-    }
+    } catch (e) {}
   }
 
   CustomCacheManager._() : super(Config(key));
diff --git a/lib/util/hide_player_route.dart b/lib/util/hide_player_route.dart
index 4876c8d..c759e09 100644
--- a/lib/util/hide_player_route.dart
+++ b/lib/util/hide_player_route.dart
@@ -7,7 +7,8 @@ import '../state/audio_state.dart';
 import '../util/extension_helper.dart';
 
 class HidePlayerRoute extends ModalRoute<void> {
-  HidePlayerRoute(this.openPage, this.transitionPage, {required Duration duration})
+  HidePlayerRoute(this.openPage, this.transitionPage,
+      {required Duration duration})
       : transitionDuration = duration;
   final openPage;
   final transitionPage;
diff --git a/lib/util/pageroute.dart b/lib/util/pageroute.dart
index 6ce1f67..5c34c84 100644
--- a/lib/util/pageroute.dart
+++ b/lib/util/pageroute.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 //Slide Transition
 class SlideLeftRoute extends PageRouteBuilder {
-  @override 
+  @override
   Duration get transitionDuration => Duration(milliseconds: 300);
   final Widget? page;
   SlideLeftRoute({this.page})
diff --git a/lib/widgets/general_dialog.dart b/lib/widgets/general_dialog.dart
index c6d9400..9c75322 100644
--- a/lib/widgets/general_dialog.dart
+++ b/lib/widgets/general_dialog.dart
@@ -31,7 +31,8 @@ Future generalDialog(BuildContext context,
       ),
     );
 
-Future generalSheet(BuildContext context, {Widget? child, String? title}) async =>
+Future generalSheet(BuildContext context,
+        {Widget? child, String? title}) async =>
     await showModalBottomSheet(
       useRootNavigator: true,
       isScrollControlled: true,