Merge pull request #2 from PeerRTC/update-branch

ShimShim27 · web-flow · commit 5a20582f469b · 2022-06-27T00:17:22.000+08:00
Update branch
diff --git a/AndroidPeerRTC/src/main/assets/mediator/mediator.js b/AndroidPeerRTC/src/main/assets/mediator/mediator.js
@@ -181,7 +181,7 @@ function sourceConnCreateAnswer(sdp){
 }
 
 
-function acceptDeclineConnectRequest(requestId, accept){
+function acceptDeclineConnectRequest(requestId, isAccept){
 	const request = connectionRequests.get(requestId)
 	if (request) {
 		if (isAccept) {
diff --git a/app/build.gradle b/app/build.gradle
@@ -45,5 +45,5 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'com.github.PeerRTC:AndroidPeerRTC:v1.0.3-beta'
+    implementation 'com.github.PeerRTC:AndroidPeerRTC:v1.0.4-beta'
 }
diff --git a/app/src/main/java/shim/shim/app/MainActivity.kt b/app/src/main/java/shim/shim/app/MainActivity.kt
@@ -88,7 +88,11 @@ class MainActivity : AppCompatActivity() {
         val receivedVideoView = binding.receivedVideoView
 
         ownVideoView.onMediaAvailable = {
-            peer.start(isSecure = true)
+            // prevent starting again if already started
+            if (!peer.isConnectedToServer){
+                peer.start(isSecure = true)
+            }
+
         }
         ownVideoView.onMediaNotAvailable = {
             Log.i(TAG, "Switched camera or stopped")
@@ -170,7 +174,7 @@ class MainActivity : AppCompatActivity() {
 
         peer.onStart = {
             peer.pingServer(10000)
-            binding.idDisplayView.text = "My id: ${peer.id}"
+            binding.idDisplayView.text = peer.id
         }
 
 
@@ -293,22 +297,32 @@ class MainActivity : AppCompatActivity() {
         }
 
         binding.sendMessageButton.setOnClickListener {
-            val inputBox = binding.messageInputBox
-            val message = inputBox.text.toString()
-            inputBox.text = null
-            addMessageToMessageBox(isSender = true, message = message)
-            peer.sendText(text = message)
+            if (peer.id == null){
+                showMessage(message = "Not yet connected to anyone")
+            } else{
+                val inputBox = binding.messageInputBox
+                val message = inputBox.text.toString()
+                inputBox.text = null
+                addMessageToMessageBox(isSender = true, message = message)
+                peer.sendText(text = message)
+            }
+
         }
 
         binding.endConnectionButton.setOnClickListener {
             peer.closeP2P()
         }
 
         binding.sendFileButton.setOnClickListener {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "*/*"
-            intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
-            newFileResult.launch(intent)
+            if (peer.id == null) {
+                showMessage(message = "Not yet connected to anyone")
+            } else{
+                val intent = Intent(Intent.ACTION_GET_CONTENT)
+                intent.type = "*/*"
+                intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+                newFileResult.launch(intent)
+            }
+
 
         }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,14 +4,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical"
+    android:padding="5dp"
     tools:context=".MainActivity">
 
-    <TextView
-        android:id="@+id/idDisplayView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp" />
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="My Id:"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/idDisplayView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:textIsSelectable="true"
+            android:textSize="17sp" />
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/incomingConnectRequestView"
@@ -31,12 +49,14 @@
             android:orientation="horizontal">
 
             <Button
+                style="@style/ButtonStyle"
                 android:id="@+id/acceptRequestButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Accept" />
 
             <Button
+                style="@style/ButtonStyle"
                 android:id="@+id/declineRequestButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -59,12 +79,14 @@
 
         <Button
             android:id="@+id/connectToPeerButton"
+            style="@style/ButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Connect" />
 
         <Button
             android:id="@+id/endConnectionButton"
+            style="@style/ButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="End" />
@@ -81,47 +103,51 @@
         android:orientation="horizontal">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:orientation="vertical">
 
             <shim.shim.androidpeerrtc.view.MediaSourceView
                 android:id="@+id/ownVideoView"
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="150dp"
                 app:cameraType="back"
                 app:mediaType="video" />
 
             <Button
                 android:id="@+id/switchCamButton"
+                style="@style/ButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Switch Cam"/>
+                android:text="Switch Cam" />
         </LinearLayout>
 
         <shim.shim.androidpeerrtc.view.MediaSourceView
             android:id="@+id/receivedVideoView"
             android:layout_width="0dp"
-            android:layout_height="200dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="10dp"
             android:layout_weight="1"
             app:mediaType="video" />
 
     </LinearLayout>
 
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:fillViewport="true">
 
         <TextView
             android:id="@+id/messageBox"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:background="@color/gray" />
 
     </ScrollView>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -132,32 +158,42 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:hint="Message"
             android:inputType="text" />
 
         <Button
             android:id="@+id/sendMessageButton"
+            style="@style/ButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Send" />
 
         <Button
             android:id="@+id/sendFileButton"
+            style="@style/ButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Send File" />
 
 
     </LinearLayout>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Incoming File:"
+        android:textSize="17sp"
+        android:textStyle="bold" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/file_preview_bitmap"
-            android:layout_width="100dp"
-            android:layout_height="100dp" />
+            android:layout_width="90dp"
+            android:layout_height="90dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="gray">#C2C2C2</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -3,14 +3,21 @@
     <style name="Theme.AndroidPeerRTC" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+
+        <item name="android:textColor">@color/black</item>
+        <item name="android:editTextColor">@color/black</item>
+        <item name="editTextStyle">@style/EditTextStyle</item>
     </style>
+
+    <style name="EditTextStyle" parent="Widget.AppCompat.EditText">
+        <item name="backgroundTint">@color/black</item>
+        <item name="android:textColorHint">@color/gray</item>
+    </style>
+
+
+    <style name="ButtonStyle" parent="Widget.AppCompat.Button">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ function sourceConnCreateAnswer(sdp){`
`181`	`181`	`}`
`182`	`182`
`183`	`183`
`184`		`-function acceptDeclineConnectRequest(requestId, accept){`
	`184`	`+function acceptDeclineConnectRequest(requestId, isAccept){`
`185`	`185`	`const request = connectionRequests.get(requestId)`
`186`	`186`	`if (request) {`
`187`	`187`	`if (isAccept) {`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,5 @@ dependencies {`
`45`	`45`	`testImplementation 'junit:junit:4.13.2'`
`46`	`46`	`androidTestImplementation 'androidx.test.ext:junit:1.1.3'`
`47`	`47`	`androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'`
`48`		`- implementation 'com.github.PeerRTC:AndroidPeerRTC:v1.0.3-beta'`
	`48`	`+ implementation 'com.github.PeerRTC:AndroidPeerRTC:v1.0.4-beta'`
`49`	`49`	`}`