Updated some dependencies.

Removed log_4_dart_2 since it is no longer compatible
Wolfteam · Mar 5, 2021 · 862eaac · 862eaac
1 parent 287dbdb
commit 862eaac
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 192 deletions.
diff --git a/lib/infrastructure/logging_service.dart b/lib/infrastructure/logging_service.dart
@@ -4,25 +4,21 @@ import 'package:genshindb/domain/extensions/string_extensions.dart';
 import 'package:genshindb/domain/services/device_info_service.dart';
 import 'package:genshindb/domain/services/logging_service.dart';
 import 'package:genshindb/domain/services/telemetry_service.dart';
-import 'package:log_4_dart_2/log_4_dart_2.dart';
 import 'package:sprintf/sprintf.dart';
 
 class LoggingServiceImpl implements LoggingService {
-  final Logger _logger;
   final TelemetryService _telemetryService;
   final DeviceInfoService _deviceInfoService;
 
-  LoggingServiceImpl(this._logger, this._telemetryService, this._deviceInfoService);
+  LoggingServiceImpl(this._telemetryService, this._deviceInfoService);
 
   @override
   void info(Type type, String msg, [List<Object> args]) {
     assert(type != null && !msg.isNullEmptyOrWhitespace);
 
     if (args != null && args.isNotEmpty) {
-      _logger.info(type.toString(), sprintf(msg, args));
       dog.i('$type - ${sprintf(msg, args)}');
     } else {
-      _logger.info(type.toString(), msg);
       dog.i('$type - $msg');
     }
   }
@@ -31,7 +27,6 @@ class LoggingServiceImpl implements LoggingService {
   void warning(Type type, String msg, [dynamic ex, StackTrace trace]) {
     assert(type != null && !msg.isNullEmptyOrWhitespace);
     final tag = type.toString();
-    _logger.warning(tag, _formatEx(msg, ex), ex, trace);
     dog.w('$tag - ${_formatEx(msg, ex)}');
 
     if (kReleaseMode) {
@@ -43,7 +38,6 @@ class LoggingServiceImpl implements LoggingService {
   void error(Type type, String msg, [dynamic ex, StackTrace trace]) {
     assert(type != null && !msg.isNullEmptyOrWhitespace);
     final tag = type.toString();
-    _logger.error(tag, _formatEx(msg, ex), ex, trace);
     dog.e('$tag - ${_formatEx(msg, ex)}');
 
     if (kReleaseMode) {

diff --git a/lib/injection.dart b/lib/injection.dart
@@ -13,12 +13,10 @@ import 'package:genshindb/infrastructure/network_service.dart';
 import 'package:genshindb/infrastructure/settings_service.dart';
 import 'package:genshindb/infrastructure/telemetry/telemetry_service.dart';
 import 'package:get_it/get_it.dart';
-import 'package:log_4_dart_2/log_4_dart_2.dart';
 
 final GetIt getIt = GetIt.instance;
 
 Future<void> initInjection() async {
-  getIt.registerSingleton(Logger());
   getIt.registerSingleton<NetworkService>(NetworkServiceImpl());
 
   final deviceInfoService = DeviceInfoServiceImpl();
@@ -29,7 +27,7 @@ Future<void> initInjection() async {
   getIt.registerSingleton<TelemetryService>(telemetryService);
   await telemetryService.initTelemetry();
 
-  final loggingService = LoggingServiceImpl(getIt<Logger>(), getIt<TelemetryService>(), deviceInfoService);
+  final loggingService = LoggingServiceImpl(getIt<TelemetryService>(), deviceInfoService);
 
   getIt.registerSingleton<LoggingService>(loggingService);
   getIt.registerSingleton<SettingsService>(SettingsServiceImpl(loggingService));

diff --git a/lib/presentation/tierlist/tier_list_page.dart b/lib/presentation/tierlist/tier_list_page.dart
@@ -124,8 +124,8 @@ class _TierListPageState extends State<TierListPage> {
         return;
       }
 
-      final file = await screenshotController.capture(pixelRatio: 1.5);
-      ImageGallerySaver.saveImage(file.readAsBytesSync(), quality: 100);
+      final bytes = await screenshotController.capture(pixelRatio: 1.5);
+      ImageGallerySaver.saveImage(bytes, quality: 100);
       ToastUtils.showSucceedToast(s.imgSavedSuccessfully);
     } catch (e) {
       ToastUtils.showErrorToast(s.unknownError);

diff --git a/lib/presentation/tierlist/widgets/tierlist_row.dart b/lib/presentation/tierlist/widgets/tierlist_row.dart
@@ -181,7 +181,7 @@ class TierListRow extends StatelessWidget {
   Future<void> _showColorPicker(BuildContext context) async {
     final newColor = await showDialog<Color>(
       context: context,
-      child: TierListRowColorPicker(currentColor: color),
+      builder: (_) => TierListRowColorPicker(currentColor: color),
     );
 
     if (newColor != null && newColor != color) {