GridCallback added.

Changed modifiers of CropperGridView and CropperImageView to make package private
jayrambhia · Dec 27, 2017 · fbc3394 · fbc3394
1 parent 05d34ed
commit fbc3394
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 30 deletions.
diff --git a/nocropper/src/main/java/com/fenchtose/nocropper/CropperGridView.java b/nocropper/src/main/java/com/fenchtose/nocropper/CropperGridView.java
@@ -15,7 +15,7 @@
 /**
  * Created by Jay Rambhia on 11/4/2015.
  */
-public class CropperGridView extends View {
+class CropperGridView extends View {
 
     private static final String TAG = "CropperGridView";
 

diff --git a/nocropper/src/main/java/com/fenchtose/nocropper/CropperImageView.java b/nocropper/src/main/java/com/fenchtose/nocropper/CropperImageView.java
@@ -23,7 +23,7 @@
 /**
  * Created by Jay Rambhia on 10/29/2015.
  */
-public class CropperImageView extends ImageView {
+class CropperImageView extends ImageView {
 
     private static final String TAG = "CropperImageView";
 

diff --git a/nocropper/src/main/java/com/fenchtose/nocropper/CropperView.java b/nocropper/src/main/java/com/fenchtose/nocropper/CropperView.java
@@ -20,6 +20,8 @@ public class CropperView extends FrameLayout {
 
     private boolean gestureEnabled = true;
 
+    private GridCallback gridCallback;
+
     public CropperView(Context context) {
         super(context);
         init(context, null);
@@ -181,12 +183,30 @@ private class TouchGestureCallback implements CropperImageView.GestureCallback {
 
         @Override
         public void onGestureStarted() {
-            mGridView.setShowGrid(true);
+            mGridView.setShowGrid(gridCallback == null || gridCallback.onGestureStarted());
         }
 
         @Override
         public void onGestureCompleted() {
-            mGridView.setShowGrid(false);
+            mGridView.setShowGrid(gridCallback != null && gridCallback.onGestureCompleted());
         }
     }
+
+    public void setGridCallback(GridCallback gridCallback) {
+        this.gridCallback = gridCallback;
+    }
+
+    public interface GridCallback {
+        /**
+         * Invoked when user user touches the grid
+         * @return true if you want to show grid, else false
+         */
+        boolean onGestureStarted();
+
+        /**
+         * Invoked when user completes the gesture
+         * @return true if you want to show grid, else false
+         */
+        boolean onGestureCompleted();
+    }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -26,6 +26,6 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     //Butterknife
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.fenchtose.nocropper:nocropper:0.2.0'
-//    compile project(':nocropper')
+//    compile 'com.fenchtose.nocropper:nocropper:0.2.0'
+    compile project(':nocropper')
 }
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -22,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -62,20 +62,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -89,7 +89,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.3.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.3.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.3.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.fenchtose.nocropper/nocropper/0.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -105,19 +104,19 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
-    <orderEntry type="library" exported="" name="nocropper-0.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.jakewharton:butterknife:7.0.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-media-compat-25.3.1" level="project" />
+    <orderEntry type="module" module-name="nocropper" exported="" />
   </component>
 </module>
diff --git a/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java b/sample/src/main/java/com/fenctose/imagecropper/MainActivity.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.jar.Manifest;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -49,6 +48,18 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         ButterKnife.bind(this);
         mImageView.setDebug(true);
+
+        mImageView.setGridCallback(new CropperView.GridCallback() {
+            @Override
+            public boolean onGestureStarted() {
+                return true;
+            }
+
+            @Override
+            public boolean onGestureCompleted() {
+                return false;
+            }
+        });
     }
 
     @OnClick(R.id.image_button)