Tweak generated logger code

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 {

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
+  static final log = Logger("account.Account");
-final _$logAccountUpgraderV1 = Logger("account.AccountUpgraderV1");
+}
 
 extension _$AccountUpgraderV1NpLog on AccountUpgraderV1 {
   // ignore: unused_element
-  Logger get _log => _$logAccountUpgraderV1;
+  Logger get _log => log;
+
+  static final log = Logger("account.AccountUpgraderV1");
 }
 
 // **************************************************************************

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
+  static final log = Logger("api.api.Api");
-final _$logApiFiles = Logger("api.api.ApiFiles");
+}
 
 extension _$ApiFilesNpLog on ApiFiles {
   // ignore: unused_element
-  Logger get _log => _$logApiFiles;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiFiles");
-final _$logApiOcsDavDirect = Logger("api.api.ApiOcsDavDirect");
+}
 
 extension _$ApiOcsDavDirectNpLog on ApiOcsDavDirect {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsDavDirect;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsDavDirect");
-final _$logApiOcsFacerecognitionPersons =
+}
-    Logger("api.api.ApiOcsFacerecognitionPersons");
 
 extension _$ApiOcsFacerecognitionPersonsNpLog on ApiOcsFacerecognitionPersons {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFacerecognitionPersons;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsFacerecognitionPersons");
-final _$logApiOcsFacerecognitionPersonFaces =
+}
-    Logger("api.api.ApiOcsFacerecognitionPersonFaces");
 
 extension _$ApiOcsFacerecognitionPersonFacesNpLog
     on ApiOcsFacerecognitionPersonFaces {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFacerecognitionPersonFaces;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsFacerecognitionPersonFaces");
-final _$logApiOcsFilesSharingShares =
+}
-    Logger("api.api.ApiOcsFilesSharingShares");
 
 extension _$ApiOcsFilesSharingSharesNpLog on ApiOcsFilesSharingShares {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingShares;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsFilesSharingShares");
-final _$logApiOcsFilesSharingShare = Logger("api.api.ApiOcsFilesSharingShare");
+}
 
 extension _$ApiOcsFilesSharingShareNpLog on ApiOcsFilesSharingShare {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingShare;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsFilesSharingShare");
-final _$logApiOcsFilesSharingSharees =
+}
-    Logger("api.api.ApiOcsFilesSharingSharees");
 
 extension _$ApiOcsFilesSharingShareesNpLog on ApiOcsFilesSharingSharees {
   // ignore: unused_element
-  Logger get _log => _$logApiOcsFilesSharingSharees;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiOcsFilesSharingSharees");
-final _$logApiSystemtags = Logger("api.api.ApiSystemtags");
+}
 
 extension _$ApiSystemtagsNpLog on ApiSystemtags {
   // ignore: unused_element
-  Logger get _log => _$logApiSystemtags;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("api.api.ApiSystemtags");
-final _$logApiSystemtagsRelationsFiles =
+}
-    Logger("api.api.ApiSystemtagsRelationsFiles");
 
 extension _$ApiSystemtagsRelationsFilesNpLog on ApiSystemtagsRelationsFiles {
   // ignore: unused_element
-  Logger get _log => _$logApiSystemtagsRelationsFiles;
+  Logger get _log => log;
+
+  static final log = Logger("api.api.ApiSystemtagsRelationsFiles");
 }
 
 // **************************************************************************

app/lib/app_localizations.dart

@@ -24,5 +24,5 @@ class L10n {
     }
   }
 
-  static final _log = _$logL10n;
+  static final _log = _$L10nNpLog.log;
 }

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");
 }

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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;
 }

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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");
 }
 
 // **************************************************************************

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
+  static final log = Logger("download_handler._DownlaodHandlerAndroid");
-final _$log_DownloadHandlerWeb = Logger("download_handler._DownloadHandlerWeb");
+}
 
 extension _$_DownloadHandlerWebNpLog on _DownloadHandlerWeb {
   // ignore: unused_element
-  Logger get _log => _$log_DownloadHandlerWeb;
+  Logger get _log => log;
+
+  static final log = Logger("download_handler._DownloadHandlerWeb");
 }

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

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");
 }
 
 // **************************************************************************

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

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");
 }
 
 // **************************************************************************

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
+  static final log = Logger("entity.album.data_source.AlbumRemoteDataSource");
-final _$logAlbumSqliteDbDataSource =
+}
-    Logger("entity.album.data_source.AlbumSqliteDbDataSource");
 
 extension _$AlbumSqliteDbDataSourceNpLog on AlbumSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logAlbumSqliteDbDataSource;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.data_source.AlbumSqliteDbDataSource");
