diff --git a/app/lib/account.dart b/app/lib/account.dart
index f313cf6c..06128dd2 100644
--- a/app/lib/account.dart
+++ b/app/lib/account.dart
@@ -119,7 +119,7 @@ class Account with EquatableMixin {
   /// versioning of this class, use to upgrade old persisted accounts
   static const version = 2;
 
-  static final _log = _$logAccount;
+  static final _log = _$AccountNpLog.log;
 }
 
 extension AccountExtension on Account {
diff --git a/app/lib/account.g.dart b/app/lib/account.g.dart
index fa02bdc0..2851a133 100644
--- a/app/lib/account.g.dart
+++ b/app/lib/account.g.dart
@@ -6,20 +6,18 @@ part of 'account.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAccount = Logger("account.Account");
-
 extension _$AccountNpLog on Account {
   // ignore: unused_element
-  Logger get _log => _$logAccount;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAccountUpgraderV1 = Logger("account.AccountUpgraderV1");
+  static final log = Logger("account.Account");
+}
 
 extension _$AccountUpgraderV1NpLog on AccountUpgraderV1 {
   // ignore: unused_element
-  Logger get _log => _$logAccountUpgraderV1;
+  Logger get _log => log;
+
+  static final log = Logger("account.AccountUpgraderV1");
 }
 
 // **************************************************************************
diff --git a/app/lib/api/api.g.dart b/app/lib/api/api.g.dart
index 2361523b..d5bc6772 100644
--- a/app/lib/api/api.g.dart
+++ b/app/lib/api/api.g.dart
@@ -6,90 +6,75 @@ part of 'api.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logApi = Logger("api.api.Api");
-
 extension _$ApiNpLog on Api {
   // ignore: unused_element
-  Logger get _log => _$logApi;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiFiles = Logger("api.api.ApiFiles");
+  static final log = Logger("api.api.Api");
+}
 
 extension _$ApiFilesNpLog on ApiFiles {
   // ignore: unused_element
-  Logger get _log => _$logApiFiles;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsDavDirect = Logger("api.api.ApiOcsDavDirect");
+  static final log = Logger("api.api.ApiFiles");
+}
 
 extension _$ApiOcsDavDirectNpLog on ApiOcsDavDirect {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsDavDirect;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsFacerecognitionPersons =
-    Logger("api.api.ApiOcsFacerecognitionPersons");
+  static final log = Logger("api.api.ApiOcsDavDirect");
+}
 
 extension _$ApiOcsFacerecognitionPersonsNpLog on ApiOcsFacerecognitionPersons {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFacerecognitionPersons;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsFacerecognitionPersonFaces =
-    Logger("api.api.ApiOcsFacerecognitionPersonFaces");
+  static final log = Logger("api.api.ApiOcsFacerecognitionPersons");
+}
 
 extension _$ApiOcsFacerecognitionPersonFacesNpLog
     on ApiOcsFacerecognitionPersonFaces {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFacerecognitionPersonFaces;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsFilesSharingShares =
-    Logger("api.api.ApiOcsFilesSharingShares");
+  static final log = Logger("api.api.ApiOcsFacerecognitionPersonFaces");
+}
 
 extension _$ApiOcsFilesSharingSharesNpLog on ApiOcsFilesSharingShares {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingShares;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsFilesSharingShare = Logger("api.api.ApiOcsFilesSharingShare");
+  static final log = Logger("api.api.ApiOcsFilesSharingShares");
+}
 
 extension _$ApiOcsFilesSharingShareNpLog on ApiOcsFilesSharingShare {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingShare;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiOcsFilesSharingSharees =
-    Logger("api.api.ApiOcsFilesSharingSharees");
+  static final log = Logger("api.api.ApiOcsFilesSharingShare");
+}
 
 extension _$ApiOcsFilesSharingShareesNpLog on ApiOcsFilesSharingSharees {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingSharees;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiSystemtags = Logger("api.api.ApiSystemtags");
+  static final log = Logger("api.api.ApiOcsFilesSharingSharees");
+}
 
 extension _$ApiSystemtagsNpLog on ApiSystemtags {
   // ignore: unused_element
-  Logger get _log => _$logApiSystemtags;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logApiSystemtagsRelationsFiles =
-    Logger("api.api.ApiSystemtagsRelationsFiles");
+  static final log = Logger("api.api.ApiSystemtags");
+}
 
 extension _$ApiSystemtagsRelationsFilesNpLog on ApiSystemtagsRelationsFiles {
   // ignore: unused_element
-  Logger get _log => _$logApiSystemtagsRelationsFiles;
+  Logger get _log => log;
+
+  static final log = Logger("api.api.ApiSystemtagsRelationsFiles");
 }
 
 // **************************************************************************
diff --git a/app/lib/app_localizations.dart b/app/lib/app_localizations.dart
index ac129342..f04db145 100644
--- a/app/lib/app_localizations.dart
+++ b/app/lib/app_localizations.dart
@@ -24,5 +24,5 @@ class L10n {
     }
   }
 
-  static final _log = _$logL10n;
+  static final _log = _$L10nNpLog.log;
 }
diff --git a/app/lib/app_localizations.g.dart b/app/lib/app_localizations.g.dart
index 6f3670cf..d764614c 100644
--- a/app/lib/app_localizations.g.dart
+++ b/app/lib/app_localizations.g.dart
@@ -6,10 +6,9 @@ part of 'app_localizations.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logL10n = Logger("app_localizations.L10n");
-
 extension _$L10nNpLog on L10n {
   // ignore: unused_element
-  Logger get _log => _$logL10n;
+  Logger get _log => log;
+
+  static final log = Logger("app_localizations.L10n");
 }
