diff --git a/lib/main.dart b/lib/main.dart index d6f3330..953723d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/data/game_session.dart'; -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/utility/globals.dart'; import 'package:cabo_counter/utility/local_storage_service.dart'; import 'package:cabo_counter/views/tab_view.dart'; @@ -81,10 +81,10 @@ class _AppState extends State with WidgetsBindingObserver { return CupertinoApp( theme: CupertinoThemeData( brightness: Brightness.dark, - primaryColor: AppTheme.primaryColor, - scaffoldBackgroundColor: AppTheme.backgroundColor, + primaryColor: CustomTheme.primaryColor, + scaffoldBackgroundColor: CustomTheme.backgroundColor, textTheme: CupertinoTextThemeData( - primaryColor: AppTheme.primaryColor, + primaryColor: CustomTheme.primaryColor, ), ), debugShowCheckedModeBanner: false, diff --git a/lib/utility/apptheme.dart b/lib/utility/custom_theme.dart similarity index 97% rename from lib/utility/apptheme.dart rename to lib/utility/custom_theme.dart index ebbbab6..225d452 100644 --- a/lib/utility/apptheme.dart +++ b/lib/utility/custom_theme.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; -class AppTheme { +class CustomTheme { static Color white = CupertinoColors.white; static Color primaryColor = CupertinoColors.systemGreen; static Color backgroundColor = const Color(0xFF101010); diff --git a/lib/views/active_game_view.dart b/lib/views/active_game_view.dart index b1dc0eb..659f2a8 100644 --- a/lib/views/active_game_view.dart +++ b/lib/views/active_game_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/data/game_session.dart'; -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/views/round_view.dart'; import 'package:flutter/cupertino.dart'; @@ -28,7 +28,7 @@ class _ActiveGameViewState extends State { padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), child: Text( 'Spieler:innen', - style: AppTheme.createGameTitle, + style: CustomTheme.createGameTitle, ), ), ListView.builder( @@ -61,7 +61,7 @@ class _ActiveGameViewState extends State { padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), child: Text( 'Runden', - style: AppTheme.createGameTitle, + style: CustomTheme.createGameTitle, ), ), ListView.builder( diff --git a/lib/views/create_game_view.dart b/lib/views/create_game_view.dart index e07685a..4c3e49f 100644 --- a/lib/views/create_game_view.dart +++ b/lib/views/create_game_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/data/game_session.dart'; -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/utility/globals.dart'; import 'package:cabo_counter/utility/local_storage_service.dart'; import 'package:cabo_counter/views/active_game_view.dart'; @@ -44,7 +44,7 @@ class _CreateGameState extends State { padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), child: Text( 'Spiel', - style: AppTheme.createGameTitle, + style: CustomTheme.createGameTitle, ), ), Padding( @@ -98,7 +98,7 @@ class _CreateGameState extends State { padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), child: Text( 'Spieler:innen', - style: AppTheme.createGameTitle, + style: CustomTheme.createGameTitle, ), ), Expanded( diff --git a/lib/views/main_menu_view.dart b/lib/views/main_menu_view.dart index 2a9d3e3..2b5afd1 100644 --- a/lib/views/main_menu_view.dart +++ b/lib/views/main_menu_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/utility/globals.dart'; import 'package:cabo_counter/utility/local_storage_service.dart'; import 'package:cabo_counter/views/active_game_view.dart'; @@ -69,7 +69,7 @@ class _MainMenuViewState extends State { child: Icon( CupertinoIcons.plus, size: 60, - color: AppTheme.primaryColor, + color: CustomTheme.primaryColor, ), )), const SizedBox(height: 10), // Abstand von oben diff --git a/lib/views/mode_selection_view.dart b/lib/views/mode_selection_view.dart index 7b55b30..5dd8010 100644 --- a/lib/views/mode_selection_view.dart +++ b/lib/views/mode_selection_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:flutter/cupertino.dart'; class ModeSelectionMenu extends StatelessWidget { @@ -15,10 +15,10 @@ class ModeSelectionMenu extends StatelessWidget { Padding( padding: const EdgeInsets.fromLTRB(0, 16, 0, 0), child: CupertinoListTile( - title: Text('101 Punkte', style: AppTheme.modeTitle), + title: Text('101 Punkte', style: CustomTheme.modeTitle), subtitle: const Text( 'Es wird solange gespielt, bis einer Spieler mehr als 100 Punkte erreicht', - style: AppTheme.modeDescription, + style: CustomTheme.modeDescription, maxLines: 3, ), onTap: () { @@ -29,11 +29,11 @@ class ModeSelectionMenu extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(vertical: 16.0), child: CupertinoListTile( - title: Text('Unbegrenzt', style: AppTheme.modeTitle), + title: Text('Unbegrenzt', style: CustomTheme.modeTitle), subtitle: const Text( 'Dem Spiel sind keine Grenzen gesetzt. Es wird so lange ' 'gespielt, bis Ihr keine Lust mehr habt.', - style: AppTheme.modeDescription, + style: CustomTheme.modeDescription, maxLines: 3, ), onTap: () { diff --git a/lib/views/round_view.dart b/lib/views/round_view.dart index 0949037..7e5ea96 100644 --- a/lib/views/round_view.dart +++ b/lib/views/round_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/data/game_session.dart'; -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/utility/local_storage_service.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; @@ -90,7 +90,7 @@ class _RoundViewState extends State { children: [ const SizedBox(height: 40), Text('Runde ${widget.roundNumber}', - style: AppTheme.roundTitle), + style: CustomTheme.roundTitle), const SizedBox(height: 10), const Text( 'Wer hat CABO gesagt?', @@ -105,8 +105,8 @@ class _RoundViewState extends State { child: SizedBox( height: 40, child: CupertinoSegmentedControl( - unselectedColor: AppTheme.backgroundTintColor, - selectedColor: AppTheme.primaryColor, + unselectedColor: CustomTheme.backgroundTintColor, + selectedColor: CustomTheme.primaryColor, groupValue: _caboPlayerIndex, children: Map.fromEntries(widget.gameSession.players .asMap() @@ -271,7 +271,7 @@ class _RoundViewState extends State { return Container( height: 80, padding: const EdgeInsets.only(bottom: 20), - color: AppTheme.backgroundTintColor, + color: CustomTheme.backgroundTintColor, child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ diff --git a/lib/views/tab_view.dart b/lib/views/tab_view.dart index 71e39e9..a0b5821 100644 --- a/lib/views/tab_view.dart +++ b/lib/views/tab_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/utility/apptheme.dart'; +import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/views/information_view.dart'; import 'package:cabo_counter/views/main_menu_view.dart'; import 'package:flutter/cupertino.dart'; @@ -16,7 +16,7 @@ class _TabViewState extends State { Widget build(BuildContext context) { return CupertinoTabScaffold( tabBar: CupertinoTabBar( - backgroundColor: AppTheme.backgroundTintColor, + backgroundColor: CustomTheme.backgroundTintColor, iconSize: 27, height: 55, items: const [