From d1ba004ebb0ee8eb3688d69bfd59c2b8fc7fe65e Mon Sep 17 00:00:00 2001 From: Marco Date: Sun, 25 Dec 2022 20:18:50 +0100 Subject: [PATCH] Restructure app. Change design. --- lib/chess/chess_app.dart | 11 ++--- lib/pages/chess_app.dart | 78 ----------------------------------- lib/pages/chess_game.dart | 18 ++------ lib/pages/lobby_selector.dart | 9 ++-- 4 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 lib/pages/chess_app.dart diff --git a/lib/chess/chess_app.dart b/lib/chess/chess_app.dart index 02a85d1..c31a477 100644 --- a/lib/chess/chess_app.dart +++ b/lib/chess/chess_app.dart @@ -13,13 +13,10 @@ class ChessApp extends StatelessWidget { create: (_) => ConnectionCubit.getInstance(), child: BlocProvider( create: (_) => ChessBloc.getInstance(), - child: Container( - color: Colors.amber, - padding: const EdgeInsets.all(2), - child: MaterialApp.router( - routerConfig: router, - title: 'mChess v0.1.1337', - ), + child: MaterialApp.router( + theme: ThemeData.dark(useMaterial3: true), + routerConfig: router, + title: 'mChess v0.1.1337', ), ), ); diff --git a/lib/pages/chess_app.dart b/lib/pages/chess_app.dart deleted file mode 100644 index 4a59ce0..0000000 --- a/lib/pages/chess_app.dart +++ /dev/null @@ -1,78 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:mchess/chess_bloc/chess_bloc.dart'; - -import 'package:mchess/chess/chess_board.dart'; -import 'package:mchess/chess/turn_indicator_widget.dart'; -import 'package:mchess/connection_cubit/connection_cubit.dart'; - -import 'package:mchess/connection/ws_connection.dart'; -import 'package:mchess/utils/widgets/server_log_widget.dart'; - -class ChessApp extends StatelessWidget { - const ChessApp({super.key}); - - @override - Widget build(BuildContext context) { - return BlocProvider( - create: (_) => ConnectionCubit.getInstance(), - child: BlocProvider( - create: (_) => ChessBloc.getInstance(), - child: MaterialApp( - title: 'mChess v0.1.1337', - home: Scaffold( - body: Container( - decoration: const BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color.fromARGB(255, 20, 20, 20), - Color.fromARGB(255, 30, 30, 30), - Color.fromARGB(255, 40, 40, 40), - ], - ), - ), - child: Center( - child: FittedBox( - fit: BoxFit.contain, - child: Row( - children: [ - if (kDebugMode) - StreamBuilder( - stream: ServerConnection.getInstance().broadcast, - builder: (context, snapshot) { - return ServerLogWidget( - snapshot.data ?? "", - textColor: Colors.white, - ); - }, - ), - Container( - margin: const EdgeInsets.all(20), - child: BlocBuilder( - builder: (context, state) { - return ChessBoard( - bState: state, - ); - }, - ), - ), - if (kDebugMode) const TurnIndicator(), - ], - ), - )), - ), - floatingActionButton: FloatingActionButton( - onPressed: () { - ConnectionCubit.getInstance().reconnect(); - }, - child: const Icon(Icons.network_wifi), - ), - ), - ), - ), - ); - } -} diff --git a/lib/pages/chess_game.dart b/lib/pages/chess_game.dart index 1c32429..8595a51 100644 --- a/lib/pages/chess_game.dart +++ b/lib/pages/chess_game.dart @@ -16,20 +16,8 @@ class ChessGame extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - body: Container( - decoration: const BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color.fromARGB(255, 20, 20, 20), - Color.fromARGB(255, 30, 30, 30), - Color.fromARGB(255, 40, 40, 40), - ], - ), - ), - child: Center( - child: FittedBox( + body: Center( + child: FittedBox( fit: BoxFit.contain, child: Row( children: [ @@ -56,7 +44,7 @@ class ChessGame extends StatelessWidget { if (kDebugMode) const TurnIndicator(), ], ), - )), + ), ), floatingActionButton: FloatingActionButton( onPressed: () { diff --git a/lib/pages/lobby_selector.dart b/lib/pages/lobby_selector.dart index fd0b85d..488cd94 100644 --- a/lib/pages/lobby_selector.dart +++ b/lib/pages/lobby_selector.dart @@ -6,14 +6,13 @@ class LobbySelector extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( - body: TextButton( + return Scaffold( + body: TextButton( onPressed: () { - context.go("/play"); + context.push("/play"); }, child: const Text('Random lobby'), - )), + ), ); } }