Merge remote-tracking branch 'origin/master'

# Conflicts:
#	GeoTagImage/src/androidTest/java/com/dangiashish/geotagimage/ExampleInstrumentedTest.kt
#	GeoTagImage/src/main/java/com/dangiashish/GeoTagImage.kt
#	GeoTagImage/src/main/res/layout/camera_layout.xml
#	app/src/androidTest/java/com/dangiashish/geotagimage/demo/ExampleInstrumentedTest.kt
#	app/src/main/java/com/dangiashish/geotagimage/demo/MainActivity.kt
#	app/src/test/java/com/dangiashish/geotagimage/demo/ExampleUnitTest.kt

Author: dangiashish

.idea/compiler.xml

@@ -1,22 +1,25 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'maven-publish'
 }
 
 android {
-    namespace 'com.codebyashish.geotagimage'
+    namespace 'com.dangiashish.geotagimage'
     compileSdk = 36
 
     defaultConfig {
-        minSdkVersion 23
+        minSdk = 23
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile(
+                    'proguard-android-optimize.txt'
+            ), 'proguard-rules.pro'
         }
     }
 
@@ -41,27 +44,25 @@ android {
     }
 }
 
-
-
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'com.google.android.material:material:1.13.0'
     implementation 'com.google.android.gms:play-services-location:21.3.0'
     implementation 'androidx.core:core-ktx:1.17.0'
-    implementation 'androidx.exifinterface:exifinterface:1.4.1'
+    implementation 'androidx.exifinterface:exifinterface:1.4.2'
 
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    def camerax_version = "1.5.2"
+    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-view:$camerax_version"
+    implementation "androidx.camera:camera-extensions:$camerax_version"
 
-    def camerax_version = "1.5.1"
-    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-view:${camerax_version}"
-    implementation "androidx.camera:camera-extensions:${camerax_version}"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
 
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.4'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    implementation "org.jetbrains.kotlin:kotlin-test:2.3.0"
 }

.idea/misc.xml

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.codebyashish.geotagimage
+package com.dangiashish.geotagimage
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -40,6 +40,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        Assert.assertEquals("com.codebyashish.geotagimage.test", appContext.packageName)
+        Assert.assertEquals("com.dangiashish.geotagimage.test", appContext.packageName)
     }
 }

GeoTagImage/build.gradle

@@ -263,7 +263,8 @@ class GeoTagImage(
                     // UI zoom 1x to 10x
                     val uiZoom = 1f + (progress / 10f)
 
-                    val cameraZoom = minZoom + ((uiZoom - 1f) / 9f) * (maxZoom - minZoom)
+            zoomSeekBar.max = 100
+            zoomSeekBar.progress = 0
 
                     camera?.cameraControl?.setZoomRatio(cameraZoom)
                     currentZoomRatio = cameraZoom
@@ -634,6 +635,7 @@ class GeoTagImage(
                 val bitmap = loadImageFromUrl(imageUrl)
                 if (bitmap != null) {
                     mapBitmap = bitmap
+                    processCapturedImage()
                 }
             } catch (e: Exception) {
                 e.printStackTrace()

…h/geotagimage/ExampleInstrumentedTest.kt …h/geotagimage/ExampleInstrumentedTest.ktGeoTagImage/src/androidTest/java/com/codebyashish/geotagimage/ExampleInstrumentedTest.kt renamed to GeoTagImage/src/androidTest/java/com/dangiashish/geotagimage/ExampleInstrumentedTest.kt GeoTagImage/src/androidTest/java/com/codebyashish/geotagimage/ExampleInstrumentedTest.kt renamed to GeoTagImage/src/androidTest/java/com/dangiashish/geotagimage/ExampleInstrumentedTest.kt

@@ -35,6 +35,9 @@ Key Features :
 - Control the features of GTI.
 - Set text size.
 - Image File GeoTagging
+- Camera Aspect Ratio Customization
+- Camera Flash Customization
+- Camera Zoom Customization
 ```
 
 ### Gradle
@@ -94,7 +97,7 @@ Add dependency in your `build.gradle` (module-level) file :
 ```groovy
 dependencies{
 
-    implementation 'com.github.dangiashish:GeoTagImage:1.2.1'
+    implementation 'com.github.dangiashish:GeoTagImage:1.2.2'
 }
 ```
 #### OR
@@ -103,7 +106,7 @@ Add dependency in your `build.gradle.kts` (module-level) file :
 ```groovy
 dependencies{
 
-    implementation("com.github.dangiashish:GeoTagImage:1.2.1")
+    implementation("com.github.dangiashish:GeoTagImage:1.2.2")
 }
 ```
 
@@ -217,6 +220,7 @@ geoTagImage.showAppName(true)
 geoTagImage.setImageQuality(ImageQuality.LOW) // Deprecated
 geoTagImage.setImageExtension(PNG)
 geoTagImage.setLabel("Clicked By") // Upload By || Author || Captured By
+geoTagImage.setCameraAspectRatio(GeoTagImage.Ratio_4X3)
 
 ```
 

GeoTagImage/src/main/java/com/dangiashish/GeoTagImage.kt

@@ -1,18 +1,19 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'maven-publish'
 }
 
 android {
-    namespace 'com.codebyashish.geotagimage.demo'
+    namespace 'com.dangiashish.geotagimage.demo'
     compileSdk = 36
 
     defaultConfig {
         applicationId "com.codebyashish.geotagimage.demo"
         minSdk 23
         targetSdk 36
-        versionCode 120
-        versionName "1.2.0"
+        versionCode 1
+        versionName "1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,7 +43,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation project(path: ':GeoTagImage')
     implementation 'androidx.core:core-ktx:1.17.0'
-    implementation 'androidx.activity:activity-ktx:1.11.0'
+    implementation 'androidx.activity:activity-ktx:1.12.2'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

GeoTagImage/src/test/java/com/codebyashish/geotagimage/ExampleUnitTest.kt

@@ -21,14 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package com.codebyashish.geotagimage
 
-package com.codebyashish.geotagimage.demo
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
+@Deprecated("geotagimage/PermissionCallback is deprecated")
+interface PermissionCallback {
+    fun onPermissionGranted()
+    fun onPermissionDenied()
+}
 
 /**
  * Instrumented test, which will execute on an Android device.

README.md

@@ -1,4 +1,4 @@
-package com.codebyashish.geotagimage.demo
+package com.dangiashish.geotagimage.demo
 /*
  * MIT License
  *
@@ -41,7 +41,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
 import androidx.fragment.app.FragmentActivity
-import com.codebyashish.geotagimage.demo.databinding.FragmentBlankBinding
+import com.dangiashish.geotagimage.demo.databinding.FragmentBlankBinding
 import com.dangiashish.PermissionCallback
 import com.dangiashish.GeoTagImage
 import java.io.File
@@ -93,7 +93,10 @@ class BlankFragment : Fragment(), PermissionCallback {
         // initialize the GeoTagImage class object with context and callback
         geoTagImage = GeoTagImage(mContext as AppCompatActivity, permissionLauncher, cameraLauncher)
         geoTagImage.requestCameraAndLocationPermissions()
-        geoTagImage.enableCameraX(false)
+
+
+
+
 
         binding.ivCamera.setOnClickListener {
             geoTagImage.launchCamera(