Merge pull request #68 from Wolfteam/feature/game_codes_improvements

feature/game_codes_improvements
Wolfteam · Jun 3, 2021 · 4604b46 · 4604b46
2 parents 1c2ec2e + 8bd1666
commit 4604b46
Show file tree

Hide file tree

Showing 36 changed files with 686 additions and 738 deletions.
diff --git a/assets/db/game_codes.json b/assets/db/game_codes.json
diff --git a/assets/i18n/ru.json b/assets/i18n/ru.json
@@ -4436,7 +4436,7 @@
     },
     {
       "key": "Mappa Mare",
-      "name": "Морская карта",
+      "name": "Морской атлас",
       "description": "Привезённая иностранными торговцами в Ли Юэ карта морских течений и ветров.",
       "refinement": "В течение 10 сек. после вызова элементальной реакции увелчивает бонус элементального урона на {{0}}%. Может складываться до 2 раз."
     },

diff --git a/lib/application/game_codes/game_codes_bloc.dart b/lib/application/game_codes/game_codes_bloc.dart
@@ -4,6 +4,8 @@ import 'package:bloc/bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:genshindb/domain/models/models.dart';
 import 'package:genshindb/domain/services/data_service.dart';
+import 'package:genshindb/domain/services/game_code_service.dart';
+import 'package:genshindb/domain/services/network_service.dart';
 import 'package:genshindb/domain/services/telemetry_service.dart';
 import 'package:meta/meta.dart';
 
@@ -16,12 +18,29 @@ const _initialState = GameCodesState.loaded(workingGameCodes: [], expiredGameCod
 class GameCodesBloc extends Bloc<GameCodesEvent, GameCodesState> {
   final DataService _dataService;
   final TelemetryService _telemetryService;
+  final GameCodeService _gameCodeService;
+  final NetworkService _networkService;
 
-  GameCodesBloc(this._dataService, this._telemetryService) : super(_initialState);
+  GameCodesBloc(this._dataService, this._telemetryService, this._gameCodeService, this._networkService) : super(_initialState);
 
   @override
   Stream<GameCodesState> mapEventToState(GameCodesEvent event) async* {
-    final s = await event.when(
+    if (event is _Refresh) {
+      final isInternetAvailable = await _networkService.isInternetAvailable();
+      if (!isInternetAvailable) {
+        yield state.copyWith.call(isInternetAvailable: false);
+        yield state.copyWith.call(isInternetAvailable: null);
+        return;
+      }
+      yield _initialState.copyWith.call(isBusy: true, workingGameCodes: [], expiredGameCodes: []);
+      final gameCodes = await _gameCodeService.getAllGameCodes();
+      await _dataService.saveGameCodes(gameCodes);
+
+      add(const GameCodesEvent.init());
+      return;
+    }
+
+    final s = await event.maybeWhen(
       init: () async {
         await _telemetryService.trackGameCodesOpened();
         return _buildInitialState();
@@ -31,6 +50,7 @@ class GameCodesBloc extends Bloc<GameCodesEvent, GameCodesState> {
         return _buildInitialState();
       },
       close: () async => _initialState,
+      orElse: () async => _initialState,
     );
 
     yield s;

diff --git a/lib/application/game_codes/game_codes_event.dart b/lib/application/game_codes/game_codes_event.dart
@@ -9,5 +9,7 @@ abstract class GameCodesEvent with _$GameCodesEvent {
     @required bool wasUsed,
   }) = _MarkAsUsed;
 
+  const factory GameCodesEvent.refresh() = _Refresh;
+
   const factory GameCodesEvent.close() = _Close;
 }
diff --git a/lib/application/game_codes/game_codes_state.dart b/lib/application/game_codes/game_codes_state.dart
@@ -5,5 +5,7 @@ abstract class GameCodesState with _$GameCodesState {
   const factory GameCodesState.loaded({
     @required List<GameCodeModel> workingGameCodes,
     @required List<GameCodeModel> expiredGameCodes,
+    @Default(false) bool isBusy,
+    bool isInternetAvailable,
   }) = _Loaded;
 }
diff --git a/lib/domain/assets.dart b/lib/domain/assets.dart
@@ -8,7 +8,6 @@ class Assets {
   static String artifactsDbPath = '$dbPath/artifacts.json';
   static String materialsDbPath = '$dbPath/materials.json';
   static String elementsDbPath = '$dbPath/elements.json';
-  static String gameCodesDbPath = '$dbPath/game_codes.json';
   static String monstersDbPath = '$dbPath/monsters.json';
   static String translationsBasePath = 'assets/i18n';
 
@@ -44,6 +43,7 @@ class Assets {
 
   //Others
   static String otherImgsBasePath = 'assets/others';
+  static String noImageAvailablePath = '$othersBasePath/$noImageAvailableName';
 
   //Monsters
   static String monstersImgsBasePath = 'assets/monsters';

diff --git a/lib/domain/models/db/game_codes/game_codes_file.dart b/lib/domain/models/db/game_codes/game_codes_file.dart
diff --git a/lib/domain/models/entities.dart b/lib/domain/models/entities.dart
@@ -1,7 +1,8 @@
 export 'entities/calculator/calculator_character_skill.dart';
 export 'entities/calculator/calculator_item.dart';
 export 'entities/calculator/calculator_session.dart';
-export 'entities/game_code/used_game_code.dart';
+export 'entities/game_code/game_code.dart';
+export 'entities/game_code/game_code_reward.dart';
 export 'entities/inventory/inventory_item.dart';
 export 'entities/inventory/inventory_used_item.dart';
 export 'entities/tierlist/tierlist_item.dart';
diff --git a/lib/domain/models/entities/game_code/game_code.dart b/lib/domain/models/entities/game_code/game_code.dart
@@ -0,0 +1,26 @@
+import 'package:hive/hive.dart';
+
+part 'game_code.g.dart';
+
+@HiveType(typeId: 6)
+class GameCode extends HiveObject {
+  @HiveField(0)
+  final String code;
+
+  @HiveField(1)
+  DateTime usedOn;
+
+  @HiveField(2)
+  DateTime discoveredOn;
+
+  @HiveField(3)
+  DateTime expiredOn;
+
+  @HiveField(4)
+  bool isExpired;
+
+  @HiveField(5)
+  int region;
+
+  GameCode(this.code, this.usedOn, this.discoveredOn, this.expiredOn, this.isExpired, this.region);
+}
diff --git a/lib/domain/models/entities/game_code/game_code_reward.dart b/lib/domain/models/entities/game_code/game_code_reward.dart
@@ -0,0 +1,17 @@
+import 'package:hive/hive.dart';
+
+part 'game_code_reward.g.dart';
+
+@HiveType(typeId: 8)
+class GameCodeReward extends HiveObject {
+  @HiveField(0)
+  final int gameCodeKey;
+
+  @HiveField(1)
+  final String itemKey;
+
+  @HiveField(2)
+  final int quantity;
+
+  GameCodeReward(this.gameCodeKey, this.itemKey, this.quantity);
+}
diff --git a/lib/domain/models/entities/game_code/used_game_code.dart b/lib/domain/models/entities/game_code/used_game_code.dart
diff --git a/lib/domain/models/game_codes/game_code_model.dart b/lib/domain/models/game_codes/game_code_model.dart
@@ -1,16 +1,25 @@
 import 'package:flutter/cupertino.dart';
+import 'package:genshindb/domain/enums/enums.dart';
 import 'package:genshindb/domain/models/models.dart';
 
 class GameCodeModel {
   final String code;
+  final AppServerResetTimeType region;
+
+  final DateTime discoveredOn;
+  final DateTime expiredOn;
   final bool isExpired;
+
   final bool isUsed;
   final List<ItemAscensionMaterialModel> rewards;
 
   GameCodeModel({
     @required this.code,
-    @required this.isExpired,
     @required this.isUsed,
     @required this.rewards,
+    @required this.isExpired,
+    @required this.discoveredOn,
+    this.expiredOn,
+    this.region,
   });
 }
diff --git a/lib/domain/models/models.dart b/lib/domain/models/models.dart
@@ -17,7 +17,6 @@ export 'db/characters/characters_file.dart';
 export 'db/elements/element_debuff_file_model.dart';
 export 'db/elements/element_reaction_file_model.dart';
 export 'db/elements/elements_file.dart';
-export 'db/game_codes/game_codes_file.dart';
 export 'db/materials/material_file_model.dart';
 export 'db/materials/materials_file.dart';
 export 'db/monsters/monster_file_model.dart';

diff --git a/lib/domain/services/data_service.dart b/lib/domain/services/data_service.dart
@@ -68,7 +68,11 @@ abstract class DataService {
 
   List<GameCodeModel> getAllGameCodes();
 
-  List<String> getAllUsedGameCodes();
+  Future<void> saveGameCodes(List<GameCodeModel> items);
+
+  Future<void> saveGameCodeRewards(int gameCodeKey, List<ItemAscensionMaterialModel> rewards);
+
+  Future<void> deleteAllGameCodeRewards(int gameCodeKey);
 
   Future<void> markCodeAsUsed(String code, {bool wasUsed = true});
 

diff --git a/lib/domain/services/game_code_service.dart b/lib/domain/services/game_code_service.dart
@@ -0,0 +1,5 @@
+import 'package:genshindb/domain/models/models.dart';
+
+abstract class GameCodeService {
+  Future<List<GameCodeModel>> getAllGameCodes();
+}
diff --git a/lib/domain/services/genshin_service.dart b/lib/domain/services/genshin_service.dart
@@ -8,7 +8,6 @@ abstract class GenshinService {
   Future<void> initArtifacts();
   Future<void> initMaterials();
   Future<void> initElements();
-  Future<void> initGameCodes();
   Future<void> initMonsters();
   Future<void> initTranslations(AppLanguageType languageType);
 
@@ -60,8 +59,6 @@ abstract class GenshinService {
   int getServerDay(AppServerResetTimeType type);
   DateTime getServerDate(AppServerResetTimeType type);
 
-  List<GameCodeFileModel> getAllGameCodes();
-
   List<String> getUpcomingKeys();
 
   MonsterFileModel getMonster(String key);

diff --git a/lib/domain/utils/date_utils.dart b/lib/domain/utils/date_utils.dart
@@ -0,0 +1,25 @@
+import 'package:intl/intl.dart';
+
+class DateUtils {
+  static const String defaultFormat = 'dd/MM/yyyy hh:mm:ss a';
+  static const String twentyFourHoursFormat = 'dd/MM/yyyy HH:mm:ss';
+  static const String dayMonthYearFormat = 'dd/MM/yyyy';
+
+  static String formatDate(
+    DateTime date, {
+    String locale,
+    String format = defaultFormat,
+  }) {
+    if (date == null) {
+      return 'N/A';
+    }
+    final formatter = DateFormat(format, locale);
+    final formatted = formatter.format(date);
+    return formatted;
+  }
+
+  static String formatDateMilitaryTime(DateTime date, {bool useTwentyFourHoursFormat = false}) {
+    final format = useTwentyFourHoursFormat ? twentyFourHoursFormat : defaultFormat;
+    return formatDate(date, format: format);
+  }
+}