Add basic classes

LinwoodDev · May 7, 2023 · c4ad5e9 · c4ad5e9
1 parent 6fd8adf
commit c4ad5e9
Show file tree

Hide file tree

Showing 20 changed files with 1,871 additions and 84 deletions.
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -10,5 +10,8 @@
   "name": "Name",
   "description": "Description",
   "cancel": "Cancel",
-  "address": "Address"
+  "address": "Address",
+  "game": "Game",
+  "players": "Players",
+  "noPlayers": "No players"
 }
diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -8,12 +8,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:material_leap/l10n/leap_localizations.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:town/pages/game/logic.dart';
 import 'package:town/pages/game/page.dart';
 import 'package:town/services/connection.dart';
 import 'package:window_manager/window_manager.dart';
 
 import 'cubits/settings.dart';
+import 'pages/game/logic/logic.dart';
 import 'pages/home/page.dart';
 import 'pages/settings/page.dart';
 import 'setup.dart'
@@ -107,9 +107,15 @@ class FlowApp extends StatelessWidget {
           GoRoute(
             path: 'game',
             pageBuilder: _fadeTransitionBuilder(
-              (context, state) => GamePage(
-                connection: state.extra as GameConnection,
-              ),
+              (context, state) {
+                if (state.extra is! GameConnection) {
+                  context.go('/');
+                  return const SizedBox.shrink();
+                }
+                return GamePage(
+                  connection: state.extra as GameConnection,
+                );
+              },
             ),
           ),
           GoRoute(

diff --git a/app/lib/models/server.dart b/app/lib/models/server.dart
@@ -2,7 +2,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'server.freezed.dart';
 
-const kDefaultPort = 71035;
+const kDefaultPort = 10357;
 
 @freezed
 class GameServer with _$GameServer {

diff --git a/app/lib/pages/game/client.dart → app/lib/pages/game/logic/client.dart b/app/lib/pages/game/client.dart → app/lib/pages/game/logic/client.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:town/pages/game/server.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
 import 'logic.dart';
+import 'server.dart';
 
 part 'client.freezed.dart';
 part 'client.g.dart';
@@ -16,6 +16,11 @@ class ClientConnectionMessage with _$ClientConnectionMessage {
     List<GamePlayer> players,
   ) = FetchedPlayersClientConnectionMessage;
 
+  const factory ClientConnectionMessage.chatMessage(
+    String message,
+    String from,
+  ) = ChatMessageClientConnectionMessage;
+
   factory ClientConnectionMessage.fromJson(Map<String, dynamic> json) =>
       _$ClientConnectionMessageFromJson(json);
 }
@@ -25,8 +30,8 @@ class ClientGameConnection extends GameConnection {
 
   ClientGameConnection(this.channel);
 
-  factory ClientGameConnection.connect(String address) {
-    final channel = WebSocketChannel.connect(Uri.parse(address));
+  factory ClientGameConnection.connect(Uri address) {
+    final channel = WebSocketChannel.connect(address);
     return ClientGameConnection(channel);
   }
 
@@ -35,11 +40,11 @@ class ClientGameConnection extends GameConnection {
   }
 
   void _send(ServerConnectionMessage message) {
-    channel.sink.add(message.toJson());
+    channel.sink.add(jsonEncode(message.toJson()));
   }
 
   Future<T> _waitForResponse<T extends ClientConnectionMessage>() async {
-    return channel.stream
+    return await channel.stream
         .map((event) => jsonDecode(event))
         .map((event) => ClientConnectionMessage.fromJson(event))
         .where((event) => event is T)