diff --git a/app/lib/bloc/app_password_exchange.g.dart b/app/lib/bloc/app_password_exchange.g.dart
index fc484b20..9bca6700 100644
--- a/app/lib/bloc/app_password_exchange.g.dart
+++ b/app/lib/bloc/app_password_exchange.g.dart
@@ -6,13 +6,12 @@ part of 'app_password_exchange.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAppPasswordExchangeBloc =
-    Logger("bloc.app_password_exchange.AppPasswordExchangeBloc");
-
 extension _$AppPasswordExchangeBlocNpLog on AppPasswordExchangeBloc {
   // ignore: unused_element
-  Logger get _log => _$logAppPasswordExchangeBloc;
+  Logger get _log => log;
+
+  static final log =
+      Logger("bloc.app_password_exchange.AppPasswordExchangeBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/home_search_suggestion.g.dart b/app/lib/bloc/home_search_suggestion.g.dart
index 581c33f6..34582ebd 100644
--- a/app/lib/bloc/home_search_suggestion.g.dart
+++ b/app/lib/bloc/home_search_suggestion.g.dart
@@ -6,13 +6,12 @@ part of 'home_search_suggestion.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logHomeSearchSuggestionBloc =
-    Logger("bloc.home_search_suggestion.HomeSearchSuggestionBloc");
-
 extension _$HomeSearchSuggestionBlocNpLog on HomeSearchSuggestionBloc {
   // ignore: unused_element
-  Logger get _log => _$logHomeSearchSuggestionBloc;
+  Logger get _log => log;
+
+  static final log =
+      Logger("bloc.home_search_suggestion.HomeSearchSuggestionBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_album.dart b/app/lib/bloc/list_album.dart
index 0e9d20ea..7aa3c79c 100644
--- a/app/lib/bloc/list_album.dart
+++ b/app/lib/bloc/list_album.dart
@@ -334,5 +334,5 @@ class ListAlbumBloc extends Bloc<ListAlbumBlocEvent, ListAlbumBlocState> {
 
   late Throttler _refreshThrottler;
 
-  static final _log = _$logListAlbumBloc;
+  static final _log = _$ListAlbumBlocNpLog.log;
 }
diff --git a/app/lib/bloc/list_album.g.dart b/app/lib/bloc/list_album.g.dart
index 107dd72e..12ed89b0 100644
--- a/app/lib/bloc/list_album.g.dart
+++ b/app/lib/bloc/list_album.g.dart
@@ -6,12 +6,11 @@ part of 'list_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListAlbumBloc = Logger("bloc.list_album.ListAlbumBloc");
-
 extension _$ListAlbumBlocNpLog on ListAlbumBloc {
   // ignore: unused_element
-  Logger get _log => _$logListAlbumBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_album.ListAlbumBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_album_share_outlier.g.dart b/app/lib/bloc/list_album_share_outlier.g.dart
index b6c7f9b7..cd087b9c 100644
--- a/app/lib/bloc/list_album_share_outlier.g.dart
+++ b/app/lib/bloc/list_album_share_outlier.g.dart
@@ -6,13 +6,12 @@ part of 'list_album_share_outlier.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListAlbumShareOutlierBloc =
-    Logger("bloc.list_album_share_outlier.ListAlbumShareOutlierBloc");
-
 extension _$ListAlbumShareOutlierBlocNpLog on ListAlbumShareOutlierBloc {
   // ignore: unused_element
-  Logger get _log => _$logListAlbumShareOutlierBloc;
+  Logger get _log => log;
+
+  static final log =
+      Logger("bloc.list_album_share_outlier.ListAlbumShareOutlierBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_face_file.g.dart b/app/lib/bloc/list_face_file.g.dart
index 69f39dff..c4dc5109 100644
--- a/app/lib/bloc/list_face_file.g.dart
+++ b/app/lib/bloc/list_face_file.g.dart
@@ -6,12 +6,11 @@ part of 'list_face_file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListFaceFileBloc = Logger("bloc.list_face_file.ListFaceFileBloc");
-
 extension _$ListFaceFileBlocNpLog on ListFaceFileBloc {
   // ignore: unused_element
-  Logger get _log => _$logListFaceFileBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_face_file.ListFaceFileBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_importable_album.g.dart b/app/lib/bloc/list_importable_album.g.dart
index acb83265..b89b1200 100644
--- a/app/lib/bloc/list_importable_album.g.dart
+++ b/app/lib/bloc/list_importable_album.g.dart
@@ -6,13 +6,12 @@ part of 'list_importable_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListImportableAlbumBloc =
-    Logger("bloc.list_importable_album.ListImportableAlbumBloc");
-
 extension _$ListImportableAlbumBlocNpLog on ListImportableAlbumBloc {
   // ignore: unused_element
-  Logger get _log => _$logListImportableAlbumBloc;
+  Logger get _log => log;
+
+  static final log =
+      Logger("bloc.list_importable_album.ListImportableAlbumBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_location.g.dart b/app/lib/bloc/list_location.g.dart
index a0e79146..46e2dfbf 100644
--- a/app/lib/bloc/list_location.g.dart
+++ b/app/lib/bloc/list_location.g.dart
@@ -6,12 +6,11 @@ part of 'list_location.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListLocationBloc = Logger("bloc.list_location.ListLocationBloc");
-
 extension _$ListLocationBlocNpLog on ListLocationBloc {
   // ignore: unused_element
-  Logger get _log => _$logListLocationBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_location.ListLocationBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_location_file.g.dart b/app/lib/bloc/list_location_file.g.dart
index e76313e2..0010b54e 100644
--- a/app/lib/bloc/list_location_file.g.dart
+++ b/app/lib/bloc/list_location_file.g.dart
@@ -6,13 +6,11 @@ part of 'list_location_file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListLocationFileBloc =
-    Logger("bloc.list_location_file.ListLocationFileBloc");
-
 extension _$ListLocationFileBlocNpLog on ListLocationFileBloc {
   // ignore: unused_element
-  Logger get _log => _$logListLocationFileBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_location_file.ListLocationFileBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_person.g.dart b/app/lib/bloc/list_person.g.dart
index 5875c3a2..73891c95 100644
--- a/app/lib/bloc/list_person.g.dart
+++ b/app/lib/bloc/list_person.g.dart
@@ -6,12 +6,11 @@ part of 'list_person.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListPersonBloc = Logger("bloc.list_person.ListPersonBloc");
-
 extension _$ListPersonBlocNpLog on ListPersonBloc {
   // ignore: unused_element
-  Logger get _log => _$logListPersonBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_person.ListPersonBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_share.g.dart b/app/lib/bloc/list_share.g.dart
index a5086cf3..1cec35af 100644
--- a/app/lib/bloc/list_share.g.dart
+++ b/app/lib/bloc/list_share.g.dart
@@ -6,12 +6,11 @@ part of 'list_share.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListShareBloc = Logger("bloc.list_share.ListShareBloc");
-
 extension _$ListShareBlocNpLog on ListShareBloc {
   // ignore: unused_element
-  Logger get _log => _$logListShareBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_share.ListShareBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_sharee.dart b/app/lib/bloc/list_sharee.dart
index 9633c7fd..53449943 100644
--- a/app/lib/bloc/list_sharee.dart
+++ b/app/lib/bloc/list_sharee.dart
@@ -107,5 +107,5 @@ class ListShareeBloc extends Bloc<ListShareeBlocEvent, ListShareeBlocState> {
     return shareeRepo.list(ev.account);
   }
 
-  static final _log = _$logListShareeBloc;
+  static final _log = _$ListShareeBlocNpLog.log;
 }
diff --git a/app/lib/bloc/list_sharee.g.dart b/app/lib/bloc/list_sharee.g.dart
index a001333e..5b0f292b 100644
--- a/app/lib/bloc/list_sharee.g.dart
+++ b/app/lib/bloc/list_sharee.g.dart
@@ -6,12 +6,11 @@ part of 'list_sharee.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListShareeBloc = Logger("bloc.list_sharee.ListShareeBloc");
-
 extension _$ListShareeBlocNpLog on ListShareeBloc {
   // ignore: unused_element
-  Logger get _log => _$logListShareeBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_sharee.ListShareeBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_sharing.dart b/app/lib/bloc/list_sharing.dart
index 102fa90f..100c306c 100644
--- a/app/lib/bloc/list_sharing.dart
+++ b/app/lib/bloc/list_sharing.dart
@@ -419,5 +419,5 @@ class ListSharingBloc extends Bloc<ListSharingBlocEvent, ListSharingBlocState> {
 
   late Throttler _refreshThrottler;
 
-  static final _log = _$logListSharingBloc;
+  static final _log = _$ListSharingBlocNpLog.log;
 }
diff --git a/app/lib/bloc/list_sharing.g.dart b/app/lib/bloc/list_sharing.g.dart
index cd4938df..60c5add4 100644
--- a/app/lib/bloc/list_sharing.g.dart
+++ b/app/lib/bloc/list_sharing.g.dart
@@ -6,12 +6,11 @@ part of 'list_sharing.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListSharingBloc = Logger("bloc.list_sharing.ListSharingBloc");
-
 extension _$ListSharingBlocNpLog on ListSharingBloc {
   // ignore: unused_element
-  Logger get _log => _$logListSharingBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_sharing.ListSharingBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_tag.dart b/app/lib/bloc/list_tag.dart
index 54de80f7..00d2e888 100644
--- a/app/lib/bloc/list_tag.dart
+++ b/app/lib/bloc/list_tag.dart
@@ -111,5 +111,5 @@ class ListTagBloc extends Bloc<ListTagBlocEvent, ListTagBlocState> {
 
   final DiContainer _c;
 
-  static final _log = _$logListTagBloc;
+  static final _log = _$ListTagBlocNpLog.log;
 }
diff --git a/app/lib/bloc/list_tag.g.dart b/app/lib/bloc/list_tag.g.dart
index 1a1b40fc..27d883cb 100644
--- a/app/lib/bloc/list_tag.g.dart
+++ b/app/lib/bloc/list_tag.g.dart
@@ -6,12 +6,11 @@ part of 'list_tag.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListTagBloc = Logger("bloc.list_tag.ListTagBloc");
-
 extension _$ListTagBlocNpLog on ListTagBloc {
   // ignore: unused_element
-  Logger get _log => _$logListTagBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_tag.ListTagBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/list_tag_file.g.dart b/app/lib/bloc/list_tag_file.g.dart
index e4125897..2ba329b9 100644
--- a/app/lib/bloc/list_tag_file.g.dart
+++ b/app/lib/bloc/list_tag_file.g.dart
@@ -6,12 +6,11 @@ part of 'list_tag_file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListTagFileBloc = Logger("bloc.list_tag_file.ListTagFileBloc");
-
 extension _$ListTagFileBlocNpLog on ListTagFileBloc {
   // ignore: unused_element
-  Logger get _log => _$logListTagFileBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.list_tag_file.ListTagFileBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/ls_dir.g.dart b/app/lib/bloc/ls_dir.g.dart
index 45d4a43f..5e9d9112 100644
--- a/app/lib/bloc/ls_dir.g.dart
+++ b/app/lib/bloc/ls_dir.g.dart
@@ -6,12 +6,11 @@ part of 'ls_dir.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logLsDirBloc = Logger("bloc.ls_dir.LsDirBloc");
-
 extension _$LsDirBlocNpLog on LsDirBloc {
   // ignore: unused_element
-  Logger get _log => _$logLsDirBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.ls_dir.LsDirBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/ls_trashbin.dart b/app/lib/bloc/ls_trashbin.dart
index a010c2b6..d633534e 100644
--- a/app/lib/bloc/ls_trashbin.dart
+++ b/app/lib/bloc/ls_trashbin.dart
@@ -180,5 +180,5 @@ class LsTrashbinBloc extends Bloc<LsTrashbinBlocEvent, LsTrashbinBlocState> {
 
   late Throttler _refreshThrottler;
 
-  static final _log = _$logLsTrashbinBloc;
+  static final _log = _$LsTrashbinBlocNpLog.log;
 }
diff --git a/app/lib/bloc/ls_trashbin.g.dart b/app/lib/bloc/ls_trashbin.g.dart
index 834aa744..067996f6 100644
--- a/app/lib/bloc/ls_trashbin.g.dart
+++ b/app/lib/bloc/ls_trashbin.g.dart
@@ -6,12 +6,11 @@ part of 'ls_trashbin.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logLsTrashbinBloc = Logger("bloc.ls_trashbin.LsTrashbinBloc");
-
 extension _$LsTrashbinBlocNpLog on LsTrashbinBloc {
   // ignore: unused_element
-  Logger get _log => _$logLsTrashbinBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.ls_trashbin.LsTrashbinBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/progress.g.dart b/app/lib/bloc/progress.g.dart
index 60809d0e..c9e133f6 100644
--- a/app/lib/bloc/progress.g.dart
+++ b/app/lib/bloc/progress.g.dart
@@ -6,12 +6,11 @@ part of 'progress.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logProgressBloc = Logger("bloc.progress.ProgressBloc");
-
 extension _$ProgressBlocNpLog on ProgressBloc {
   // ignore: unused_element
-  Logger get _log => _$logProgressBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.progress.ProgressBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/scan_account_dir.dart b/app/lib/bloc/scan_account_dir.dart
index 2e5104b0..bd1365f5 100644
--- a/app/lib/bloc/scan_account_dir.dart
+++ b/app/lib/bloc/scan_account_dir.dart
@@ -538,5 +538,5 @@ class ScanAccountDirBloc
     logTag: "ScanAccountDirBloc.refresh",
   );
 
-  static final _log = _$logScanAccountDirBloc;
+  static final _log = _$ScanAccountDirBlocNpLog.log;
 }
diff --git a/app/lib/bloc/scan_account_dir.g.dart b/app/lib/bloc/scan_account_dir.g.dart
index 017a7452..76f200b2 100644
--- a/app/lib/bloc/scan_account_dir.g.dart
+++ b/app/lib/bloc/scan_account_dir.g.dart
@@ -6,13 +6,11 @@ part of 'scan_account_dir.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logScanAccountDirBloc =
-    Logger("bloc.scan_account_dir.ScanAccountDirBloc");
-
 extension _$ScanAccountDirBlocNpLog on ScanAccountDirBloc {
   // ignore: unused_element
-  Logger get _log => _$logScanAccountDirBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.scan_account_dir.ScanAccountDirBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/scan_local_dir.g.dart b/app/lib/bloc/scan_local_dir.g.dart
index 9688e167..7952e1d5 100644
--- a/app/lib/bloc/scan_local_dir.g.dart
+++ b/app/lib/bloc/scan_local_dir.g.dart
@@ -6,12 +6,11 @@ part of 'scan_local_dir.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logScanLocalDirBloc = Logger("bloc.scan_local_dir.ScanLocalDirBloc");
-
 extension _$ScanLocalDirBlocNpLog on ScanLocalDirBloc {
   // ignore: unused_element
-  Logger get _log => _$logScanLocalDirBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.scan_local_dir.ScanLocalDirBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/search.g.dart b/app/lib/bloc/search.g.dart
index 437142ce..00452316 100644
--- a/app/lib/bloc/search.g.dart
+++ b/app/lib/bloc/search.g.dart
@@ -6,12 +6,11 @@ part of 'search.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSearchBloc = Logger("bloc.search.SearchBloc");
-
 extension _$SearchBlocNpLog on SearchBloc {
   // ignore: unused_element
-  Logger get _log => _$logSearchBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.search.SearchBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/search_landing.g.dart b/app/lib/bloc/search_landing.g.dart
index 3aedd358..e52af8e8 100644
--- a/app/lib/bloc/search_landing.g.dart
+++ b/app/lib/bloc/search_landing.g.dart
@@ -6,12 +6,11 @@ part of 'search_landing.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSearchLandingBloc = Logger("bloc.search_landing.SearchLandingBloc");
-
 extension _$SearchLandingBlocNpLog on SearchLandingBloc {
   // ignore: unused_element
-  Logger get _log => _$logSearchLandingBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.search_landing.SearchLandingBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/bloc/search_suggestion.g.dart b/app/lib/bloc/search_suggestion.g.dart
index 2a00662b..1f3945ed 100644
--- a/app/lib/bloc/search_suggestion.g.dart
+++ b/app/lib/bloc/search_suggestion.g.dart
@@ -6,13 +6,11 @@ part of 'search_suggestion.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSearchSuggestionBloc =
-    Logger("bloc.search_suggestion.SearchSuggestionBloc");
-
 extension _$SearchSuggestionBlocNpLog on SearchSuggestionBloc {
   // ignore: unused_element
-  Logger get _log => _$logSearchSuggestionBloc;
+  Logger get _log => log;
+
+  static final log = Logger("bloc.search_suggestion.SearchSuggestionBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/download_handler.g.dart b/app/lib/download_handler.g.dart
index f15ecda1..0027772b 100644
--- a/app/lib/download_handler.g.dart
+++ b/app/lib/download_handler.g.dart
@@ -6,19 +6,16 @@ part of 'download_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_DownlaodHandlerAndroid =
-    Logger("download_handler._DownlaodHandlerAndroid");
-
 extension _$_DownlaodHandlerAndroidNpLog on _DownlaodHandlerAndroid {
   // ignore: unused_element
-  Logger get _log => _$log_DownlaodHandlerAndroid;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_DownloadHandlerWeb = Logger("download_handler._DownloadHandlerWeb");
+  static final log = Logger("download_handler._DownlaodHandlerAndroid");
+}
 
 extension _$_DownloadHandlerWebNpLog on _DownloadHandlerWeb {
   // ignore: unused_element
-  Logger get _log => _$log_DownloadHandlerWeb;
+  Logger get _log => log;
+
+  static final log = Logger("download_handler._DownloadHandlerWeb");
 }
diff --git a/app/lib/entity/album.dart b/app/lib/entity/album.dart
index fddf39cb..aa1761a7 100644
--- a/app/lib/entity/album.dart
+++ b/app/lib/entity/album.dart
@@ -218,7 +218,7 @@ class Album with EquatableMixin {
   /// versioning of this class, use to upgrade old persisted album
   static const version = 8;
 
-  static final _log = _$logAlbum;
+  static final _log = _$AlbumNpLog.log;
 }
 
 @toString
diff --git a/app/lib/entity/album.g.dart b/app/lib/entity/album.g.dart
index e7504252..f1928cf0 100644
--- a/app/lib/entity/album.g.dart
+++ b/app/lib/entity/album.g.dart
@@ -6,12 +6,11 @@ part of 'album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbum = Logger("entity.album.Album");
-
 extension _$AlbumNpLog on Album {
   // ignore: unused_element
-  Logger get _log => _$logAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.Album");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/album/cover_provider.dart b/app/lib/entity/album/cover_provider.dart
index f2d03ba7..22c2850b 100644
--- a/app/lib/entity/album/cover_provider.dart
+++ b/app/lib/entity/album/cover_provider.dart
@@ -59,7 +59,7 @@ abstract class AlbumCoverProvider with EquatableMixin {
 
   JsonObj _toContentJson();
 
-  static final _log = _$logAlbumCoverProvider;
+  static final _log = _$AlbumCoverProviderNpLog.log;
 }
 
 /// Cover selected automatically by us
diff --git a/app/lib/entity/album/cover_provider.g.dart b/app/lib/entity/album/cover_provider.g.dart
index 9134a5b3..a3adc55a 100644
--- a/app/lib/entity/album/cover_provider.g.dart
+++ b/app/lib/entity/album/cover_provider.g.dart
@@ -6,13 +6,11 @@ part of 'cover_provider.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumCoverProvider =
-    Logger("entity.album.cover_provider.AlbumCoverProvider");
-
 extension _$AlbumCoverProviderNpLog on AlbumCoverProvider {
   // ignore: unused_element
-  Logger get _log => _$logAlbumCoverProvider;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.cover_provider.AlbumCoverProvider");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/album/data_source.g.dart b/app/lib/entity/album/data_source.g.dart
index 226c215e..e1a1169e 100644
--- a/app/lib/entity/album/data_source.g.dart
+++ b/app/lib/entity/album/data_source.g.dart
@@ -6,29 +6,23 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumRemoteDataSource =
-    Logger("entity.album.data_source.AlbumRemoteDataSource");
-
 extension _$AlbumRemoteDataSourceNpLog on AlbumRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logAlbumRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumSqliteDbDataSource =
-    Logger("entity.album.data_source.AlbumSqliteDbDataSource");
+  static final log = Logger("entity.album.data_source.AlbumRemoteDataSource");
+}
 
 extension _$AlbumSqliteDbDataSourceNpLog on AlbumSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logAlbumSqliteDbDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumCachedDataSource =
-    Logger("entity.album.data_source.AlbumCachedDataSource");
+  static final log = Logger("entity.album.data_source.AlbumSqliteDbDataSource");
+}
 
 extension _$AlbumCachedDataSourceNpLog on AlbumCachedDataSource {
   // ignore: unused_element
-  Logger get _log => _$logAlbumCachedDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.data_source.AlbumCachedDataSource");
 }
diff --git a/app/lib/entity/album/item.dart b/app/lib/entity/album/item.dart
index 46fc0bd5..600546d9 100644
--- a/app/lib/entity/album/item.dart
+++ b/app/lib/entity/album/item.dart
@@ -69,7 +69,7 @@ abstract class AlbumItem with EquatableMixin {
   final CiString addedBy;
   final DateTime addedAt;
 
-  static final _log = _$logAlbumItem;
+  static final _log = _$AlbumItemNpLog.log;
 }
 
 @toString
diff --git a/app/lib/entity/album/item.g.dart b/app/lib/entity/album/item.g.dart
index 294b94db..9c3131e9 100644
--- a/app/lib/entity/album/item.g.dart
+++ b/app/lib/entity/album/item.g.dart
@@ -6,12 +6,11 @@ part of 'item.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumItem = Logger("entity.album.item.AlbumItem");
-
 extension _$AlbumItemNpLog on AlbumItem {
   // ignore: unused_element
-  Logger get _log => _$logAlbumItem;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.item.AlbumItem");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/album/provider.dart b/app/lib/entity/album/provider.dart
index ab79245d..b3266543 100644
--- a/app/lib/entity/album/provider.dart
+++ b/app/lib/entity/album/provider.dart
@@ -65,7 +65,7 @@ abstract class AlbumProvider with EquatableMixin {
 
   AlbumProvider copyWith();
 
-  static final _log = _$logAlbumProvider;
+  static final _log = _$AlbumProviderNpLog.log;
 }
 
 abstract class AlbumProviderBase extends AlbumProvider {
diff --git a/app/lib/entity/album/provider.g.dart b/app/lib/entity/album/provider.g.dart
index eca228f7..3c4a0f2d 100644
--- a/app/lib/entity/album/provider.g.dart
+++ b/app/lib/entity/album/provider.g.dart
@@ -6,12 +6,11 @@ part of 'provider.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumProvider = Logger("entity.album.provider.AlbumProvider");
-
 extension _$AlbumProviderNpLog on AlbumProvider {
   // ignore: unused_element
-  Logger get _log => _$logAlbumProvider;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.provider.AlbumProvider");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/album/sort_provider.dart b/app/lib/entity/album/sort_provider.dart
index ac53e3d3..a31e5818 100644
--- a/app/lib/entity/album/sort_provider.dart
+++ b/app/lib/entity/album/sort_provider.dart
@@ -57,7 +57,7 @@ abstract class AlbumSortProvider with EquatableMixin {
 
   JsonObj _toContentJson();
 
-  static final _log = _$logAlbumSortProvider;
+  static final _log = _$AlbumSortProviderNpLog.log;
 }
 
 /// Sort provider that does nothing
diff --git a/app/lib/entity/album/sort_provider.g.dart b/app/lib/entity/album/sort_provider.g.dart
index ff12c2cd..eb42b617 100644
--- a/app/lib/entity/album/sort_provider.g.dart
+++ b/app/lib/entity/album/sort_provider.g.dart
@@ -6,13 +6,11 @@ part of 'sort_provider.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumSortProvider =
-    Logger("entity.album.sort_provider.AlbumSortProvider");
-
 extension _$AlbumSortProviderNpLog on AlbumSortProvider {
   // ignore: unused_element
-  Logger get _log => _$logAlbumSortProvider;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.sort_provider.AlbumSortProvider");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/album/upgrader.g.dart b/app/lib/entity/album/upgrader.g.dart
index 2664977f..29011f64 100644
--- a/app/lib/entity/album/upgrader.g.dart
+++ b/app/lib/entity/album/upgrader.g.dart
@@ -6,58 +6,51 @@ part of 'upgrader.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV1 = Logger("entity.album.upgrader.AlbumUpgraderV1");
-
 extension _$AlbumUpgraderV1NpLog on AlbumUpgraderV1 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV1;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV2 = Logger("entity.album.upgrader.AlbumUpgraderV2");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV1");
+}
 
 extension _$AlbumUpgraderV2NpLog on AlbumUpgraderV2 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV2;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV3 = Logger("entity.album.upgrader.AlbumUpgraderV3");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV2");
+}
 
 extension _$AlbumUpgraderV3NpLog on AlbumUpgraderV3 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV3;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV4 = Logger("entity.album.upgrader.AlbumUpgraderV4");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV3");
+}
 
 extension _$AlbumUpgraderV4NpLog on AlbumUpgraderV4 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV4;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV5 = Logger("entity.album.upgrader.AlbumUpgraderV5");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV4");
+}
 
 extension _$AlbumUpgraderV5NpLog on AlbumUpgraderV5 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV5;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV6 = Logger("entity.album.upgrader.AlbumUpgraderV6");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV5");
+}
 
 extension _$AlbumUpgraderV6NpLog on AlbumUpgraderV6 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV6;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logAlbumUpgraderV7 = Logger("entity.album.upgrader.AlbumUpgraderV7");
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV6");
+}
 
 extension _$AlbumUpgraderV7NpLog on AlbumUpgraderV7 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV7;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV7");
 }
diff --git a/app/lib/entity/exif.g.dart b/app/lib/entity/exif.g.dart
index 1398537b..c2695f4c 100644
--- a/app/lib/entity/exif.g.dart
+++ b/app/lib/entity/exif.g.dart
@@ -6,10 +6,9 @@ part of 'exif.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logExif = Logger("entity.exif.Exif");
-
 extension _$ExifNpLog on Exif {
   // ignore: unused_element
-  Logger get _log => _$logExif;
+  Logger get _log => log;
+
+  static final log = Logger("entity.exif.Exif");
 }
diff --git a/app/lib/entity/face/data_source.g.dart b/app/lib/entity/face/data_source.g.dart
index b05dc16e..f7cefcfe 100644
--- a/app/lib/entity/face/data_source.g.dart
+++ b/app/lib/entity/face/data_source.g.dart
@@ -6,19 +6,16 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logFaceRemoteDataSource =
-    Logger("entity.face.data_source.FaceRemoteDataSource");
-
 extension _$FaceRemoteDataSourceNpLog on FaceRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFaceRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_FaceParser = Logger("entity.face.data_source._FaceParser");
+  static final log = Logger("entity.face.data_source.FaceRemoteDataSource");
+}
 
 extension _$_FaceParserNpLog on _FaceParser {
   // ignore: unused_element
-  Logger get _log => _$log_FaceParser;
+  Logger get _log => log;
+
+  static final log = Logger("entity.face.data_source._FaceParser");
 }
diff --git a/app/lib/entity/favorite/data_source.g.dart b/app/lib/entity/favorite/data_source.g.dart
index c1716a40..50f7b30e 100644
--- a/app/lib/entity/favorite/data_source.g.dart
+++ b/app/lib/entity/favorite/data_source.g.dart
@@ -6,11 +6,10 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logFavoriteRemoteDataSource =
-    Logger("entity.favorite.data_source.FavoriteRemoteDataSource");
-
 extension _$FavoriteRemoteDataSourceNpLog on FavoriteRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFavoriteRemoteDataSource;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.favorite.data_source.FavoriteRemoteDataSource");
 }
diff --git a/app/lib/entity/file.dart b/app/lib/entity/file.dart
index dff969b2..fef6b35c 100644
--- a/app/lib/entity/file.dart
+++ b/app/lib/entity/file.dart
@@ -208,7 +208,7 @@ class Metadata with EquatableMixin {
   /// versioning of this class, use to upgrade old persisted metadata
   static const version = 4;
 
-  static final _log = _$logMetadata;
+  static final _log = _$MetadataNpLog.log;
 }
 
 abstract class MetadataUpgrader {
diff --git a/app/lib/entity/file.g.dart b/app/lib/entity/file.g.dart
index 0b0043d8..4966d2d0 100644
--- a/app/lib/entity/file.g.dart
+++ b/app/lib/entity/file.g.dart
@@ -6,36 +6,32 @@ part of 'file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logMetadata = Logger("entity.file.Metadata");
-
 extension _$MetadataNpLog on Metadata {
   // ignore: unused_element
-  Logger get _log => _$logMetadata;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logMetadataUpgraderV1 = Logger("entity.file.MetadataUpgraderV1");
+  static final log = Logger("entity.file.Metadata");
+}
 
 extension _$MetadataUpgraderV1NpLog on MetadataUpgraderV1 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV1;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logMetadataUpgraderV2 = Logger("entity.file.MetadataUpgraderV2");
+  static final log = Logger("entity.file.MetadataUpgraderV1");
+}
 
 extension _$MetadataUpgraderV2NpLog on MetadataUpgraderV2 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV2;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logMetadataUpgraderV3 = Logger("entity.file.MetadataUpgraderV3");
+  static final log = Logger("entity.file.MetadataUpgraderV2");
+}
 
 extension _$MetadataUpgraderV3NpLog on MetadataUpgraderV3 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV3;
+  Logger get _log => log;
+
+  static final log = Logger("entity.file.MetadataUpgraderV3");
 }
 
 // **************************************************************************
diff --git a/app/lib/entity/file/data_source.g.dart b/app/lib/entity/file/data_source.g.dart
index 86cb3dd9..56b935c1 100644
--- a/app/lib/entity/file/data_source.g.dart
+++ b/app/lib/entity/file/data_source.g.dart
@@ -6,29 +6,23 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logFileWebdavDataSource =
-    Logger("entity.file.data_source.FileWebdavDataSource");
-
 extension _$FileWebdavDataSourceNpLog on FileWebdavDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFileWebdavDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logFileSqliteDbDataSource =
-    Logger("entity.file.data_source.FileSqliteDbDataSource");
+  static final log = Logger("entity.file.data_source.FileWebdavDataSource");
+}
 
 extension _$FileSqliteDbDataSourceNpLog on FileSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFileSqliteDbDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logFileCachedDataSource =
-    Logger("entity.file.data_source.FileCachedDataSource");
+  static final log = Logger("entity.file.data_source.FileSqliteDbDataSource");
+}
 
 extension _$FileCachedDataSourceNpLog on FileCachedDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFileCachedDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.file.data_source.FileCachedDataSource");
 }
diff --git a/app/lib/entity/file/file_cache_manager.g.dart b/app/lib/entity/file/file_cache_manager.g.dart
index 292f7b88..9c649fce 100644
--- a/app/lib/entity/file/file_cache_manager.g.dart
+++ b/app/lib/entity/file/file_cache_manager.g.dart
@@ -6,20 +6,17 @@ part of 'file_cache_manager.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logFileCacheLoader =
-    Logger("entity.file.file_cache_manager.FileCacheLoader");
-
 extension _$FileCacheLoaderNpLog on FileCacheLoader {
   // ignore: unused_element
-  Logger get _log => _$logFileCacheLoader;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logFileSqliteCacheUpdater =
-    Logger("entity.file.file_cache_manager.FileSqliteCacheUpdater");
+  static final log = Logger("entity.file.file_cache_manager.FileCacheLoader");
+}
 
 extension _$FileSqliteCacheUpdaterNpLog on FileSqliteCacheUpdater {
   // ignore: unused_element
-  Logger get _log => _$logFileSqliteCacheUpdater;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.file.file_cache_manager.FileSqliteCacheUpdater");
 }
diff --git a/app/lib/entity/local_file/data_source.g.dart b/app/lib/entity/local_file/data_source.g.dart
index 2ca0443a..cf3fccbf 100644
--- a/app/lib/entity/local_file/data_source.g.dart
+++ b/app/lib/entity/local_file/data_source.g.dart
@@ -6,12 +6,11 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logLocalFileMediaStoreDataSource =
-    Logger("entity.local_file.data_source.LocalFileMediaStoreDataSource");
-
 extension _$LocalFileMediaStoreDataSourceNpLog
     on LocalFileMediaStoreDataSource {
   // ignore: unused_element
-  Logger get _log => _$logLocalFileMediaStoreDataSource;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.local_file.data_source.LocalFileMediaStoreDataSource");
 }
diff --git a/app/lib/entity/person/data_source.g.dart b/app/lib/entity/person/data_source.g.dart
index ed943dc6..999bf240 100644
--- a/app/lib/entity/person/data_source.g.dart
+++ b/app/lib/entity/person/data_source.g.dart
@@ -6,28 +6,24 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logPersonRemoteDataSource =
-    Logger("entity.person.data_source.PersonRemoteDataSource");
-
 extension _$PersonRemoteDataSourceNpLog on PersonRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logPersonRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logPersonSqliteDbDataSource =
-    Logger("entity.person.data_source.PersonSqliteDbDataSource");
+  static final log = Logger("entity.person.data_source.PersonRemoteDataSource");
+}
 
 extension _$PersonSqliteDbDataSourceNpLog on PersonSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logPersonSqliteDbDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_PersonParser = Logger("entity.person.data_source._PersonParser");
+  static final log =
+      Logger("entity.person.data_source.PersonSqliteDbDataSource");
+}
 
 extension _$_PersonParserNpLog on _PersonParser {
   // ignore: unused_element
-  Logger get _log => _$log_PersonParser;
+  Logger get _log => log;
+
+  static final log = Logger("entity.person.data_source._PersonParser");
 }
diff --git a/app/lib/entity/search/data_source.g.dart b/app/lib/entity/search/data_source.g.dart
index d6d64b5a..dabe78f3 100644
--- a/app/lib/entity/search/data_source.g.dart
+++ b/app/lib/entity/search/data_source.g.dart
@@ -6,11 +6,10 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSearchSqliteDbDataSource =
-    Logger("entity.search.data_source.SearchSqliteDbDataSource");
-
 extension _$SearchSqliteDbDataSourceNpLog on SearchSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logSearchSqliteDbDataSource;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.search.data_source.SearchSqliteDbDataSource");
 }
diff --git a/app/lib/entity/share/data_source.g.dart b/app/lib/entity/share/data_source.g.dart
index ff6c1e33..7b42b1b7 100644
--- a/app/lib/entity/share/data_source.g.dart
+++ b/app/lib/entity/share/data_source.g.dart
@@ -6,19 +6,16 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logShareRemoteDataSource =
-    Logger("entity.share.data_source.ShareRemoteDataSource");
-
 extension _$ShareRemoteDataSourceNpLog on ShareRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logShareRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_ShareParser = Logger("entity.share.data_source._ShareParser");
+  static final log = Logger("entity.share.data_source.ShareRemoteDataSource");
+}
 
 extension _$_ShareParserNpLog on _ShareParser {
   // ignore: unused_element
-  Logger get _log => _$log_ShareParser;
+  Logger get _log => log;
+
+  static final log = Logger("entity.share.data_source._ShareParser");
 }
diff --git a/app/lib/entity/sharee/data_source.g.dart b/app/lib/entity/sharee/data_source.g.dart
index 58ae343d..be90ba66 100644
--- a/app/lib/entity/sharee/data_source.g.dart
+++ b/app/lib/entity/sharee/data_source.g.dart
@@ -6,19 +6,16 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logShareeRemoteDataSource =
-    Logger("entity.sharee.data_source.ShareeRemoteDataSource");
-
 extension _$ShareeRemoteDataSourceNpLog on ShareeRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logShareeRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_ShareeParser = Logger("entity.sharee.data_source._ShareeParser");
+  static final log = Logger("entity.sharee.data_source.ShareeRemoteDataSource");
+}
 
 extension _$_ShareeParserNpLog on _ShareeParser {
   // ignore: unused_element
-  Logger get _log => _$log_ShareeParser;
+  Logger get _log => log;
+
+  static final log = Logger("entity.sharee.data_source._ShareeParser");
 }
diff --git a/app/lib/entity/sqlite_table.g.dart b/app/lib/entity/sqlite_table.g.dart
index e349a55a..222db5cc 100644
--- a/app/lib/entity/sqlite_table.g.dart
+++ b/app/lib/entity/sqlite_table.g.dart
@@ -4195,10 +4195,9 @@ abstract class _$SqliteDb extends GeneratedDatabase {
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSqliteDb = Logger("entity.sqlite_table.SqliteDb");
-
 extension _$SqliteDbNpLog on SqliteDb {
   // ignore: unused_element
-  Logger get _log => _$logSqliteDb;
+  Logger get _log => log;
+
+  static final log = Logger("entity.sqlite_table.SqliteDb");
 }
diff --git a/app/lib/entity/sqlite_table_extension.g.dart b/app/lib/entity/sqlite_table_extension.g.dart
index fd727b63..0085d569 100644
--- a/app/lib/entity/sqlite_table_extension.g.dart
+++ b/app/lib/entity/sqlite_table_extension.g.dart
@@ -6,11 +6,9 @@ part of 'sqlite_table_extension.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSqliteDbExtension =
-    Logger("entity.sqlite_table_extension.SqliteDbExtension");
-
 extension _$SqliteDbExtensionNpLog on SqliteDb {
   // ignore: unused_element
-  Logger get _log => _$logSqliteDbExtension;
+  Logger get _log => log;
+
+  static final log = Logger("entity.sqlite_table_extension.SqliteDbExtension");
 }
diff --git a/app/lib/entity/tag/data_source.g.dart b/app/lib/entity/tag/data_source.g.dart
index 301c9c2d..7433ea0c 100644
--- a/app/lib/entity/tag/data_source.g.dart
+++ b/app/lib/entity/tag/data_source.g.dart
@@ -6,20 +6,16 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logTagRemoteDataSource =
-    Logger("entity.tag.data_source.TagRemoteDataSource");
-
 extension _$TagRemoteDataSourceNpLog on TagRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logTagRemoteDataSource;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logTagSqliteDbDataSource =
-    Logger("entity.tag.data_source.TagSqliteDbDataSource");
+  static final log = Logger("entity.tag.data_source.TagRemoteDataSource");
+}
 
 extension _$TagSqliteDbDataSourceNpLog on TagSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logTagSqliteDbDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.tag.data_source.TagSqliteDbDataSource");
 }
diff --git a/app/lib/entity/tagged_file/data_source.g.dart b/app/lib/entity/tagged_file/data_source.g.dart
index dd493c0d..71cd6d80 100644
--- a/app/lib/entity/tagged_file/data_source.g.dart
+++ b/app/lib/entity/tagged_file/data_source.g.dart
@@ -6,11 +6,10 @@ part of 'data_source.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logTaggedFileRemoteDataSource =
-    Logger("entity.tagged_file.data_source.TaggedFileRemoteDataSource");
-
 extension _$TaggedFileRemoteDataSourceNpLog on TaggedFileRemoteDataSource {
   // ignore: unused_element
-  Logger get _log => _$logTaggedFileRemoteDataSource;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.tagged_file.data_source.TaggedFileRemoteDataSource");
 }
diff --git a/app/lib/entity/webdav_response_parser.g.dart b/app/lib/entity/webdav_response_parser.g.dart
index 8d634d87..a5953030 100644
--- a/app/lib/entity/webdav_response_parser.g.dart
+++ b/app/lib/entity/webdav_response_parser.g.dart
@@ -6,11 +6,10 @@ part of 'webdav_response_parser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logWebdavResponseParser =
-    Logger("entity.webdav_response_parser.WebdavResponseParser");
-
 extension _$WebdavResponseParserNpLog on WebdavResponseParser {
   // ignore: unused_element
-  Logger get _log => _$logWebdavResponseParser;
+  Logger get _log => log;
+
+  static final log =
+      Logger("entity.webdav_response_parser.WebdavResponseParser");
 }
diff --git a/app/lib/legacy/app_password_exchange_bloc.dart b/app/lib/legacy/app_password_exchange_bloc.dart
index 1ecaa8f1..4c90cd0e 100644
--- a/app/lib/legacy/app_password_exchange_bloc.dart
+++ b/app/lib/legacy/app_password_exchange_bloc.dart
@@ -128,5 +128,5 @@ class AppPasswordExchangeBloc
     }
   }
 
-  static final _log = _$logAppPasswordExchangeBloc;
+  static final _log = _$AppPasswordExchangeBlocNpLog.log;
 }
diff --git a/app/lib/legacy/app_password_exchange_bloc.g.dart b/app/lib/legacy/app_password_exchange_bloc.g.dart
index 28fc9de1..d93aa030 100644
--- a/app/lib/legacy/app_password_exchange_bloc.g.dart
+++ b/app/lib/legacy/app_password_exchange_bloc.g.dart
@@ -6,13 +6,12 @@ part of 'app_password_exchange_bloc.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAppPasswordExchangeBloc =
-    Logger("legacy.app_password_exchange_bloc.AppPasswordExchangeBloc");
-
 extension _$AppPasswordExchangeBlocNpLog on AppPasswordExchangeBloc {
   // ignore: unused_element
-  Logger get _log => _$logAppPasswordExchangeBloc;
+  Logger get _log => log;
+
+  static final log =
+      Logger("legacy.app_password_exchange_bloc.AppPasswordExchangeBloc");
 }
 
 // **************************************************************************
diff --git a/app/lib/legacy/connect.g.dart b/app/lib/legacy/connect.g.dart
index 0a1f1ff2..a9c058fd 100644
--- a/app/lib/legacy/connect.g.dart
+++ b/app/lib/legacy/connect.g.dart
@@ -6,10 +6,9 @@ part of 'connect.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ConnectState = Logger("legacy.connect._ConnectState");
-
 extension _$_ConnectStateNpLog on _ConnectState {
   // ignore: unused_element
-  Logger get _log => _$log_ConnectState;
+  Logger get _log => log;
+
+  static final log = Logger("legacy.connect._ConnectState");
 }
diff --git a/app/lib/legacy/sign_in.g.dart b/app/lib/legacy/sign_in.g.dart
index ca37f2ae..24355410 100644
--- a/app/lib/legacy/sign_in.g.dart
+++ b/app/lib/legacy/sign_in.g.dart
@@ -6,10 +6,9 @@ part of 'sign_in.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SignInState = Logger("legacy.sign_in._SignInState");
-
 extension _$_SignInStateNpLog on _SignInState {
   // ignore: unused_element
-  Logger get _log => _$log_SignInState;
+  Logger get _log => log;
+
+  static final log = Logger("legacy.sign_in._SignInState");
 }
diff --git a/app/lib/main.g.dart b/app/lib/main.g.dart
index 9aec442c..1be4843d 100644
--- a/app/lib/main.g.dart
+++ b/app/lib/main.g.dart
@@ -6,10 +6,9 @@ part of 'main.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_BlocObserver = Logger("main._BlocObserver");
-
 extension _$_BlocObserverNpLog on _BlocObserver {
   // ignore: unused_element
-  Logger get _log => _$log_BlocObserver;
+  Logger get _log => log;
+
+  static final log = Logger("main._BlocObserver");
 }
diff --git a/app/lib/metadata_task_manager.g.dart b/app/lib/metadata_task_manager.g.dart
index 3eaa56e0..65fc62ed 100644
--- a/app/lib/metadata_task_manager.g.dart
+++ b/app/lib/metadata_task_manager.g.dart
@@ -6,21 +6,18 @@ part of 'metadata_task_manager.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logMetadataTask = Logger("metadata_task_manager.MetadataTask");
-
 extension _$MetadataTaskNpLog on MetadataTask {
   // ignore: unused_element
-  Logger get _log => _$logMetadataTask;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$logMetadataTaskManager =
-    Logger("metadata_task_manager.MetadataTaskManager");
+  static final log = Logger("metadata_task_manager.MetadataTask");
+}
 
 extension _$MetadataTaskManagerNpLog on MetadataTaskManager {
   // ignore: unused_element
-  Logger get _log => _$logMetadataTaskManager;
+  Logger get _log => log;
+
+  static final log = Logger("metadata_task_manager.MetadataTaskManager");
 }
 
 // **************************************************************************
diff --git a/app/lib/mobile/android/android_info.dart b/app/lib/mobile/android/android_info.dart
index 040378bd..9c282f39 100644
--- a/app/lib/mobile/android/android_info.dart
+++ b/app/lib/mobile/android/android_info.dart
@@ -43,7 +43,7 @@ class AndroidInfo {
   final int sdkInt;
   final double totalMemMb;
 
-  static final _log = _$logAndroidInfo;
+  static final _log = _$AndroidInfoNpLog.log;
 }
 
 abstract class AndroidVersion {
diff --git a/app/lib/mobile/android/android_info.g.dart b/app/lib/mobile/android/android_info.g.dart
index 29e7646d..f9442a2d 100644
--- a/app/lib/mobile/android/android_info.g.dart
+++ b/app/lib/mobile/android/android_info.g.dart
@@ -6,12 +6,11 @@ part of 'android_info.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAndroidInfo = Logger("mobile.android.android_info.AndroidInfo");
-
 extension _$AndroidInfoNpLog on AndroidInfo {
   // ignore: unused_element
-  Logger get _log => _$logAndroidInfo;
+  Logger get _log => log;
+
+  static final log = Logger("mobile.android.android_info.AndroidInfo");
 }
 
 // **************************************************************************
diff --git a/app/lib/mobile/download.g.dart b/app/lib/mobile/download.g.dart
index 31116dc0..d9007b62 100644
--- a/app/lib/mobile/download.g.dart
+++ b/app/lib/mobile/download.g.dart
@@ -6,10 +6,9 @@ part of 'download.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AndroidDownload = Logger("mobile.download._AndroidDownload");
-
 extension _$_AndroidDownloadNpLog on _AndroidDownload {
   // ignore: unused_element
-  Logger get _log => _$log_AndroidDownload;
+  Logger get _log => log;
+
+  static final log = Logger("mobile.download._AndroidDownload");
 }
diff --git a/app/lib/mobile/notification.g.dart b/app/lib/mobile/notification.g.dart
index 90a76c4d..12a282e6 100644
--- a/app/lib/mobile/notification.g.dart
+++ b/app/lib/mobile/notification.g.dart
@@ -6,11 +6,9 @@ part of 'notification.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logNotificationManager =
-    Logger("mobile.notification.NotificationManager");
-
 extension _$NotificationManagerNpLog on NotificationManager {
   // ignore: unused_element
-  Logger get _log => _$logNotificationManager;
+  Logger get _log => log;
+
+  static final log = Logger("mobile.notification.NotificationManager");
 }
diff --git a/app/lib/mobile/self_signed_cert_manager.g.dart b/app/lib/mobile/self_signed_cert_manager.g.dart
index e66ae5ef..3b346494 100644
--- a/app/lib/mobile/self_signed_cert_manager.g.dart
+++ b/app/lib/mobile/self_signed_cert_manager.g.dart
@@ -6,20 +6,18 @@ part of 'self_signed_cert_manager.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSelfSignedCertManager =
-    Logger("mobile.self_signed_cert_manager.SelfSignedCertManager");
-
 extension _$SelfSignedCertManagerNpLog on SelfSignedCertManager {
   // ignore: unused_element
-  Logger get _log => _$logSelfSignedCertManager;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_CustomHttpOverrides =
-    Logger("mobile.self_signed_cert_manager._CustomHttpOverrides");
+  static final log =
+      Logger("mobile.self_signed_cert_manager.SelfSignedCertManager");
+}
 
 extension _$_CustomHttpOverridesNpLog on _CustomHttpOverrides {
   // ignore: unused_element
-  Logger get _log => _$log_CustomHttpOverrides;
+  Logger get _log => log;
+
+  static final log =
+      Logger("mobile.self_signed_cert_manager._CustomHttpOverrides");
 }
diff --git a/app/lib/pref.g.dart b/app/lib/pref.g.dart
index cc00ddc1..9b2da01b 100644
--- a/app/lib/pref.g.dart
+++ b/app/lib/pref.g.dart
@@ -6,10 +6,9 @@ part of 'pref.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logPref = Logger("pref.Pref");
-
 extension _$PrefNpLog on Pref {
   // ignore: unused_element
-  Logger get _log => _$logPref;
+  Logger get _log => log;
+
+  static final log = Logger("pref.Pref");
 }
diff --git a/app/lib/reverse_geocoder.g.dart b/app/lib/reverse_geocoder.g.dart
index 34e77643..a193d8d9 100644
--- a/app/lib/reverse_geocoder.g.dart
+++ b/app/lib/reverse_geocoder.g.dart
@@ -6,12 +6,11 @@ part of 'reverse_geocoder.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logReverseGeocoder = Logger("reverse_geocoder.ReverseGeocoder");
-
 extension _$ReverseGeocoderNpLog on ReverseGeocoder {
   // ignore: unused_element
-  Logger get _log => _$logReverseGeocoder;
+  Logger get _log => log;
+
+  static final log = Logger("reverse_geocoder.ReverseGeocoder");
 }
 
 // **************************************************************************
diff --git a/app/lib/service.g.dart b/app/lib/service.g.dart
index 3c9ef3e4..03542f4b 100644
--- a/app/lib/service.g.dart
+++ b/app/lib/service.g.dart
@@ -6,26 +6,23 @@ part of 'service.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_Service = Logger("service._Service");
-
 extension _$_ServiceNpLog on _Service {
   // ignore: unused_element
-  Logger get _log => _$log_Service;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_L10n = Logger("service._L10n");
+  static final log = Logger("service._Service");
+}
 
 extension _$_L10nNpLog on _L10n {
   // ignore: unused_element
-  Logger get _log => _$log_L10n;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_MetadataTask = Logger("service._MetadataTask");
+  static final log = Logger("service._L10n");
+}
 
 extension _$_MetadataTaskNpLog on _MetadataTask {
   // ignore: unused_element
-  Logger get _log => _$log_MetadataTask;
+  Logger get _log => log;
+
+  static final log = Logger("service._MetadataTask");
 }
diff --git a/app/lib/share_handler.g.dart b/app/lib/share_handler.g.dart
index d9cede87..bd879d71 100644
--- a/app/lib/share_handler.g.dart
+++ b/app/lib/share_handler.g.dart
@@ -6,10 +6,9 @@ part of 'share_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logShareHandler = Logger("share_handler.ShareHandler");
-
 extension _$ShareHandlerNpLog on ShareHandler {
   // ignore: unused_element
-  Logger get _log => _$logShareHandler;
+  Logger get _log => log;
+
+  static final log = Logger("share_handler.ShareHandler");
 }
diff --git a/app/lib/snack_bar_manager.g.dart b/app/lib/snack_bar_manager.g.dart
index 4b2d8c82..e656eaa9 100644
--- a/app/lib/snack_bar_manager.g.dart
+++ b/app/lib/snack_bar_manager.g.dart
@@ -6,10 +6,9 @@ part of 'snack_bar_manager.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSnackBarManager = Logger("snack_bar_manager.SnackBarManager");
-
 extension _$SnackBarManagerNpLog on SnackBarManager {
   // ignore: unused_element
-  Logger get _log => _$logSnackBarManager;
+  Logger get _log => log;
+
+  static final log = Logger("snack_bar_manager.SnackBarManager");
 }
diff --git a/app/lib/throttler.g.dart b/app/lib/throttler.g.dart
index 0895cb92..08064626 100644
--- a/app/lib/throttler.g.dart
+++ b/app/lib/throttler.g.dart
@@ -6,10 +6,9 @@ part of 'throttler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logThrottler = Logger("throttler.Throttler");
-
 extension _$ThrottlerNpLog on Throttler {
   // ignore: unused_element
-  Logger get _log => _$logThrottler;
+  Logger get _log => log;
+
+  static final log = Logger("throttler.Throttler");
 }
diff --git a/app/lib/touch_manager.g.dart b/app/lib/touch_manager.g.dart
index 465402d7..886657c7 100644
--- a/app/lib/touch_manager.g.dart
+++ b/app/lib/touch_manager.g.dart
@@ -6,10 +6,9 @@ part of 'touch_manager.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logTouchManager = Logger("touch_manager.TouchManager");
-
 extension _$TouchManagerNpLog on TouchManager {
   // ignore: unused_element
-  Logger get _log => _$logTouchManager;
+  Logger get _log => log;
+
+  static final log = Logger("touch_manager.TouchManager");
 }
diff --git a/app/lib/use_case/add_to_album.g.dart b/app/lib/use_case/add_to_album.g.dart
index 2de141de..14b3ad1e 100644
--- a/app/lib/use_case/add_to_album.g.dart
+++ b/app/lib/use_case/add_to_album.g.dart
@@ -6,10 +6,9 @@ part of 'add_to_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAddToAlbum = Logger("use_case.add_to_album.AddToAlbum");
-
 extension _$AddToAlbumNpLog on AddToAlbum {
   // ignore: unused_element
-  Logger get _log => _$logAddToAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.add_to_album.AddToAlbum");
 }
diff --git a/app/lib/use_case/cache_favorite.g.dart b/app/lib/use_case/cache_favorite.g.dart
index 4152cca0..8ab86eab 100644
--- a/app/lib/use_case/cache_favorite.g.dart
+++ b/app/lib/use_case/cache_favorite.g.dart
@@ -6,10 +6,9 @@ part of 'cache_favorite.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCacheFavorite = Logger("use_case.cache_favorite.CacheFavorite");
-
 extension _$CacheFavoriteNpLog on CacheFavorite {
   // ignore: unused_element
-  Logger get _log => _$logCacheFavorite;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.cache_favorite.CacheFavorite");
 }
diff --git a/app/lib/use_case/compat/v15.g.dart b/app/lib/use_case/compat/v15.g.dart
index fc2b5b34..42d5831f 100644
--- a/app/lib/use_case/compat/v15.g.dart
+++ b/app/lib/use_case/compat/v15.g.dart
@@ -6,11 +6,9 @@ part of 'v15.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_MigrateAlbumFiles =
-    Logger("use_case.compat.v15._MigrateAlbumFiles");
-
 extension _$_MigrateAlbumFilesNpLog on _MigrateAlbumFiles {
   // ignore: unused_element
-  Logger get _log => _$log_MigrateAlbumFiles;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v15._MigrateAlbumFiles");
 }
diff --git a/app/lib/use_case/compat/v25.g.dart b/app/lib/use_case/compat/v25.g.dart
index af85936c..1083956e 100644
--- a/app/lib/use_case/compat/v25.g.dart
+++ b/app/lib/use_case/compat/v25.g.dart
@@ -6,10 +6,9 @@ part of 'v25.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_MigrateAlbumFile = Logger("use_case.compat.v25._MigrateAlbumFile");
-
 extension _$_MigrateAlbumFileNpLog on _MigrateAlbumFile {
   // ignore: unused_element
-  Logger get _log => _$log_MigrateAlbumFile;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v25._MigrateAlbumFile");
 }
diff --git a/app/lib/use_case/compat/v32.dart b/app/lib/use_case/compat/v32.dart
index d71d2295..6ee4a6ce 100644
--- a/app/lib/use_case/compat/v32.dart
+++ b/app/lib/use_case/compat/v32.dart
@@ -53,5 +53,5 @@ class CompatV32 {
     return Exif(newData);
   }
 
-  static final _log = _$logCompatV32;
+  static final _log = _$CompatV32NpLog.log;
 }
diff --git a/app/lib/use_case/compat/v32.g.dart b/app/lib/use_case/compat/v32.g.dart
index 2a5d1079..5afbca74 100644
--- a/app/lib/use_case/compat/v32.g.dart
+++ b/app/lib/use_case/compat/v32.g.dart
@@ -6,10 +6,9 @@ part of 'v32.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCompatV32 = Logger("use_case.compat.v32.CompatV32");
-
 extension _$CompatV32NpLog on CompatV32 {
   // ignore: unused_element
-  Logger get _log => _$logCompatV32;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v32.CompatV32");
 }
diff --git a/app/lib/use_case/compat/v34.dart b/app/lib/use_case/compat/v34.dart
index ca435811..aff4b8f6 100644
--- a/app/lib/use_case/compat/v34.dart
+++ b/app/lib/use_case/compat/v34.dart
@@ -75,5 +75,5 @@ class CompatV34 {
     }
   }
 
-  static final _log = _$logCompatV34;
+  static final _log = _$CompatV34NpLog.log;
 }
diff --git a/app/lib/use_case/compat/v34.g.dart b/app/lib/use_case/compat/v34.g.dart
index 521dd00a..d0db4b34 100644
--- a/app/lib/use_case/compat/v34.g.dart
+++ b/app/lib/use_case/compat/v34.g.dart
@@ -6,10 +6,9 @@ part of 'v34.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCompatV34 = Logger("use_case.compat.v34.CompatV34");
-
 extension _$CompatV34NpLog on CompatV34 {
   // ignore: unused_element
-  Logger get _log => _$logCompatV34;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v34.CompatV34");
 }
diff --git a/app/lib/use_case/compat/v46.dart b/app/lib/use_case/compat/v46.dart
index 4aaf57ca..fe745711 100644
--- a/app/lib/use_case/compat/v46.dart
+++ b/app/lib/use_case/compat/v46.dart
@@ -19,5 +19,5 @@ class CompatV46 {
     });
   }
 
-  static final _log = _$logCompatV46;
+  static final _log = _$CompatV46NpLog.log;
 }
