Some simplifications to the artifacts translation file

lib/bloc/artifact_details/artifact_details_bloc.dart

@@ -5,6 +5,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../../common/app_constants.dart';
 import '../../common/assets.dart';
+import '../../models/models.dart';
 import '../../services/genshing_service.dart';
 import '../../telemetry.dart';
 
@@ -36,7 +37,10 @@ class ArtifactDetailsBloc extends Bloc<ArtifactDetailsEvent, ArtifactDetailsStat
           image: artifact.fullImagePath,
           rarityMin: artifact.rarityMin,
           rarityMax: artifact.rarityMax,
-          bonus: translation.bonus,
+          bonus: translation.bonus.map((t) {
+            final pieces = artifact.bonus.firstWhere((b) => b.key == t.key).pieces;
+            return ArtifactCardBonusModel(pieces: pieces, bonus: t.bonus);
+          }).toList(),
           images: translation.bonus.length == 1
               ? [artifact.fullImagePath]
               : artifactOrder.map((e) => Assets.getArtifactPath('$image$e.png')).toList(),

lib/bloc/artifact_details/artifact_details_state.dart

@@ -9,7 +9,7 @@ abstract class ArtifactDetailsState with _$ArtifactDetailsState {
     @required String image,
     @required int rarityMin,
     @required int rarityMax,
-    @required List<String> bonus,
+    @required List<ArtifactCardBonusModel> bonus,
     @required List<String> images,
   }) = _LoadedState;
 }

lib/bloc/main/main_bloc.dart

@@ -60,7 +60,7 @@ class MainBloc extends Bloc<MainEvent, MainState> {
     } catch (e, s) {
       _logger.error(runtimeType, '_init: Unknown error while trying to delete old logs', e, s);
     }
-    await _genshinService.init(AppLanguageType.english);
+    await _genshinService.init(_settingsService.language);
     final packageInfo = await PackageInfo.fromPlatform();
     final settings = _settingsService.appSettings;
     await Future.delayed(const Duration(milliseconds: 600));

lib/common/assets.dart

@@ -86,7 +86,7 @@ class Assets {
       case AppLanguageType.english:
         return '$translationsBasePath/en.json';
       case AppLanguageType.spanish:
-        return '$translationsBasePath/en.json';
+        return '$translationsBasePath/es.json';
       default:
         throw Exception('Invalid language = $languageType');
     }

lib/generated/intl/messages_en.dart

@@ -51,6 +51,8 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(value) => "Unlocked at ascention level ${value}";
 
+  static m16(value) => "${value} Pieces";
+
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
     "about" : MessageLookupByLibrary.simpleMessage("About"),
@@ -209,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weapons" : MessageLookupByLibrary.simpleMessage("Weapons"),
     "wednesday" : MessageLookupByLibrary.simpleMessage("Wednesday"),
     "wishSimulator" : MessageLookupByLibrary.simpleMessage("Wish simulator"),
+    "xPieces" : m16,
     "youCanAlsoSendMeAnEmail" : MessageLookupByLibrary.simpleMessage("You can also send me an email")
   };
 }

lib/generated/intl/messages_es_ES.dart

@@ -51,6 +51,8 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m15(value) => "Desbloqueada en nivel de ascención ${value}";
 
+  static m16(value) => "${value} Piezas";
+
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
     "about" : MessageLookupByLibrary.simpleMessage("Acerca de"),
@@ -79,7 +81,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chooseAccentColor" : MessageLookupByLibrary.simpleMessage("Escoge un color de acento"),
     "chooseBaseAppTheme" : MessageLookupByLibrary.simpleMessage("Escoge un tema base"),
     "chooseLanguage" : MessageLookupByLibrary.simpleMessage("Escoge un lenguaje"),
-    "claymore" : MessageLookupByLibrary.simpleMessage("Claymore"),
+    "claymore" : MessageLookupByLibrary.simpleMessage("Mandoble"),
     "clock" : MessageLookupByLibrary.simpleMessage("Reloj"),
     "comingSoon" : MessageLookupByLibrary.simpleMessage("Próximamente"),
     "constellationX" : m3,
@@ -98,8 +100,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "disclaimerMsg" : MessageLookupByLibrary.simpleMessage("Esta app no está afiliada ni asociada a miHoYo. GenshinDb es solo una aplicación de tipo base de datos para el juego Genshin Impact"),
     "dps" : MessageLookupByLibrary.simpleMessage("DPS"),
     "element" : MessageLookupByLibrary.simpleMessage("Elemento"),
