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

Compare commits

base: liquid-development:806ed200f7a6f2334b5b2e69aa398fa8203dcc38
Branches Tags
liquid-development:development liquid-development:feature/120-bearbeiten-und-loeschen-von-matches liquid-development:feature/88-neue-datenbank-struktur liquid-development:feature/119-implementierung-der-games liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:main
liquid-development:v.0.0.1-alpha
...
compare: liquid-development:e483fc38f3bc96c40b29428158d432d48cb92e1e
Branches Tags
liquid-development:feature/120-bearbeiten-und-loeschen-von-matches liquid-development:development liquid-development:feature/88-neue-datenbank-struktur liquid-development:feature/119-implementierung-der-games liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:main
liquid-development:v.0.0.1-alpha

6 Commits
806ed200f7 ... e483fc38f3

Author SHA1 Message Date
Felix Kirchner
e483fc38f3 Merge pull request 'Anzeigefehler mit Snackbar' (#166) from bug/155-anzeigefehler-mit-snackbar into development 
Reviewed-on: #166
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>
 2026-01-13 21:09:21 +00:00
Felix Kirchner
7be0b96491 Added hiding to prevent stacking snackbars
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m19s
Details
Pull Request Pipeline / lint (pull_request) Successful in 2m23s
Details
2026-01-13 21:45:22 +01:00
Felix Kirchner
efdb5e0361 Fixed snackbar 2026-01-13 21:44:38 +01:00
Mathis Kirchner
7a1752f773 Merge pull request 'TopCenteredMessage Anzeigefehler' (#161) from bug/159-topcenteredmessage-anzeigefehler into development 
Reviewed-on: #161
Reviewed-by: Mathis Kirchner <mathis.kirchner.mk@gmail.com>
 2026-01-13 14:30:53 +00:00
Felix Kirchner
57357f8aad Merge branch 'development' into bug/159-topcenteredmessage-anzeigefehler
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m3s
Details
Pull Request Pipeline / lint (pull_request) Successful in 2m12s
Details 
# Conflicts:
#	pubspec.yaml
 2026-01-13 15:25:59 +01:00
Felix Kirchner
d5bd0bca5f Fixed displayment bug with TopCenteredMessage
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m6s
Details
Pull Request Pipeline / lint (pull_request) Successful in 2m11s
Details
2026-01-12 23:19:37 +01:00
4 changed files with 222 additions and 184 deletions
Expand all files Collapse all files

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

@@ -37,194 +37,223 @@ 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) => AlertDialog(
title: Text('${loc.delete_all_data}?'),
content: Text(loc.this_cannot_be_undone),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(loc.cancel),
),
TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(loc.delete),
),
],
), ),
).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: scaffoldMessengerContext,
icon: Icons.gpp_good_rounded, builder: (dialogContext) => AlertDialog(
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), title: Text('${loc.delete_all_data}?'),
onPressed: null, content: Text(loc.this_cannot_be_undone),
), actions: [
Padding( TextButton(
padding: const EdgeInsets.only(top: 30, bottom: 20), onPressed: () =>
child: Center( Navigator.of(dialogContext).pop(false),
child: Column( child: Text(loc.cancel),
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( TextButton(
child: const FaIcon(FontAwesomeIcons.github), onPressed: () =>
onTap: () => { Navigator.of(dialogContext).pop(true),
launchUrl( child: Text(loc.delete),
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 &&
'© ${DateFormat('yyyy').format(DateTime.now())} Liquid Development', scaffoldMessengerContext.mounted) {
style: TextStyle( DataTransferService.deleteAllData(
color: Colors.grey.shade600, scaffoldMessengerContext,
fontSize: 14, );
fontWeight: FontWeight.w600, showSnackbar(
), context: scaffoldMessengerContext,
), message: AppLocalizations.of(
Text( scaffoldMessengerContext,
'Version ${_packageInfo.version} (${_packageInfo.buildNumber})', ).data_successfully_deleted,
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,
),
),
],
),
),
),
],
), ),
], ),
), );
), },
), ),
); );
} }
@@ -285,10 +314,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,

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

@@ -181,6 +181,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
icon: Icons.info, icon: Icons.info,
title: loc.info, title: loc.info,
message: _getInfoText(context), message: _getInfoText(context),
fullscreen: false,
), ),
child: ListView.builder( child: ListView.builder(
itemCount: suggestedPlayers.length, itemCount: suggestedPlayers.length,
@@ -294,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,

8
lib/presentation/widgets/top_centered_message.dart
View File

@@ -10,6 +10,7 @@ class TopCenteredMessage extends StatelessWidget {
required this.icon, required this.icon,
required this.title, required this.title,
required this.message, required this.message,
this.fullscreen = true,
}); });
/// The icon to display above the title. /// The icon to display above the title.
@@ -21,13 +22,18 @@ class TopCenteredMessage extends StatelessWidget {
/// The message text to display below the title. /// The message text to display below the title.
final String message; final String message;
final bool fullscreen;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: const EdgeInsets.only(top: 100), padding: fullscreen ? const EdgeInsets.only(top: 100) : null,
margin: const EdgeInsets.symmetric(horizontal: 10), margin: const EdgeInsets.symmetric(horizontal: 10),
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Column( child: Column(
mainAxisAlignment: fullscreen
? MainAxisAlignment.start
: MainAxisAlignment.center,
children: [ children: [
Icon(icon, size: 45), Icon(icon, size: 45),
const SizedBox(height: 10), const SizedBox(height: 10),

2
pubspec.yaml
View File

@@ -1,7 +1,7 @@
name: game_tracker name: game_tracker
description: "Game Tracking App for Card Games" description: "Game Tracking App for Card Games"
publish_to: 'none' publish_to: 'none'
version: 0.0.6+208 version: 0.0.6+209
environment: environment:
sdk: ^3.8.1 sdk: ^3.8.1