diff --git a/app/lib/use_case/compat/v46.g.dart b/app/lib/use_case/compat/v46.g.dart
index c32764ff..07876033 100644
--- a/app/lib/use_case/compat/v46.g.dart
+++ b/app/lib/use_case/compat/v46.g.dart
@@ -6,10 +6,9 @@ part of 'v46.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCompatV46 = Logger("use_case.compat.v46.CompatV46");
-
 extension _$CompatV46NpLog on CompatV46 {
   // ignore: unused_element
-  Logger get _log => _$logCompatV46;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v46.CompatV46");
 }
diff --git a/app/lib/use_case/compat/v55.dart b/app/lib/use_case/compat/v55.dart
index 209f4eff..52255348 100644
--- a/app/lib/use_case/compat/v55.dart
+++ b/app/lib/use_case/compat/v55.dart
@@ -97,5 +97,5 @@ class CompatV55 {
     });
   }
 
-  static final _log = _$logCompatV55;
+  static final _log = _$CompatV55NpLog.log;
 }
diff --git a/app/lib/use_case/compat/v55.g.dart b/app/lib/use_case/compat/v55.g.dart
index a2e3774e..5fb62696 100644
--- a/app/lib/use_case/compat/v55.g.dart
+++ b/app/lib/use_case/compat/v55.g.dart
@@ -6,10 +6,9 @@ part of 'v55.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCompatV55 = Logger("use_case.compat.v55.CompatV55");
-
 extension _$CompatV55NpLog on CompatV55 {
   // ignore: unused_element
-  Logger get _log => _$logCompatV55;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.compat.v55.CompatV55");
 }
