[Domain] Updated the file services with new props

Wolfteam · Aug 31, 2022 · 159693d · 159693d
1 parent ae317f2
commit 159693d
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 14 deletions.
diff --git a/lib/application/settings/settings_bloc.dart b/lib/application/settings/settings_bloc.dart
@@ -43,7 +43,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
           useDarkAmoledTheme: settings.useDarkAmoled,
           currentAccentColor: settings.accentColor,
           currentLanguage: settings.appLanguage,
-          appVersion: _deviceInfoService.version,
+          appVersion: _deviceInfoService.versionWithBuildNumber,
           showCharacterDetails: settings.showCharacterDetails,
           showWeaponDetails: settings.showWeaponDetails,
           serverResetTime: settings.serverResetTime,

diff --git a/lib/domain/app_constants.dart b/lib/domain/app_constants.dart
@@ -3,6 +3,7 @@ import 'package:shiori/domain/enums/enums.dart';
 
 import 'models/models.dart';
 
+const na = 'N/A';
 const githubPage = 'https://github.com/Wolfteam/Shiori';
 
 //This order matches the one in the game, and the numbers represent each image

diff --git a/lib/domain/services/api_service.dart b/lib/domain/services/api_service.dart
@@ -0,0 +1,5 @@
+typedef ProgressChanged = void Function(double);
+
+abstract class ApiService {
+  Future<String> getChangelog(String defaultValue);
+}
diff --git a/lib/domain/services/changelog_provider.dart b/lib/domain/services/changelog_provider.dart
@@ -1,5 +1,3 @@
 abstract class ChangelogProvider {
-  String get defaultChangelog;
-
   Future<String> load();
 }
diff --git a/lib/domain/services/data_service.dart b/lib/domain/services/data_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:shiori/domain/services/persistence/calculator_data_service.dart';
 import 'package:shiori/domain/services/persistence/custom_builds_data_service.dart';
 import 'package:shiori/domain/services/persistence/game_codes_data_service.dart';
