Merge pull request 'MVP' (#141) from development into main

Reviewed-on: #141
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

lib/l10n/arb/app_de.arb

@@ -1,6 +1,6 @@
 {
   "@@locale": "de",
-  "all_players": "Alle Spieler:innen:",
+  "all_players": "Alle Spieler:innen",
   "all_players_selected": "Alle Spieler:innen ausgewählt",
   "amount_of_matches": "Anzahl der Spiele",
   "cancel": "Abbrechen",
@@ -44,7 +44,7 @@
   "no_matches_created_yet": "Noch keine Spiele erstellt",
   "no_players_created_yet": "Noch keine Spieler:in erstellt",
   "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
-  "no_players_selected": "Keine Spieler:in ausgewählt",
+  "no_players_selected": "Keine Spieler:innen ausgewählt",
   "no_recent_matches_available": "Keine letzten Spiele verfügbar",
   "no_second_match_available": "Kein zweites Spiel verfügbar",
   "no_statistics_available": "Keine Statistiken verfügbar",
@@ -64,7 +64,7 @@
   "search_for_groups": "Nach Gruppen suchen",
   "search_for_players": "Nach Spieler:innen suchen",
   "select_winner": "Gewinner:in wählen:",
-  "selected_players": "Ausgewählte Spieler:innen: {count}",
+  "selected_players": "Ausgewählte Spieler:innen",
   "settings": "Einstellungen",
   "single_loser": "Ein:e Verlierer:in",
   "single_winner": "Ein:e Gewinner:in",
@@ -73,11 +73,11 @@
   "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt",
   "there_is_no_group_matching_your_search": "Es gibt keine Gruppe, die deiner Suche entspricht",
   "this_cannot_be_undone": "Dies kann nicht rückgängig gemacht werden",
-  "today_at": "Heute um {time}",
+  "today_at": "Heute um",
   "undo": "Rückgängig",
   "unknown_exception": "Unbekannter Fehler (siehe Konsole)",
-  "winner": "Gewinner*in",
+  "winner": "Gewinner:in",
   "winrate": "Siegquote",
   "wins": "Siege",
-  "yesterday_at": "Gestern um {time}"
+  "yesterday_at": "Gestern um"
 }

lib/l10n/arb/app_en.arb

@@ -9,6 +9,9 @@
   "@amount_of_matches": {
     "description": "Label for amount of matches statistic"
   },
+  "@app_name": {
+    "description": "The name of the App"
+  },
   "@cancel": {
     "description": "Cancel button text"
   },
@@ -22,13 +25,7 @@
     "description": "Label for choosing a ruleset"
   },
   "@could_not_add_player": {
-		"description": "Error message when adding a player fails",
+    "description": "Error message when adding a player fails"
-		"placeholders": {
-			"playerName": {
-				"type": "String",
-				"example": "John"
-			}
-		}
   },
   "@create_group": {
     "description": "Button text to create a group"
@@ -86,9 +83,6 @@
   "@game_name": {
     "description": "Placeholder for game name search"
   },
-	"@game_tracker": {
-		"description": "App Name"
-	},
   "@group": {
     "description": "Group label"
   },
@@ -212,13 +206,7 @@
     "description": "Label to select the winner"
   },
   "@selected_players": {
-		"description": "Shows the number of selected players",
+    "description": "Shows the number of selected players"
-		"placeholders": {
-			"count": {
-				"type": "int",
-				"format": "compact"
-			}
-		}
   },
   "@settings": {
     "description": "Settings label"
@@ -251,13 +239,7 @@
     "description": "Warning message for irreversible actions"
   },
   "@today_at": {
-		"description": "Date format for today",
+    "description": "Date format for today"
-		"placeholders": {
-			"time": {
-				"type": "String",
-				"example": "14:30"
-			}
-		}
   },
   "@undo": {
     "description": "Undo button text"
@@ -275,22 +257,17 @@
     "description": "Label for wins statistic"
   },
   "@yesterday_at": {
-		"description": "Date format for yesterday",
+    "description": "Date format for yesterday"
-		"placeholders": {
-			"time": {
-				"type": "String",
-				"example": "14:30"
-			}
-		}
   },
-	"all_players": "All players:",
+  "all_players": "All players",
   "all_players_selected": "All players selected",
   "amount_of_matches": "Amount of Matches",
+  "app_name": "Game Tracker",
   "cancel": "Cancel",
   "choose_game": "Choose Game",
   "choose_group": "Choose Group",
   "choose_ruleset": "Choose Ruleset",
-	"could_not_add_player": "Could not add player {playerName}",
+  "could_not_add_player": "Could not add player",
   "create_group": "Create Group",
   "create_match": "Create match",
   "create_new_group": "Create new group",
@@ -308,7 +285,6 @@
   "format_exception": "Format Exception (see console)",
   "game": "Game",
   "game_name": "Game Name",
