Track the app version

lib/application/settings/settings_bloc.dart

@@ -4,8 +4,8 @@ import 'package:bloc/bloc.dart';
 import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:genshindb/domain/enums/enums.dart';
+import 'package:genshindb/domain/services/device_info_service.dart';
 import 'package:genshindb/domain/services/settings_service.dart';
-import 'package:package_info/package_info.dart';
 
 import '../bloc.dart';
 
@@ -15,10 +15,11 @@ part 'settings_state.dart';
 
 class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
   final SettingsService _settingsService;
+  final DeviceInfoService _deviceInfoService;
   final MainBloc _mainBloc;
   final HomeBloc _homeBloc;
 
-  SettingsBloc(this._settingsService, this._mainBloc, this._homeBloc) : super(const SettingsState.loading());
+  SettingsBloc(this._settingsService, this._deviceInfoService, this._mainBloc, this._homeBloc) : super(const SettingsState.loading());
 
   _LoadedState get currentState => state as _LoadedState;
 
@@ -30,12 +31,11 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
       init: (_) async {
         await _settingsService.init();
         final settings = _settingsService.appSettings;
-        final packageInfo = await PackageInfo.fromPlatform();
         return SettingsState.loaded(
           currentTheme: settings.appTheme,
           currentAccentColor: settings.accentColor,
           currentLanguage: settings.appLanguage,
-          appVersion: packageInfo.version,
+          appVersion: _deviceInfoService.version,
           showCharacterDetails: settings.showCharacterDetails,
           showWeaponDetails: settings.showWeaponDetails,
           serverResetTime: settings.serverResetTime,

lib/domain/services/device_info_service.dart

@@ -1,5 +1,7 @@
 abstract class DeviceInfoService {
   Map<String, String> get deviceInfo;
 
+  String get version;
+
   Future<void> init();
 }

lib/infrastructure/device_info_service.dart

@@ -1,23 +1,32 @@
 import 'package:device_info/device_info.dart';
 import 'package:genshindb/domain/services/device_info_service.dart';
+import 'package:package_info/package_info.dart';
 
 class DeviceInfoServiceImpl implements DeviceInfoService {
   Map<String, String> _deviceInfo;
+  String _version;
 
   @override
   Map<String, String> get deviceInfo => _deviceInfo;
 
+  @override
+  String get version => _version;
+
   @override
   Future<void> init() async {
     try {
       final deviceInfo = DeviceInfoPlugin();
       final androidInfo = await deviceInfo.androidInfo;
+      final packageInfo = await PackageInfo.fromPlatform();
+      _version = packageInfo.version;
       _deviceInfo = {
         'Model': androidInfo.model,
         'OsVersion': '${androidInfo.version.sdkInt}',
+        'AppVersion': '${packageInfo.version}_${packageInfo.buildNumber}'
       };
     } catch (ex) {
-      _deviceInfo = {'Model': 'N/A', 'OsVersion': 'N/A'};
+      _deviceInfo = {'Model': 'N/A', 'OsVersion': 'N/A', 'AppVersion': 'N/A'};
+      _version = 'N/A';
     }
   }
 }

lib/main.dart

@@ -5,6 +5,7 @@ import 'package:flutter_user_agent/flutter_user_agent.dart';
 import 'application/bloc.dart';
 import 'domain/services/calculator_service.dart';
 import 'domain/services/data_service.dart';
+import 'domain/services/device_info_service.dart';
 import 'domain/services/genshin_service.dart';
 import 'domain/services/locale_service.dart';
 import 'domain/services/logging_service.dart';
@@ -129,7 +130,8 @@ class MyApp extends StatelessWidget {
         BlocProvider(
           create: (ctx) {
             final settingsService = getIt<SettingsService>();
-            return SettingsBloc(settingsService, ctx.read<MainBloc>(), ctx.read<HomeBloc>());
+            final deviceInfoService = getIt<DeviceInfoService>();
+            return SettingsBloc(settingsService, deviceInfoService, ctx.read<MainBloc>(), ctx.read<HomeBloc>());
           },
         ),
         BlocProvider(