Fix samples

CanHub · Nov 28, 2021 · 38df145 · 38df145
1 parent 5ee2f30
commit 38df145
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 494 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,6 +29,6 @@ Path: `.idea/codeStyles/` Please never change anything inside this folders
 - After changes you can run `./gradlew ktlintFormat` or the shortcuts in your touched files.
 
 ### General code library rules
-- We do not use reflection without need, so avoid any `::` kotlint reflection without need.
-- Documentation should alwways reflect the latest and best way of using the library, if is not let's fix.
+- We do not use reflection without need, so avoid any `::` kotlin reflection without need.
+- Documentation should always reflect the latest and best way of using the library, if is not let's fix.
 - For tests we use GIVEN/WHEN/THEN pattern
diff --git a/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt b/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt
@@ -20,10 +20,6 @@ import com.canhub.cropper.databinding.CropImageActivityBinding
 import com.canhub.cropper.utils.getUriForFile
 import java.io.File
 
-/**
- * Built-in activity for image cropping.<br></br>
- * Use [CropImage.activity] to create a builder to start this activity.
- */
 open class CropImageActivity :
     AppCompatActivity(),
     OnSetImageUriCompleteListener,
@@ -69,10 +65,10 @@ open class CropImageActivity :
                         cropImageOptions.imageSourceIncludeCamera ->
                         showImageSourceDialog(
                             openCamera = { openCamera() },
-                            openGallery = { pickImageGallery.launch("/image/*") },
+                            openGallery = { pickImageGallery.launch("image/*") },
                         )
                     cropImageOptions.imageSourceIncludeGallery ->
-                        pickImageGallery.launch("/image/*")
+                        pickImageGallery.launch("image/*")
                     cropImageOptions.imageSourceIncludeCamera ->
                         openCamera()
                     else -> finish()
@@ -111,10 +107,12 @@ open class CropImageActivity :
      * and customised with the app layout if need.
      */
     open fun showImageSourceDialog(openCamera: () -> Unit, openGallery: () -> Unit) {
+        // TODO improve layout
         AlertDialog.Builder(this)
             .setTitle(R.string.pick_image_chooser_title)
             .setNegativeButton(R.string.pick_image_camera) { _, _ -> openCamera() }
             .setPositiveButton(R.string.pick_image_gallery) { _, _ -> openGallery() }
+            .show()
     }
 
     public override fun onStart() {

diff --git a/cropper/src/main/res/xml/library_file_paths.xml b/cropper/src/main/res/xml/library_file_paths.xml
@@ -1,4 +1,14 @@
 <paths>
-    <files-path name="cropper" path="cropper-internal/" />
-    <external-files-path name="my_images" path="/" />
+    <files-path
+        name="cropper"
+        path="cropper-internal/" />
+    <external-files-path
+        name="my_images"
+        path="/" />
+    <cache-path
+        name="cached_files"
+        path="." />
+    <files-path
+        name="images"
+        path="." />
 </paths>
diff --git a/cropper/src/test/java/com/canhub/cropper/ContractTestFragment.kt b/cropper/src/test/java/com/canhub/cropper/ContractTestFragment.kt
@@ -16,19 +16,11 @@ class ContractTestFragment(
         this.cropResult = result
     }
 
-    val pickImage = registerForActivityResult(PickImageContract(), registry) { result ->
-        this.pickResult = result
-    }
-
     fun cropImage(input: CropImageContractOptions) {
         cropImage.launch(input)
     }
 
     fun cropImageIntent(input: CropImageContractOptions): Intent {
         return cropImage.contract.createIntent(requireContext(), input)
     }
-
-    fun pickImageIntent(input: PickImageContractOptions): Intent {
-        return pickImage.contract.createIntent(requireContext(), input)
-    }
 }
diff --git a/cropper/src/test/java/com/canhub/cropper/CropImageContractTest.kt b/cropper/src/test/java/com/canhub/cropper/CropImageContractTest.kt
@@ -174,7 +174,6 @@ package com.canhub.cropper
 //        // THEN
 //        assertEquals(expectedClassName, cropImageIntent?.component?.className)
 //        assertEquals(expectedSource, bundle?.getParcelable(CropImage.CROP_IMAGE_EXTRA_SOURCE))
-//        assertEquals(options.options, bundle?.getParcelable(CropImage.CROP_IMAGE_EXTRA_OPTIONS))
 //    }
 //
 //    @Test

diff --git a/cropper/src/test/java/com/canhub/cropper/PickImageContractTest.kt b/cropper/src/test/java/com/canhub/cropper/PickImageContractTest.kt
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -23,14 +23,5 @@
             android:name="com.canhub.cropper.sample.extend_activity.app.SExtendActivity"
             android:theme="@style/Theme.SampleNoActionBar" />
 
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_file_paths" />
-        </provider>
     </application>
 </manifest>