Various changes.

lib/api/websocket_message.dart

@@ -0,0 +1,41 @@
+import 'package:mchess/api/move.dart';
+
+enum MessageType {
+  moveMessage,
+  colorDetermined;
+
+  String toJson() => name;
+  static MessageType fromJson(String json) => values.byName(json);
+}
+
+enum ApiColor {
+  black,
+  white;
+
+  String toJson() => name;
+  static ApiColor fromJson(String json) => values.byName(json);
+}
+
+class ApiWebsocketMessage {
+  final MessageType type;
+  final ApiMove? move;
+  final ApiColor? color;
+
+  ApiWebsocketMessage(
+      {required this.type, required this.move, required this.color});
+
+  factory ApiWebsocketMessage.fromJson(Map<String, dynamic> json) {
+    final type = MessageType.fromJson(json['messageType']);
+    ApiWebsocketMessage ret;
+    switch (type) {
+      case MessageType.colorDetermined:
+        ret = ApiWebsocketMessage(
+            type: type, move: null, color: ApiColor.fromJson(json['color']));
+        break;
+      case MessageType.moveMessage:
+        ret = ApiWebsocketMessage(
+            type: type, move: ApiMove.fromJson(json['move']), color: null);
+    }
+    return ret;
+  }
+}

lib/chess_bloc/chess_bloc.dart

@@ -51,8 +51,6 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
         ? ChessColor.black
         : ChessColor.white;
 
-    log('emitting new state with position $newPosition');
-
     emit(
       ChessBoardState(
         state.bottomColor,
@@ -60,6 +58,7 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
         newPosition,
       ),
     );
+    log('emitting new state with position $newPosition');
   }
 
   void ownMoveHandler(OwnPieceMoved event, Emitter<ChessBoardState> emit) {
@@ -72,6 +71,21 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
     var move = ApiMove(startSquare: start, endSquare: end);
 
     ServerConnection.getInstance().send(jsonEncode(move));
+
+    turnColor = state.newTurnColor == ChessColor.white
+        ? ChessColor.black
+        : ChessColor.white;
+
+    var newPosition = ChessPosition.getInstance().currentPosition;
+
+    emit(
+      ChessBoardState(
+        state.bottomColor,
+        turnColor,
+        newPosition,
+      ),
+    );
+    log('emitting new state with position $newPosition');
   }
 }
 

lib/connection/ws_connection.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:developer';
 import 'package:flutter/foundation.dart';
-import 'package:mchess/api/move.dart';
+import 'package:mchess/api/websocket_message.dart';
 import 'package:mchess/chess_bloc/chess_bloc.dart';
 import 'package:mchess/chess_bloc/chess_events.dart';
 import 'package:mchess/chess_bloc/chess_position.dart';
@@ -41,8 +41,8 @@ class ServerConnection {
       channel =
           WebSocketChannel.connect(Uri.parse('ws://localhost:8080/api/ws'));
     } else {
-      channel =
+      channel = WebSocketChannel.connect(
-          WebSocketChannel.connect(Uri.parse('wss://chess.sw-gross.de:8080'));
+          Uri.parse('wss://chess.sw-gross.de:9999/api/ws'));
     }
     send(jsonEncode(WebsocketMessageIdentifyPlayer(
         playerID: (playerID), lobbyID: (lobbyID))));
@@ -59,12 +59,21 @@ class ServerConnection {
   void handleIncomingData(dynamic data) {
     log("Data received:");
     log(data);
-    var apiMove = ApiMove.fromJson(jsonDecode(data));
+    var apiMessage = ApiWebsocketMessage.fromJson(jsonDecode(data));
 
-//Todo: Implement status messages
+    switch (apiMessage.type) {
-// e.g. to tell the client that both players connected, who is playing which color and so on
+      case MessageType.colorDetermined:
+        ChessBloc.getInstance().add(ColorDetermined(
+            myColor: ChessColor.fromApiColor(apiMessage.color!)));
+        break;
 
-    var move = ChessMove.fromApiMove(apiMove);
+      case MessageType.moveMessage:
+        handleIncomingMoveMessage(apiMessage);
+    }
+  }
+
+  void handleIncomingMoveMessage(ApiWebsocketMessage apiMessage) {
+    var move = ChessMove.fromApiMove(apiMessage.move!);
     if (move == ChessPosition.getInstance().lastMove) {
       //This is our own move that got resent by the server. Do not process.
     } else {

lib/pages/chess_game.dart

@@ -35,7 +35,7 @@ class _ChessGameState extends State<ChessGame> {
       body: Center(
         child: FittedBox(
           fit: BoxFit.contain,
-          child: Row(
+          child: Column(
             children: [
               if (kDebugMode)
                 StreamBuilder(

lib/pages/lobby_selector.dart

@@ -7,12 +7,14 @@ class LobbySelector extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: TextButton(
+      body: Center(
+        child: TextButton(
           onPressed: () {
             context.goNamed('prepareChessGame');
           },
           child: const Text('Random lobby'),
         ),
+      ),