-	"game_tracker": "Game Tracker",
   "group": "Group",
   "group_name": "Group name",
   "groups": "Groups",
@@ -348,7 +324,7 @@
   "search_for_groups": "Search for groups",
   "search_for_players": "Search for players",
   "select_winner": "Select Winner:",
-	"selected_players": "Selected players: {count}",
+  "selected_players": "Selected players",
   "settings": "Settings",
   "single_loser": "Single Loser",
   "single_winner": "Single Winner",
@@ -357,11 +333,11 @@
   "successfully_added_player": "Successfully added player {playerName}",
   "there_is_no_group_matching_your_search": "There is no group matching your search",
   "this_cannot_be_undone": "This can't be undone",
-	"today_at": "Today at {time}",
+  "today_at": "Today at",
   "undo": "Undo",
   "unknown_exception": "Unknown Exception (see console)",
   "winner": "Winner",
   "winrate": "Winrate",
   "wins": "Wins",
-	"yesterday_at": "Yesterday at {time}"
+  "yesterday_at": "Yesterday at"
 }

lib/l10n/generated/app_localizations.dart

@@ -101,7 +101,7 @@ abstract class AppLocalizations {
   /// Label for all players list
   ///
   /// In en, this message translates to:
-  /// **'All players:'**
+  /// **'All players'**
   String get all_players;
 
   /// Message when all players are added to selection
@@ -116,6 +116,12 @@ abstract class AppLocalizations {
   /// **'Amount of Matches'**
   String get amount_of_matches;
 
+  /// The name of the App
+  ///
+  /// In en, this message translates to:
+  /// **'Game Tracker'**
+  String get app_name;
+
   /// Cancel button text
   ///
   /// In en, this message translates to:
@@ -143,8 +149,8 @@ abstract class AppLocalizations {
   /// Error message when adding a player fails
   ///
   /// In en, this message translates to:
-  /// **'Could not add player {playerName}'**
+  /// **'Could not add player'**
-  String could_not_add_player(String playerName);
+  String could_not_add_player(Object playerName);
 
   /// Button text to create a group
   ///
@@ -248,12 +254,6 @@ abstract class AppLocalizations {
   /// **'Game Name'**
   String get game_name;
 
-  /// App Name
-  ///
-  /// In en, this message translates to:
-  /// **'Game Tracker'**
-  String get game_tracker;
-
   /// Group label
   ///
   /// In en, this message translates to:
@@ -491,8 +491,8 @@ abstract class AppLocalizations {
   /// Shows the number of selected players
   ///
   /// In en, this message translates to:
-  /// **'Selected players: {count}'**
+  /// **'Selected players'**
-  String selected_players(int count);
+  String get selected_players;
 
   /// Settings label
   ///
@@ -545,8 +545,8 @@ abstract class AppLocalizations {
   /// Date format for today
   ///
   /// In en, this message translates to:
-  /// **'Today at {time}'**
+  /// **'Today at'**
-  String today_at(String time);
+  String get today_at;
 
   /// Undo button text
   ///
@@ -581,8 +581,8 @@ abstract class AppLocalizations {
   /// Date format for yesterday
   ///
   /// In en, this message translates to:
-  /// **'Yesterday at {time}'**
+  /// **'Yesterday at'**
-  String yesterday_at(String time);
+  String get yesterday_at;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/generated/app_localizations_de.dart

@@ -9,7 +9,7 @@ class AppLocalizationsDe extends AppLocalizations {
   AppLocalizationsDe([String locale = 'de']) : super(locale);
 
   @override
-  String get all_players => 'Alle Spieler:innen:';
+  String get all_players => 'Alle Spieler:innen';
 
   @override
   String get all_players_selected => 'Alle Spieler:innen ausgewählt';
@@ -17,6 +17,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get amount_of_matches => 'Anzahl der Spiele';
 
+  @override
+  String get app_name => 'Game Tracker';
+
   @override
   String get cancel => 'Abbrechen';
 
@@ -30,7 +33,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get choose_ruleset => 'Regelwerk wählen';
 
   @override
-  String could_not_add_player(String playerName) {
+  String could_not_add_player(Object playerName) {
     return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
   }
 
@@ -88,9 +91,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get game_name => 'Spielvorlagenname';
 
-  @override
-  String get game_tracker => 'Game Tracker';
-
   @override
   String get group => 'Gruppe';
 
@@ -150,7 +150,7 @@ class AppLocalizationsDe extends AppLocalizations {
       'Keine Spieler:in mit diesem Namen gefunden';
 
   @override
-  String get no_players_selected => 'Keine Spieler:in ausgewählt';
+  String get no_players_selected => 'Keine Spieler:innen ausgewählt';
 
   @override
   String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';
@@ -216,14 +216,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get select_winner => 'Gewinner:in wählen:';
 
   @override
-  String selected_players(int count) {
+  String get selected_players => 'Ausgewählte Spieler:innen';
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Ausgewählte Spieler:innen: $countString';
-  }
 
   @override
   String get settings => 'Einstellungen';
@@ -254,9 +247,7 @@ class AppLocalizationsDe extends AppLocalizations {
       'Dies kann nicht rückgängig gemacht werden';
 
   @override
-  String today_at(String time) {
+  String get today_at => 'Heute um';
-    return 'Heute um $time';
-  }
 
   @override
   String get undo => 'Rückgängig';
@@ -265,7 +256,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get unknown_exception => 'Unbekannter Fehler (siehe Konsole)';
 
   @override
-  String get winner => 'Gewinner*in';
+  String get winner => 'Gewinner:in';
 
   @override
   String get winrate => 'Siegquote';
@@ -274,7 +265,5 @@ class AppLocalizationsDe extends AppLocalizations {
   String get wins => 'Siege';
 
   @override
-  String yesterday_at(String time) {
+  String get yesterday_at => 'Gestern um';
-    return 'Gestern um $time';
-  }
 }

lib/l10n/generated/app_localizations_en.dart

@@ -9,7 +9,7 @@ class AppLocalizationsEn extends AppLocalizations {
   AppLocalizationsEn([String locale = 'en']) : super(locale);
 
   @override
-  String get all_players => 'All players:';
+  String get all_players => 'All players';
 
   @override
   String get all_players_selected => 'All players selected';
@@ -17,6 +17,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get amount_of_matches => 'Amount of Matches';
 
+  @override
+  String get app_name => 'Game Tracker';
+
   @override
   String get cancel => 'Cancel';
 
@@ -30,8 +33,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get choose_ruleset => 'Choose Ruleset';
 
   @override
-  String could_not_add_player(String playerName) {
+  String could_not_add_player(Object playerName) {
-    return 'Could not add player $playerName';
+    return 'Could not add player';
   }
 
   @override
@@ -88,9 +91,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get game_name => 'Game Name';
 
-  @override
-  String get game_tracker => 'Game Tracker';
-
   @override
   String get group => 'Group';
 
@@ -216,14 +216,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get select_winner => 'Select Winner:';
 
   @override
-  String selected_players(int count) {
+  String get selected_players => 'Selected players';
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Selected players: $countString';
-  }
 
   @override
   String get settings => 'Settings';
@@ -253,9 +246,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get this_cannot_be_undone => 'This can\'t be undone';
 
   @override
-  String today_at(String time) {
+  String get today_at => 'Today at';
-    return 'Today at $time';
-  }
 
   @override
   String get undo => 'Undo';
@@ -273,7 +264,5 @@ class AppLocalizationsEn extends AppLocalizations {
   String get wins => 'Wins';
 
   @override
-  String yesterday_at(String time) {
+  String get yesterday_at => 'Yesterday at';
-    return 'Yesterday at $time';
-  }
 }

lib/main.dart

@@ -34,21 +34,17 @@ class GameTracker extends StatelessWidget {
         );
       },
       debugShowCheckedModeBanner: false,
-      onGenerateTitle: (context) => AppLocalizations.of(context).game_tracker,
+      onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
-      darkTheme: ThemeData.dark(),
-
       themeMode: ThemeMode.dark, // forces dark mode
       theme: ThemeData(
         primaryColor: CustomTheme.primaryColor,
         scaffoldBackgroundColor: CustomTheme.backgroundColor,
         appBarTheme: CustomTheme.appBarTheme,
-
         colorScheme: ColorScheme.fromSeed(
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
       ),
-
       home: const CustomNavigationBar(),
     );
   }

lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -155,7 +155,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                       (r) => r.$1 == selectedRuleset,
                     );
                   } else {
-                    hintText = AppLocalizations.of(context).match_name;
+                    hintText = loc.match_name;
                     selectedRuleset = null;
                   }
                 });

lib/presentation/widgets/player_selection.dart

@@ -119,9 +119,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           ),
           const SizedBox(height: 10),
           Text(
-            AppLocalizations.of(
+            loc.selected_players,
-              context,
-            ).selected_players(selectedPlayers.length),
             style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
           ),
           const SizedBox(height: 10),

lib/presentation/widgets/tiles/match_tile.dart

@@ -161,13 +161,9 @@ class _MatchTileState extends State<MatchTile> {
     final loc = AppLocalizations.of(context);
 
     if (difference.inDays == 0) {
-      return AppLocalizations.of(
+      return "${loc.today_at} ${DateFormat('HH:mm').format(dateTime)}";
-        context,
-      ).today_at(DateFormat('HH:mm').format(dateTime));
     } else if (difference.inDays == 1) {
-      return AppLocalizations.of(
+      return "${loc.yesterday_at} ${DateFormat('HH:mm').format(dateTime)}";
-        context,
-      ).yesterday_at(DateFormat('HH:mm').format(dateTime));
     } else if (difference.inDays < 7) {
       return loc.days_ago(difference.inDays);
     } else {