diff --git a/app/lib/use_case/copy.g.dart b/app/lib/use_case/copy.g.dart
index d61791d2..c5fc11e8 100644
--- a/app/lib/use_case/copy.g.dart
+++ b/app/lib/use_case/copy.g.dart
@@ -6,10 +6,9 @@ part of 'copy.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logCopy = Logger("use_case.copy.Copy");
-
 extension _$CopyNpLog on Copy {
   // ignore: unused_element
-  Logger get _log => _$logCopy;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.copy.Copy");
 }
diff --git a/app/lib/use_case/delete_local.g.dart b/app/lib/use_case/delete_local.g.dart
index 5b14c0fd..4dd739c2 100644
--- a/app/lib/use_case/delete_local.g.dart
+++ b/app/lib/use_case/delete_local.g.dart
@@ -6,10 +6,9 @@ part of 'delete_local.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logDeleteLocal = Logger("use_case.delete_local.DeleteLocal");
-
 extension _$DeleteLocalNpLog on DeleteLocal {
   // ignore: unused_element
-  Logger get _log => _$logDeleteLocal;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.delete_local.DeleteLocal");
 }
diff --git a/app/lib/use_case/find_file.g.dart b/app/lib/use_case/find_file.g.dart
index 017ccafc..390d0d2f 100644
--- a/app/lib/use_case/find_file.g.dart
+++ b/app/lib/use_case/find_file.g.dart
@@ -6,10 +6,9 @@ part of 'find_file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logFindFile = Logger("use_case.find_file.FindFile");
-
 extension _$FindFileNpLog on FindFile {
   // ignore: unused_element
-  Logger get _log => _$logFindFile;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.find_file.FindFile");
 }
