diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 57b8519..c18d876 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -35,10 +35,7 @@ class _CustomNavigationBarState extends State centerTitle: true, title: Text( _currentTabTitle(), - style: const TextStyle( - fontSize: 20, - fontWeight: FontWeight.bold, - ), + style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), ), backgroundColor: CustomTheme.backgroundColor, scrolledUnderElevation: 0, @@ -114,6 +111,7 @@ class _CustomNavigationBarState extends State currentIndex = index; }); } + String _currentTabTitle() { switch (currentIndex) { case 0: @@ -128,4 +126,4 @@ class _CustomNavigationBarState extends State return ''; } } -} \ No newline at end of file +} diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 32c41db..6d0179a 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -119,7 +119,7 @@ class _GameHistoryViewState extends State { }, ]; late List> suggestedGameData; - + @override void initState() { super.initState(); @@ -134,9 +134,7 @@ class _GameHistoryViewState extends State { children: [ Column( children: [ - Container( - margin: EdgeInsets.only(bottom: 75), - ), + Container(margin: EdgeInsets.only(bottom: 75)), Expanded( child: gameHistoryListView(allGameData, suggestedGameData), ), @@ -146,7 +144,7 @@ class _GameHistoryViewState extends State { margin: EdgeInsets.only(top: 10, bottom: 10, left: 10, right: 10), child: SearchBar( leading: Icon(Icons.search), - onChanged:(value) { + onChanged: (value) { if (value.isEmpty) { setState(() { suggestedGameData.clear(); @@ -155,9 +153,15 @@ class _GameHistoryViewState extends State { return; } final suggestions = allGameData.where((currentGame) { - return currentGame['game'].toString().toLowerCase().contains(value.toLowerCase()) || - currentGame['title'].toString().toLowerCase().contains(value.toLowerCase()) || - currentGame['group'].toString().toLowerCase().contains(value.toLowerCase()); + return currentGame['game'].toString().toLowerCase().contains( + value.toLowerCase(), + ) || + currentGame['title'].toString().toLowerCase().contains( + value.toLowerCase(), + ) || + currentGame['group'].toString().toLowerCase().contains( + value.toLowerCase(), + ); }); setState(() { suggestedGameData.clear(); @@ -179,10 +183,10 @@ Widget gameHistoryListView(allGameData, suggestedGameData) { return TopCenteredMessage("Kein Spiel mit den Suchparametern gefunden."); } return ListView.builder( - itemCount: suggestedGameData.length, - itemBuilder: (context, index) { - final currentGame = suggestedGameData[index]; - return GameHistoryListTile(currentGame); - } - ); -} \ No newline at end of file + itemCount: suggestedGameData.length, + itemBuilder: (context, index) { + final currentGame = suggestedGameData[index]; + return GameHistoryListTile(currentGame); + }, + ); +} diff --git a/lib/presentation/widgets/game_history_listtile.dart b/lib/presentation/widgets/game_history_listtile.dart index ccc818d..66b18b2 100644 --- a/lib/presentation/widgets/game_history_listtile.dart +++ b/lib/presentation/widgets/game_history_listtile.dart @@ -1,32 +1,35 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -Widget GameHistoryListTile(Map currentGame){ - return Container( - margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - color: CustomTheme.secondaryColor, +Widget GameHistoryListTile(Map currentGame) { + return Container( + margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + color: CustomTheme.secondaryColor, + ), + child: Column( + children: [ + Row( + children: [ + Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), + Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text( + "${currentGame['players']} Spieler", + style: TextStyle(fontSize: 20), ), - child: Column( - children: [ - Row( - children: [ - Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), - Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text("${currentGame['players']} Spieler", style: TextStyle(fontSize: 20)) - ], - ), - Row( - children: [ - Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text("${currentGame['date']}", style: TextStyle(fontSize: 20)) - ], - ), - ], - ), - ); -} \ No newline at end of file + ], + ), + Row( + children: [ + Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text("${currentGame['date']}", style: TextStyle(fontSize: 20)), + ], + ), + ], + ), + ); +} diff --git a/lib/presentation/widgets/top_centered_message.dart b/lib/presentation/widgets/top_centered_message.dart index be29d88..6fe34ff 100644 --- a/lib/presentation/widgets/top_centered_message.dart +++ b/lib/presentation/widgets/top_centered_message.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; Widget TopCenteredMessage(String message) { return Container( - padding: EdgeInsets.only(top:100), - margin: EdgeInsets.only(left: 10, right: 10), - alignment: Alignment.topCenter, - child: Text( - "$message", - style: TextStyle(fontSize: 20), - textAlign: TextAlign.center, - ) - ); -} \ No newline at end of file + padding: EdgeInsets.only(top: 100), + margin: EdgeInsets.only(left: 10, right: 10), + alignment: Alignment.topCenter, + child: Text( + "$message", + style: TextStyle(fontSize: 20), + textAlign: TextAlign.center, + ), + ); +}