custom ui adjustment (#365)

imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerLauncher.kt

@@ -17,29 +17,30 @@ import com.esafirm.imagepicker.model.Image
 /* --------------------------------------------------- */
 
 class ImagePickerLauncher(
-    private val context: Context,
+    private val context: () -> Context,
     private val resultLauncher: ActivityResultLauncher<Intent>
 ) {
     fun launch(config: BaseConfig = ImagePickerConfig()) {
         val finalConfig = if (config is ImagePickerConfig) checkConfig(config) else config
-        val intent = createImagePickerIntent(context, finalConfig)
+        val intent = createImagePickerIntent(context(), finalConfig)
         resultLauncher.launch(intent)
     }
 }
 
 typealias ImagePickerCallback = (List<Image>) -> Unit
 
 fun Fragment.registerImagePicker(
-    context: Context,
+    context: () -> Context = { requireContext() },
     callback: ImagePickerCallback
 ): ImagePickerLauncher {
     return ImagePickerLauncher(context, createLauncher(callback))
 }
 
 fun ComponentActivity.registerImagePicker(
+    context: () -> Context = { this },
     callback: ImagePickerCallback
 ): ImagePickerLauncher {
-    return ImagePickerLauncher(this, createLauncher(callback))
+    return ImagePickerLauncher(context, createLauncher(callback))
 }
 
 fun createImagePickerIntent(context: Context, config: BaseConfig): Intent {

sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt

@@ -0,0 +1,50 @@
+package com.esafirm.sample
+
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
+import androidx.test.runner.AndroidJUnit4
+import com.esafirm.sample.utils.ViewAsserts
+import com.esafirm.sample.utils.Views
+import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class CustomUiTest {
+
+    @Rule
+    @JvmField
+    var testRule = ActivityTestRule(MainActivity::class.java)
+
+    @Rule
+    @JvmField
+    var grantPermissionRule = GrantPermissionRule.grant(
+        "android.permission.WRITE_EXTERNAL_STORAGE"
+    )
+
+    @Test
+    fun cameraOnlyTestTwo() {
+        clickOn(R.id.button_custom_ui)
+
+        val recyclerView = Views.recyclersView()
+        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, ViewActions.click()))
+
+        // Click done button
+        val actionMenuItemView = Views.pickerDoneButton()
+        actionMenuItemView.perform(ViewActions.click())
+
+        // Check if image is picked
+        Views.waitFor(500)
+        clickOn(R.id.text_view)
+
+        val imageView = Views.imageDetail()
+        ViewAsserts.imagePicked(imageView)
+    }
+}

sample/src/main/java/com/esafirm/sample/MainFragment.kt

@@ -1,6 +1,5 @@
 package com.esafirm.sample
 
-import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
@@ -12,16 +11,11 @@ class MainFragment : Fragment(R.layout.fragment_main) {
 
     private lateinit var binding: FragmentMainBinding
 
-    private lateinit var imagePickerLauncher: ImagePickerLauncher
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        imagePickerLauncher = registerImagePicker(context) {
-            val firstImage = it.firstOrNull() ?: return@registerImagePicker
-            Glide.with(binding.imgFragment)
-                .load(firstImage.uri)
-                .into(binding.imgFragment)
-        }
+    private val imagePickerLauncher = registerImagePicker {
+        val firstImage = it.firstOrNull() ?: return@registerImagePicker
+        Glide.with(binding.imgFragment)
+            .load(firstImage.uri)
+            .into(binding.imgFragment)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {