From 435bb758bb9e3443e4341ab286a88dfb2b4c81de Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 9 Jan 2023 17:03:57 +0100
Subject: [PATCH] Update openvidu-android and openvidu-react-native for e2e
 tests

---
 openvidu-android/.idea/gradle.xml                           | 2 +-
 openvidu-android/.idea/jarRepositories.xml                  | 5 +++++
 openvidu-android/app/src/main/res/layout/activity_main.xml  | 6 ++++--
 openvidu-react-native/.gitignore                            | 4 +++-
 openvidu-react-native/android/.project                      | 2 +-
 openvidu-react-native/android/build.gradle                  | 2 +-
 .../android/gradle/wrapper/gradle-wrapper.properties        | 2 +-
 openvidu-react-native/package.json                          | 4 ++--
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/openvidu-android/.idea/gradle.xml b/openvidu-android/.idea/gradle.xml
index 6e5389ed..56d6814d 100644
--- a/openvidu-android/.idea/gradle.xml
+++ b/openvidu-android/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/openvidu-android/.idea/jarRepositories.xml b/openvidu-android/.idea/jarRepositories.xml
index 23704740..35ffc9d8 100644
--- a/openvidu-android/.idea/jarRepositories.xml
+++ b/openvidu-android/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/openvidu-android/app/src/main/res/layout/activity_main.xml b/openvidu-android/app/src/main/res/layout/activity_main.xml
index 6b4946b1..b24f2005 100644
--- a/openvidu-android/app/src/main/res/layout/activity_main.xml
+++ b/openvidu-android/app/src/main/res/layout/activity_main.xml
@@ -72,8 +72,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_margin="5dp"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="5dp"
             android:onClick="buttonPressed"
             android:text="@string/start_button" />
 
diff --git a/openvidu-react-native/.gitignore b/openvidu-react-native/.gitignore
index 4ce07696..4d035f54 100644
--- a/openvidu-react-native/.gitignore
+++ b/openvidu-react-native/.gitignore
@@ -59,4 +59,6 @@ buck-out/
 # CocoaPods
 /ios/Pods/
 
-org.eclipse.buildship.core.prefs
\ No newline at end of file
+org.eclipse.buildship.core.prefs
+
+index.android.bundle
\ No newline at end of file
diff --git a/openvidu-react-native/android/.project b/openvidu-react-native/android/.project
index 9619457a..ba2f52dd 100644
--- a/openvidu-react-native/android/.project
+++ b/openvidu-react-native/android/.project
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1671718063585</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
diff --git a/openvidu-react-native/android/build.gradle b/openvidu-react-native/android/build.gradle
index e2d5f6f9..47a7aaa8 100644
--- a/openvidu-react-native/android/build.gradle
+++ b/openvidu-react-native/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.2.2')
+        classpath('com.android.tools.build:gradle:7.3.1')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/openvidu-react-native/android/gradle/wrapper/gradle-wrapper.properties b/openvidu-react-native/android/gradle/wrapper/gradle-wrapper.properties
index 669386b8..b1159fc5 100644
--- a/openvidu-react-native/android/gradle/wrapper/gradle-wrapper.properties
+++ b/openvidu-react-native/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/openvidu-react-native/package.json b/openvidu-react-native/package.json
index e6331c7a..d119f742 100644
--- a/openvidu-react-native/package.json
+++ b/openvidu-react-native/package.json
@@ -7,8 +7,8 @@
     "start:cache": "npm start -- --reset-cache",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "build:android": "cd android && ./gradlew assembleDebug",
-    "copy:android": "cp ./android/app/build/outputs/apk/debug/app-debug.apk /opt/openvidu/android/openvidu-react-native.apk",
+    "build:android": "mkdir -p android/app/src/main/assets/ && npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle && cd android && ./gradlew assembleRelease",
+    "copy:android": "cp ./android/app/build/outputs/apk/release/app-release.apk /opt/openvidu/android/openvidu-react-native.apk",
     "clean": "rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-* && rm -rf node_modules && rm -f package-lock.json",
     "install-ov": "npm i openvidu-react-native-adapter-*.tgz",
     "test": "jest"