-    "elementalAbsorption" : MessageLookupByLibrary.simpleMessage("Absorción Elemental"),
-    "elementalBurst" : MessageLookupByLibrary.simpleMessage("Ráfaga Elemental"),
+    "elementalAbsorption" : MessageLookupByLibrary.simpleMessage("Cambio Elemental"),
+    "elementalBurst" : MessageLookupByLibrary.simpleMessage("Impulso Elemental"),
     "elementalDebuffs" : MessageLookupByLibrary.simpleMessage("Debuffs Elementales"),
     "elementalDebuffsExplainded" : MessageLookupByLibrary.simpleMessage("Cada uno de estos tienen diferentes efectos negativos cuando son aplicados a tus enemigos o a ti"),
     "elementalDmgPercentage" : MessageLookupByLibrary.simpleMessage("Elemental DMG%"),
@@ -156,7 +158,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "physDmgPercentage" : m13,
     "pieces" : MessageLookupByLibrary.simpleMessage("Piezas"),
     "plume" : MessageLookupByLibrary.simpleMessage("Pluma"),
-    "plungingAttack" : MessageLookupByLibrary.simpleMessage("Ataque en Picada"),
+    "plungingAttack" : MessageLookupByLibrary.simpleMessage("Ataque Descendiente"),
     "polearm" : MessageLookupByLibrary.simpleMessage("Lanza"),
     "press" : MessageLookupByLibrary.simpleMessage("Presionar"),
     "quest" : MessageLookupByLibrary.simpleMessage("Misión"),
@@ -208,6 +210,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weaponType" : MessageLookupByLibrary.simpleMessage("Tipo de arma"),
     "weapons" : MessageLookupByLibrary.simpleMessage("Armas"),
     "wednesday" : MessageLookupByLibrary.simpleMessage("Miércoles"),
+    "xPieces" : m16,
     "youCanAlsoSendMeAnEmail" : MessageLookupByLibrary.simpleMessage("También puedes enviarme un correo")
   };
 }

lib/l10n/intl_en.arb

@@ -155,5 +155,6 @@
     "hold": "Hold",
     "press": "Press",
     "short": "Short",
-    "elementalAbsorption": "Elemental Absorption"
+    "elementalAbsorption": "Elemental Absorption",
+    "xPieces": "{value} Pieces"
 }

lib/l10n/intl_es_ES.arb

@@ -5,7 +5,7 @@
     "english": "Inglés",
     "spanish": "Español",
     "bow": "Arco",
-    "claymore": "Claymore",
+    "claymore": "Mandoble",
     "sword": "Espada",
     "polearm": "Lanza",
     "catalyst": "Catalizador",
@@ -154,5 +154,6 @@
     "hold": "Mantener",
     "press": "Presionar",
     "short": "Corto",
-    "elementalAbsorption": "Cambio Elemental"
+    "elementalAbsorption": "Cambio Elemental",
+    "xPieces": "{value} Piezas"
 }

lib/models/artifacts/artifact_card_model.dart

@@ -5,13 +5,23 @@ class ArtifactCardModel {
   final String name;
   final String image;
   final int rarity;
-  final List<String> bonus;
+  final List<ArtifactCardBonusModel> bonus;
 
-  ArtifactCardModel({
+  const ArtifactCardModel({
     @required this.key,
     @required this.name,
     @required this.image,
     @required this.rarity,
     @required this.bonus,
   });
 }
+
+class ArtifactCardBonusModel {
+  final int pieces;
+  final String bonus;
+
+  const ArtifactCardBonusModel({
+    @required this.pieces,
+    @required this.bonus,
+  });
+}

lib/models/db/artifacts/artifact_file_model.dart

@@ -15,9 +15,22 @@ abstract class ArtifactFileModel implements _$ArtifactFileModel {
     @required String image,
     @required int rarityMin,
     @required int rarityMax,
+    @required List<ArtifactFileBonusModel> bonus,
   }) = _ArtifactFileModel;
 
   ArtifactFileModel._();
 
   factory ArtifactFileModel.fromJson(Map<String, dynamic> json) => _$ArtifactFileModelFromJson(json);
 }
+
+@freezed
+abstract class ArtifactFileBonusModel implements _$ArtifactFileBonusModel {
+  factory ArtifactFileBonusModel({
+    @required String key,
+    @required int pieces,
+  }) = _ArtifactFileBonusModel;
+
+  ArtifactFileBonusModel._();
+
+  factory ArtifactFileBonusModel.fromJson(Map<String, dynamic> json) => _$ArtifactFileBonusModelFromJson(json);
+}

lib/models/db/translations/translation_artifact_file.dart

@@ -8,10 +8,23 @@ abstract class TranslationArtifactFile implements _$TranslationArtifactFile {
   factory TranslationArtifactFile({
     @required String key,
     @required String name,
-    @required List<String> bonus,
+    @required List<TranslationArtifactBonusFile> bonus,
   }) = _TranslationArtifactFile;
 
   const TranslationArtifactFile._();
 
   factory TranslationArtifactFile.fromJson(Map<String, dynamic> json) => _$TranslationArtifactFileFromJson(json);
 }
