6 Commits

Author SHA1 Message Date
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
7be0b96491 Added hiding to prevent stacking snackbars
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m19s
Pull Request Pipeline / lint (pull_request) Successful in 2m23s
2026-01-13 21:45:22 +01:00
efdb5e0361 Fixed snackbar 2026-01-13 21:44:38 +01:00
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
57357f8aad Merge branch 'development' into bug/159-topcenteredmessage-anzeigefehler
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m3s
Pull Request Pipeline / lint (pull_request) Successful in 2m12s
# Conflicts:
#	pubspec.yaml
2026-01-13 15:25:59 +01:00
d5bd0bca5f Fixed displayment bug with TopCenteredMessage
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m6s
Pull Request Pipeline / lint (pull_request) Successful in 2m11s
2026-01-12 23:19:37 +01:00
4 changed files with 222 additions and 184 deletions

View File

@@ -37,7 +37,9 @@ 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(
builder: (scaffoldMessengerContext) {
return Scaffold(
appBar: AppBar(backgroundColor: CustomTheme.backgroundColor), appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
backgroundColor: CustomTheme.backgroundColor, backgroundColor: CustomTheme.backgroundColor,
body: SingleChildScrollView( body: SingleChildScrollView(
@@ -57,7 +59,11 @@ class _SettingsViewState extends State<SettingsView> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10), padding: const EdgeInsets.only(
left: 16,
top: 10,
bottom: 10,
),
child: Text( child: Text(
textAlign: TextAlign.start, textAlign: TextAlign.start,
loc.data, loc.data,
@@ -73,13 +79,18 @@ class _SettingsViewState extends State<SettingsView> {
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async { onPressed: () async {
final String json = final String json =
await DataTransferService.getAppDataAsJson(context); await DataTransferService.getAppDataAsJson(
scaffoldMessengerContext,
);
final result = await DataTransferService.exportData( final result = await DataTransferService.exportData(
json, json,
'game_tracker-data', 'game_tracker-data',
); );
if (!context.mounted) return; if (!scaffoldMessengerContext.mounted) return;
showExportSnackBar(context: context, result: result); showExportSnackBar(
context: scaffoldMessengerContext,
result: result,
);
}, },
), ),
SettingsListTile( SettingsListTile(
@@ -87,9 +98,14 @@ class _SettingsViewState extends State<SettingsView> {
icon: Icons.download, icon: Icons.download,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async { onPressed: () async {
final result = await DataTransferService.importData(context); final result = await DataTransferService.importData(
if (!context.mounted) return; scaffoldMessengerContext,
showImportSnackBar(context: context, result: result); );
if (!scaffoldMessengerContext.mounted) return;
showImportSnackBar(
context: scaffoldMessengerContext,
result: result,
);
}, },
), ),
SettingsListTile( SettingsListTile(
@@ -98,28 +114,33 @@ class _SettingsViewState extends State<SettingsView> {
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () { onPressed: () {
showDialog<bool>( showDialog<bool>(
context: context, context: scaffoldMessengerContext,
builder: (context) => AlertDialog( builder: (dialogContext) => AlertDialog(
title: Text('${loc.delete_all_data}?'), title: Text('${loc.delete_all_data}?'),
content: Text(loc.this_cannot_be_undone), content: Text(loc.this_cannot_be_undone),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(context).pop(false), onPressed: () =>
Navigator.of(dialogContext).pop(false),
child: Text(loc.cancel), child: Text(loc.cancel),
), ),
TextButton( TextButton(
onPressed: () => Navigator.of(context).pop(true), onPressed: () =>
Navigator.of(dialogContext).pop(true),
child: Text(loc.delete), child: Text(loc.delete),
), ),
], ],
), ),
).then((confirmed) { ).then((confirmed) {
if (confirmed == true && context.mounted) { if (confirmed == true &&
DataTransferService.deleteAllData(context); scaffoldMessengerContext.mounted) {
DataTransferService.deleteAllData(
scaffoldMessengerContext,
);
showSnackbar( showSnackbar(
context: context, context: scaffoldMessengerContext,
message: AppLocalizations.of( message: AppLocalizations.of(
context, scaffoldMessengerContext,
).data_successfully_deleted, ).data_successfully_deleted,
); );
} }
@@ -127,7 +148,11 @@ class _SettingsViewState extends State<SettingsView> {
}, },
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10), padding: const EdgeInsets.only(
left: 16,
top: 10,
bottom: 10,
),
child: Text( child: Text(
textAlign: TextAlign.start, textAlign: TextAlign.start,
loc.legal, loc.legal,
@@ -176,7 +201,9 @@ class _SettingsViewState extends State<SettingsView> {
GestureDetector( GestureDetector(
child: const Icon(Icons.language), child: const Icon(Icons.language),
onTap: () => { onTap: () => {
launchUrl(Uri.parse('https://liquid-dev.de')), launchUrl(
Uri.parse('https://liquid-dev.de'),
),
}, },
), ),
GestureDetector( GestureDetector(
@@ -225,6 +252,8 @@ class _SettingsViewState extends State<SettingsView> {
], ],
), ),
), ),
);
},
), ),
); );
} }
@@ -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,

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,

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),

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