Merge pull request 'Versions- und Build Nr in Einstellungen' (#149) from enhancement/146-versions-und-build-nr-in-einstellungen into development

Reviewed-on: #149
Reviewed-by: Mathis Kirchner <mathis.kirchner.mk@gmail.com>

lib/l10n/arb/app_de.arb

@@ -17,7 +17,7 @@
   "data_successfully_imported": "Daten erfolgreich importiert",
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
-  "delete_all_data": "Alle Daten löschen?",
+  "delete_all_data": "Alle Daten löschen",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",

lib/l10n/arb/app_en.arb

@@ -277,7 +277,7 @@
   "data_successfully_imported": "Data successfully imported",
   "days_ago": "{count} days ago",
   "delete": "Delete",
-  "delete_all_data": "Delete all data?",
+  "delete_all_data": "Delete all data",
   "error_creating_group": "Error while creating group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",

lib/l10n/generated/app_localizations.dart

@@ -209,7 +209,7 @@ abstract class AppLocalizations {
   /// Confirmation dialog for deleting all data
   ///
   /// In en, this message translates to:
-  /// **'Delete all data?'**
+  /// **'Delete all data'**
   String get delete_all_data;
 
   /// Error message when group creation fails

lib/l10n/generated/app_localizations_de.dart

@@ -67,7 +67,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Alle Daten löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
 
   @override
   String get error_creating_group =>

lib/l10n/generated/app_localizations_en.dart

@@ -67,7 +67,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete => 'Delete';
 
   @override
-  String get delete_all_data => 'Delete all data?';
+  String get delete_all_data => 'Delete all data';
 
   @override
   String get error_creating_group =>

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

@@ -140,7 +140,11 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
+                (group) =>
+            group.name.toLowerCase().contains(query.toLowerCase()) ||
+                group.members.any(
+                      (player) => player.name.toLowerCase().contains(query.toLowerCase()),
+                ),
           ),
         );
       }

lib/presentation/views/main_menu/settings_view.dart

@@ -4,6 +4,7 @@ import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
 import 'package:game_tracker/services/data_transfer_service.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class SettingsView extends StatefulWidget {
   const SettingsView({super.key});
@@ -13,9 +14,16 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
+  PackageInfo _packageInfo = PackageInfo(
+    appName: 'n.A.',
+    packageName: 'n.A.',
+    version: 'n.A.',
+    buildNumber: 'n.A.',
+  );
   @override
   void initState() {
     super.initState();
+    _initPackageInfo();
   }
 
   @override
@@ -25,10 +33,7 @@ class _SettingsViewState extends State<SettingsView> {
       child: Scaffold(
         appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
         backgroundColor: CustomTheme.backgroundColor,
-        body: LayoutBuilder(
+        body: Column(
-          builder: (BuildContext context, BoxConstraints constraints) =>
-              SingleChildScrollView(
-                child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -44,10 +49,7 @@ class _SettingsViewState extends State<SettingsView> {
               ),
             ),
             Padding(
-                      padding: const EdgeInsets.symmetric(
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
-                        horizontal: 24,
-                        vertical: 10,
-                      ),
               child: Text(
                 textAlign: TextAlign.start,
                 loc.settings,
@@ -62,8 +64,9 @@ class _SettingsViewState extends State<SettingsView> {
               icon: Icons.upload_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                        final String json =
+                final String json = await DataTransferService.getAppDataAsJson(
-                            await DataTransferService.getAppDataAsJson(context);
+                  context,
+                );
                 final result = await DataTransferService.exportData(
                   json,
                   'game_tracker-data',
@@ -77,9 +80,7 @@ class _SettingsViewState extends State<SettingsView> {
               icon: Icons.download_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                        final result = await DataTransferService.importData(
+                final result = await DataTransferService.importData(context);
-                          context,
-                        );
                 if (!context.mounted) return;
                 showImportSnackBar(context: context, result: result);
               },
@@ -92,7 +93,7 @@ class _SettingsViewState extends State<SettingsView> {
                 showDialog<bool>(
                   context: context,
                   builder: (context) => AlertDialog(
-                            title: Text(loc.delete_all_data),
+                    title: Text('${loc.delete_all_data}?'),
                     content: Text(loc.this_cannot_be_undone),
                     actions: [
                       TextButton(
@@ -118,11 +119,23 @@ class _SettingsViewState extends State<SettingsView> {
                 });
               },
             ),
+            const Spacer(),
+            Padding(
+              padding: const EdgeInsets.all(20),
+              child: Center(
+                child: Text(
+                  'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
+                  style: TextStyle(
+                    color: Colors.grey.shade600,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ),
+            ),
           ],
         ),
       ),
-        ),
-      ),
     );
   }
 
@@ -196,4 +209,11 @@ class _SettingsViewState extends State<SettingsView> {
       ),
     );
   }
+
+  Future<void> _initPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    setState(() {
+      _packageInfo = info;
+    });
+  }
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.3+93
+version: 0.0.4+101
 
 environment:
   sdk: ^3.8.1
@@ -22,6 +22,7 @@ dependencies:
   intl: any
   flutter_localizations:
     sdk: flutter
+  package_info_plus: ^9.0.0
 
 dev_dependencies:
   flutter_test: