Improve bloc logs

app/lib/bloc_util.dart

@@ -1,4 +1,4 @@
-abstract class BlocLogger {
+mixin BlocLogger {
   String? get tag => null;
 
   bool Function(dynamic currentState, dynamic nextState)? get shouldLog => null;

app/lib/widget/account_picker_dialog/bloc.dart

@@ -1,7 +1,7 @@
 part of '../account_picker_dialog.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required DiContainer container,
     required this.accountController,
@@ -32,9 +32,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   void _onToggleDropdown(_ToggleDropdown ev, Emitter<_State> emit) {
     _log.info(ev);
     emit(state.copyWith(isOpenDropdown: !state.isOpenDropdown));

app/lib/widget/collection_browser/bloc.dart

@@ -1,7 +1,7 @@
 part of '../collection_browser.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required DiContainer container,
     required this.account,
@@ -81,9 +81,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
     return super.close();
   }
 
-  @override
-  String get tag => _log.fullName;
-
   @override
   bool Function(dynamic, dynamic)? get shouldLog => (currentState, nextState) {
         return currentState.scale == nextState.scale;

app/lib/widget/collection_picker/bloc.dart

@@ -1,7 +1,7 @@
 part of '../collection_picker.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.account,
     required this.controller,
@@ -16,9 +16,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/export_collection_dialog.dart

@@ -6,6 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/account_controller.dart';
 import 'package:nc_photos/controller/collections_controller.dart';
 import 'package:nc_photos/controller/server_controller.dart';

app/lib/widget/export_collection_dialog/bloc.dart

@@ -1,7 +1,7 @@
 part of '../export_collection_dialog.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.account,
     required this.collectionsController,
@@ -14,6 +14,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetError>(_onSetError);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/file_sharer_dialog/bloc.dart

@@ -1,7 +1,7 @@
 part of '../file_sharer_dialog.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required DiContainer container,
     required this.account,
@@ -19,9 +19,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/home_collections/bloc.dart

@@ -1,7 +1,7 @@
 part of '../home_collections.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.account,
     required this.controller,
@@ -34,9 +34,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/new_collection_dialog.dart

@@ -6,6 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/account_controller.dart';
 import 'package:nc_photos/controller/server_controller.dart';
 import 'package:nc_photos/entity/album.dart';

app/lib/widget/new_collection_dialog/bloc.dart

@@ -1,7 +1,7 @@
 part of '../new_collection_dialog.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.account,
     required Set<_ProviderOption> supportedProviders,
@@ -15,6 +15,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetError>(_onSetError);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/people_browser/bloc.dart

@@ -1,7 +1,7 @@
 part of '../people_browser.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.account,
     required this.personsController,
@@ -13,9 +13,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   Future<void> _onLoad(_LoadPersons ev, Emitter<_State> emit) {
     _log.info(ev);
     return emit.forEach<PersonStreamEvent>(

app/lib/widget/settings/account/bloc.dart

@@ -1,7 +1,7 @@
 part of '../account_settings.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required DiContainer container,
     required Account account,
@@ -53,6 +53,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetError>(_onSetError);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   @override
   Future<void> close() {
     for (final s in _subscriptions) {

app/lib/widget/settings/account_settings.dart

@@ -7,6 +7,7 @@ import 'package:kiwi/kiwi.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/account_controller.dart';
 import 'package:nc_photos/controller/account_pref_controller.dart';
 import 'package:nc_photos/di_container.dart';

app/lib/widget/settings/developer/bloc.dart

@@ -1,7 +1,7 @@
 part of '../developer_settings.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc(DiContainer c)
       : _c = c,
         super(const _State()) {
@@ -13,6 +13,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetError>(_onSetError);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/settings/expert/bloc.dart

@@ -9,13 +9,16 @@ class _Error {
 }
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc(DiContainer c)
       : _c = c,
         super(const _State()) {
     on<_ClearCacheDatabase>(_onClearCacheDatabase);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   Stream<_Error> errorStream() => _errorStream.stream;
 
   Future<void> _onClearCacheDatabase(

app/lib/widget/settings/expert_settings.dart

@@ -6,6 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kiwi/kiwi.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/di_container.dart';
 import 'package:nc_photos/entity/pref.dart';
 import 'package:nc_photos/entity/sqlite/database.dart';

app/lib/widget/settings/language/bloc.dart

@@ -1,7 +1,7 @@
 part of '../language_settings.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.prefController,
   }) : super(_State.init(
@@ -15,9 +15,6 @@ class _Bloc extends Bloc<_Event, _State> implements BlocLogger {
   @override
   String get tag => _log.fullName;
 
-  @override
-  bool Function(dynamic, dynamic)? get shouldLog => null;
-
   @override
   void onError(Object error, StackTrace stackTrace) {
     // we need this to prevent onError being triggered recursively

app/lib/widget/settings/metadata/bloc.dart

@@ -1,7 +1,7 @@
 part of '../metadata_settings.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.prefController,
   }) : super(_State(
@@ -13,6 +13,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetWifiOnly>(_onSetWifiOnly);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   Future<void> _onInit(_Init ev, Emitter<_State> emit) async {
     _log.info(ev);
     await Future.wait([

app/lib/widget/settings/metadata_settings.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/pref_controller.dart';
 import 'package:nc_photos/exception_event.dart';
 import 'package:nc_photos/exception_util.dart' as exception_util;

app/lib/widget/settings/photos/bloc.dart

@@ -1,7 +1,7 @@
 part of '../photos_settings.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required this.prefController,
     required this.accountPrefController,
@@ -15,6 +15,9 @@ class _Bloc extends Bloc<_Event, _State> {
     on<_SetMemoriesRange>(_onSetMemoriesRange);
   }
 
+  @override
+  String get tag => _log.fullName;
+
   Future<void> _onInit(_Init ev, Emitter<_State> emit) async {
     _log.info(ev);
     await Future.wait([

app/lib/widget/settings/photos_settings.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/account_controller.dart';
 import 'package:nc_photos/controller/account_pref_controller.dart';
 import 'package:nc_photos/controller/pref_controller.dart';

app/lib/widget/settings/theme/bloc.dart

@@ -7,7 +7,7 @@ class _Error {
 }
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc(DiContainer c)
       : assert(require(c)),
         _c = c,
@@ -23,6 +23,9 @@ class _Bloc extends Bloc<_Event, _State> {
 
   static bool require(DiContainer c) => DiContainer.has(c, DiType.pref);
 
+  @override
+  String get tag => _log.fullName;
+
   Stream<_Error> errorStream() => _errorStream.stream;
 
   Future<void> _onSetFollowSystemTheme(

app/lib/widget/settings/theme_settings.dart

@@ -8,6 +8,7 @@ import 'package:flutter_colorpicker/flutter_colorpicker.dart';
 import 'package:kiwi/kiwi.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/di_container.dart';
 import 'package:nc_photos/entity/pref.dart';
 import 'package:nc_photos/event/event.dart';

app/lib/widget/share_collection_dialog.dart

@@ -9,6 +9,7 @@ import 'package:kiwi/kiwi.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/app_localizations.dart';
+import 'package:nc_photos/bloc_util.dart';
 import 'package:nc_photos/controller/account_controller.dart';
 import 'package:nc_photos/controller/collections_controller.dart';
 import 'package:nc_photos/di_container.dart';

app/lib/widget/share_collection_dialog/bloc.dart

@@ -1,7 +1,7 @@
 part of '../share_collection_dialog.dart';
 
 @npLog
-class _Bloc extends Bloc<_Event, _State> {
+class _Bloc extends Bloc<_Event, _State> with BlocLogger {
   _Bloc({
     required DiContainer container,
     required this.account,
@@ -41,6 +41,9 @@ class _Bloc extends Bloc<_Event, _State> {
     );
   }
 
+  @override
+  String get tag => _log.fullName;
+
   @override
   Future<void> close() {
     _collectionControllerSubscription?.cancel();