-final _$logAlbumCachedDataSource =
+}
-    Logger("entity.album.data_source.AlbumCachedDataSource");
 
 extension _$AlbumCachedDataSourceNpLog on AlbumCachedDataSource {
   // ignore: unused_element
-  Logger get _log => _$logAlbumCachedDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.data_source.AlbumCachedDataSource");
 }

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

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");
 }
 
 // **************************************************************************

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 {

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");
 }
 
 // **************************************************************************

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

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");
 }
 
 // **************************************************************************

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
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV1");
-final _$logAlbumUpgraderV2 = Logger("entity.album.upgrader.AlbumUpgraderV2");
+}
 
 extension _$AlbumUpgraderV2NpLog on AlbumUpgraderV2 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV2;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV2");
-final _$logAlbumUpgraderV3 = Logger("entity.album.upgrader.AlbumUpgraderV3");
+}
 
 extension _$AlbumUpgraderV3NpLog on AlbumUpgraderV3 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV3;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV3");
-final _$logAlbumUpgraderV4 = Logger("entity.album.upgrader.AlbumUpgraderV4");
+}
 
 extension _$AlbumUpgraderV4NpLog on AlbumUpgraderV4 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV4;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV4");
-final _$logAlbumUpgraderV5 = Logger("entity.album.upgrader.AlbumUpgraderV5");
+}
 
 extension _$AlbumUpgraderV5NpLog on AlbumUpgraderV5 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV5;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV5");
-final _$logAlbumUpgraderV6 = Logger("entity.album.upgrader.AlbumUpgraderV6");
+}
 
 extension _$AlbumUpgraderV6NpLog on AlbumUpgraderV6 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV6;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV6");
-final _$logAlbumUpgraderV7 = Logger("entity.album.upgrader.AlbumUpgraderV7");
+}
 
 extension _$AlbumUpgraderV7NpLog on AlbumUpgraderV7 {
   // ignore: unused_element
-  Logger get _log => _$logAlbumUpgraderV7;
+  Logger get _log => log;
+
+  static final log = Logger("entity.album.upgrader.AlbumUpgraderV7");
 }

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");
 }

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
+  static final log = Logger("entity.face.data_source.FaceRemoteDataSource");
-final _$log_FaceParser = Logger("entity.face.data_source._FaceParser");
+}
 
 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");
 }

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");
 }

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 {

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
+  static final log = Logger("entity.file.Metadata");
-final _$logMetadataUpgraderV1 = Logger("entity.file.MetadataUpgraderV1");
+}
 
 extension _$MetadataUpgraderV1NpLog on MetadataUpgraderV1 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV1;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.file.MetadataUpgraderV1");
-final _$logMetadataUpgraderV2 = Logger("entity.file.MetadataUpgraderV2");
+}
 
 extension _$MetadataUpgraderV2NpLog on MetadataUpgraderV2 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV2;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.file.MetadataUpgraderV2");
-final _$logMetadataUpgraderV3 = Logger("entity.file.MetadataUpgraderV3");
+}
 
 extension _$MetadataUpgraderV3NpLog on MetadataUpgraderV3 {
   // ignore: unused_element
-  Logger get _log => _$logMetadataUpgraderV3;
+  Logger get _log => log;
+
+  static final log = Logger("entity.file.MetadataUpgraderV3");
 }
 
 // **************************************************************************

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
+  static final log = Logger("entity.file.data_source.FileWebdavDataSource");
-final _$logFileSqliteDbDataSource =
+}
-    Logger("entity.file.data_source.FileSqliteDbDataSource");
 
 extension _$FileSqliteDbDataSourceNpLog on FileSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFileSqliteDbDataSource;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("entity.file.data_source.FileSqliteDbDataSource");
