make reconnecting robust + cosmetic changes

Author: MrMineDe

rentnerend/lib/info_window.dart

@@ -52,14 +52,16 @@ class _InfoWindowState extends State<InfoWindow> {
 
 	Future<void> connectWS() async {
 		ws.connect();
-		// TODO add quitting after 1sec or smth
+		final start = DateTime.now();
 		await Future.doWhile(() async {
 			await Future.delayed(Duration(milliseconds: 10));
-			return !ws.connected.value;
+			return
+				!ws.connected.value
+         	 && DateTime.now().difference(start) < const Duration(seconds: 3);
 		});
 		if(!ws.connected.value) return;
 
-		ws.sendSignal(MessageType.DATA_JSON);
+		ws.sendSignal(MessageType.PLS_SEND_JSON);
 	}
 
 	final textGroup = AutoSizeGroup();
@@ -347,7 +349,7 @@ class _InfoWindowState extends State<InfoWindow> {
 											return blockWSStatus(md);
 										}
 									),
-									if (!md.meta.game.ended && md.currentGame == null)
+									if (!md.meta.game.ended && md.currentGame != null)
 										blockCurGame(md, secondBgColor),
 									blockGameplan(md, secondBgColor),
 									blockLivetable(md, md.groups[0], secondBgColor),

rentnerend/lib/input_end_window.dart

@@ -47,16 +47,19 @@ class _InputEndWindowState extends State<InputEndWindow> {
 	}
 
 	Future<void> connectWS() async {
+		debugPrint("connectWS: connecting...");
 		ws.client.connect();
-		// TODO add quitting after 1sec or smth
+		final start = DateTime.now();
 		await Future.doWhile(() async {
 			await Future.delayed(Duration(milliseconds: 10));
-			return !ws.client.connected.value;
+			return
+				!ws.clientConnected
+         	 && DateTime.now().difference(start) < const Duration(seconds: 3);
 		});
 		if(!ws.clientConnected) return;
 
-		ws.sendSignal(MessageType.DATA_JSON);
-		while(mounted && !ws.client.boss.value) {
+		ws.client.sendSignal(MessageType.DATA_JSON);
+		while(mounted && !ws.client.boss.value && ws.client.connected.value) {
 			ws.client.sendSignal(MessageType.IM_THE_BOSS);
 			await Future.delayed(Duration(seconds: 10));
 		}
@@ -312,7 +315,7 @@ class _InputEndWindowState extends State<InputEndWindow> {
 													}
 												)
 											),
-											Center(child: Text("SPIELTAGS-ZUSAMMENFASSUNG", maxLines: 1, style: const TextStyle(fontSize: 25)))
+											Center(child: Padding(padding: EdgeInsets.only(left: 40), child: AutoSizeText("ERGEBNISSE", maxLines: 1, style: const TextStyle(fontSize: 25))))
 										]),
 										blockGameplan(md, secondBgColor),
 										blockLivetable(md, md.groups[0], secondBgColor),

rentnerend/lib/input_window.dart

@@ -97,22 +97,23 @@ class _InputWindowState extends State<InputWindow> {
 
 		_reconnectTimer = Timer.periodic(const Duration(seconds: 3), (_) async {
 			if (!mounted) return;
-			if(!ws.clientConnected) await connectWS();
+			if(!ws.clientConnected) connectWS();
 		});
 	}
 
 	Future<void> connectWS() async {
-		debugPrint("connectWS: connecting... now: ${ws.clientConnected}");
 		ws.client.connect();
+		final start = DateTime.now();
 		await Future.doWhile(() async {
 			await Future.delayed(Duration(milliseconds: 10));
-			return !ws.client.connected.value;
+			return
+				!ws.clientConnected
+         	 && DateTime.now().difference(start) < const Duration(seconds: 3);
 		});
-		debugPrint("connectWS: connected? ${ws.clientConnected}");
 		if(!ws.clientConnected) return;
 
 		ws.client.sendSignal(MessageType.DATA_JSON);
-		while(mounted && !ws.client.boss.value) {
+		while(mounted && !ws.client.boss.value && ws.client.connected.value) {
 			ws.client.sendSignal(MessageType.IM_THE_BOSS);
 			await Future.delayed(Duration(seconds: 10));
 		}
@@ -160,8 +161,8 @@ class _InputWindowState extends State<InputWindow> {
 			end = await dialog(
 				"Spieltag beenden?",
 				"Es sieht so aus, als würde das aktuelle Spiel noch laufen.\n"
-				"Bist du sicher, dass du den Spieltag trotzdem beenden willst?\n"
-				"Die Ergebnisse werden gespeichert und du kannst jederzeit zurückgehen, allerdings wird die Zeit gestoppt!",
+				"Bist du sicher, dass du den Spieltag trotzdem beenden willst?\n\n"
+				"Die Ergebnisse werden gespeichert und du kannst jederzeit zurückgehen, aber die Zeit wird gestoppt!",
 				["Hier bleiben", "Trotzem beenden"]
 			) == 1 ? true : false;
 		}