Merge remote-tracking branch 'origin/hotfix/89-hotfix-correcting-links' into feature/46-implement-native-rating-dialogs

# Conflicts: # analysis_options.yaml # lib/core/constants.dart # lib/main.dart # lib/presentation/views/information_view.dart # lib/presentation/views/mode_selection_view.dart # lib/presentation/views/settings_view.dart # lib/presentation/views/tab_view.dart # lib/services/version_service.dart # pubspec.yaml
2025-07-10 17:29:02 +02:00
parent 37c539607f 16b6dbb150
commit 6db7fa6ad2
21 changed files with 68 additions and 34 deletions
--- a/lib/presentation/views/active_game_view.dart
+++ b/lib/presentation/views/active_game_view.dart
@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/create_game_view.dart';
 import 'package:cabo_counter/presentation/views/graph_view.dart';
 import 'package:cabo_counter/presentation/views/round_view.dart';
--- a/lib/presentation/views/create_game_view.dart
+++ b/lib/presentation/views/create_game_view.dart
@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/active_game_view.dart';
 import 'package:cabo_counter/presentation/views/mode_selection_view.dart';
 import 'package:cabo_counter/services/config_service.dart';
--- a/lib/presentation/views/graph_view.dart
+++ b/lib/presentation/views/graph_view.dart
@@ -1,5 +1,5 @@
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
--- a/lib/presentation/views/information_view.dart
+++ b/lib/presentation/views/information_view.dart
@@ -1,4 +1,5 @@
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
+import 'package:cabo_counter/utility/constants.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -53,19 +54,16 @@ class InformationView extends StatelessWidget {
              mainAxisAlignment: MainAxisAlignment.center,
              children: [
                IconButton(
-                    onPressed: () => launchUrl(
-                        Uri.parse('https://www.instagram.com/flixcoo'),
-                        mode: LaunchMode.externalApplication),
+                    onPressed: () =>
+                        launchUrl(Uri.parse(Constants.INSTAGRAM_LINK)),
                    icon: const Icon(FontAwesomeIcons.instagram)),
                IconButton(
-                    onPressed: () => launchUrl(
-                        Uri.parse('mailto:felix.kirchner.fk@gmail.com'),
-                        mode: LaunchMode.externalApplication),
+                    onPressed: () =>
+                        launchUrl(Uri.parse('mailto:${Constants.EMAIL}')),
                    icon: const Icon(CupertinoIcons.envelope)),
                IconButton(
-                    onPressed: () => launchUrl(
-                        Uri.parse('https://www.github.com/flixcoo'),
-                        mode: LaunchMode.externalApplication),
+                    onPressed: () =>
+                        launchUrl(Uri.parse(Constants.GITHUB_LINK)),
                    icon: const Icon(FontAwesomeIcons.github)),
              ],
            ),
--- a/lib/presentation/views/main_menu_view.dart
+++ b/lib/presentation/views/main_menu_view.dart
@@ -1,7 +1,7 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/core/globals.dart';
 import 'package:cabo_counter/data/game_manager.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/active_game_view.dart';
 import 'package:cabo_counter/presentation/views/create_game_view.dart';
 import 'package:cabo_counter/presentation/views/settings_view.dart';
--- a/lib/presentation/views/mode_selection_view.dart
+++ b/lib/presentation/views/mode_selection_view.dart
@@ -1,5 +1,7 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
+import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';

 class ModeSelectionMenu extends StatelessWidget {
--- a/lib/presentation/views/round_view.dart
+++ b/lib/presentation/views/round_view.dart
@@ -1,6 +1,6 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
--- a/lib/presentation/views/settings_view.dart
+++ b/lib/presentation/views/settings_view.dart
@@ -1,10 +1,13 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/widgets/custom_form_row.dart';
 import 'package:cabo_counter/presentation/widgets/stepper.dart';
 import 'package:cabo_counter/services/config_service.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:cabo_counter/services/version_service.dart';
+import 'package:cabo_counter/utility/constants.dart';
+import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -93,7 +96,6 @@ class _SettingsViewState extends State<SettingsView> {
                            setState(() {
                              _stepperKey1 = UniqueKey();
                              _stepperKey2 = UniqueKey();
-                              print('Config reset to default');
                            });
                          },
                        )
@@ -142,21 +144,25 @@ class _SettingsViewState extends State<SettingsView> {
                      margin: EdgeInsets.zero,
                      children: [
                        CustomFormRow(
-                          prefixText: AppLocalizations.of(context).create_issue,
-                          prefixIcon: FontAwesomeIcons.github,
-                          onPressed: () => launchUrl(
-                              Uri.parse(
-                                  'https://github.com/flixcoo/Cabo-Counter/issues'),
-                              mode: LaunchMode.externalApplication),
+                          prefixText: AppLocalizations.of(context).wiki,
+                          prefixIcon: CupertinoIcons.book,
+                          onPressed: () =>
+                              launchUrl(Uri.parse(Constants.GITHUB_WIKI_LINK)),
                          suffixWidget: const CupertinoListTileChevron(),
                        ),
                        CustomFormRow(
-                          prefixText: AppLocalizations.of(context).wiki,
-                          prefixIcon: CupertinoIcons.book,
+                          prefixText:
+                              AppLocalizations.of(context).privacy_policy,
+                          prefixIcon: CupertinoIcons.doc_append,
                          onPressed: () => launchUrl(
-                              Uri.parse(
-                                  'https://github.com/flixcoo/Cabo-Counter/wiki'),
-                              mode: LaunchMode.externalApplication),
+                              Uri.parse(Constants.PRIVACY_POLICY_LINK)),
+                          suffixWidget: const CupertinoListTileChevron(),
+                        ),
+                        CustomFormRow(
+                          prefixText: AppLocalizations.of(context).error_found,
+                          prefixIcon: FontAwesomeIcons.github,
+                          onPressed: () => launchUrl(
+                              Uri.parse(Constants.GITHUB_ISSUES_LINK)),
                          suffixWidget: const CupertinoListTileChevron(),
                        ),
                        CustomFormRow(
--- a/lib/presentation/views/tab_view.dart
+++ b/lib/presentation/views/tab_view.dart
@@ -1,5 +1,6 @@
 import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
+import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/information_view.dart';
 import 'package:cabo_counter/presentation/views/main_menu_view.dart';
 import 'package:flutter/cupertino.dart';