Merge pull request #160 from flixcoo/enhance/158-title-and-description-corrections

Title and Description corrections

lib/l10n/arb/app_de.arb

@@ -10,6 +10,8 @@
   "delete": "Löschen",
   "cancel": "Abbrechen",
   "game": "Spiel",
+  "games": "Spiele",
+  "gamemode": "Spielmodus",
   "ok": "OK",
   "player": "Spieler:in",
     "players": "Spieler:innen",
@@ -74,7 +76,7 @@
       }
     }
   },
-  "unlimited_description": "Dem Spiel sind keine Grenzen gesetzt. Es wird so lange gespielt, bis ihr keine Lust mehr habt.",
+  "unlimited_description": "Es wird so lange gespielt, bis ihr keine Lust mehr habt. Das Spiel kann jederzeit manuell beendet werden.",
 
   "results": "Ergebnisse",
   "who_said_cabo": "Wer hat CABO gesagt?",
@@ -126,7 +128,7 @@
   "end_game_message": "Möchtest du das Spiel beenden? Das Spiel wird als beendet markiert und kann nicht fortgeführt werden.",
 
   "statistics": "Statistiken",
-  "point_overview": "Punkteübersicht",
+  "point_overview": "Punktetabelle",
   "scoring_history": "Spielverlauf",
   "empty_graph_text": "Du musst mindestens eine Runde spielen, damit der Graph des Spielverlaufes angezeigt werden kann.",
 

lib/l10n/arb/app_en.arb

@@ -10,6 +10,8 @@
   "delete": "Delete",
   "cancel": "Cancel",
   "game": "Game",
+  "games": "Games",
+  "gamemode": "Gamemode",
   "ok": "OK",
   "player": "Player",
   "players": "Players",
@@ -40,7 +42,7 @@
   "yes": "Yes",
   "no": "No",
   "bad_rating_title": "Not satisfied?",
-  "bad_rating_message": "If you are not satisfied with the app, please let me know before leaving a bad rating. I will try to fix the issue as soon as possible.",
+  "bad_rating_message": "Feel free to send me an email directly so we can solve your problem!",
   "contact_email": "Contact via E-Mail",
   "email_subject": "Feedback: Cabo Counter App",
   "email_body": "I have the following feedback...",
@@ -74,7 +76,7 @@
       }
     }
   },
-  "unlimited_description": "The game continues until you decide to stop playing",
+  "unlimited_description": "The game continues until you decide to stop playing. The game can be ended manually at any time.",
 
   "results": "Results",
   "who_said_cabo": "Who called Cabo?",

lib/l10n/generated/app_localizations.dart

@@ -152,6 +152,18 @@ abstract class AppLocalizations {
   /// **'Spiel'**
   String get game;
 
+  /// No description provided for @games.
+  ///
+  /// In de, this message translates to:
+  /// **'Spiele'**
+  String get games;
+
+  /// No description provided for @gamemode.
+  ///
+  /// In de, this message translates to:
+  /// **'Spielmodus'**
+  String get gamemode;
+
   /// No description provided for @ok.
   ///
   /// In de, this message translates to:
@@ -425,7 +437,7 @@ abstract class AppLocalizations {
   /// No description provided for @unlimited_description.
   ///
   /// In de, this message translates to:
-  /// **'Dem Spiel sind keine Grenzen gesetzt. Es wird so lange gespielt, bis ihr keine Lust mehr habt.'**
+  /// **'Es wird so lange gespielt, bis ihr keine Lust mehr habt. Das Spiel kann jederzeit manuell beendet werden.'**
   String get unlimited_description;
 
   /// No description provided for @results.
@@ -546,7 +558,7 @@ abstract class AppLocalizations {
   /// No description provided for @point_overview.
   ///
   /// In de, this message translates to:
-  /// **'Punkteübersicht'**
+  /// **'Punktetabelle'**
   String get point_overview;
 
   /// No description provided for @scoring_history.

lib/l10n/generated/app_localizations_de.dart

@@ -35,6 +35,12 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get game => 'Spiel';
 
+  @override
+  String get games => 'Spiele';
+
+  @override
+  String get gamemode => 'Spielmodus';
+
   @override
   String get ok => 'OK';
 
@@ -183,7 +189,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get unlimited_description =>
-      'Dem Spiel sind keine Grenzen gesetzt. Es wird so lange gespielt, bis ihr keine Lust mehr habt.';
+      'Es wird so lange gespielt, bis ihr keine Lust mehr habt. Das Spiel kann jederzeit manuell beendet werden.';
 
   @override
   String get results => 'Ergebnisse';
@@ -265,7 +271,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get statistics => 'Statistiken';
 
   @override
-  String get point_overview => 'Punkteübersicht';
+  String get point_overview => 'Punktetabelle';
 
   @override
   String get scoring_history => 'Spielverlauf';

lib/l10n/generated/app_localizations_en.dart

@@ -35,6 +35,12 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get game => 'Game';
 
+  @override
+  String get games => 'Games';
+
+  @override
+  String get gamemode => 'Gamemode';
+
   @override
   String get ok => 'OK';
 
@@ -101,7 +107,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get bad_rating_message =>
-      'If you are not satisfied with the app, please let me know before leaving a bad rating. I will try to fix the issue as soon as possible.';
+      'Feel free to send me an email directly so we can solve your problem!';
 
   @override
   String get contact_email => 'Contact via E-Mail';
@@ -180,7 +186,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get unlimited_description =>
-      'The game continues until you decide to stop playing';
+      'The game continues until you decide to stop playing. The game can be ended manually at any time.';
 
   @override
   String get results => 'Results';

lib/presentation/views/about/licenses/license_detail_view.dart

@@ -17,6 +17,7 @@ class LicenseDetailView extends StatelessWidget {
         middle: Text(
           AppLocalizations.of(context).license_details,
         ),
+        previousPageTitle: AppLocalizations.of(context).licenses,
       ),
       child: SafeArea(
         child: SingleChildScrollView(

lib/presentation/views/about/licenses/license_view.dart

@@ -16,6 +16,7 @@ class LicenseView extends StatelessWidget {
     return CupertinoPageScaffold(
       navigationBar: CupertinoNavigationBar(
         middle: Text(AppLocalizations.of(context).licenses),
+        previousPageTitle: AppLocalizations.of(context).about,
       ),
       child: SafeArea(
         child: ListView.builder(

lib/presentation/views/home/active_game/active_game_view.dart

@@ -57,10 +57,8 @@ class _ActiveGameViewState extends State<ActiveGameView> {
                   gameSession.playerScores, sortedPlayerIndices);
               return CupertinoPageScaffold(
                   navigationBar: CupertinoNavigationBar(
-                    middle: Text(
+                    previousPageTitle: AppLocalizations.of(context).games,
-                      gameSession.gameTitle,
+                    middle: Text(AppLocalizations.of(context).overview),
-                      overflow: TextOverflow.ellipsis,
-                    ),
                   ),
                   child: SafeArea(
                     child: SingleChildScrollView(
@@ -223,7 +221,7 @@ class _ActiveGameViewState extends State<ActiveGameView> {
                                 backgroundColorActivated:
                                     CustomTheme.backgroundColor,
                                 onTap: () {
-                                  Navigator.pushReplacement(
+                                  Navigator.push(
                                       context,
                                       CupertinoPageRoute(
                                           builder: (_) => CreateGameView(

lib/presentation/views/home/active_game/graph_view.dart

@@ -28,7 +28,7 @@ class _GraphViewState extends State<GraphView> {
     return CupertinoPageScaffold(
         navigationBar: CupertinoNavigationBar(
           middle: Text(AppLocalizations.of(context).scoring_history),
-          previousPageTitle: AppLocalizations.of(context).back,
+          previousPageTitle: AppLocalizations.of(context).overview,
         ),
         child: SafeArea(
           child: Visibility(

lib/presentation/views/home/active_game/mode_selection_view.dart

@@ -18,7 +18,9 @@ class ModeSelectionMenu extends StatelessWidget {
   Widget build(BuildContext context) {
     return CupertinoPageScaffold(
       navigationBar: CupertinoNavigationBar(
-        middle: Text(AppLocalizations.of(context).select_game_mode),
+        middle: Text(AppLocalizations.of(context).gamemode),
+        previousPageTitle:
+            !showDeselection ? AppLocalizations.of(context).new_game : '',
       ),
       child: ListView(
         children: [

lib/presentation/views/home/active_game/points_view.dart

@@ -19,7 +19,7 @@ class _PointsViewState extends State<PointsView> {
     return CupertinoPageScaffold(
         navigationBar: CupertinoNavigationBar(
           middle: Text(AppLocalizations.of(context).point_overview),
-          previousPageTitle: AppLocalizations.of(context).back,
+          previousPageTitle: AppLocalizations.of(context).overview,
         ),
         child: SafeArea(child: LayoutBuilder(builder: (context, constraints) {
           const double caboFieldWidthFactor = 0.2;

lib/presentation/views/home/create_game_view.dart

@@ -80,7 +80,7 @@ class _CreateGameViewState extends State<CreateGameView> {
     return CupertinoPageScaffold(
         resizeToAvoidBottomInset: false,
         navigationBar: CupertinoNavigationBar(
-          previousPageTitle: AppLocalizations.of(context).overview,
+          previousPageTitle: AppLocalizations.of(context).games,
           middle: Text(AppLocalizations.of(context).new_game),
         ),
         child: SafeArea(
@@ -452,10 +452,12 @@ class _CreateGameViewState extends State<CreateGameView> {
     gameManager.addGameSession(gameSession);
     final session = gameManager.getGameSessionById(id) ?? gameSession;
 
-    Navigator.pushReplacement(
+    Navigator.pushAndRemoveUntil(
-        context,
+      context,
-        CupertinoPageRoute(
+      CupertinoPageRoute(
-            builder: (context) => ActiveGameView(gameSession: session)));
+          builder: (context) => ActiveGameView(gameSession: session)),
+      (Route<dynamic> route) => route.isFirst,
+    );
   }
 
   @override

lib/presentation/views/home/main_menu_view.dart

@@ -75,7 +75,7 @@ class _MainMenuViewState extends State<MainMenuView> {
                       });
                     },
                     icon: const Icon(CupertinoIcons.settings, size: 30)),
-                middle: Text(AppLocalizations.of(context).app_name),
+                middle: Text(AppLocalizations.of(context).games),
                 trailing: IconButton(
                     onPressed: () => Navigator.push(
                           context,

lib/presentation/views/home/settings_view.dart

@@ -32,6 +32,7 @@ class _SettingsViewState extends State<SettingsView> {
     return CupertinoPageScaffold(
       navigationBar: CupertinoNavigationBar(
         middle: Text(AppLocalizations.of(context).settings),
+        previousPageTitle: AppLocalizations.of(context).games,
       ),
       child: SafeArea(
           child: SingleChildScrollView(

pubspec.yaml

@@ -2,7 +2,7 @@ name: cabo_counter
 description: "Mobile app for the card game Cabo"
 publish_to: 'none'
 
-version: 0.5.6+661
+version: 0.5.7+661
 
 environment:
   sdk: ^3.5.4