* [f][M] Writing call ended at to RTDB

* [f] Adding app icon
* [u] Android gradle plugin

Author: shahsurajk

app/src/main/ic_launcher-web.png

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.ConsoleMessage
 import android.widget.Toast
+import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.IgnoreExtraProperties
 import com.google.firebase.database.PropertyName
@@ -28,9 +29,9 @@ class WebViewFragment: PermissionAwareWebViewFragment(), JSInterface.JSInterface
         private const val ARG_URL_STRING = "arg-url"
         private const val ARG_INTERACTION_TYPE = "arg-interaction-type"
 
-        private var isTestUrl = false
-
-        private lateinit var interactionType: InteractionType
+        private const val RTDB_CHILD_CALL_DETAILS = "clDts"
+        private const val RTDB_CHILD_PARTICIPANTS = "prtcpnts"
+        private const val RTDB_VALUE_CALL_ENDED_AT = "clEdAt"
 
         fun init(url: String, interactionType: InteractionType = InteractionType.IN_CALL): WebViewFragment {
             return WebViewFragment().apply {
@@ -42,16 +43,22 @@ class WebViewFragment: PermissionAwareWebViewFragment(), JSInterface.JSInterface
         }
     }
 
+    private var isTestUrl = false
+
+    private lateinit var interactionType: InteractionType
+
     private lateinit var jsInterface: JSInterface
 
+    private lateinit var rtdbReference: DatabaseReference
+
     private data class TestUserObject(
         val tstId: String,
         val iPrv: Boolean = true,
         val mod: String = "VOIP"
     )
 
     @IgnoreExtraProperties
-    data class RTDBPreviewCallDetails(
+    private data class RTDBPreviewCallDetails(
         @get:PropertyName("rtcClId")
         @set:PropertyName("rtcClId")
         var rtcCallId: String,
@@ -82,14 +89,15 @@ class WebViewFragment: PermissionAwareWebViewFragment(), JSInterface.JSInterface
         val ref = database.getReference("qtalkDebugAndStaging/calls").child(callId)
 
         // store the participant info with the key as the user id
-        ref.child("prtcpnts").child(selectedUser).setValue(TestUserObject(selectedUser))
+        ref.child(RTDB_CHILD_PARTICIPANTS).child(selectedUser).setValue(TestUserObject(selectedUser))
 
         // store call details
-        ref.child("clDts").setValue(RTDBPreviewCallDetails(
+        ref.child(RTDB_CHILD_CALL_DETAILS).setValue(RTDBPreviewCallDetails(
             callId,
             System.currentTimeMillis()
         ))
 
+        rtdbReference = ref
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -114,6 +122,13 @@ class WebViewFragment: PermissionAwareWebViewFragment(), JSInterface.JSInterface
         if (interactionType == InteractionType.WEB_SHARING) {
             // write to QTalks RTDB here as participant information needs to be added in the array.
             writeParticipantInfoAndCallDetailsToRTDB()
+
+            endCallButton.visibility = View.VISIBLE
+
+            endCallButton.setOnClickListener{
+                rtdbReference.child(RTDB_CHILD_CALL_DETAILS).child(RTDB_VALUE_CALL_ENDED_AT).setValue(System.currentTimeMillis())
+                activity?.finish()
+            }
         }
 
         jsInterface = JSInterface(this)

app/src/main/java/io/qtalk/qgamejsinterfacetester/WebViewFragment.kt

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="108dp"
-        android:width="108dp"
-        android:viewportHeight="108"
-        android:viewportWidth="108">
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#008577"
           android:pathData="M0,0h108v108h-108z"/>
     <path android:fillColor="#00000000" android:pathData="M9,0L9,108"

app/src/main/res/drawable/ic_launcher_background.xml

@@ -64,6 +64,21 @@
             android:layout_height="0dp"
             app:layout_constraintTop_toBottomOf="@id/logView"
             app:layout_constraintBottom_toBottomOf="parent"/>
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:layout_width="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_margin="16dp"
+        tools:visibility="visible"
+        android:visibility="gone"
+        android:id="@+id/endCallButton"
+        android:rotation="45"
+        android:elevation="0dp"
+        android:padding="6dp"
+        android:src="@android:drawable/ic_menu_call"
+        android:tint="@android:color/white"
+        android:background="@drawable/custom_bg_8dp_primary"
+        android:layout_height="wrap_content"/>
     <ProgressBar
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/webview_fragment.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>