liquid-development/game-tracker
3
0
Fork 0
Code Issues 14 Pull Requests 4 Actions Releases 1 Activity

Merge branch 'development' into feature/129-neues-popup-design

Browse Source 
# Conflicts:
#	lib/presentation/views/main_menu/settings_view/settings_view.dart
This commit is contained in:
Felix Kirchner
2026-01-13 22:57:19 +01:00
parent 5350113ee1 e483fc38f3
commit 6a3e184a95
2 changed files with 208 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

389
lib/presentation/views/main_menu/settings_view/settings_view.dart
View File

@@ -39,194 +39,218 @@ class _SettingsViewState extends State<SettingsView> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final loc = AppLocalizations.of(context); final loc = AppLocalizations.of(context);
return ScaffoldMessenger( return ScaffoldMessenger(
child: Scaffold( child: Builder(
appBar: AppBar(backgroundColor: CustomTheme.backgroundColor), builder: (scaffoldMessengerContext) {
backgroundColor: CustomTheme.backgroundColor, return Scaffold(
body: SingleChildScrollView( appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
child: Column( backgroundColor: CustomTheme.backgroundColor,
mainAxisAlignment: MainAxisAlignment.start, body: SingleChildScrollView(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ mainAxisAlignment: MainAxisAlignment.start,
Padding( crossAxisAlignment: CrossAxisAlignment.start,
padding: const EdgeInsets.only(left: 16, bottom: 10), children: [
child: Text( Padding(
textAlign: TextAlign.start, padding: const EdgeInsets.only(left: 16, bottom: 10),
loc.settings, child: Text(
style: const TextStyle( textAlign: TextAlign.start,
fontSize: 28, loc.settings,
fontWeight: FontWeight.bold, style: const TextStyle(
), fontSize: 28,
), fontWeight: FontWeight.bold,
), ),
Padding(
padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10),
child: Text(
textAlign: TextAlign.start,
loc.data,
style: const TextStyle(
fontSize: 22,
fontWeight: FontWeight.bold,
),
),
),
SettingsListTile(
title: loc.export_data,
icon: Icons.upload,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async {
final String json =
await DataTransferService.getAppDataAsJson(context);
final result = await DataTransferService.exportData(
json,
'game_tracker-data',
);
if (!context.mounted) return;
showExportSnackBar(context: context, result: result);
},
),
SettingsListTile(
title: loc.import_data,
icon: Icons.download,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async {
final result = await DataTransferService.importData(context);
if (!context.mounted) return;
showImportSnackBar(context: context, result: result);
},
),
SettingsListTile(
title: loc.delete_all_data,
icon: Icons.delete,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () {
showDialog<bool>(
context: context,
builder: (context) => CustomAlertDialog(
title: '${loc.delete_all_data}?',
content: loc.this_cannot_be_undone,
actions: [
AnimatedDialogButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(loc.cancel, style: const TextStyle(color: CustomTheme.textColor)),
),
AnimatedDialogButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(loc.delete, style: TextStyle(color: CustomTheme.secondaryColor)),
),
],
), ),
).then((confirmed) { ),
if (confirmed == true && context.mounted) { Padding(
DataTransferService.deleteAllData(context); padding: const EdgeInsets.only(
showSnackbar( left: 16,
context: context, top: 10,
message: AppLocalizations.of( bottom: 10,
context, ),
).data_successfully_deleted, child: Text(
textAlign: TextAlign.start,
loc.data,
style: const TextStyle(
fontSize: 22,
fontWeight: FontWeight.bold,
),
),
),
SettingsListTile(
title: loc.export_data,
icon: Icons.upload,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async {
final String json =
await DataTransferService.getAppDataAsJson(
scaffoldMessengerContext,
);
final result = await DataTransferService.exportData(
json,
'game_tracker-data',
); );
} if (!scaffoldMessengerContext.mounted) return;
}); showExportSnackBar(
}, context: scaffoldMessengerContext,
), result: result,
Padding( );
padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10), },
child: Text(
textAlign: TextAlign.start,
loc.legal,
style: const TextStyle(
fontSize: 22,
fontWeight: FontWeight.bold,
), ),
), SettingsListTile(
), title: loc.import_data,
SettingsListTile( icon: Icons.download,
title: loc.licenses, suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
icon: Icons.insert_drive_file, onPressed: () async {
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), final result = await DataTransferService.importData(
onPressed: () { scaffoldMessengerContext,
Navigator.of(context).push( );
MaterialPageRoute( if (!scaffoldMessengerContext.mounted) return;
builder: (context) => const LicensesView(), showImportSnackBar(
), context: scaffoldMessengerContext,
); result: result,
}, );
), },
SettingsListTile( ),
title: loc.legal_notice, SettingsListTile(
icon: Icons.account_balance_sharp, title: loc.delete_all_data,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), icon: Icons.delete,
onPressed: null, suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
), onPressed: () {
SettingsListTile( showDialog<bool>(
title: loc.privacy_policy, context: context,
icon: Icons.gpp_good_rounded, builder: (context) => CustomAlertDialog(
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), title: '${loc.delete_all_data}?',
onPressed: null, content: loc.this_cannot_be_undone,
), actions: [
Padding( AnimatedDialogButton(
padding: const EdgeInsets.only(top: 30, bottom: 20), onPressed: () => Navigator.of(context).pop(false),
child: Center( child: Text(loc.cancel, style: const TextStyle(color: CustomTheme.textColor)),
child: Column(
spacing: 4,
children: [
Padding(
padding: const EdgeInsets.only(bottom: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 40,
children: [
GestureDetector(
child: const Icon(Icons.language),
onTap: () => {
launchUrl(Uri.parse('https://liquid-dev.de')),
},
), ),
GestureDetector( AnimatedDialogButton(
child: const FaIcon(FontAwesomeIcons.github), onPressed: () => Navigator.of(context).pop(true),
onTap: () => { child: Text(loc.delete, style: TextStyle(color: CustomTheme.secondaryColor)),
launchUrl(
Uri.parse(
'https://github.com/liquiddevelopmentde',
),
),
},
),
GestureDetector(
child: Icon(
Platform.isIOS
? CupertinoIcons.mail_solid
: Icons.email,
),
onTap: () => launchUrl(
Uri.parse('mailto:hi@liquid-dev.de'),
),
), ),
], ],
), ),
), ).then((confirmed) {
Text( if (confirmed == true && context.mounted) {
'© ${DateFormat('yyyy').format(DateTime.now())} Liquid Development', DataTransferService.deleteAllData(context);
style: TextStyle( showSnackbar(
color: Colors.grey.shade600, context: context,
fontSize: 14, message: AppLocalizations.of(
fontWeight: FontWeight.w600, context,
), ).data_successfully_deleted,
), );
Text( }
'Version ${_packageInfo.version} (${_packageInfo.buildNumber})', });
style: TextStyle( },
color: Colors.grey.shade600,
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
],
), ),
), Padding(
padding: const EdgeInsets.only(
left: 16,
top: 10,
bottom: 10,
),
child: Text(
textAlign: TextAlign.start,
loc.legal,
style: const TextStyle(
fontSize: 22,
fontWeight: FontWeight.bold,
),
),
),
SettingsListTile(
title: loc.licenses,
icon: Icons.insert_drive_file,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const LicensesView(),
),
);
},
),
SettingsListTile(
title: loc.legal_notice,
icon: Icons.account_balance_sharp,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: null,
),
SettingsListTile(
title: loc.privacy_policy,
icon: Icons.gpp_good_rounded,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: null,
),
Padding(
padding: const EdgeInsets.only(top: 30, bottom: 20),
child: Center(
child: Column(
spacing: 4,
children: [
Padding(
padding: const EdgeInsets.only(bottom: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 40,
children: [
GestureDetector(
child: const Icon(Icons.language),
onTap: () => {
launchUrl(
Uri.parse('https://liquid-dev.de'),
),
},
),
GestureDetector(
child: const FaIcon(FontAwesomeIcons.github),
onTap: () => {
launchUrl(
Uri.parse(
'https://github.com/liquiddevelopmentde',
),
),
},
),
GestureDetector(
child: Icon(
Platform.isIOS
? CupertinoIcons.mail_solid
: Icons.email,
),
onTap: () => launchUrl(
Uri.parse('mailto:hi@liquid-dev.de'),
),
),
],
),
),
Text(
'© ${DateFormat('yyyy').format(DateTime.now())} Liquid Development',
style: TextStyle(
color: Colors.grey.shade600,
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
Text(
'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
style: TextStyle(
color: Colors.grey.shade600,
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
],
),
),
),
],
), ),
], ),
), );
), },
), ),
); );
} }
@@ -287,10 +311,11 @@ class _SettingsViewState extends State<SettingsView> {
Duration duration = const Duration(seconds: 3), Duration duration = const Duration(seconds: 3),
VoidCallback? action, VoidCallback? action,
}) { }) {
if (!context.mounted) return;
final loc = AppLocalizations.of(context); final loc = AppLocalizations.of(context);
final messenger = ScaffoldMessenger.of(context); ScaffoldMessenger.of(context).hideCurrentSnackBar();
messenger.hideCurrentSnackBar(); ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar( SnackBar(
content: Text(message, style: const TextStyle(color: Colors.white)), content: Text(message, style: const TextStyle(color: Colors.white)),
backgroundColor: CustomTheme.onBoxColor, backgroundColor: CustomTheme.onBoxColor,

1
lib/presentation/widgets/player_selection.dart
View File

@@ -295,6 +295,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
/// [message] - The message to display in the snackbar. /// [message] - The message to display in the snackbar.
void showSnackBarMessage(String message) { void showSnackBarMessage(String message) {
if (!context.mounted) return; if (!context.mounted) return;
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
backgroundColor: CustomTheme.boxColor, backgroundColor: CustomTheme.boxColor,