1.7.3 - New tab showing played games history (#146)

* progress on play history page * progress on grouping and UI of the play history page * updating UI of the play history item * fixing an issue with null reference when removing bgg games * ensuring that play history updates when playthroughs updated * adding empty state to the play history page
Progrunning · Nov 19, 2022 · 251b574 · 251b574
1 parent bb53909
commit 251b574
Show file tree

Hide file tree

Showing 56 changed files with 2,238 additions and 425 deletions.
diff --git a/board_games_companion/lib/app.dart b/board_games_companion/lib/app.dart
@@ -72,6 +72,7 @@ class BoardGamesCompanionAppState extends State<BoardGamesCompanionApp> {
             viewModel.setBoardGameId(arguments.boardGameId);
             viewModel.setBoardGameName(arguments.boardGameName);
             viewModel.setBoardGameImageUrl(arguments.boardGameImageUrl);
+            viewModel.setBoardGameImageHeroId(arguments.boardGameImageHeroId);
 
             return MaterialPageRoute<dynamic>(
               settings: routeSettings,
@@ -98,6 +99,7 @@ class BoardGamesCompanionAppState extends State<BoardGamesCompanionApp> {
 
             final viewModel = getIt<PlaythroughsViewModel>();
             viewModel.setBoardGame(arguments.boardGameDetails);
+            viewModel.setBoardGameImageHeroId(arguments.boardGameImageHeroId);
 
             return MaterialPageRoute<dynamic>(
               settings: routeSettings,

diff --git a/board_games_companion/lib/common/app_text.dart b/board_games_companion/lib/common/app_text.dart
@@ -16,6 +16,16 @@ class AppText {
 
   static const goBack = 'Go Back';
 
+  static const today = 'today';
+  static const yesteday = 'yesterday';
+  static const dayBeforeYesteday = 'day before yesterday';
+  static const daysAgoFormat = '%s days ago';
+
+  static const homePageGamesTabTitle = 'Games';
+  static const homePageSearchTabTitle = 'Search';
+  static const homePageGamesHistoryTabTitle = 'Play History';
+  static const homePageGamesPlayersTabTitle = 'Players';
+
   static const aboutPageAuthorSectionTitle = 'Author';
   static const aboutPageDesignAndArtSectionTitle = 'Design & Art';
   static const aboutPageContentAndDataSectionTitle = 'Content & Data';
@@ -172,6 +182,11 @@ class AppText {
   static const settingsPageRestoreFailedMessage =
       'Unfortunately we ran into a problem with restoring your data. Please try again or contact support at [email protected]';
 
+  static const playHistoryPageEmptyTitle = "You haven't played any games yet";
+  static const playHistoryPageEmptyTextPartOne = 'Nothing to worry about though! ';
+  static const playHistoryPageEmptyTextPartTwo =
+      'Start recording your plays in the app and this screen will automatically populate with a history of your playthroughs.';
+
   static const gamePlaytimeFormat = '%s min';
   static const gamePlayersSingularFormat = '%i players';
   static const gamePlayersPluralFormat = '%i players';
@@ -181,6 +196,7 @@ class AppText {
   static const collectionsPageTitle = 'Collections';
   static const settingsPageTitle = 'Settings';
   static const newPlayerPageTitle = 'New Player';
+  static const playHistoryPageTitle = 'Play History';
 
   static const drawerVersionFormat = 'Version %s';
   static const drawerReleaseNotes = 'Release notes';

diff --git a/board_games_companion/lib/common/dimensions.dart b/board_games_companion/lib/common/dimensions.dart
@@ -9,6 +9,9 @@ class Dimensions {
 
   static const double boardGameDetailsImageHeight = 80;
 
+  static const double emptyPageTitleTopSpacing = 40;
+  static const double emptyPageTitleIconSize = 80;
+
   static const double extraSmallFontSize = 10;
   static const double smallFontSize = 12;
   static const double standardFontSize = 14;

diff --git a/board_games_companion/lib/extensions/date_time_extensions.dart b/board_games_companion/lib/extensions/date_time_extensions.dart
@@ -1,4 +1,6 @@
+import 'package:board_games_companion/common/app_text.dart';
 import 'package:intl/intl.dart';
+import 'package:sprintf/sprintf.dart';
 
 import '../common/constants.dart';
 
@@ -20,24 +22,47 @@ extension DateTimeExtensions on DateTime? {
   }
 
   String toDaysAgo() {
-    const String daysAgoText = 'days ago';
     if (this == null) {
-      return '- $daysAgoText';
+      return sprintf(AppText.daysAgoFormat, ['-']);
     }
 
-    final nowUtc = DateTime.now().toUtc();
-    final daysAgo = nowUtc.difference(this!).inDays;
-    if (daysAgo == 0) {
-      return 'today';
+    if (isToday) {
+      return AppText.today;
     }
-    if (daysAgo == 1) {
-      return 'yesterday';
+    if (isYesterday) {
+      return AppText.yesteday;
     }
-    if (daysAgo == 2) {
-      return 'day before yesterday';
+    if (isDayBeforeYesterday) {
+      return AppText.dayBeforeYesteday;
     }
 
-    return '$daysAgo $daysAgoText';
+    return sprintf(AppText.daysAgoFormat, [daysAgo]);
+  }
+
+  int get daysAgo {
+    final nowUtc = DateTime.now().toUtc();
+    return nowUtc.difference(this!).inDays;
+  }
+
+  bool get isToday {
+    final nowUtc = DateTime.now().toUtc();
+    final daysAgo = nowUtc.difference(this!).inDays;
+
+    return daysAgo == 0;
+  }
+
+  bool get isYesterday {
+    final nowUtc = DateTime.now().toUtc();
+    final daysAgo = nowUtc.difference(this!).inDays;
+
+    return daysAgo == 1;
+  }
+
+  bool get isDayBeforeYesterday {
+    final nowUtc = DateTime.now().toUtc();
+    final daysAgo = nowUtc.difference(this!).inDays;
+
+    return daysAgo == 2;
   }
 
   int safeCompareTo(DateTime? dateTimeToCompare) {

diff --git a/board_games_companion/lib/extensions/int_extensions.dart b/board_games_companion/lib/extensions/int_extensions.dart
@@ -28,7 +28,7 @@ extension IntExtensions on int? {
     }
   }
 
-  String toPlaytimeDuration([String? fallbackValue, bool showSeconds = true]) {
+  String toPlaytimeDuration({String? fallbackValue, bool showSeconds = true}) {
     if (this == null) {
       return fallbackValue ?? '';
     }

diff --git a/board_games_companion/lib/extensions/player_score_extensions.dart b/board_games_companion/lib/extensions/player_score_extensions.dart
@@ -0,0 +1,12 @@
+import '../common/enums/game_winning_condition.dart';
+import '../extensions/scores_extensions.dart';
+import '../models/player_score.dart';
+
+extension PlayerScoresExtesions on List<PlayerScore> {
+  List<PlayerScore> sortByScore(GameWinningCondition winningCondition) {
+    return this
+      ..sort((PlayerScore playerScore, PlayerScore otherPlayerScore) {
+        return compareScores(playerScore.score, otherPlayerScore.score, winningCondition);
+      });
+  }
+}
diff --git a/board_games_companion/lib/extensions/scores_extensions.dart b/board_games_companion/lib/extensions/scores_extensions.dart
@@ -5,6 +5,12 @@ import 'package:board_games_companion/common/enums/game_winning_condition.dart';
 
 import '../models/hive/score.dart';
 
+extension ScoreExtesions on Score {
+  String toMapKey() {
+    return '$playthroughId$playerId';
+  }
+}
+
 extension ScoresExtesions on List<Score>? {
   List<Score> onlyScoresWithValue() {
     return this
@@ -16,45 +22,7 @@ extension ScoresExtesions on List<Score>? {
   List<Score>? sortByScore(GameWinningCondition winningCondition) {
     return this
       ?..sort((Score score, Score otherScore) {
-        switch (winningCondition) {
-          case GameWinningCondition.LowestScore:
-            // MK Swap scores around
-            final buffer = otherScore;
-            otherScore = score;
-            score = buffer;
-            break;
-          case GameWinningCondition.HighestScore:
-            // MK No swapping needed
-            break;
-        }
-
-        if (score.value == null && otherScore.value == null) {
-          return Constants.leaveAsIs;
-        }
-
-        if (score.value == null) {
-          return Constants.moveBelow;
-        }
-
-        if (otherScore.value == null) {
-          return Constants.moveAbove;
-        }
-
-        final num? aNumber = num.tryParse(score.value!);
-        final num? bNumber = num.tryParse(otherScore.value!);
-        if (aNumber == null && bNumber == null) {
-          return Constants.leaveAsIs;
-        }
-
-        if (aNumber == null) {
-          return Constants.moveBelow;
-        }
-
-        if (bNumber == null) {
-          return Constants.moveAbove;
-        }
-
-        return bNumber.compareTo(aNumber);
+        return compareScores(score, otherScore, winningCondition);
       });
   }
 
@@ -84,3 +52,45 @@ extension ScoresExtesions on List<Score>? {
     return scores.reduce((a, b) => a + b) / scores.length;
   }
 }
+
+int compareScores(Score score, Score otherScore, GameWinningCondition winningCondition) {
+  switch (winningCondition) {
+    case GameWinningCondition.LowestScore:
+      // MK Swap scores around
+      final buffer = otherScore;
+      otherScore = score;
+      score = buffer;
+      break;
+    case GameWinningCondition.HighestScore:
+      // MK No swapping needed
+      break;
+  }
+
+  if (score.value == null && otherScore.value == null) {
+    return Constants.leaveAsIs;
+  }
+
+  if (score.value == null) {
+    return Constants.moveBelow;
+  }
+
+  if (otherScore.value == null) {
+    return Constants.moveAbove;
+  }
+
+  final num? aNumber = num.tryParse(score.value!);
+  final num? bNumber = num.tryParse(otherScore.value!);
+  if (aNumber == null && bNumber == null) {
+    return Constants.leaveAsIs;
+  }
+
+  if (aNumber == null) {
+    return Constants.moveBelow;
+  }
+
+  if (bNumber == null) {
+    return Constants.moveAbove;
+  }
+
+  return bNumber.compareTo(aNumber);
+}
diff --git a/board_games_companion/lib/extensions/string_extensions.dart b/board_games_companion/lib/extensions/string_extensions.dart
@@ -16,4 +16,12 @@ extension StringExtensions on String? {
 
     return this!.compareTo(stringToCompare!);
   }
+
+  String toCapitalized() {
+    if (this == null) {
+      return '';
+    }
+
+    return this!.isNotEmpty ? '${this![0].toUpperCase()}${this!.substring(1).toLowerCase()}' : '';
+  }
 }