Merge Conflict

.idea/Zoom_SDK.iml

@@ -9,7 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Flutter Plugins" level="project" />
+    <orderEntry type="library" exported="" name="Dart SDK" level="project" />
+    <orderEntry type="library" exported="" name="Flutter Plugins" level="project" />
   </component>
 </module>
\ No newline at end of file

android/build.gradle

@@ -48,11 +48,11 @@ android {
 
 
 dependencies {
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation "androidx.multidex:multidex:2.0.0"
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+    implementation "com.google.android.material:material:1.4.0"
     implementation 'com.google.android:flexbox:2.0.1'
 
     implementation "com.google.code.gson:gson:2.8.1"
@@ -63,9 +63,16 @@ dependencies {
     implementation "com.google.crypto.tink:tink-android:1.5.0"
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "com.google.android.exoplayer:exoplayer-core:2.12.3"
-    implementation "com.google.android.exoplayer:exoplayer-ui:2.12.3"
-
+    implementation "com.google.android.exoplayer:exoplayer-core:2.16.1"
+    implementation "com.google.android.exoplayer:exoplayer-ui:2.16.1"
+    implementation "com.airbnb.android:lottie:4.0.0"
+    implementation "androidx.window:window:1.0.0"
+    implementation "androidx.window:window-java:1.0.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
+    implementation "androidx.fragment:fragment-ktx:1.4.1"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'