+
+@freezed
+abstract class TranslationArtifactBonusFile implements _$TranslationArtifactBonusFile {
+  factory TranslationArtifactBonusFile({
+    @required String key,
+    @required String bonus,
+  }) = _TranslationArtifactBonusFile;
+
+  const TranslationArtifactBonusFile._();
+
+  factory TranslationArtifactBonusFile.fromJson(Map<String, dynamic> json) =>
+      _$TranslationArtifactBonusFileFromJson(json);
+}

lib/services/genshing_service.dart

@@ -213,7 +213,10 @@ class GenshinServiceImpl implements GenshinService {
           name: translation.name,
           image: e.fullImagePath,
           rarity: e.rarityMax,
-          bonus: translation.bonus,
+          bonus: translation.bonus.map((t) {
+            final pieces = e.bonus.firstWhere((b) => b.key == t.key).pieces;
+            return ArtifactCardBonusModel(pieces: pieces, bonus: t.bonus);
+          }).toList(),
         );
       },
     ).toList();
@@ -228,7 +231,10 @@ class GenshinServiceImpl implements GenshinService {
       name: translation.name,
       image: artifact.fullImagePath,
       rarity: artifact.rarityMax,
-      bonus: translation.bonus,
+      bonus: translation.bonus.map((t) {
+        final pieces = artifact.bonus.firstWhere((b) => b.key == t.key).pieces;
+        return ArtifactCardBonusModel(pieces: pieces, bonus: t.bonus);
+      }).toList(),
     );
   }
 

lib/services/logging_service.dart

@@ -64,20 +64,21 @@ class LoggingServiceImpl implements LoggingService {
   }
 
   void _trackError(String tag, String msg, [dynamic ex, StackTrace trace]) {
-    final map = {
-      'tag': tag,
-      'msg': _formatEx(msg, ex),
-      'trace': trace?.toString() ?? 'No trace available',
-    };
+    final map = _buildError(tag, msg, ex, trace);
     trackEventAsync('Error - ${DateTime.now()}', map);
   }
 
   void _trackWarning(String tag, String msg, [dynamic ex, StackTrace trace]) {
-    final map = {
+    final map = _buildError(tag, msg, ex, trace);
+    trackEventAsync('Warning - ${DateTime.now()}', map);
+  }
+
+  Map<String, String> _buildError(String tag, String msg, [dynamic ex, StackTrace trace]) {
+    return {
       'tag': tag,
-      'msg': _formatEx(msg, ex),
+      'msg': msg ?? 'No message available',
+      'ex': ex?.toString() ?? 'No exception available',
       'trace': trace?.toString() ?? 'No trace available',
     };
-    trackEventAsync('Warning - ${DateTime.now()}', map);
   }
 }

lib/ui/pages/artifact_details_page.dart

@@ -5,6 +5,7 @@ import '../../bloc/bloc.dart';
 import '../../common/extensions/rarity_extensions.dart';
 import '../../common/styles.dart';
 import '../../generated/l10n.dart';
+import '../../models/models.dart';
 import '../widgets/artifacts/artifact_stats.dart';
 import '../widgets/common/item_description_detail.dart';
 import '../widgets/common/loading.dart';
@@ -97,7 +98,7 @@ class ArtifactDetailsPage extends StatelessWidget {
   Widget _buildBottom(
     int rarity,
     List<String> images,
-    List<String> bonus,
+    List<ArtifactCardBonusModel> bonus,
     BuildContext context,
   ) {
     final s = S.of(context);
@@ -116,7 +117,10 @@ class ArtifactDetailsPage extends StatelessWidget {
               margin: const EdgeInsets.only(bottom: 10),
               child: ItemDescriptionDetail(
                 title: s.bonus,
-                body: Container(margin: const EdgeInsets.symmetric(horizontal: 5), child: ArtifactStats(bonus: bonus)),
+                body: Container(
+                  margin: const EdgeInsets.symmetric(horizontal: 5),
+                  child: ArtifactStats(bonus: bonus),
+                ),
                 textColor: rarity.getRarityColors().last,
               ),
             ),

lib/ui/widgets/artifacts/artifact_card.dart

@@ -5,6 +5,7 @@ import 'package:transparent_image/transparent_image.dart';
 import '../../../bloc/bloc.dart';
 import '../../../common/extensions/rarity_extensions.dart';
 import '../../../common/styles.dart';
+import '../../../models/models.dart';
 import '../../pages/artifact_details_page.dart';
 import '../common/gradient_card.dart';
 import '../common/rarity.dart';
@@ -15,7 +16,7 @@ class ArtifactCard extends StatelessWidget {
   final String name;
   final String image;
   final int rarity;
-  final List<String> bonus;
+  final List<ArtifactCardBonusModel> bonus;
   final double imgWidth;
   final double imgHeight;
   final bool withoutDetails;