Update Android Kotlin, reorganise native modules.

Author: retrixe

android/app/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: "com.android.application"
-apply plugin: "kotlin-android"
+apply plugin: "kotlin-android" // manual
 
 import com.android.build.OutputFile
 
@@ -257,8 +257,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" // manual
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" // manual
+    implementation "androidx.core:core-ktx:1.8.0" // manual
 
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules

android/app/src/main/java/com/enderchat/MainApplication.java

@@ -2,6 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
+import com.enderchat.modules.compression.CompressionPackage;
+import com.enderchat.modules.navbarcolor.NavBarColorPackage;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;

android/app/src/main/java/com/enderchat/CompressionModule.kt renamed to android/app/src/main/java/com/enderchat/modules/compression/CompressionModule.kt

@@ -1,6 +1,7 @@
-package com.enderchat
+package com.enderchat.modules.compression
 
 import android.util.Base64
+import com.enderchat.MainActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -15,7 +16,8 @@ class CompressionModule(reactContext: ReactApplicationContext)
     override fun getName() = "CompressionModule"
 
     @ReactMethod fun compressData(data: String, promise: Promise) {
-        val handler = (reactApplicationContext.currentActivity as MainActivity).dataTransformsThreadHandler
+        val handler = (reactApplicationContext.currentActivity as MainActivity)
+            .dataTransformsThreadHandler
         val bytes = Base64.decode(data, Base64.DEFAULT)
         handler.post {
             try {
@@ -40,7 +42,8 @@ class CompressionModule(reactContext: ReactApplicationContext)
     }
 
     @ReactMethod fun decompressData(data: String, promise: Promise) {
-        val handler = (reactApplicationContext.currentActivity as MainActivity).dataTransformsThreadHandler
+        val handler = (reactApplicationContext.currentActivity as MainActivity)
+            .dataTransformsThreadHandler
         val bytes = Base64.decode(data, Base64.DEFAULT)
         handler.post {
             try {

android/app/src/main/java/com/enderchat/CompressionPackage.kt renamed to android/app/src/main/java/com/enderchat/modules/compression/CompressionPackage.kt

@@ -1,4 +1,4 @@
-package com.enderchat
+package com.enderchat.modules.compression
 
 import android.view.View
 import com.facebook.react.ReactPackage

android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt

@@ -0,0 +1,10 @@
+package com.enderchat.modules.connection
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+
+class ConnectionModule(reactContext: ReactApplicationContext)
+    : ReactContextBaseJavaModule(reactContext) {
+
+    override fun getName() = "ConnectionModule"
+}

android/app/src/main/java/com/enderchat/modules/connection/ConnectionPackage.kt

@@ -0,0 +1,19 @@
+package com.enderchat.modules.connection
+
+import android.view.View
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ReactShadowNode
+import com.facebook.react.uimanager.ViewManager
+
+class ConnectionPackage : ReactPackage {
+
+    override fun createViewManagers(
+        reactContext: ReactApplicationContext
+    ): MutableList<ViewManager<View, ReactShadowNode<*>>> = mutableListOf()
+
+    override fun createNativeModules(
+        reactContext: ReactApplicationContext
+    ): MutableList<NativeModule> = listOf(ConnectionModule(reactContext)).toMutableList()
+}

android/app/src/main/java/com/enderchat/NavBarColorModule.java renamed to android/app/src/main/java/com/enderchat/modules/navbarcolor/NavBarColorModule.java

@@ -1,4 +1,4 @@
-package com.enderchat;
+package com.enderchat.modules.navbarcolor;
 
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;

android/app/src/main/java/com/enderchat/NavBarColorPackage.java renamed to android/app/src/main/java/com/enderchat/modules/navbarcolor/NavBarColorPackage.java

@@ -1,4 +1,4 @@
-package com.enderchat;
+package com.enderchat.modules.navbarcolor;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;

android/build.gradle

@@ -4,7 +4,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 buildscript {
     ext {
-        kotlinVersion = "1.6.21"
+        kotlinVersion = "1.7.10" // manual
         buildToolsVersion = "31.0.0"
         minSdkVersion = 21
         compileSdkVersion = 31
@@ -28,7 +28,7 @@ buildscript {
         classpath("de.undercouch:gradle-download-task:5.0.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}") // manual
     }
 }
 

src/screens/chat/ChatScreen.tsx

@@ -157,8 +157,6 @@ const ChatScreen = ({ navigation, route }: Props) => {
         closeChatScreen
       )
         .then(conn => {
-          console.log(statusRef.current)
-          console.log(isConnection(conn))
           if (statusRef.current !== 'CLOSED') {
             if (isConnection(conn)) setConnection(conn)
             else setDisconnectReason(conn)