fix Andorid to Android

.gitignore

@@ -7,6 +7,7 @@ local.properties
 
 # Log/OS Files
 *.log
+.DS_Store
 
 # Android Studio generated files and folders
 captures/
@@ -22,6 +23,9 @@ misc.xml
 deploymentTargetDropDown.xml
 render.experimental.xml
 
+# VS Code
+.vscode
+
 # Keystore files
 *.jks
 *.keystore

Andorid/app/src/main/res/layout/camera_permission_activity.xml → Android/app/src/main/res/layout/camera_permission_activity.xml

@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        app:tint="@color/material_dynamic_tertiary30" />
+        app:tint="@color/black" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv_explain"

Andorid/build.gradle → Android/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '8.0.1' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }

Andorid/gradle/wrapper/gradle-wrapper.properties → Android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Mar 30 21:35:33 EEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

VideoServer/Dockerfile

@@ -0,0 +1,51 @@
+# Stage 1: Build the application
+FROM eclipse-temurin:22-jdk AS build
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy the Gradle wrapper files
+COPY gradlew /app/gradlew
+COPY gradlew.bat /app/gradlew.bat
+COPY gradle/wrapper/gradle-wrapper.jar /app/gradle/wrapper/gradle-wrapper.jar
+COPY gradle/wrapper/gradle-wrapper.properties /app/gradle/wrapper/gradle-wrapper.properties
+
+# Copy the build files
+COPY build.gradle settings.gradle /app/
+
+# Copy the source code
+COPY src /app/src
+
+# Give execute permission to gradlew
+RUN chmod +x gradlew
+
+# Run Gradle build to create the shadow JAR file
+RUN ./gradlew clean shadowJar
+
+# Stage 2: Run the application
+FROM eclipse-temurin:22-jdk
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy the shadow JAR file from the build stage
+COPY --from=build /app/build/libs/VideoServer-1.0-SNAPSHOT.jar /app/VideoServer.jar
+
+# Copy the image asset to the container working directory
+COPY device_offline.jpg /app/device_offline.jpg
+
+# Specify the command to run the JAR file
+ENTRYPOINT ["java", "-jar", "/app/VideoServer.jar"]
+
+# WebSocket Server (runs on port 1234).
+# MJPEG Server (runs on port 4444).
+# Camera Server (runs on port 4321).
+EXPOSE 1234
+EXPOSE 4444
+EXPOSE 4321
+
+# Instructions for building and running the Docker container
+# Building
+# sudo docker build -t videoserver:latest . 
+# Running
+# sudo docker run -d -p 1234:1234 -p 4444:4444 -p 4321:4321 videoserver

VideoServer/build.gradle

@@ -1,8 +1,9 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.7.21'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.0.0'
 }
 
-group = 'org.example'
+group = 'com.videoserver'
 version = '1.0-SNAPSHOT'
 
 repositories {
@@ -11,17 +12,33 @@ repositories {
 
 dependencies {
     implementation 'org.java-websocket:Java-WebSocket:1.5.3'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.0"
+    testImplementation 'org.jetbrains.kotlin:kotlin-test:1.8.0'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(22)
+    }
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = '22'
+    }
 }
 
 test {
     useJUnitPlatform()
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = '1.8'
+shadowJar {
+    archiveBaseName.set('VideoServer')
+    archiveVersion.set('1.0-SNAPSHOT')
+    archiveClassifier.set('')
+    manifest {
+        attributes 'Main-Class': 'com.videoserver.MainKt'
+    }
 }
 
-compileTestKotlin {
-    kotlinOptions.jvmTarget = '1.8'
-}
+build.dependsOn(shadowJar)

VideoServer/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

VideoServer/src/main/kotlin/CameraServer.kt → VideoServer/src/main/kotlin/com/videoserver/CameraServer.kt

@@ -1,3 +1,5 @@
+package com.videoserver
+
 import java.io.DataInputStream
 import java.io.EOFException
 import java.io.File

VideoServer/src/main/kotlin/Frame.kt → VideoServer/src/main/kotlin/com/videoserver/Frame.kt

@@ -1 +1,3 @@
+package com.videoserver
+
 data class Frame(val data: List<Byte>)

VideoServer/src/main/kotlin/MJpegServer.kt → VideoServer/src/main/kotlin/com/videoserver/MJpegServer.kt

@@ -1,3 +1,5 @@
+package com.videoserver
+
 import java.io.IOException
 import java.net.ServerSocket
 import java.net.Socket

VideoServer/src/main/kotlin/Main.kt → VideoServer/src/main/kotlin/com/videoserver/Main.kt

@@ -1,3 +1,5 @@
+package com.videoserver
+
 fun main(args: Array<String>) {
 
     val cameraServer = CameraServer()

VideoServer/src/main/kotlin/ViewerConnectionListener.kt → VideoServer/src/main/kotlin/com/videoserver/ViewerConnectionListener.kt

@@ -1,3 +1,5 @@
+package com.videoserver
+
 interface ViewerConnectionListener {
     fun onConnect(onFrameAvailable: CameraServer.OnFrameAvailable)
     fun onDisconnect(onFrameAvailable: CameraServer.OnFrameAvailable)

VideoServer/src/main/kotlin/ViewerWebSocketServer.kt → VideoServer/src/main/kotlin/com/videoserver/ViewerWebSocketServer.kt

@@ -1,3 +1,5 @@
+package com.videoserver
+
 import org.java_websocket.WebSocket
 import org.java_websocket.handshake.ClientHandshake
 import org.java_websocket.server.WebSocketServer