fix bugs

Author: treeplate

PROTOCOL.md

@@ -42,7 +42,7 @@ This uses dart's [Socket](https://api.dart.dev/stable/3.3.0/dart-io/Socket-class
 `programCard` : `int8` - there are 5 `programCard`s, each one represents a program card slot in order from first register phase to last:
 - `0b1000_0001`: there is a program card there
 - `0b1000_0000`: there is not a program card there
-- anything else: there is a face-up program card there. The program cards are listed in order in [this file](program_cards.txt).
+- anything else: there is a face-up program card there. The program cards are listed in order in [this file](roborally_server/program_cards.txt).
 
 `optionCardCount` : `int8` - How many option cards this robot has. This number cannot be above 26, as there are only 26 option cards.<br>
 `optionCards` : `int8` x `optionCardCount` - For each option card, the index of the option card. These option cards are listed in order in [this file](roborally_client/option_cards.txt). This number cannot be above 25.<br>

README.md

@@ -7,12 +7,13 @@ This is a game (based on [this board game](https://en.wikipedia.org/wiki/RoboRal
 1 tablet/laptop/desktop (the "server device")<br>
 
 ## Before the game
-Create a file called `servers.cfg` with each line following this format:
+Create a file called `servers.cfg` in `roborally_client` with each line following this format:
 ```
 <server ip> <server name>
 ```
 Server IP is the IP of the server device.<br>
 Server Name is what you want to call this server device.<br>
+When running the client, each line will be a server device you can connect to.
 <br>
 Install [Flutter](https://docs.flutter.dev/get-started) on a computer. 
 In the `roborally_client` folder, 

roborally_client/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "d05eaf4a98f215b768a54bb055c1a867d3d1daf1"
+  revision: "fe598e7d6f22e176499ede063572aafd9a9ef2b9"
   channel: "main"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: android
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: ios
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: linux
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: macos
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: web
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
     - platform: windows
-      create_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
-      base_revision: d05eaf4a98f215b768a54bb055c1a867d3d1daf1
+      create_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
+      base_revision: fe598e7d6f22e176499ede063572aafd9a9ef2b9
 
   # User provided section
 

roborally_client/android/.gitignore

@@ -5,9 +5,10 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+.cxx/
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

roborally_client/android/app/build.gradle

@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.roborally_client"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.roborally_client"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}

roborally_client/android/app/build.gradle.kts

@@ -7,6 +7,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -31,7 +32,7 @@
             android:value="2" />
     </application>
     <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
+         https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
 
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

roborally_client/android/app/src/main/AndroidManifest.xml

@@ -2,4 +2,4 @@ package com.example.roborally_client
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity()
+class MainActivity : FlutterActivity()

roborally_client/android/app/src/main/kotlin/com/example/roborally_client/MainActivity.kt

@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

roborally_client/android/build.gradle

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

roborally_client/android/build.gradle.kts

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

roborally_client/android/gradle.properties

@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.7.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+}
+
+include(":app")