-final _$logFileCachedDataSource =
+}
-    Logger("entity.file.data_source.FileCachedDataSource");
 
 extension _$FileCachedDataSourceNpLog on FileCachedDataSource {
   // ignore: unused_element
-  Logger get _log => _$logFileCachedDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.file.data_source.FileCachedDataSource");
 }

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
+  static final log = Logger("entity.file.file_cache_manager.FileCacheLoader");
-final _$logFileSqliteCacheUpdater =
+}
-    Logger("entity.file.file_cache_manager.FileSqliteCacheUpdater");
 
 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");
 }

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");
 }

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
+  static final log = Logger("entity.person.data_source.PersonRemoteDataSource");
-final _$logPersonSqliteDbDataSource =
+}
-    Logger("entity.person.data_source.PersonSqliteDbDataSource");
 
 extension _$PersonSqliteDbDataSourceNpLog on PersonSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logPersonSqliteDbDataSource;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log =
-final _$log_PersonParser = Logger("entity.person.data_source._PersonParser");
+      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");
 }

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");
 }

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
+  static final log = Logger("entity.share.data_source.ShareRemoteDataSource");
-final _$log_ShareParser = Logger("entity.share.data_source._ShareParser");
+}
 
 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");
 }

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
+  static final log = Logger("entity.sharee.data_source.ShareeRemoteDataSource");
-final _$log_ShareeParser = Logger("entity.sharee.data_source._ShareeParser");
+}
 
 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");
 }

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");
 }

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");
 }

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
+  static final log = Logger("entity.tag.data_source.TagRemoteDataSource");
-final _$logTagSqliteDbDataSource =
+}
-    Logger("entity.tag.data_source.TagSqliteDbDataSource");
 
 extension _$TagSqliteDbDataSourceNpLog on TagSqliteDbDataSource {
   // ignore: unused_element
-  Logger get _log => _$logTagSqliteDbDataSource;
+  Logger get _log => log;
+
+  static final log = Logger("entity.tag.data_source.TagSqliteDbDataSource");
 }

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");
 }

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");
 }

app/lib/legacy/app_password_exchange_bloc.dart

@@ -128,5 +128,5 @@ class AppPasswordExchangeBloc
     }
   }
 
-  static final _log = _$logAppPasswordExchangeBloc;
+  static final _log = _$AppPasswordExchangeBlocNpLog.log;
 }

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");
 }
 
 // **************************************************************************

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");
 }

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");
 }

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");
 }

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
+  static final log = Logger("metadata_task_manager.MetadataTask");
-final _$logMetadataTaskManager =
+}
-    Logger("metadata_task_manager.MetadataTaskManager");
 
 extension _$MetadataTaskManagerNpLog on MetadataTaskManager {
   // ignore: unused_element
-  Logger get _log => _$logMetadataTaskManager;
+  Logger get _log => log;
+
+  static final log = Logger("metadata_task_manager.MetadataTaskManager");
 }
 
 // **************************************************************************

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 {

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");
 }
 
 // **************************************************************************

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");
 }

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");
 }

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
+  static final log =
-final _$log_CustomHttpOverrides =
+      Logger("mobile.self_signed_cert_manager.SelfSignedCertManager");
-    Logger("mobile.self_signed_cert_manager._CustomHttpOverrides");
+}
 
 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");
 }

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");
 }

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");
 }
 
 // **************************************************************************

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
+  static final log = Logger("service._Service");
-final _$log_L10n = Logger("service._L10n");
+}
 
 extension _$_L10nNpLog on _L10n {
   // ignore: unused_element
-  Logger get _log => _$log_L10n;
+  Logger get _log => log;
-}
 
-// ignore: non_constant_identifier_names
+  static final log = Logger("service._L10n");
-final _$log_MetadataTask = Logger("service._MetadataTask");
+}
 
 extension _$_MetadataTaskNpLog on _MetadataTask {
   // ignore: unused_element
-  Logger get _log => _$log_MetadataTask;
+  Logger get _log => log;
+
+  static final log = Logger("service._MetadataTask");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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;
 }

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");
 }

app/lib/use_case/compat/v34.dart

@@ -75,5 +75,5 @@ class CompatV34 {
     }
   }
 
-  static final _log = _$logCompatV34;
+  static final _log = _$CompatV34NpLog.log;
 }

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");
 }

app/lib/use_case/compat/v46.dart

@@ -19,5 +19,5 @@ class CompatV46 {
     });
   }
 
-  static final _log = _$logCompatV46;
+  static final _log = _$CompatV46NpLog.log;
 }

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");
 }

app/lib/use_case/compat/v55.dart

@@ -97,5 +97,5 @@ class CompatV55 {
     });
   }
 
-  static final _log = _$logCompatV55;
+  static final _log = _$CompatV55NpLog.log;
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }

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");
 }
 
 // **************************************************************************

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");
 }