@@ -22,6 +23,9 @@ abstract class DataService {
 
   Future<void> init({String dir = 'shiori_data'});
 
+  @visibleForTesting
+  Future<void> initForTests(String path);
+
   Future<void> deleteThemAll();
 
   Future<void> closeThemAll();

diff --git a/lib/domain/services/device_info_service.dart b/lib/domain/services/device_info_service.dart
@@ -5,6 +5,8 @@ abstract class DeviceInfoService {
 
   String get version;
 
+  String get versionWithBuildNumber;
+
   bool get versionChanged;
 
   String? get userAgent;

diff --git a/lib/domain/services/file/artifact_file_service.dart b/lib/domain/services/file/artifact_file_service.dart
@@ -2,7 +2,7 @@ import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class ArtifactFileService implements BaseFileService {
+abstract class ArtifactFileService extends BaseFileService {
   List<ArtifactCardModel> getArtifactsForCard({ArtifactType? type});
 
   ArtifactCardModel getArtifactForCard(String key);

diff --git a/lib/domain/services/file/banner_history_file_service.dart b/lib/domain/services/file/banner_history_file_service.dart
@@ -2,7 +2,7 @@ import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class BannerHistoryFileService implements BaseFileService {
+abstract class BannerHistoryFileService extends BaseFileService {
   List<double> getBannerHistoryVersions(SortDirectionType type);
 
   List<BannerHistoryItemModel> getBannerHistory(BannerHistoryItemType type);

diff --git a/lib/domain/services/file/base_file_service.dart b/lib/domain/services/file/base_file_service.dart
@@ -1,3 +1,13 @@
+import 'package:shiori/domain/assets.dart';
+import 'package:shiori/domain/services/file/file_infrastructure.dart';
+
 abstract class BaseFileService {
-  Future<void> init();
+  TranslationFileService get translations;
+
+  Future<Map<String, dynamic>> readJson(String assetPath) async {
+    final jsonString = await Assets.getJsonFromPath(assetPath);
+    return jsonString;
+  }
+
+  Future<void> init(String assetPath);
 }
diff --git a/lib/domain/services/file/character_file_service.dart b/lib/domain/services/file/character_file_service.dart
@@ -1,8 +1,15 @@
 import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
+import 'package:shiori/domain/services/file/file_infrastructure.dart';
 
 abstract class CharacterFileService extends BaseFileService {
+  ArtifactFileService get artifacts;
+
+  MaterialFileService get materials;
+
+  WeaponFileService get weapons;
+
   List<CharacterCardModel> getCharactersForCard();
 
   CharacterCardModel getCharacterForCard(String key);

diff --git a/lib/domain/services/file/element_file_service.dart b/lib/domain/services/file/element_file_service.dart
@@ -1,7 +1,7 @@
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class ElementFileService implements BaseFileService {
+abstract class ElementFileService extends BaseFileService {
   List<ElementCardModel> getElementDebuffs();
 
   List<ElementReactionCardModel> getElementReactions();

diff --git a/lib/domain/services/file/furniture_file_service.dart b/lib/domain/services/file/furniture_file_service.dart
@@ -1,7 +1,7 @@
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class FurnitureFileService implements BaseFileService {
+abstract class FurnitureFileService extends BaseFileService {
   FurnitureFileModel getDefaultFurnitureForNotifications();
 
   FurnitureFileModel getFurniture(String key);

diff --git a/lib/domain/services/file/gadget_file_service.dart b/lib/domain/services/file/gadget_file_service.dart
@@ -1,7 +1,7 @@
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class GadgetFileService implements BaseFileService {
+abstract class GadgetFileService extends BaseFileService {
   List<GadgetFileModel> getAllGadgetsForNotifications();
 
   GadgetFileModel getGadget(String key);

diff --git a/lib/domain/services/file/material_file_service.dart b/lib/domain/services/file/material_file_service.dart
@@ -2,7 +2,7 @@ import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class MaterialFileService implements BaseFileService {
+abstract class MaterialFileService extends BaseFileService {
   List<MaterialCardModel> getAllMaterialsForCard();
 
   MaterialCardModel getMaterialForCard(String key);
@@ -33,4 +33,6 @@ abstract class MaterialFileService implements BaseFileService {
   MaterialFileModel getRealmCurrencyMaterial();
 
   MaterialFileModel getPrimogemMaterial();
+
+  MaterialFileModel getFragileResinMaterial();
 }
diff --git a/lib/domain/services/file/monster_file_service.dart b/lib/domain/services/file/monster_file_service.dart
@@ -2,7 +2,7 @@ import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class MonsterFileService implements BaseFileService {
+abstract class MonsterFileService extends BaseFileService {
   MonsterFileModel getMonster(String key);
 
   List<MonsterCardModel> getAllMonstersForCard();

diff --git a/lib/domain/services/file/translation_file_service.dart b/lib/domain/services/file/translation_file_service.dart
@@ -1,8 +1,9 @@
 import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
+import 'package:shiori/domain/services/file/base_file_service.dart';
 
-abstract class TranslationFileService {
-  Future<void> init(AppLanguageType languageType);
+abstract class TranslationFileService extends BaseFileService {
+  Future<void> initTranslations(AppLanguageType languageType, String assetPath);
 
   TranslationCharacterFile getCharacterTranslation(String key);
 

diff --git a/lib/domain/services/file/weapon_file_service.dart b/lib/domain/services/file/weapon_file_service.dart
@@ -1,8 +1,11 @@
 import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/services/file/base_file_service.dart';
+import 'package:shiori/domain/services/file/file_infrastructure.dart';
+
+abstract class WeaponFileService extends BaseFileService {
+  MaterialFileService get materials;
 
-abstract class WeaponFileService implements BaseFileService {
   List<WeaponCardModel> getWeaponsForCard();
 
   WeaponCardModel getWeaponForCard(String key);

diff --git a/lib/domain/services/logging_service.dart b/lib/domain/services/logging_service.dart
@@ -1,6 +1,8 @@
 abstract class LoggingService {
   void info(Type type, String msg, [List<Object>? args]);
 
+  void debug(Type type, String msg, [List<Object>? args]);
+
   void warning(Type type, String msg, [dynamic ex, StackTrace? trace]);
 
   void error(Type type, String msg, [dynamic ex, StackTrace? trace]);