add view model an refactor code

Author: AlfredoHdez1709

EasyCameraAndGallery/build.gradle

@@ -39,19 +39,18 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     def camerax_version = "1.1.0"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-video:${camerax_version}"
+   // implementation "androidx.camera:camera-video:${camerax_version}" new version
 
     implementation "androidx.camera:camera-view:${camerax_version}"
     implementation "androidx.camera:camera-extensions:${camerax_version}"
 
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
+
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
 }

EasyCameraAndGallery/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
 
     <application>
         <activity
-            android:name=".CameraActivity"
+            android:name=".camera.CameraActivity"
             android:exported="false" />
     </application>
 

EasyCameraAndGallery/src/main/java/dev/ahrsoft/easycameraandgallery/EasyCamera.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import dev.ahrsoft.easycameraandgallery.camera.CameraActivity
 
 object EasyCamera {
     const val IMAGE_RESULTS = "image_results"

EasyCameraAndGallery/src/main/java/dev/ahrsoft/easycameraandgallery/OptionsCamera.kt

@@ -4,14 +4,12 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import java.io.Serializable
 
-
 data class OptionsCamera(
     var count : Int = 1,
     var path : String = "EasyCamera/",
     var flash: Flash = Flash.Auto,
     var isFrontFacing : Boolean = false,
     var ratio : Ratio = Ratio.RATIO_AUTO,
-    var galleryCount : Int = 0
 ) : Serializable
 
 @Parcelize

EasyCameraAndGallery/src/main/java/dev/ahrsoft/easycameraandgallery/Utils.kt

@@ -73,7 +73,7 @@ class Utils(private val activity: Activity) {
         }
     }
 
-    fun getScreenHeight(): Int {
+    private fun getScreenHeight(): Int {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             val windowMetrics = activity.windowManager.currentWindowMetrics
             val bounds: Rect = windowMetrics.bounds