diff --git a/app/lib/use_case/import_potential_shared_album.g.dart b/app/lib/use_case/import_potential_shared_album.g.dart
index 9ea6b497..fb98abe0 100644
--- a/app/lib/use_case/import_potential_shared_album.g.dart
+++ b/app/lib/use_case/import_potential_shared_album.g.dart
@@ -6,11 +6,10 @@ part of 'import_potential_shared_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logImportPotentialSharedAlbum =
-    Logger("use_case.import_potential_shared_album.ImportPotentialSharedAlbum");
-
 extension _$ImportPotentialSharedAlbumNpLog on ImportPotentialSharedAlbum {
   // ignore: unused_element
-  Logger get _log => _$logImportPotentialSharedAlbum;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "use_case.import_potential_shared_album.ImportPotentialSharedAlbum");
 }
diff --git a/app/lib/use_case/list_favorite.g.dart b/app/lib/use_case/list_favorite.g.dart
index ea355781..49f2b6e2 100644
--- a/app/lib/use_case/list_favorite.g.dart
+++ b/app/lib/use_case/list_favorite.g.dart
@@ -6,10 +6,9 @@ part of 'list_favorite.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListFavorite = Logger("use_case.list_favorite.ListFavorite");
-
 extension _$ListFavoriteNpLog on ListFavorite {
   // ignore: unused_element
-  Logger get _log => _$logListFavorite;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.list_favorite.ListFavorite");
 }
diff --git a/app/lib/use_case/list_location_group.g.dart b/app/lib/use_case/list_location_group.g.dart
index 92d754a9..b7df94af 100644
--- a/app/lib/use_case/list_location_group.g.dart
+++ b/app/lib/use_case/list_location_group.g.dart
@@ -6,13 +6,11 @@ part of 'list_location_group.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListLocationGroup =
-    Logger("use_case.list_location_group.ListLocationGroup");
-
 extension _$ListLocationGroupNpLog on ListLocationGroup {
   // ignore: unused_element
-  Logger get _log => _$logListLocationGroup;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.list_location_group.ListLocationGroup");
 }
 
 // **************************************************************************
diff --git a/app/lib/use_case/list_potential_shared_album.g.dart b/app/lib/use_case/list_potential_shared_album.g.dart
index 5c59b41f..03370724 100644
--- a/app/lib/use_case/list_potential_shared_album.g.dart
+++ b/app/lib/use_case/list_potential_shared_album.g.dart
@@ -6,11 +6,10 @@ part of 'list_potential_shared_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListPotentialSharedAlbum =
-    Logger("use_case.list_potential_shared_album.ListPotentialSharedAlbum");
-
 extension _$ListPotentialSharedAlbumNpLog on ListPotentialSharedAlbum {
   // ignore: unused_element
-  Logger get _log => _$logListPotentialSharedAlbum;
+  Logger get _log => log;
+
+  static final log =
+      Logger("use_case.list_potential_shared_album.ListPotentialSharedAlbum");
 }
diff --git a/app/lib/use_case/list_share.g.dart b/app/lib/use_case/list_share.g.dart
index bead57ea..bca80024 100644
--- a/app/lib/use_case/list_share.g.dart
+++ b/app/lib/use_case/list_share.g.dart
@@ -6,10 +6,9 @@ part of 'list_share.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListShare = Logger("use_case.list_share.ListShare");
-
 extension _$ListShareNpLog on ListShare {
   // ignore: unused_element
-  Logger get _log => _$logListShare;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.list_share.ListShare");
 }
diff --git a/app/lib/use_case/list_tagged_file.g.dart b/app/lib/use_case/list_tagged_file.g.dart
index 5edf347a..66115b7c 100644
--- a/app/lib/use_case/list_tagged_file.g.dart
+++ b/app/lib/use_case/list_tagged_file.g.dart
@@ -6,10 +6,9 @@ part of 'list_tagged_file.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logListTaggedFile = Logger("use_case.list_tagged_file.ListTaggedFile");
-
 extension _$ListTaggedFileNpLog on ListTaggedFile {
   // ignore: unused_element
-  Logger get _log => _$logListTaggedFile;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.list_tagged_file.ListTaggedFile");
 }
diff --git a/app/lib/use_case/load_metadata.g.dart b/app/lib/use_case/load_metadata.g.dart
index a6acd8a0..f2a78d61 100644
--- a/app/lib/use_case/load_metadata.g.dart
+++ b/app/lib/use_case/load_metadata.g.dart
@@ -6,10 +6,9 @@ part of 'load_metadata.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logLoadMetadata = Logger("use_case.load_metadata.LoadMetadata");
-
 extension _$LoadMetadataNpLog on LoadMetadata {
   // ignore: unused_element
-  Logger get _log => _$logLoadMetadata;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.load_metadata.LoadMetadata");
 }
diff --git a/app/lib/use_case/move.g.dart b/app/lib/use_case/move.g.dart
index 58cc42ba..fe9e1417 100644
--- a/app/lib/use_case/move.g.dart
+++ b/app/lib/use_case/move.g.dart
@@ -6,10 +6,9 @@ part of 'move.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logMove = Logger("use_case.move.Move");
-
 extension _$MoveNpLog on Move {
   // ignore: unused_element
-  Logger get _log => _$logMove;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.move.Move");
 }
diff --git a/app/lib/use_case/populate_album.g.dart b/app/lib/use_case/populate_album.g.dart
index 1984419d..4cd5bd25 100644
--- a/app/lib/use_case/populate_album.g.dart
+++ b/app/lib/use_case/populate_album.g.dart
@@ -6,10 +6,9 @@ part of 'populate_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logPopulateAlbum = Logger("use_case.populate_album.PopulateAlbum");
-
 extension _$PopulateAlbumNpLog on PopulateAlbum {
   // ignore: unused_element
-  Logger get _log => _$logPopulateAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.populate_album.PopulateAlbum");
 }
diff --git a/app/lib/use_case/populate_person.g.dart b/app/lib/use_case/populate_person.g.dart
index ff00e038..8f72daa7 100644
--- a/app/lib/use_case/populate_person.g.dart
+++ b/app/lib/use_case/populate_person.g.dart
@@ -6,10 +6,9 @@ part of 'populate_person.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logPopulatePerson = Logger("use_case.populate_person.PopulatePerson");
-
 extension _$PopulatePersonNpLog on PopulatePerson {
   // ignore: unused_element
-  Logger get _log => _$logPopulatePerson;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.populate_person.PopulatePerson");
 }
diff --git a/app/lib/use_case/put_file_binary.g.dart b/app/lib/use_case/put_file_binary.g.dart
index 9832dda7..1f84532c 100644
--- a/app/lib/use_case/put_file_binary.g.dart
+++ b/app/lib/use_case/put_file_binary.g.dart
@@ -6,10 +6,9 @@ part of 'put_file_binary.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logPutFileBinary = Logger("use_case.put_file_binary.PutFileBinary");
-
 extension _$PutFileBinaryNpLog on PutFileBinary {
   // ignore: unused_element
-  Logger get _log => _$logPutFileBinary;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.put_file_binary.PutFileBinary");
 }
diff --git a/app/lib/use_case/remove.g.dart b/app/lib/use_case/remove.g.dart
index 329ac6a6..2cae2106 100644
--- a/app/lib/use_case/remove.g.dart
+++ b/app/lib/use_case/remove.g.dart
@@ -6,10 +6,9 @@ part of 'remove.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logRemove = Logger("use_case.remove.Remove");
-
 extension _$RemoveNpLog on Remove {
   // ignore: unused_element
-  Logger get _log => _$logRemove;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.remove.Remove");
 }
diff --git a/app/lib/use_case/remove_album.g.dart b/app/lib/use_case/remove_album.g.dart
index dc78d204..1c9aea3a 100644
--- a/app/lib/use_case/remove_album.g.dart
+++ b/app/lib/use_case/remove_album.g.dart
@@ -6,10 +6,9 @@ part of 'remove_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logRemoveAlbum = Logger("use_case.remove_album.RemoveAlbum");
-
 extension _$RemoveAlbumNpLog on RemoveAlbum {
   // ignore: unused_element
-  Logger get _log => _$logRemoveAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.remove_album.RemoveAlbum");
 }
diff --git a/app/lib/use_case/remove_from_album.g.dart b/app/lib/use_case/remove_from_album.g.dart
index 134253fc..51256a52 100644
--- a/app/lib/use_case/remove_from_album.g.dart
+++ b/app/lib/use_case/remove_from_album.g.dart
@@ -6,11 +6,9 @@ part of 'remove_from_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logRemoveFromAlbum =
-    Logger("use_case.remove_from_album.RemoveFromAlbum");
-
 extension _$RemoveFromAlbumNpLog on RemoveFromAlbum {
   // ignore: unused_element
-  Logger get _log => _$logRemoveFromAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.remove_from_album.RemoveFromAlbum");
 }
diff --git a/app/lib/use_case/request_public_link.g.dart b/app/lib/use_case/request_public_link.g.dart
index 181d3bdb..2b12090c 100644
--- a/app/lib/use_case/request_public_link.g.dart
+++ b/app/lib/use_case/request_public_link.g.dart
@@ -6,11 +6,9 @@ part of 'request_public_link.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logRequestPublicLink =
-    Logger("use_case.request_public_link.RequestPublicLink");
-
 extension _$RequestPublicLinkNpLog on RequestPublicLink {
   // ignore: unused_element
-  Logger get _log => _$logRequestPublicLink;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.request_public_link.RequestPublicLink");
 }
diff --git a/app/lib/use_case/resync_album.g.dart b/app/lib/use_case/resync_album.g.dart
index 8c18bbea..3b5c9e6d 100644
--- a/app/lib/use_case/resync_album.g.dart
+++ b/app/lib/use_case/resync_album.g.dart
@@ -6,10 +6,9 @@ part of 'resync_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logResyncAlbum = Logger("use_case.resync_album.ResyncAlbum");
-
 extension _$ResyncAlbumNpLog on ResyncAlbum {
   // ignore: unused_element
-  Logger get _log => _$logResyncAlbum;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.resync_album.ResyncAlbum");
 }
diff --git a/app/lib/use_case/scan_dir.g.dart b/app/lib/use_case/scan_dir.g.dart
index 645b4194..3efa201f 100644
--- a/app/lib/use_case/scan_dir.g.dart
+++ b/app/lib/use_case/scan_dir.g.dart
@@ -6,10 +6,9 @@ part of 'scan_dir.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logScanDir = Logger("use_case.scan_dir.ScanDir");
-
 extension _$ScanDirNpLog on ScanDir {
   // ignore: unused_element
-  Logger get _log => _$logScanDir;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.scan_dir.ScanDir");
 }
diff --git a/app/lib/use_case/share_album_with_user.g.dart b/app/lib/use_case/share_album_with_user.g.dart
index 7396cb25..33af6875 100644
--- a/app/lib/use_case/share_album_with_user.g.dart
+++ b/app/lib/use_case/share_album_with_user.g.dart
@@ -6,11 +6,10 @@ part of 'share_album_with_user.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logShareAlbumWithUser =
-    Logger("use_case.share_album_with_user.ShareAlbumWithUser");
-
 extension _$ShareAlbumWithUserNpLog on ShareAlbumWithUser {
   // ignore: unused_element
-  Logger get _log => _$logShareAlbumWithUser;
+  Logger get _log => log;
+
+  static final log =
+      Logger("use_case.share_album_with_user.ShareAlbumWithUser");
 }
diff --git a/app/lib/use_case/share_local.g.dart b/app/lib/use_case/share_local.g.dart
index 7e1d112a..118705f6 100644
--- a/app/lib/use_case/share_local.g.dart
+++ b/app/lib/use_case/share_local.g.dart
@@ -6,10 +6,9 @@ part of 'share_local.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logShareLocal = Logger("use_case.share_local.ShareLocal");
-
 extension _$ShareLocalNpLog on ShareLocal {
   // ignore: unused_element
-  Logger get _log => _$logShareLocal;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.share_local.ShareLocal");
 }
diff --git a/app/lib/use_case/startup_sync.g.dart b/app/lib/use_case/startup_sync.g.dart
index 4eb541c5..7e45e33d 100644
--- a/app/lib/use_case/startup_sync.g.dart
+++ b/app/lib/use_case/startup_sync.g.dart
@@ -6,10 +6,9 @@ part of 'startup_sync.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logStartupSync = Logger("use_case.startup_sync.StartupSync");
-
 extension _$StartupSyncNpLog on StartupSync {
   // ignore: unused_element
-  Logger get _log => _$logStartupSync;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.startup_sync.StartupSync");
 }
diff --git a/app/lib/use_case/sync_dir.g.dart b/app/lib/use_case/sync_dir.g.dart
index 0cfaa871..81774780 100644
--- a/app/lib/use_case/sync_dir.g.dart
+++ b/app/lib/use_case/sync_dir.g.dart
@@ -6,10 +6,9 @@ part of 'sync_dir.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSyncDir = Logger("use_case.sync_dir.SyncDir");
-
 extension _$SyncDirNpLog on SyncDir {
   // ignore: unused_element
-  Logger get _log => _$logSyncDir;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.sync_dir.SyncDir");
 }
diff --git a/app/lib/use_case/sync_favorite.g.dart b/app/lib/use_case/sync_favorite.g.dart
index 4d09a2b7..d5cc6882 100644
--- a/app/lib/use_case/sync_favorite.g.dart
+++ b/app/lib/use_case/sync_favorite.g.dart
@@ -6,10 +6,9 @@ part of 'sync_favorite.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSyncFavorite = Logger("use_case.sync_favorite.SyncFavorite");
-
 extension _$SyncFavoriteNpLog on SyncFavorite {
   // ignore: unused_element
-  Logger get _log => _$logSyncFavorite;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.sync_favorite.SyncFavorite");
 }
diff --git a/app/lib/use_case/sync_person.g.dart b/app/lib/use_case/sync_person.g.dart
index 14ddd076..5c297597 100644
--- a/app/lib/use_case/sync_person.g.dart
+++ b/app/lib/use_case/sync_person.g.dart
@@ -6,10 +6,9 @@ part of 'sync_person.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSyncPerson = Logger("use_case.sync_person.SyncPerson");
-
 extension _$SyncPersonNpLog on SyncPerson {
   // ignore: unused_element
-  Logger get _log => _$logSyncPerson;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.sync_person.SyncPerson");
 }
diff --git a/app/lib/use_case/sync_tag.g.dart b/app/lib/use_case/sync_tag.g.dart
index 17848598..f8d05ef4 100644
--- a/app/lib/use_case/sync_tag.g.dart
+++ b/app/lib/use_case/sync_tag.g.dart
@@ -6,10 +6,9 @@ part of 'sync_tag.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSyncTag = Logger("use_case.sync_tag.SyncTag");
-
 extension _$SyncTagNpLog on SyncTag {
   // ignore: unused_element
-  Logger get _log => _$logSyncTag;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.sync_tag.SyncTag");
 }
