Pluggable Chat & Video

.gitignore

@@ -23,3 +23,5 @@ salt.env
 /app/release/
 /app/src/main/assets
 /webrtc/src/main/assets/config.properties
+/resources/src/ida/assets/
+/resources/src/kf/assets/

app/build.gradle

@@ -4,8 +4,9 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: "kotlin-kapt"
-apply from: "resdir.gradle"
-apply from: "whitelabel.gradle"
+//apply from: "resdir.gradle"
+apply from: "${rootProject.projectDir}/whitelabel.gradle"
+apply from: "${rootProject.projectDir}/variants.gradle"
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 
@@ -20,9 +21,11 @@ android {
 
     defaultConfig {
         applicationId "org.intelehealth.app"
-        minSdk 23
+        minSdk 24
         targetSdk 34
-        versionCode 67
+//        versionCode 65
+//        versionName '5.0'
+        versionCode 78
         versionName '5.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //Change this to true to enable multidex support for Kitkat
@@ -43,10 +46,22 @@ android {
                 abortOnError false
             }
             minifyEnabled true
+//            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/main.kotlin_module'
+    }
     // use the bundle block to control which types of configuration APKs
     // you want your app bundle to support.
     bundle {
@@ -78,24 +93,31 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
+    dynamicFeatures = [':features:ondemand:chat', ':features:ondemand:video']
+
+//    dynamicFeatures = [':features:ondemand:video']
 
-//    dynamicFeatures = [':features:ondemand:klivekit']
 }
 dependencies {
-    implementation project(':features:ondemand:klivekit')
+//    implementation project(':features:ondemand:klivekit')
     api project(':fcm')
     api project(':config')
-//    api project(':common')
+    api project(':core:socket')
+    api(project(":resources"))
+    api project(":features:ondemand:mediator")
+    api project(":features:installer")
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'com.google.android.gms:play-services-fido:21.1.0'
     implementation project(path: ':ihutils')
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
+    implementation 'com.android.volley:volley:1.2.1'
+
     testImplementation 'junit:junit:4.13.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.media:media:1.7.0'
@@ -104,13 +126,12 @@ dependencies {
     //fingerprint lock
     implementation 'androidx.biometric:biometric:1.1.0'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     //mvvm
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.6'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.7'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-
     // JSON Converter
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     // RxJava
@@ -133,33 +154,33 @@ dependencies {
     //camera view
     implementation 'com.github.google:cameraview:9bbe07ba44'
     //Google Guava
-    implementation 'com.google.guava:guava:27.1-jre'
+    implementation 'com.google.guava:guava:32.0.1-jre'
     //Parse SDK
     implementation 'com.parse:parse-android:1.15.7'
     //date and time
-    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'joda-time:joda-time:2.10.3'
 
     //jsoup to parse html
     implementation 'org.jsoup:jsoup:1.15.2'
 
     implementation 'org.apache.commons:commons-lang3:3.6'
 
     // (Java only) Targeting S+ (version 31 and above)
-    implementation 'androidx.work:work-runtime:2.9.0'
+    implementation 'androidx.work:work-runtime:2.9.1'
     // optional - RxJava2 support
-    implementation 'androidx.work:work-rxjava2:2.9.0'
+    implementation 'androidx.work:work-rxjava2:2.9.1'
     // optional - Test helpers
-    androidTestImplementation 'androidx.work:work-testing:2.9.0'
+    androidTestImplementation 'androidx.work:work-testing:2.9.1'
 
     implementation "com.github.permissions-dispatcher:permissionsdispatcher:4.9.2"
     annotationProcessor "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.9.2"
 
-    implementation platform('com.google.firebase:firebase-bom:30.3.1')
+    implementation platform('com.google.firebase:firebase-bom:33.5.0')
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-messaging'
-    implementation "com.google.firebase:firebase-iid"
-    implementation "com.google.firebase:firebase-core"
+//    implementation "com.google.firebase:firebase-iid"
+//    implementation "com.google.firebase:firebase-core"
 
     implementation 'com.google.firebase:firebase-database'
     implementation 'com.google.firebase:firebase-config'
@@ -171,13 +192,14 @@ dependencies {
     implementation 'com.github.piruin:quickaction:2.4.3'
 
     implementation 'com.hbb20:ccp:2.6.1'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
 
     implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'com.github.EusebiuCandrea:ToolTipPopupWordTV:1.0.1'//
     implementation 'com.github.zerobranch:SwipeLayout:1.3.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+
 }
 apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin

app/src/main/AndroidManifest.xml

@@ -49,9 +49,9 @@
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute, LockedOrientationActivity"
         tools:replace="allowBackup">
-        <activity
-            android:name=".activities.onboarding.CommonWebviewActivity"
-            android:exported="false" />
+        <!--        <activity-->
+        <!--            android:name=".activities.onboarding.CommonWebviewActivity"-->
+        <!--            android:exported="false" />-->
         <activity
             android:name=".activities.onboarding.PersonalConsentActivity"
             android:exported="false"
@@ -69,15 +69,6 @@
             android:name=".ayu.visit.VisitCreationActivity"
             android:exported="false"
             android:theme="@style/AppThemeMaterialNew" />
-        <activity
-            android:name=".activities.chatHelp.ChatHelpActivity_New"
-            android:exported="true"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
         <activity
             android:name=".ui2.calendarviewcustom.CalendarViewDemoActivity"
             android:exported="true"
@@ -163,15 +154,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".activities.identificationActivity.IdentificationActivity_New"
-            android:exported="false"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustResize">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
         <activity
             android:name=".appointmentNew.AppointmentDetailsActivity"
             android:exported="true"
@@ -207,6 +189,18 @@
             android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name="org.intelehealth.installer.activity.DynamicModuleDownloadingActivity"
+            android:exported="true"
+            android:theme="@style/AppThemeMaterialNew"
+            android:windowSoftInputMode="adjustPan">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN" />-->
+
+            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--            </intent-filter>-->
+        </activity>
         <activity
             android:name=".ui.splash.activity.SplashActivity"
             android:exported="true"
@@ -229,6 +223,11 @@
             <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             <!--            </intent-filter>-->
         </activity>
+        <activity
+            android:name=".ui.setup.activity.SyncActivity"
+            android:exported="true"
+            android:theme="@style/AppThemeMaterialNew"
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".activities.notification.view.NotificationActivity"
             android:exported="false"
@@ -375,26 +374,26 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".webrtc.activity.IDAChatActivity"
-            android:exported="true"
-            android:theme="@style/AppThemeMaterialNew"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".webrtc.activity.IDAVideoActivity"
-            android:excludeFromRecents="true"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:showOnLockScreen="true"
-            android:taskAffinity=""
-            android:theme="@style/AppThemeMaterialNew"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".webrtc.activity.IDACallLogActivity"
-            android:exported="true"
-            android:theme="@style/AppThemeMaterialNew"
-            android:windowSoftInputMode="adjustPan" />
+        <!--        <activity-->
+        <!--            android:name=".webrtc.activity.IDAChatActivity"-->
+        <!--            android:exported="true"-->
+        <!--            android:theme="@style/AppThemeMaterialNew"-->
+        <!--            android:windowSoftInputMode="adjustPan" />-->
+        <!--        <activity-->
+        <!--            android:name=".webrtc.activity.IDAVideoActivity"-->
+        <!--            android:excludeFromRecents="true"-->
+        <!--            android:exported="true"-->
+        <!--            android:launchMode="singleTask"-->
+        <!--            android:screenOrientation="portrait"-->
+        <!--            android:showOnLockScreen="true"-->
+        <!--            android:taskAffinity=""-->
+        <!--            android:theme="@style/AppThemeMaterialNew"-->
+        <!--            android:windowSoftInputMode="adjustPan" />-->
+        <!--        <activity-->
+        <!--            android:name=".webrtc.activity.IDACallLogActivity"-->
+        <!--            android:exported="true"-->
+        <!--            android:theme="@style/AppThemeMaterialNew"-->
+        <!--            android:windowSoftInputMode="adjustPan" />-->
 
         <service
             android:name=".utilities.OpenMRSAccountAuthenticatorService"
@@ -445,7 +444,7 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".notificationScheduler.ScheduleNotificationReceiver"/>
+        <receiver android:name=".notificationScheduler.ScheduleNotificationReceiver" />
 
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"

app/src/main/java/android/print/PdfPrint.java

@@ -1,14 +1,9 @@
 package android.print;
 
-import android.os.Build;
 import android.os.CancellationSignal;
-import android.os.Environment;
 import android.os.ParcelFileDescriptor;
-import android.print.PrintAttributes;
-import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentInfo;
+
 import org.intelehealth.app.utilities.CustomLog;
-import org.intelehealth.app.utilities.PublicDirFileSaverUtils;
 
 import java.io.File;
 

app/src/main/java/org/intelehealth/app/activities/aboutus/AboutUsActivity.java

@@ -1,6 +1,5 @@
 package org.intelehealth.app.activities.aboutus;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -19,13 +18,11 @@
 import android.text.util.Linkify;
 import android.util.DisplayMetrics;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.intelehealth.app.R;
-import org.intelehealth.app.activities.help.adapter.MostSearchedVideosAdapter_New;
 import org.intelehealth.app.shared.BaseActivity;
 import org.intelehealth.app.syncModule.SyncUtils;
 import org.intelehealth.app.utilities.SessionManager;