feat: add countdown and word entry details card

README.md

@@ -42,6 +42,7 @@ Run the dict_parser by using the included script:
 Here are some things I still need/want to implement.
 
 - Actually being able to play the game.
+- Kana-insensitive word search (i.e., refactor and improve `package:kana`)
 - Backend integration to play against other players preferably using Firebase.
 - More pretty animations.
 

app/lib/app/app_root.dart

@@ -3,7 +3,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
-import 'package:shiritori/assets/assets.dart';
+import 'package:shiritori/backend/backend.dart';
 import 'package:shiritori/intl/intl.dart';
 import 'package:shiritori/theme/theme.dart';
 import 'package:shiritori/ui/routes/routes.dart';

app/lib/assets/assets.dart

@@ -1,3 +1,3 @@
-export 'dictionaries.dart';
+export 'dictionary_files.dart';
 export 'fonts.dart';
 export 'images.dart';

app/lib/assets/dictionary_files.dart

@@ -0,0 +1,7 @@
+import 'package:shiritori/backend/backend.dart';
+
+const _basePath = 'assets/dicts';
+
+final dictionaryFiles = <Language, String>{
+  Language.japanese: '$_basePath/dict_ja.json',
+};

app/lib/backend/backend.dart

@@ -1 +1,2 @@
+export 'models/models.dart';
 export 'repositories/repositories.dart';

app/lib/assets/dictionaries.dart → app/lib/backend/models/dictionaries.dart

@@ -5,6 +5,7 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_models/shared_models.dart';
+import 'package:shiritori/assets/assets.dart';
 
 export 'package:shared_models/shared_models.dart';
 