diff --git a/app/lib/use_case/unshare_album_with_user.g.dart b/app/lib/use_case/unshare_album_with_user.g.dart
index 47c1b434..e80f8bff 100644
--- a/app/lib/use_case/unshare_album_with_user.g.dart
+++ b/app/lib/use_case/unshare_album_with_user.g.dart
@@ -6,11 +6,10 @@ part of 'unshare_album_with_user.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUnshareAlbumWithUser =
-    Logger("use_case.unshare_album_with_user.UnshareAlbumWithUser");
-
 extension _$UnshareAlbumWithUserNpLog on UnshareAlbumWithUser {
   // ignore: unused_element
-  Logger get _log => _$logUnshareAlbumWithUser;
+  Logger get _log => log;
+
+  static final log =
+      Logger("use_case.unshare_album_with_user.UnshareAlbumWithUser");
 }
diff --git a/app/lib/use_case/unshare_file_from_album.g.dart b/app/lib/use_case/unshare_file_from_album.g.dart
index 5a340808..89680f06 100644
--- a/app/lib/use_case/unshare_file_from_album.g.dart
+++ b/app/lib/use_case/unshare_file_from_album.g.dart
@@ -6,11 +6,10 @@ part of 'unshare_file_from_album.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUnshareFileFromAlbum =
-    Logger("use_case.unshare_file_from_album.UnshareFileFromAlbum");
-
 extension _$UnshareFileFromAlbumNpLog on UnshareFileFromAlbum {
   // ignore: unused_element
-  Logger get _log => _$logUnshareFileFromAlbum;
+  Logger get _log => log;
+
+  static final log =
+      Logger("use_case.unshare_file_from_album.UnshareFileFromAlbum");
 }
diff --git a/app/lib/use_case/update_album_with_actual_items.g.dart b/app/lib/use_case/update_album_with_actual_items.g.dart
index dd398da7..80e63658 100644
--- a/app/lib/use_case/update_album_with_actual_items.g.dart
+++ b/app/lib/use_case/update_album_with_actual_items.g.dart
@@ -6,11 +6,10 @@ part of 'update_album_with_actual_items.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUpdateAlbumWithActualItems = Logger(
-    "use_case.update_album_with_actual_items.UpdateAlbumWithActualItems");
-
 extension _$UpdateAlbumWithActualItemsNpLog on UpdateAlbumWithActualItems {
   // ignore: unused_element
-  Logger get _log => _$logUpdateAlbumWithActualItems;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "use_case.update_album_with_actual_items.UpdateAlbumWithActualItems");
 }
diff --git a/app/lib/use_case/update_missing_metadata.g.dart b/app/lib/use_case/update_missing_metadata.g.dart
index 9561c5eb..1c045135 100644
--- a/app/lib/use_case/update_missing_metadata.g.dart
+++ b/app/lib/use_case/update_missing_metadata.g.dart
@@ -6,11 +6,10 @@ part of 'update_missing_metadata.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUpdateMissingMetadata =
-    Logger("use_case.update_missing_metadata.UpdateMissingMetadata");
-
 extension _$UpdateMissingMetadataNpLog on UpdateMissingMetadata {
   // ignore: unused_element
-  Logger get _log => _$logUpdateMissingMetadata;
+  Logger get _log => log;
+
+  static final log =
+      Logger("use_case.update_missing_metadata.UpdateMissingMetadata");
 }
diff --git a/app/lib/use_case/update_property.g.dart b/app/lib/use_case/update_property.g.dart
index 48885451..02cd37b2 100644
--- a/app/lib/use_case/update_property.g.dart
+++ b/app/lib/use_case/update_property.g.dart
@@ -6,10 +6,9 @@ part of 'update_property.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUpdateProperty = Logger("use_case.update_property.UpdateProperty");
-
 extension _$UpdatePropertyNpLog on UpdateProperty {
   // ignore: unused_element
-  Logger get _log => _$logUpdateProperty;
+  Logger get _log => log;
+
+  static final log = Logger("use_case.update_property.UpdateProperty");
 }
diff --git a/app/lib/web/notification.g.dart b/app/lib/web/notification.g.dart
index b9be7778..5e183bb3 100644
--- a/app/lib/web/notification.g.dart
+++ b/app/lib/web/notification.g.dart
@@ -6,10 +6,9 @@ part of 'notification.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logNotificationManager = Logger("web.notification.NotificationManager");
-
 extension _$NotificationManagerNpLog on NotificationManager {
   // ignore: unused_element
-  Logger get _log => _$logNotificationManager;
+  Logger get _log => log;
+
+  static final log = Logger("web.notification.NotificationManager");
 }
diff --git a/app/lib/widget/account_picker_dialog.g.dart b/app/lib/widget/account_picker_dialog.g.dart
index ad1251bf..ae5c2101 100644
--- a/app/lib/widget/account_picker_dialog.g.dart
+++ b/app/lib/widget/account_picker_dialog.g.dart
@@ -6,11 +6,10 @@ part of 'account_picker_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AccountPickerDialogState =
-    Logger("widget.account_picker_dialog._AccountPickerDialogState");
-
 extension _$_AccountPickerDialogStateNpLog on _AccountPickerDialogState {
   // ignore: unused_element
-  Logger get _log => _$log_AccountPickerDialogState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.account_picker_dialog._AccountPickerDialogState");
 }
diff --git a/app/lib/widget/album_browser.g.dart b/app/lib/widget/album_browser.g.dart
index 8dd3f4fd..27993fc2 100644
--- a/app/lib/widget/album_browser.g.dart
+++ b/app/lib/widget/album_browser.g.dart
@@ -6,13 +6,11 @@ part of 'album_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumBrowserState =
-    Logger("widget.album_browser._AlbumBrowserState");
-
 extension _$_AlbumBrowserStateNpLog on _AlbumBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.album_browser._AlbumBrowserState");
 }
 
 // **************************************************************************
diff --git a/app/lib/widget/album_browser_mixin.g.dart b/app/lib/widget/album_browser_mixin.g.dart
index 918c962a..0965e136 100644
--- a/app/lib/widget/album_browser_mixin.g.dart
+++ b/app/lib/widget/album_browser_mixin.g.dart
@@ -6,11 +6,9 @@ part of 'album_browser_mixin.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAlbumBrowserMixin =
-    Logger("widget.album_browser_mixin.AlbumBrowserMixin");
-
 extension _$AlbumBrowserMixinNpLog on AlbumBrowserMixin {
   // ignore: unused_element
-  Logger get _log => _$logAlbumBrowserMixin;
+  Logger get _log => log;
+
+  static final log = Logger("widget.album_browser_mixin.AlbumBrowserMixin");
 }
diff --git a/app/lib/widget/album_dir_picker.g.dart b/app/lib/widget/album_dir_picker.g.dart
index 83c6cabc..b7f1575a 100644
--- a/app/lib/widget/album_dir_picker.g.dart
+++ b/app/lib/widget/album_dir_picker.g.dart
@@ -6,11 +6,9 @@ part of 'album_dir_picker.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumDirPickerState =
-    Logger("widget.album_dir_picker._AlbumDirPickerState");
-
 extension _$_AlbumDirPickerStateNpLog on _AlbumDirPickerState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumDirPickerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.album_dir_picker._AlbumDirPickerState");
 }
diff --git a/app/lib/widget/album_importer.g.dart b/app/lib/widget/album_importer.g.dart
index 1c2ec98d..702d5827 100644
--- a/app/lib/widget/album_importer.g.dart
+++ b/app/lib/widget/album_importer.g.dart
@@ -6,11 +6,9 @@ part of 'album_importer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumImporterState =
-    Logger("widget.album_importer._AlbumImporterState");
-
 extension _$_AlbumImporterStateNpLog on _AlbumImporterState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumImporterState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.album_importer._AlbumImporterState");
 }
diff --git a/app/lib/widget/album_picker.g.dart b/app/lib/widget/album_picker.g.dart
index 64073acb..88b19827 100644
--- a/app/lib/widget/album_picker.g.dart
+++ b/app/lib/widget/album_picker.g.dart
@@ -6,10 +6,9 @@ part of 'album_picker.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumPickerState = Logger("widget.album_picker._AlbumPickerState");
-
 extension _$_AlbumPickerStateNpLog on _AlbumPickerState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumPickerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.album_picker._AlbumPickerState");
 }
diff --git a/app/lib/widget/album_share_outlier_browser.g.dart b/app/lib/widget/album_share_outlier_browser.g.dart
index 065f3e6f..1209b8ff 100644
--- a/app/lib/widget/album_share_outlier_browser.g.dart
+++ b/app/lib/widget/album_share_outlier_browser.g.dart
@@ -6,12 +6,11 @@ part of 'album_share_outlier_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumShareOutlierBrowserState =
-    Logger("widget.album_share_outlier_browser._AlbumShareOutlierBrowserState");
-
 extension _$_AlbumShareOutlierBrowserStateNpLog
     on _AlbumShareOutlierBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumShareOutlierBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.album_share_outlier_browser._AlbumShareOutlierBrowserState");
 }
diff --git a/app/lib/widget/archive_browser.g.dart b/app/lib/widget/archive_browser.g.dart
index 6e410baf..b58eeda6 100644
--- a/app/lib/widget/archive_browser.g.dart
+++ b/app/lib/widget/archive_browser.g.dart
@@ -6,11 +6,9 @@ part of 'archive_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ArchiveBrowserState =
-    Logger("widget.archive_browser._ArchiveBrowserState");
-
 extension _$_ArchiveBrowserStateNpLog on _ArchiveBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_ArchiveBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.archive_browser._ArchiveBrowserState");
 }
diff --git a/app/lib/widget/builder/photo_list_item_builder.g.dart b/app/lib/widget/builder/photo_list_item_builder.g.dart
index da4e1af3..98bd662f 100644
--- a/app/lib/widget/builder/photo_list_item_builder.g.dart
+++ b/app/lib/widget/builder/photo_list_item_builder.g.dart
@@ -6,11 +6,10 @@ part of 'photo_list_item_builder.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PhotoListItemBuilder =
-    Logger("widget.builder.photo_list_item_builder._PhotoListItemBuilder");
-
 extension _$_PhotoListItemBuilderNpLog on _PhotoListItemBuilder {
   // ignore: unused_element
-  Logger get _log => _$log_PhotoListItemBuilder;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.builder.photo_list_item_builder._PhotoListItemBuilder");
 }
diff --git a/app/lib/widget/changelog.g.dart b/app/lib/widget/changelog.g.dart
index 87dbd67b..b32851dc 100644
--- a/app/lib/widget/changelog.g.dart
+++ b/app/lib/widget/changelog.g.dart
@@ -6,10 +6,9 @@ part of 'changelog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logChangelog = Logger("widget.changelog.Changelog");
-
 extension _$ChangelogNpLog on Changelog {
   // ignore: unused_element
-  Logger get _log => _$logChangelog;
+  Logger get _log => log;
+
+  static final log = Logger("widget.changelog.Changelog");
 }
diff --git a/app/lib/widget/connect.g.dart b/app/lib/widget/connect.g.dart
index e698d6df..c923ef44 100644
--- a/app/lib/widget/connect.g.dart
+++ b/app/lib/widget/connect.g.dart
@@ -6,10 +6,9 @@ part of 'connect.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ConnectState = Logger("widget.connect._ConnectState");
-
 extension _$_ConnectStateNpLog on _ConnectState {
   // ignore: unused_element
-  Logger get _log => _$log_ConnectState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.connect._ConnectState");
 }
diff --git a/app/lib/widget/dir_picker.g.dart b/app/lib/widget/dir_picker.g.dart
index f799b137..5dd20ccf 100644
--- a/app/lib/widget/dir_picker.g.dart
+++ b/app/lib/widget/dir_picker.g.dart
@@ -6,10 +6,9 @@ part of 'dir_picker.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logDirPickerState = Logger("widget.dir_picker.DirPickerState");
-
 extension _$DirPickerStateNpLog on DirPickerState {
   // ignore: unused_element
-  Logger get _log => _$logDirPickerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.dir_picker.DirPickerState");
 }
diff --git a/app/lib/widget/draggable.g.dart b/app/lib/widget/draggable.g.dart
index d5255fbd..8e7b6cee 100644
--- a/app/lib/widget/draggable.g.dart
+++ b/app/lib/widget/draggable.g.dart
@@ -6,10 +6,9 @@ part of 'draggable.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logDraggable = Logger("widget.draggable.Draggable");
-
 extension _$DraggableNpLog on Draggable {
   // ignore: unused_element
-  Logger get _log => _$logDraggable;
+  Logger get _log => log;
+
+  static final log = Logger("widget.draggable.Draggable");
 }
diff --git a/app/lib/widget/dynamic_album_browser.g.dart b/app/lib/widget/dynamic_album_browser.g.dart
index c7b053a3..5823beae 100644
--- a/app/lib/widget/dynamic_album_browser.g.dart
+++ b/app/lib/widget/dynamic_album_browser.g.dart
@@ -6,13 +6,12 @@ part of 'dynamic_album_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_DynamicAlbumBrowserState =
-    Logger("widget.dynamic_album_browser._DynamicAlbumBrowserState");
-
 extension _$_DynamicAlbumBrowserStateNpLog on _DynamicAlbumBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_DynamicAlbumBrowserState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.dynamic_album_browser._DynamicAlbumBrowserState");
 }
 
 // **************************************************************************
diff --git a/app/lib/widget/enhanced_photo_browser.g.dart b/app/lib/widget/enhanced_photo_browser.g.dart
index 15f2d447..3645ac16 100644
--- a/app/lib/widget/enhanced_photo_browser.g.dart
+++ b/app/lib/widget/enhanced_photo_browser.g.dart
@@ -6,19 +6,17 @@ part of 'enhanced_photo_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_EnhancedPhotoBrowserState =
-    Logger("widget.enhanced_photo_browser._EnhancedPhotoBrowserState");
-
 extension _$_EnhancedPhotoBrowserStateNpLog on _EnhancedPhotoBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_EnhancedPhotoBrowserState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_Builder = Logger("widget.enhanced_photo_browser._Builder");
+  static final log =
+      Logger("widget.enhanced_photo_browser._EnhancedPhotoBrowserState");
+}
 
 extension _$_BuilderNpLog on _Builder {
   // ignore: unused_element
-  Logger get _log => _$log_Builder;
+  Logger get _log => log;
+
+  static final log = Logger("widget.enhanced_photo_browser._Builder");
 }
diff --git a/app/lib/widget/handler/add_selection_to_album_handler.g.dart b/app/lib/widget/handler/add_selection_to_album_handler.g.dart
index 39bf2a88..41295342 100644
--- a/app/lib/widget/handler/add_selection_to_album_handler.g.dart
+++ b/app/lib/widget/handler/add_selection_to_album_handler.g.dart
@@ -6,11 +6,10 @@ part of 'add_selection_to_album_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logAddSelectionToAlbumHandler = Logger(
-    "widget.handler.add_selection_to_album_handler.AddSelectionToAlbumHandler");
-
 extension _$AddSelectionToAlbumHandlerNpLog on AddSelectionToAlbumHandler {
   // ignore: unused_element
-  Logger get _log => _$logAddSelectionToAlbumHandler;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.handler.add_selection_to_album_handler.AddSelectionToAlbumHandler");
 }
diff --git a/app/lib/widget/handler/archive_selection_handler.g.dart b/app/lib/widget/handler/archive_selection_handler.g.dart
index 3946e2d0..8c50cfb1 100644
--- a/app/lib/widget/handler/archive_selection_handler.g.dart
+++ b/app/lib/widget/handler/archive_selection_handler.g.dart
@@ -6,11 +6,10 @@ part of 'archive_selection_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logArchiveSelectionHandler =
-    Logger("widget.handler.archive_selection_handler.ArchiveSelectionHandler");
-
 extension _$ArchiveSelectionHandlerNpLog on ArchiveSelectionHandler {
   // ignore: unused_element
-  Logger get _log => _$logArchiveSelectionHandler;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.handler.archive_selection_handler.ArchiveSelectionHandler");
 }
