Create an empty GravatarUCropActivity to avoid Manifest merger fails (#398)

Author: AdamGrzybkowski

demo-app/build.gradle.kts

@@ -117,6 +117,7 @@ dependencies {
     implementation(libs.coil.compose)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.ucrop)
     implementation(project(":gravatar"))
     implementation(project(":gravatar-ui"))
     implementation(project(":gravatar-quickeditor"))

demo-app/src/main/AndroidManifest.xml

@@ -55,6 +55,12 @@
 <!--                    android:scheme="${DEMO_OAUTH_REDIRECT_URI_SCHEME}" />-->
 <!--            </intent-filter>-->
         </activity>
+
+        <!-- Lib activities -->
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/Theme.AppCompat" />
+
         <provider
             android:name=".DemoFileProvider"
             android:authorities="${applicationId}.fileprovider"

gravatar-quickeditor/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
 
         <!-- Lib activities-->
         <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
+            android:name=".ui.cropperlauncher.GravatarUCropActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
     </application>
 

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/avatarpicker/AvatarPicker.kt

@@ -50,8 +50,8 @@ import com.gravatar.quickeditor.ui.components.EmailLabel
 import com.gravatar.quickeditor.ui.components.ErrorSection
 import com.gravatar.quickeditor.ui.components.FailedAvatarUploadAlertDialog
 import com.gravatar.quickeditor.ui.components.ProfileCard
-import com.gravatar.quickeditor.ui.copperlauncher.CropperLauncher
-import com.gravatar.quickeditor.ui.copperlauncher.UCropCropperLauncher
+import com.gravatar.quickeditor.ui.cropperlauncher.CropperLauncher
+import com.gravatar.quickeditor.ui.cropperlauncher.UCropCropperLauncher
 import com.gravatar.quickeditor.ui.editor.AvatarPickerContentLayout
 import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorParams
 import com.gravatar.quickeditor.ui.editor.bottomsheet.DEFAULT_PAGE_HEIGHT

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/copperlauncher/CropperLauncher.kt renamed to gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/cropperlauncher/CropperLauncher.kt

@@ -1,4 +1,4 @@
-package com.gravatar.quickeditor.ui.copperlauncher
+package com.gravatar.quickeditor.ui.cropperlauncher
 
 import android.content.Context
 import android.content.Intent

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/copperlauncher/UCropCropperLauncher.kt renamed to gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/cropperlauncher/UCropCropperLauncher.kt

@@ -1,4 +1,4 @@
-package com.gravatar.quickeditor.ui.copperlauncher
+package com.gravatar.quickeditor.ui.cropperlauncher
 
 import android.content.Context
 import android.content.Intent
@@ -24,7 +24,21 @@ internal class UCropCropperLauncher : CropperLauncher {
             setCircleDimmedLayer(true)
         }
         launcher.launch(
-            UCrop.of(image, Uri.fromFile(tempFile)).withAspectRatio(1f, 1f).withOptions(options).getIntent(context),
+            UCrop.of(image, Uri.fromFile(tempFile))
+                .withAspectRatio(1f, 1f)
+                .withOptions(options)
+                .getGravatarIntent(context),
         )
     }
 }
+
+private fun UCrop.getGravatarIntent(context: Context): Intent {
+    return getIntent(context).apply {
+        setClass(context, GravatarUCropActivity::class.java)
+    }
+}
+
+/**
+ * Empty Activity to not cause conflicts with UCropActivity when third-party apps depend on it already
+ */
+internal class GravatarUCropActivity : UCropActivity()