@@ -27,8 +28,7 @@ class Dictionaries {
   }
 
   static Future<Dictionary> _loadDictionaryFromDisk(Language language) async {
-    final dictText =
-        await rootBundle.loadString('assets/dicts/dict_${language.code}.json');
+    final dictText = await rootBundle.loadString(dictionaryFiles[language]);
     final dictJson = json.decode(dictText) as Map<String, dynamic>;
 
     final dict = Dictionary.fromJson(dictJson);

app/lib/backend/models/game.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/widgets.dart';
+import 'package:meta/meta.dart';
+import 'package:provider/provider.dart';
+import 'package:shiritori/backend/backend.dart';
+
+class Game {
+  const Game({
+    @required this.settings,
+    @required this.guessesByPlayerIndex,
+    this.winningPlayerIndex,
+  })  : assert(settings != null),
+        assert(guessesByPlayerIndex != null);
+
+  factory Game.startNew(GameSettings settings) {
+    return Game(
+      settings: settings,
+      guessesByPlayerIndex: {0: {}, 1: {}},
+      winningPlayerIndex: null,
+    );
+  }
+
+  static Game of(BuildContext context) {
+    return Provider.of<Game>(context, listen: false);
+  }
+
+  final GameSettings settings;
+  final Map<int, Set<String>> guessesByPlayerIndex;
+  final int winningPlayerIndex;
+
+  Set<String> get allGuesses {
+    return guessesByPlayerIndex.entries.expand((entry) => entry.value).toSet();
+  }
+
+  bool hasBeenGuessed(String guess) {
+    return allGuesses.contains(guess);
+  }
+
+  bool isValidGuess(String guess) {
+    return hasBeenGuessed(guess);
+  }
+}

app/lib/backend/models/game_settings.dart

@@ -0,0 +1,60 @@
+import 'package:flutter/widgets.dart';
+import 'package:meta/meta.dart';
+import 'package:shiritori/backend/backend.dart';
+
+@immutable
+abstract class GameSettings {
+  const GameSettings({
+    @required this.dictionary,
+    @required this.answeringDuration,
+    @required this.enemyType,
+  });
+
+  final Dictionary dictionary;
+  final Duration answeringDuration;
+  final GameEnemyType enemyType;
+}
+
+@immutable
+class SingleplayerGameSettings implements GameSettings {
+  const SingleplayerGameSettings({
+    @required this.dictionary,
+    @required this.answeringDuration,
+  });
+
+  @override
+  final Dictionary dictionary;
+
+  @override
+  final Duration answeringDuration;
+
+  @override
+  final GameEnemyType enemyType = GameEnemyType.singleplayer;
+}
+
+@immutable
+class MultiplayerGameSettings implements GameSettings {
+  const MultiplayerGameSettings({
+    @required this.dictionary,
+    @required this.answeringDuration,
+  });
+
+  @override
+  final Dictionary dictionary;
+
+  @override
+  final Duration answeringDuration;
+
+  @override
+  final GameEnemyType enemyType = GameEnemyType.multiplayer;
+}
+
+enum GameEnemyType {
+  singleplayer,
+  multiplayer,
+}
+
+extension GameEnemyTypeX on GameEnemyType {
+  bool get isSingleplayer => this == GameEnemyType.singleplayer;
+  bool get isMultiplayer => this == GameEnemyType.multiplayer;
+}

app/lib/backend/models/models.dart

@@ -0,0 +1,3 @@
+export 'dictionaries.dart';
+export 'game.dart';
+export 'game_settings.dart';

app/lib/intl/arb/intl_messages.arb

@@ -1,4 +1,22 @@
 {
+  "singleplayerTitle": "Singleplayer",
+  "@singleplayerTitle": {
+    "description": "The header for the Singleplayer page. Usually, this string should be the same as HomeStrings.singleplayerCardTitle.",
+    "type": "text",
+    "placeholders": {}
+  },
+  "multiplayerTitle": "Multiplayer",
+  "@multiplayerTitle": {
+    "description": "The header for the Multiplayer page. Usually, this string should be the same as HomeStrings.multiplayerCardTitle.",
+    "type": "text",
+    "placeholders": {}
+  },
+  "getReady": "Get Ready...",
+  "@getReady": {
+    "description": "Text indicating a match is about to start and the player needs to start paying attention and get themselves ready.",
+    "type": "text",
+    "placeholders": {}
+  },
   "welcomeHeader": "Welcome back,\n{name}.",
   "@welcomeHeader": {
     "description": "Welcome message displayed at the top of the screen that greets the user.",
@@ -27,15 +45,15 @@
     "type": "text",
     "placeholders": {}
   },
-  "quickPlayCardTitle": "Quick Play",
-  "@quickPlayCardTitle": {
-    "description": "Title on the Quick Play card that allows the user to start a quick play match.",
+  "singleplayerCardTitle": "Singleplayer",
+  "@singleplayerCardTitle": {
+    "description": "Title on the Singleplayer card that allows the user to start a quick play match.",
     "type": "text",
     "placeholders": {}
   },
-  "quickPlayCardSubtitle": "PLAY AGAINST CPU",
-  "@quickPlayCardSubtitle": {
-    "description": "Subtitle on the Quick Play card that indicates it is a new game mode. Should be all capitals if applicable.",
+  "singleplayerCardSubtitle": "AGAINST CPU",
+  "@singleplayerCardSubtitle": {
+    "description": "Subtitle on the Singleplayer card that indicates it is a new game mode. Should be all capitals if applicable.",
     "type": "text",
     "placeholders": {}
   },
@@ -45,7 +63,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "multiplayerCardSubtitle": "PLAY WITH FRIENDS",
+  "multiplayerCardSubtitle": "WITH FRIENDS",
   "@multiplayerCardSubtitle": {
     "description": "Subtitle on the Multiplayer card that indicates the user can play with friends. Should be all capitals if applicable.",
     "type": "text",
@@ -75,10 +93,22 @@
     "type": "text",
     "placeholders": {}
   },
+  "quickPlayButtonTitle": "Quick Play",
+  "@quickPlayButtonTitle": {
+    "description": "Text on the Quick Play button that instantly starts a singleplayer CPU match.",
+    "type": "text",
+    "placeholders": {}
+  },
   "snackBarConfirmButton": "OK",
   "@snackBarConfirmButton": {
     "description": "Button text displayed on a snackbar that confirms and dismisses it.",
     "type": "text",
     "placeholders": {}
+  },
+  "back": "BACK",
+  "@back": {
+    "description": "Button text displayed on back buttons that confirms and dismisses it. Should be all capitals if applicable.",
+    "type": "text",
+    "placeholders": {}
   }
 }

app/lib/intl/strings/game_strings.dart

@@ -10,4 +10,24 @@ class GameStrings {
           'HomeStrings.singleplayerCardTitle.',
     );
   }
+
+  String get multiplayerTitle {
+    return Intl.message(
+      'Multiplayer',
+      name: 'multiplayerTitle',
+      desc: 'The header for the Multiplayer page. '
+          'Usually, this string should be the same as '
+          'HomeStrings.multiplayerCardTitle.',
+    );
+  }
+
+  String get getReady {
+    return Intl.message(
+      'Get Ready...',
+      name: 'getReady',
+      desc: 'Text indicating a match is about to start '
+          'and the player needs to start paying attention '
+          'and get themselves ready.',
+    );
+  }
 }

app/lib/main.dart

@@ -2,20 +2,21 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:shiritori/app/app.dart';
+import 'package:shiritori/backend/backend.dart';
 
 import 'assets/assets.dart';
 
 void main() async {
   log('Initializing bindings...');
-  
+
   final initStopwatch = Stopwatch()..start();
   WidgetsFlutterBinding.ensureInitialized();
   log('Loading background image...');
   final backgroundImage = await Images.loadBackground();
   log('Loading dictionaries...');
   final dictionaries = await Dictionaries.loadFromDisk();
   initStopwatch.stop();
-  
+
   final seconds = (initStopwatch.elapsedMilliseconds / 1000).toStringAsFixed(3);
   log('Initialization done. (took $seconds seconds)');
 

app/lib/theme/theme.dart

@@ -6,6 +6,7 @@ abstract class AppTheme {
   static ThemeData get themeDataLight {
     return ThemeData(
       buttonTheme: buttonTheme,
+      canvasColor: veryLightGrey,
       cardTheme: cardTheme,
       dividerTheme: dividerTheme,
       fontFamily: Fonts.hurmeGeometricSans,
@@ -36,19 +37,19 @@ abstract class AppTheme {
   static const _letterSpacing = -0.5;
   static const textTheme = TextTheme(
     headline1: TextStyle(
-      color: white,
+      color: blue,
       fontWeight: FontWeight.bold,
       height: 1.0,
       letterSpacing: _letterSpacing,
     ),
     headline2: TextStyle(
-      color: white,
+      color: blue,
       height: 1.0,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
     ),
     headline3: TextStyle(
-      color: white,
+      color: blue,
       height: 1.0,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
@@ -67,25 +68,40 @@ abstract class AppTheme {
     ),
     headline6: TextStyle(
       color: blue,
+      fontSize: 22,
       height: 1.0,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
     ),
-    overline: TextStyle(
+    bodyText1: TextStyle(
+      fontSize: 20,
+    ),
+    bodyText2: TextStyle(
+      fontSize: 18,
+    ),
+    subtitle1: TextStyle(
       color: blue,
+      fontSize: 20,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
     ),
-    subtitle1: TextStyle(
+    subtitle2: TextStyle(
       color: blue,
+      fontSize: 18,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
     ),
-    subtitle2: TextStyle(
+    caption: TextStyle(
       color: blue,
+      fontSize: 16,
       fontWeight: FontWeight.bold,
       letterSpacing: _letterSpacing,
     ),
+    overline: TextStyle(
+      color: blue,
+      fontSize: 14,
+      letterSpacing: _letterSpacing,
+    ),
   );
 
   static const white = Color(0xFFFFFFFF);
@@ -114,7 +130,7 @@ abstract class AppTheme {
 
   static const colorSingleplayer = orange;
 
-  static const elevationDefault = 18.0;
+  static const elevationDefault = 8.0;
   static const elevationDisabled = elevationDefault / 3;
   static const radiusCardDefault = Radius.circular(16.0);
   static const shapeDefault = RoundedRectangleBorder(