diff --git a/app/lib/widget/handler/delete_local_selection_handler.g.dart b/app/lib/widget/handler/delete_local_selection_handler.g.dart
index 34511939..939aa071 100644
--- a/app/lib/widget/handler/delete_local_selection_handler.g.dart
+++ b/app/lib/widget/handler/delete_local_selection_handler.g.dart
@@ -6,11 +6,10 @@ part of 'delete_local_selection_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logDeleteLocalSelectionHandler = Logger(
-    "widget.handler.delete_local_selection_handler.DeleteLocalSelectionHandler");
-
 extension _$DeleteLocalSelectionHandlerNpLog on DeleteLocalSelectionHandler {
   // ignore: unused_element
-  Logger get _log => _$logDeleteLocalSelectionHandler;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.handler.delete_local_selection_handler.DeleteLocalSelectionHandler");
 }
diff --git a/app/lib/widget/handler/remove_selection_handler.g.dart b/app/lib/widget/handler/remove_selection_handler.g.dart
index 8fc179e2..5e1febd6 100644
--- a/app/lib/widget/handler/remove_selection_handler.g.dart
+++ b/app/lib/widget/handler/remove_selection_handler.g.dart
@@ -6,11 +6,10 @@ part of 'remove_selection_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logRemoveSelectionHandler =
-    Logger("widget.handler.remove_selection_handler.RemoveSelectionHandler");
-
 extension _$RemoveSelectionHandlerNpLog on RemoveSelectionHandler {
   // ignore: unused_element
-  Logger get _log => _$logRemoveSelectionHandler;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.handler.remove_selection_handler.RemoveSelectionHandler");
 }
diff --git a/app/lib/widget/handler/unarchive_selection_handler.g.dart b/app/lib/widget/handler/unarchive_selection_handler.g.dart
index 3b34d253..ce842a45 100644
--- a/app/lib/widget/handler/unarchive_selection_handler.g.dart
+++ b/app/lib/widget/handler/unarchive_selection_handler.g.dart
@@ -6,11 +6,10 @@ part of 'unarchive_selection_handler.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logUnarchiveSelectionHandler = Logger(
-    "widget.handler.unarchive_selection_handler.UnarchiveSelectionHandler");
-
 extension _$UnarchiveSelectionHandlerNpLog on UnarchiveSelectionHandler {
   // ignore: unused_element
-  Logger get _log => _$logUnarchiveSelectionHandler;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.handler.unarchive_selection_handler.UnarchiveSelectionHandler");
 }
diff --git a/app/lib/widget/home.g.dart b/app/lib/widget/home.g.dart
index 2f0c96fb..a98abc2d 100644
--- a/app/lib/widget/home.g.dart
+++ b/app/lib/widget/home.g.dart
@@ -6,10 +6,9 @@ part of 'home.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_HomeState = Logger("widget.home._HomeState");
-
 extension _$_HomeStateNpLog on _HomeState {
   // ignore: unused_element
-  Logger get _log => _$log_HomeState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.home._HomeState");
 }
diff --git a/app/lib/widget/home_albums.g.dart b/app/lib/widget/home_albums.g.dart
index f4baf5be..96f164c6 100644
--- a/app/lib/widget/home_albums.g.dart
+++ b/app/lib/widget/home_albums.g.dart
@@ -6,10 +6,9 @@ part of 'home_albums.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_HomeAlbumsState = Logger("widget.home_albums._HomeAlbumsState");
-
 extension _$_HomeAlbumsStateNpLog on _HomeAlbumsState {
   // ignore: unused_element
-  Logger get _log => _$log_HomeAlbumsState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.home_albums._HomeAlbumsState");
 }
diff --git a/app/lib/widget/home_photos.g.dart b/app/lib/widget/home_photos.g.dart
index 4f94d246..9c22ac33 100644
--- a/app/lib/widget/home_photos.g.dart
+++ b/app/lib/widget/home_photos.g.dart
@@ -6,10 +6,9 @@ part of 'home_photos.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_HomePhotosState = Logger("widget.home_photos._HomePhotosState");
-
 extension _$_HomePhotosStateNpLog on _HomePhotosState {
   // ignore: unused_element
-  Logger get _log => _$log_HomePhotosState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.home_photos._HomePhotosState");
 }
diff --git a/app/lib/widget/home_search.g.dart b/app/lib/widget/home_search.g.dart
index 40947628..6e1918c3 100644
--- a/app/lib/widget/home_search.g.dart
+++ b/app/lib/widget/home_search.g.dart
@@ -6,10 +6,9 @@ part of 'home_search.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_HomeSearchState = Logger("widget.home_search._HomeSearchState");
-
 extension _$_HomeSearchStateNpLog on _HomeSearchState {
   // ignore: unused_element
-  Logger get _log => _$log_HomeSearchState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.home_search._HomeSearchState");
 }
diff --git a/app/lib/widget/home_search_suggestion.g.dart b/app/lib/widget/home_search_suggestion.g.dart
index f8cc1cb6..e119da1b 100644
--- a/app/lib/widget/home_search_suggestion.g.dart
+++ b/app/lib/widget/home_search_suggestion.g.dart
@@ -6,11 +6,10 @@ part of 'home_search_suggestion.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_HomeSearchSuggestionState =
-    Logger("widget.home_search_suggestion._HomeSearchSuggestionState");
-
 extension _$_HomeSearchSuggestionStateNpLog on _HomeSearchSuggestionState {
   // ignore: unused_element
-  Logger get _log => _$log_HomeSearchSuggestionState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.home_search_suggestion._HomeSearchSuggestionState");
 }
diff --git a/app/lib/widget/image_editor/crop_controller.g.dart b/app/lib/widget/image_editor/crop_controller.g.dart
index e00f7b78..0dca062e 100644
--- a/app/lib/widget/image_editor/crop_controller.g.dart
+++ b/app/lib/widget/image_editor/crop_controller.g.dart
@@ -6,11 +6,10 @@ part of 'crop_controller.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_CropControllerState =
-    Logger("widget.image_editor.crop_controller._CropControllerState");
-
 extension _$_CropControllerStateNpLog on _CropControllerState {
   // ignore: unused_element
-  Logger get _log => _$log_CropControllerState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.image_editor.crop_controller._CropControllerState");
 }
diff --git a/app/lib/widget/image_editor_persist_option_dialog.g.dart b/app/lib/widget/image_editor_persist_option_dialog.g.dart
index f1edbc0e..b9ad8078 100644
--- a/app/lib/widget/image_editor_persist_option_dialog.g.dart
+++ b/app/lib/widget/image_editor_persist_option_dialog.g.dart
@@ -6,12 +6,11 @@ part of 'image_editor_persist_option_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logImageEditorPersistOptionDialog = Logger(
-    "widget.image_editor_persist_option_dialog.ImageEditorPersistOptionDialog");
-
 extension _$ImageEditorPersistOptionDialogNpLog
     on ImageEditorPersistOptionDialog {
   // ignore: unused_element
-  Logger get _log => _$logImageEditorPersistOptionDialog;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.image_editor_persist_option_dialog.ImageEditorPersistOptionDialog");
 }
diff --git a/app/lib/widget/image_enhancer.g.dart b/app/lib/widget/image_enhancer.g.dart
index a9b751c9..c56cd376 100644
--- a/app/lib/widget/image_enhancer.g.dart
+++ b/app/lib/widget/image_enhancer.g.dart
@@ -6,20 +6,16 @@ part of 'image_enhancer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ImageEnhancerState =
-    Logger("widget.image_enhancer._ImageEnhancerState");
-
 extension _$_ImageEnhancerStateNpLog on _ImageEnhancerState {
   // ignore: unused_element
-  Logger get _log => _$log_ImageEnhancerState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_StylePickerState =
-    Logger("widget.image_enhancer._StylePickerState");
+  static final log = Logger("widget.image_enhancer._ImageEnhancerState");
+}
 
 extension _$_StylePickerStateNpLog on _StylePickerState {
   // ignore: unused_element
-  Logger get _log => _$log_StylePickerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.image_enhancer._StylePickerState");
 }
diff --git a/app/lib/widget/image_viewer.g.dart b/app/lib/widget/image_viewer.g.dart
index 656e441a..94d1abf6 100644
--- a/app/lib/widget/image_viewer.g.dart
+++ b/app/lib/widget/image_viewer.g.dart
@@ -6,28 +6,23 @@ part of 'image_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_LocalImageViewerState =
-    Logger("widget.image_viewer._LocalImageViewerState");
-
 extension _$_LocalImageViewerStateNpLog on _LocalImageViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_LocalImageViewerState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_RemoteImageViewerState =
-    Logger("widget.image_viewer._RemoteImageViewerState");
+  static final log = Logger("widget.image_viewer._LocalImageViewerState");
+}
 
 extension _$_RemoteImageViewerStateNpLog on _RemoteImageViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_RemoteImageViewerState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_ImageViewerState = Logger("widget.image_viewer._ImageViewerState");
+  static final log = Logger("widget.image_viewer._RemoteImageViewerState");
+}
 
 extension _$_ImageViewerStateNpLog on _ImageViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_ImageViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.image_viewer._ImageViewerState");
 }
diff --git a/app/lib/widget/local_file_viewer.g.dart b/app/lib/widget/local_file_viewer.g.dart
index 72eb0abc..941a88c0 100644
--- a/app/lib/widget/local_file_viewer.g.dart
+++ b/app/lib/widget/local_file_viewer.g.dart
@@ -6,11 +6,9 @@ part of 'local_file_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_LocalFileViewerState =
-    Logger("widget.local_file_viewer._LocalFileViewerState");
-
 extension _$_LocalFileViewerStateNpLog on _LocalFileViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_LocalFileViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.local_file_viewer._LocalFileViewerState");
 }
diff --git a/app/lib/widget/measurable_item_list.g.dart b/app/lib/widget/measurable_item_list.g.dart
index 35732817..a32680d2 100644
--- a/app/lib/widget/measurable_item_list.g.dart
+++ b/app/lib/widget/measurable_item_list.g.dart
@@ -6,11 +6,10 @@ part of 'measurable_item_list.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_MeasurableItemListState =
-    Logger("widget.measurable_item_list._MeasurableItemListState");
-
 extension _$_MeasurableItemListStateNpLog on _MeasurableItemListState {
   // ignore: unused_element
-  Logger get _log => _$log_MeasurableItemListState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.measurable_item_list._MeasurableItemListState");
 }
diff --git a/app/lib/widget/my_app.g.dart b/app/lib/widget/my_app.g.dart
index d8fe2138..00a51cd0 100644
--- a/app/lib/widget/my_app.g.dart
+++ b/app/lib/widget/my_app.g.dart
@@ -6,10 +6,9 @@ part of 'my_app.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_MyAppState = Logger("widget.my_app._MyAppState");
-
 extension _$_MyAppStateNpLog on _MyAppState {
   // ignore: unused_element
-  Logger get _log => _$log_MyAppState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.my_app._MyAppState");
 }
diff --git a/app/lib/widget/new_album_dialog.g.dart b/app/lib/widget/new_album_dialog.g.dart
index ac865f89..e1b3a2aa 100644
--- a/app/lib/widget/new_album_dialog.g.dart
+++ b/app/lib/widget/new_album_dialog.g.dart
@@ -6,11 +6,9 @@ part of 'new_album_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_NewAlbumDialogState =
-    Logger("widget.new_album_dialog._NewAlbumDialogState");
-
 extension _$_NewAlbumDialogStateNpLog on _NewAlbumDialogState {
   // ignore: unused_element
-  Logger get _log => _$log_NewAlbumDialogState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.new_album_dialog._NewAlbumDialogState");
 }
diff --git a/app/lib/widget/people_browser.g.dart b/app/lib/widget/people_browser.g.dart
index 4dc7fb89..d230d51f 100644
--- a/app/lib/widget/people_browser.g.dart
+++ b/app/lib/widget/people_browser.g.dart
@@ -6,11 +6,9 @@ part of 'people_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PeopleBrowserState =
-    Logger("widget.people_browser._PeopleBrowserState");
-
 extension _$_PeopleBrowserStateNpLog on _PeopleBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_PeopleBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.people_browser._PeopleBrowserState");
 }
diff --git a/app/lib/widget/person_browser.g.dart b/app/lib/widget/person_browser.g.dart
index 5ec40195..a769fdf1 100644
--- a/app/lib/widget/person_browser.g.dart
+++ b/app/lib/widget/person_browser.g.dart
@@ -6,11 +6,9 @@ part of 'person_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PersonBrowserState =
-    Logger("widget.person_browser._PersonBrowserState");
-
 extension _$_PersonBrowserStateNpLog on _PersonBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_PersonBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.person_browser._PersonBrowserState");
 }
diff --git a/app/lib/widget/photo_date_time_edit_dialog.g.dart b/app/lib/widget/photo_date_time_edit_dialog.g.dart
index f26a276d..48561ff9 100644
--- a/app/lib/widget/photo_date_time_edit_dialog.g.dart
+++ b/app/lib/widget/photo_date_time_edit_dialog.g.dart
@@ -6,12 +6,11 @@ part of 'photo_date_time_edit_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PhotoDateTimeEditDialogState =
-    Logger("widget.photo_date_time_edit_dialog._PhotoDateTimeEditDialogState");
-
 extension _$_PhotoDateTimeEditDialogStateNpLog
     on _PhotoDateTimeEditDialogState {
   // ignore: unused_element
-  Logger get _log => _$log_PhotoDateTimeEditDialogState;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.photo_date_time_edit_dialog._PhotoDateTimeEditDialogState");
 }
diff --git a/app/lib/widget/photo_list_util.g.dart b/app/lib/widget/photo_list_util.g.dart
index 2c6ca7b4..79bfa43a 100644
--- a/app/lib/widget/photo_list_util.g.dart
+++ b/app/lib/widget/photo_list_util.g.dart
@@ -6,11 +6,9 @@ part of 'photo_list_util.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logMemoryAlbumHelper =
-    Logger("widget.photo_list_util.MemoryAlbumHelper");
-
 extension _$MemoryAlbumHelperNpLog on MemoryAlbumHelper {
   // ignore: unused_element
-  Logger get _log => _$logMemoryAlbumHelper;
+  Logger get _log => log;
+
+  static final log = Logger("widget.photo_list_util.MemoryAlbumHelper");
 }
diff --git a/app/lib/widget/place_browser.g.dart b/app/lib/widget/place_browser.g.dart
index d7e983c8..eee6b2ca 100644
--- a/app/lib/widget/place_browser.g.dart
+++ b/app/lib/widget/place_browser.g.dart
@@ -6,11 +6,9 @@ part of 'place_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PlaceBrowserState =
-    Logger("widget.place_browser._PlaceBrowserState");
-
 extension _$_PlaceBrowserStateNpLog on _PlaceBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_PlaceBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.place_browser._PlaceBrowserState");
 }
diff --git a/app/lib/widget/places_browser.g.dart b/app/lib/widget/places_browser.g.dart
index ff51936e..04eb4345 100644
--- a/app/lib/widget/places_browser.g.dart
+++ b/app/lib/widget/places_browser.g.dart
@@ -6,11 +6,9 @@ part of 'places_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_PlacesBrowserState =
-    Logger("widget.places_browser._PlacesBrowserState");
-
 extension _$_PlacesBrowserStateNpLog on _PlacesBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_PlacesBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.places_browser._PlacesBrowserState");
 }
diff --git a/app/lib/widget/result_viewer.g.dart b/app/lib/widget/result_viewer.g.dart
index 43cfc790..c3edfd0b 100644
--- a/app/lib/widget/result_viewer.g.dart
+++ b/app/lib/widget/result_viewer.g.dart
@@ -6,11 +6,9 @@ part of 'result_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ResultViewerState =
-    Logger("widget.result_viewer._ResultViewerState");
-
 extension _$_ResultViewerStateNpLog on _ResultViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_ResultViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.result_viewer._ResultViewerState");
 }
diff --git a/app/lib/widget/root_picker.g.dart b/app/lib/widget/root_picker.g.dart
index af79f58e..8d879340 100644
--- a/app/lib/widget/root_picker.g.dart
+++ b/app/lib/widget/root_picker.g.dart
@@ -6,10 +6,9 @@ part of 'root_picker.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_RootPickerState = Logger("widget.root_picker._RootPickerState");
-
 extension _$_RootPickerStateNpLog on _RootPickerState {
   // ignore: unused_element
-  Logger get _log => _$log_RootPickerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.root_picker._RootPickerState");
 }
