Merge pull request #797 from QuickBlox/videochat-kotlin

4.1.0-videochat-kotlin
QuickBlox · Sep 7, 2022 · 24e82c3 · 24e82c3
2 parents 7d09ead + b8363cb
commit 24e82c3
Show file tree

Hide file tree

Showing 56 changed files with 990 additions and 1,657 deletions.
diff --git a/sample-videochat-kotlin/app/build.gradle b/sample-videochat-kotlin/app/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinGradlePluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
     }
 }
 
@@ -29,26 +29,26 @@ android {
 
     compileSdkVersion 31
     buildToolsVersion "31.0.0"
-    flavorDimensions dimensionDefault
+    flavorDimensions "default"
 
     defaultConfig {
         applicationId "com.quickblox.sample.videochat.kotlin"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 405000
-        versionName '4.0.5'
+        versionCode 410000
+        versionName '4.1.0'
         multiDexEnabled true
     }
 
     productFlavors {
         dev {
-            dimension dimensionDefault
+            dimension "default"
             buildConfigField('boolean', "IS_QA", "false")
             buildConfigField("int", "VERSION_QA_CODE", versionQACode.toString())
         }
 
         qa {
-            dimension dimensionDefault
+            dimension "default"
             buildConfigField("boolean", "IS_QA", "true")
             buildConfigField("int", "VERSION_QA_CODE", versionQACode.toString())
         }
@@ -92,14 +92,14 @@ android {
 }
 
 dependencies {
-    implementation "com.quickblox:quickblox-android-sdk-videochat-webrtc:$qbSdkVersion"
-    implementation "com.quickblox:quickblox-android-sdk-messages:$qbSdkVersion"
-    implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"
-    implementation "com.google.android.material:material:$materialVersion"
-    implementation "com.github.johnkil.android-robototextview:robototextview:$robotoTextViewVersion"
-    implementation "androidx.fragment:fragment-ktx:$fragmentAndroidXVersion"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleViewmodelAndroidXVersion"
-    implementation "androidx.core:core-ktx:$coreKtxVersion"
+    implementation 'com.quickblox:quickblox-android-sdk-videochat-webrtc:3.10.1'
+    implementation 'com.quickblox:quickblox-android-sdk-messages:3.10.1'
+    implementation 'com.google.firebase:firebase-core:21.1.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.github.johnkil.android-robototextview:robototextview:4.0.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.core:core-ktx:1.8.0'
 }
 
 apply from: "../artifacts.gradle"

diff --git a/sample-videochat-kotlin/app/proguard-rules.pro b/sample-videochat-kotlin/app/proguard-rules.pro
@@ -41,4 +41,7 @@
 -keep class org.webrtc.** { *; }
 
 #google gms
--keep class com.google.android.gms.** { *; }
+-keep class com.google.android.gms.** { *; }
+
+#json
+-keep class org.json.** { *; }
diff --git a/sample-videochat-kotlin/app/src/main/AndroidManifest.xml b/sample-videochat-kotlin/app/src/main/AndroidManifest.xml
@@ -37,11 +37,6 @@
             android:name=".activities.LoginActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".activities.SettingsActivity"
-            android:configChanges="keyboardHidden|screenSize|orientation"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".activities.OpponentsActivity"
             android:screenOrientation="portrait" />

diff --git a/sample-videochat-kotlin/app/src/main/java/com/quickblox/sample/videochat/kotlin/App.kt b/sample-videochat-kotlin/app/src/main/java/com/quickblox/sample/videochat/kotlin/App.kt
@@ -4,10 +4,10 @@ import android.app.Application
 import com.quickblox.auth.session.QBSettings
 import com.quickblox.sample.videochat.kotlin.db.DbHelper
 
-//User default credentials
+// user default credentials
 const val DEFAULT_USER_PASSWORD = "quickblox"
 
-//App credentials
+// app credentials
 private const val APPLICATION_ID = ""
 private const val AUTH_KEY = ""
 private const val AUTH_SECRET = ""
@@ -42,7 +42,7 @@ class App : Application() {
         QBSettings.getInstance().init(applicationContext, APPLICATION_ID, AUTH_KEY, AUTH_SECRET)
         QBSettings.getInstance().accountKey = ACCOUNT_KEY
 
-        // Uncomment and put your Api and Chat servers endpoints if you want to point the sample
+        // uncomment and put your Api and Chat servers endpoints if you want to point the sample
         // against your own server.
         //
         // QBSettings.getInstance().setEndpoints("https://your_api_endpoint.com", "your_chat_endpoint", ServiceZone.PRODUCTION);

diff --git a/...lin/app/src/main/java/com/quickblox/sample/videochat/kotlin/activities/AppInfoActivity.kt b/...lin/app/src/main/java/com/quickblox/sample/videochat/kotlin/activities/AppInfoActivity.kt
@@ -71,7 +71,7 @@ class AppInfoActivity : AppCompatActivity() {
             appQAVersionTextView.setText(spannable, TextView.BufferType.SPANNABLE)
             appQAVersionTextView.visibility = View.VISIBLE
 
-            findViewById<View>(R.id.text_qa_version_title).visibility = View.VISIBLE
+            findViewById<TextView>(R.id.text_qa_version_title).visibility = View.VISIBLE
         }
     }
 

diff --git a/...kotlin/app/src/main/java/com/quickblox/sample/videochat/kotlin/activities/BaseActivity.kt b/...kotlin/app/src/main/java/com/quickblox/sample/videochat/kotlin/activities/BaseActivity.kt
@@ -11,23 +11,19 @@ import androidx.core.content.ContextCompat
 import com.quickblox.sample.videochat.kotlin.R
 import com.quickblox.sample.videochat.kotlin.utils.showErrorSnackbar
 
-
 abstract class BaseActivity : AppCompatActivity() {
     private var progressDialog: ProgressDialog? = null
 
-
     internal fun showProgressDialog(@StringRes messageId: Int) {
         if (progressDialog == null) {
             progressDialog = ProgressDialog(this)
-            progressDialog!!.isIndeterminate = true
-            progressDialog!!.setCancelable(false)
-            progressDialog!!.setCanceledOnTouchOutside(false)
-
-            // Disable the back button
-            progressDialog!!.setOnKeyListener(KeyEventListener())
+            progressDialog?.isIndeterminate = true
+            progressDialog?.setCancelable(false)
+            progressDialog?.setCanceledOnTouchOutside(false)
+            progressDialog?.setOnKeyListener(KeyEventListener())
         }
-        progressDialog!!.setMessage(getString(messageId))
-        progressDialog!!.show()
+        progressDialog?.setMessage(getString(messageId))
+        progressDialog?.show()
     }
 
     override fun onPause() {
@@ -36,16 +32,14 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     internal fun hideProgressDialog() {
-        if (progressDialog != null && progressDialog?.isShowing == true) {
-            progressDialog!!.dismiss()
+        if (progressDialog?.isShowing == true) {
+            progressDialog?.dismiss()
         }
     }
 
-    protected fun showErrorSnackbar(@StringRes resId: Int, e: Exception, clickListener: View.OnClickListener) {
+    protected fun showErrorSnackbar(@StringRes resId: Int, e: Exception?, clickListener: View.OnClickListener) {
         val rootView = window.decorView.findViewById<View>(android.R.id.content)
-        if (rootView != null) {
-            showErrorSnackbar(rootView, resId, e, R.string.dlg_retry, clickListener)
-        }
+        showErrorSnackbar(rootView, resId, e, R.string.dlg_retry, clickListener)
     }
 
     protected fun checkPermissions(permissions: Array<String>): Boolean {