diff --git a/app/lib/widget/search_landing.g.dart b/app/lib/widget/search_landing.g.dart
index 9e1607cd..55d6b85d 100644
--- a/app/lib/widget/search_landing.g.dart
+++ b/app/lib/widget/search_landing.g.dart
@@ -6,11 +6,9 @@ part of 'search_landing.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SearchLandingState =
-    Logger("widget.search_landing._SearchLandingState");
-
 extension _$_SearchLandingStateNpLog on _SearchLandingState {
   // ignore: unused_element
-  Logger get _log => _$log_SearchLandingState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.search_landing._SearchLandingState");
 }
diff --git a/app/lib/widget/selectable_item_stream_list_mixin.g.dart b/app/lib/widget/selectable_item_stream_list_mixin.g.dart
index f976d7cb..4a0a7dad 100644
--- a/app/lib/widget/selectable_item_stream_list_mixin.g.dart
+++ b/app/lib/widget/selectable_item_stream_list_mixin.g.dart
@@ -6,12 +6,11 @@ part of 'selectable_item_stream_list_mixin.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logSelectableItemStreamListMixin = Logger(
-    "widget.selectable_item_stream_list_mixin.SelectableItemStreamListMixin");
-
 extension _$SelectableItemStreamListMixinNpLog
     on SelectableItemStreamListMixin {
   // ignore: unused_element
-  Logger get _log => _$logSelectableItemStreamListMixin;
+  Logger get _log => log;
+
+  static final log = Logger(
+      "widget.selectable_item_stream_list_mixin.SelectableItemStreamListMixin");
 }
diff --git a/app/lib/widget/settings.g.dart b/app/lib/widget/settings.g.dart
index 59579679..b0aeb946 100644
--- a/app/lib/widget/settings.g.dart
+++ b/app/lib/widget/settings.g.dart
@@ -6,79 +6,65 @@ part of 'settings.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SettingsState = Logger("widget.settings._SettingsState");
-
 extension _$_SettingsStateNpLog on _SettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_SettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_AccountSettingsState =
-    Logger("widget.settings._AccountSettingsState");
+  static final log = Logger("widget.settings._SettingsState");
+}
 
 extension _$_AccountSettingsStateNpLog on _AccountSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_AccountSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_PhotosSettingsState =
-    Logger("widget.settings._PhotosSettingsState");
+  static final log = Logger("widget.settings._AccountSettingsState");
+}
 
 extension _$_PhotosSettingsStateNpLog on _PhotosSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_PhotosSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_ViewerSettingsState =
-    Logger("widget.settings._ViewerSettingsState");
+  static final log = Logger("widget.settings._PhotosSettingsState");
+}
 
 extension _$_ViewerSettingsStateNpLog on _ViewerSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_ViewerSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_AlbumSettingsState = Logger("widget.settings._AlbumSettingsState");
+  static final log = Logger("widget.settings._ViewerSettingsState");
+}
 
 extension _$_AlbumSettingsStateNpLog on _AlbumSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_AlbumSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_EnhancementSettingsState =
-    Logger("widget.settings._EnhancementSettingsState");
+  static final log = Logger("widget.settings._AlbumSettingsState");
+}
 
 extension _$_EnhancementSettingsStateNpLog on _EnhancementSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_EnhancementSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_MiscSettingsState = Logger("widget.settings._MiscSettingsState");
+  static final log = Logger("widget.settings._EnhancementSettingsState");
+}
 
 extension _$_MiscSettingsStateNpLog on _MiscSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_MiscSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_ExperimentalSettingsState =
-    Logger("widget.settings._ExperimentalSettingsState");
+  static final log = Logger("widget.settings._MiscSettingsState");
+}
 
 extension _$_ExperimentalSettingsStateNpLog on _ExperimentalSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_ExperimentalSettingsState;
-}
+  Logger get _log => log;
 
-// ignore: non_constant_identifier_names
-final _$log_DevSettingsState = Logger("widget.settings._DevSettingsState");
+  static final log = Logger("widget.settings._ExperimentalSettingsState");
+}
 
 extension _$_DevSettingsStateNpLog on _DevSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_DevSettingsState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.settings._DevSettingsState");
 }
diff --git a/app/lib/widget/settings/theme_settings.g.dart b/app/lib/widget/settings/theme_settings.g.dart
index 6da7c9ab..6f679148 100644
--- a/app/lib/widget/settings/theme_settings.g.dart
+++ b/app/lib/widget/settings/theme_settings.g.dart
@@ -6,11 +6,10 @@ part of 'theme_settings.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ThemeSettingsState =
-    Logger("widget.settings.theme_settings._ThemeSettingsState");
-
 extension _$_ThemeSettingsStateNpLog on _ThemeSettingsState {
   // ignore: unused_element
-  Logger get _log => _$log_ThemeSettingsState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.settings.theme_settings._ThemeSettingsState");
 }
diff --git a/app/lib/widget/share_album_dialog.g.dart b/app/lib/widget/share_album_dialog.g.dart
index f850b0f9..9a649177 100644
--- a/app/lib/widget/share_album_dialog.g.dart
+++ b/app/lib/widget/share_album_dialog.g.dart
@@ -6,11 +6,9 @@ part of 'share_album_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ShareAlbumDialogState =
-    Logger("widget.share_album_dialog._ShareAlbumDialogState");
-
 extension _$_ShareAlbumDialogStateNpLog on _ShareAlbumDialogState {
   // ignore: unused_element
-  Logger get _log => _$log_ShareAlbumDialogState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.share_album_dialog._ShareAlbumDialogState");
 }
diff --git a/app/lib/widget/share_folder_picker.g.dart b/app/lib/widget/share_folder_picker.g.dart
index 3d0e0c81..b4950f6d 100644
--- a/app/lib/widget/share_folder_picker.g.dart
+++ b/app/lib/widget/share_folder_picker.g.dart
@@ -6,11 +6,10 @@ part of 'share_folder_picker.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ShareFolderPickerState =
-    Logger("widget.share_folder_picker._ShareFolderPickerState");
-
 extension _$_ShareFolderPickerStateNpLog on _ShareFolderPickerState {
   // ignore: unused_element
-  Logger get _log => _$log_ShareFolderPickerState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.share_folder_picker._ShareFolderPickerState");
 }
diff --git a/app/lib/widget/shared_file_viewer.g.dart b/app/lib/widget/shared_file_viewer.g.dart
index a2c4d465..b9bca319 100644
--- a/app/lib/widget/shared_file_viewer.g.dart
+++ b/app/lib/widget/shared_file_viewer.g.dart
@@ -6,11 +6,9 @@ part of 'shared_file_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SharedFileViewerState =
-    Logger("widget.shared_file_viewer._SharedFileViewerState");
-
 extension _$_SharedFileViewerStateNpLog on _SharedFileViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_SharedFileViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.shared_file_viewer._SharedFileViewerState");
 }
diff --git a/app/lib/widget/sharing_browser.g.dart b/app/lib/widget/sharing_browser.g.dart
index a2e5d4a7..371bd9ea 100644
--- a/app/lib/widget/sharing_browser.g.dart
+++ b/app/lib/widget/sharing_browser.g.dart
@@ -6,11 +6,9 @@ part of 'sharing_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SharingBrowserState =
-    Logger("widget.sharing_browser._SharingBrowserState");
-
 extension _$_SharingBrowserStateNpLog on _SharingBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_SharingBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.sharing_browser._SharingBrowserState");
 }
diff --git a/app/lib/widget/sign_in.g.dart b/app/lib/widget/sign_in.g.dart
index 252d2578..847360d6 100644
--- a/app/lib/widget/sign_in.g.dart
+++ b/app/lib/widget/sign_in.g.dart
@@ -6,10 +6,9 @@ part of 'sign_in.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SignInState = Logger("widget.sign_in._SignInState");
-
 extension _$_SignInStateNpLog on _SignInState {
   // ignore: unused_element
-  Logger get _log => _$log_SignInState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.sign_in._SignInState");
 }
diff --git a/app/lib/widget/slideshow_dialog.g.dart b/app/lib/widget/slideshow_dialog.g.dart
index 5f89ea97..a3ec9fa5 100644
--- a/app/lib/widget/slideshow_dialog.g.dart
+++ b/app/lib/widget/slideshow_dialog.g.dart
@@ -6,13 +6,11 @@ part of 'slideshow_dialog.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SlideshowDialogState =
-    Logger("widget.slideshow_dialog._SlideshowDialogState");
-
 extension _$_SlideshowDialogStateNpLog on _SlideshowDialogState {
   // ignore: unused_element
-  Logger get _log => _$log_SlideshowDialogState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.slideshow_dialog._SlideshowDialogState");
 }
 
 // **************************************************************************
diff --git a/app/lib/widget/slideshow_viewer.g.dart b/app/lib/widget/slideshow_viewer.g.dart
index 326a4ceb..c685571d 100644
--- a/app/lib/widget/slideshow_viewer.g.dart
+++ b/app/lib/widget/slideshow_viewer.g.dart
@@ -6,11 +6,9 @@ part of 'slideshow_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SlideshowViewerState =
-    Logger("widget.slideshow_viewer._SlideshowViewerState");
-
 extension _$_SlideshowViewerStateNpLog on _SlideshowViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_SlideshowViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.slideshow_viewer._SlideshowViewerState");
 }
diff --git a/app/lib/widget/smart_album_browser.g.dart b/app/lib/widget/smart_album_browser.g.dart
index c18e5dfc..bf5026a3 100644
--- a/app/lib/widget/smart_album_browser.g.dart
+++ b/app/lib/widget/smart_album_browser.g.dart
@@ -6,13 +6,12 @@ part of 'smart_album_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SmartAlbumBrowserState =
-    Logger("widget.smart_album_browser._SmartAlbumBrowserState");
-
 extension _$_SmartAlbumBrowserStateNpLog on _SmartAlbumBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_SmartAlbumBrowserState;
+  Logger get _log => log;
+
+  static final log =
+      Logger("widget.smart_album_browser._SmartAlbumBrowserState");
 }
 
 // **************************************************************************
diff --git a/app/lib/widget/splash.g.dart b/app/lib/widget/splash.g.dart
index 1cd251c5..89940d04 100644
--- a/app/lib/widget/splash.g.dart
+++ b/app/lib/widget/splash.g.dart
@@ -6,12 +6,11 @@ part of 'splash.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_SplashState = Logger("widget.splash._SplashState");
-
 extension _$_SplashStateNpLog on _SplashState {
   // ignore: unused_element
-  Logger get _log => _$log_SplashState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.splash._SplashState");
 }
 
 // **************************************************************************
diff --git a/app/lib/widget/tag_browser.g.dart b/app/lib/widget/tag_browser.g.dart
index e72eb7d0..7a2faedb 100644
--- a/app/lib/widget/tag_browser.g.dart
+++ b/app/lib/widget/tag_browser.g.dart
@@ -6,10 +6,9 @@ part of 'tag_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_TagBrowserState = Logger("widget.tag_browser._TagBrowserState");
-
 extension _$_TagBrowserStateNpLog on _TagBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_TagBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.tag_browser._TagBrowserState");
 }
diff --git a/app/lib/widget/trashbin_browser.g.dart b/app/lib/widget/trashbin_browser.g.dart
index 151de25e..c214d9ab 100644
--- a/app/lib/widget/trashbin_browser.g.dart
+++ b/app/lib/widget/trashbin_browser.g.dart
@@ -6,11 +6,9 @@ part of 'trashbin_browser.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_TrashbinBrowserState =
-    Logger("widget.trashbin_browser._TrashbinBrowserState");
-
 extension _$_TrashbinBrowserStateNpLog on _TrashbinBrowserState {
   // ignore: unused_element
-  Logger get _log => _$log_TrashbinBrowserState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.trashbin_browser._TrashbinBrowserState");
 }
diff --git a/app/lib/widget/trashbin_viewer.g.dart b/app/lib/widget/trashbin_viewer.g.dart
index 9487af56..9e9c0da6 100644
--- a/app/lib/widget/trashbin_viewer.g.dart
+++ b/app/lib/widget/trashbin_viewer.g.dart
@@ -6,11 +6,9 @@ part of 'trashbin_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_TrashbinViewerState =
-    Logger("widget.trashbin_viewer._TrashbinViewerState");
-
 extension _$_TrashbinViewerStateNpLog on _TrashbinViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_TrashbinViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.trashbin_viewer._TrashbinViewerState");
 }
diff --git a/app/lib/widget/video_viewer.g.dart b/app/lib/widget/video_viewer.g.dart
index 1d598b33..b784b45c 100644
--- a/app/lib/widget/video_viewer.g.dart
+++ b/app/lib/widget/video_viewer.g.dart
@@ -6,10 +6,9 @@ part of 'video_viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_VideoViewerState = Logger("widget.video_viewer._VideoViewerState");
-
 extension _$_VideoViewerStateNpLog on _VideoViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_VideoViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.video_viewer._VideoViewerState");
 }
diff --git a/app/lib/widget/viewer.g.dart b/app/lib/widget/viewer.g.dart
index 82e8b8a7..ef85660e 100644
--- a/app/lib/widget/viewer.g.dart
+++ b/app/lib/widget/viewer.g.dart
@@ -6,10 +6,9 @@ part of 'viewer.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ViewerState = Logger("widget.viewer._ViewerState");
-
 extension _$_ViewerStateNpLog on _ViewerState {
   // ignore: unused_element
-  Logger get _log => _$log_ViewerState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.viewer._ViewerState");
 }
diff --git a/app/lib/widget/viewer_detail_pane.g.dart b/app/lib/widget/viewer_detail_pane.g.dart
index 1bfc1e09..d8864463 100644
--- a/app/lib/widget/viewer_detail_pane.g.dart
+++ b/app/lib/widget/viewer_detail_pane.g.dart
@@ -6,11 +6,9 @@ part of 'viewer_detail_pane.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$log_ViewerDetailPaneState =
-    Logger("widget.viewer_detail_pane._ViewerDetailPaneState");
-
 extension _$_ViewerDetailPaneStateNpLog on _ViewerDetailPaneState {
   // ignore: unused_element
-  Logger get _log => _$log_ViewerDetailPaneState;
+  Logger get _log => log;
+
+  static final log = Logger("widget.viewer_detail_pane._ViewerDetailPaneState");
 }
diff --git a/app/lib/widget/viewer_mixin.g.dart b/app/lib/widget/viewer_mixin.g.dart
index 0f51af7a..47723b53 100644
--- a/app/lib/widget/viewer_mixin.g.dart
+++ b/app/lib/widget/viewer_mixin.g.dart
@@ -6,11 +6,9 @@ part of 'viewer_mixin.dart';
 // NpLogGenerator
 // **************************************************************************
 
-// ignore: non_constant_identifier_names
-final _$logViewerControllersMixin =
-    Logger("widget.viewer_mixin.ViewerControllersMixin");
-
 extension _$ViewerControllersMixinNpLog on ViewerControllersMixin {
   // ignore: unused_element
-  Logger get _log => _$logViewerControllersMixin;
+  Logger get _log => log;
+
+  static final log = Logger("widget.viewer_mixin.ViewerControllersMixin");
 }
diff --git a/codegen/lib/src/np_log_generator.dart b/codegen/lib/src/np_log_generator.dart
index afb03810..352c4067 100644
--- a/codegen/lib/src/np_log_generator.dart
+++ b/codegen/lib/src/np_log_generator.dart
@@ -19,23 +19,21 @@ class NpLogGenerator extends GeneratorForAnnotation<NpLog> {
     if (element is ClassElement) {
       final clazz = element;
       return """
-// ignore: non_constant_identifier_names
-final _\$log${clazz.name} = Logger("${_buildLogTag(clazz)}");
-
 extension _\$${clazz.name}NpLog on ${clazz.name} {
   // ignore: unused_element
-  Logger get _log => _\$log${clazz.name};
+  Logger get _log => log;
+
+  static final log = Logger("${_buildLogTag(clazz)}");
 }
 """;
     } else if (element is ExtensionElement) {
       final extension = element;
       return """
-// ignore: non_constant_identifier_names
-final _\$log${extension.name} = Logger("${_buildLogTag(extension)}");
-
 extension _\$${extension.name}NpLog on ${extension.extendedType.element2!.name} {
   // ignore: unused_element
-  Logger get _log => _\$log${extension.name};
+  Logger get _log => log;
+
+  static final log = Logger("${_buildLogTag(extension)}");
 }
 """;
     } else {