Merge pull request #83 from Omega-R/develop

Updated readme

Author: anton-knyazev

README.md

@@ -17,6 +17,7 @@ allprojects {
 }
 ```
 **Step 2.** Add the dependency
+#### If you use only Java.
 ```
 dependencies {
     implementation 'com.github.Omega-R.OmegaIntentBuilder:core:1.1.1'
@@ -26,6 +27,30 @@ dependencies {
 }
 ```
 
+#### If you use Kotlin or Java with Kotlin, please use kapt instead java annotationProcessor. Main build.gradle file should look like this
+```
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    generateStubs = true
+}
+
+android {
+    ......
+}    
+    
+dependencies {
+    implementation 'com.github.Omega-R.OmegaIntentBuilder:core:1.1.1'
+    // For extras
+    implementation 'com.github.Omega-R.OmegaIntentBuilder:annotations:1.1.1'
+    kapt 'com.github.Omega-R.OmegaIntentBuilder:processor:1.1.1'
+}
+```
+
+
+
 ## [Wiki](https://github.com/Omega-R/OmegaIntentBuilder/wiki)
 
 Supported features.

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
-    ext.supportVersion = '27.0.2'
+    ext.kotlin_version = '1.2.41'
+    ext.supportVersion = '27.1.1'
     ext.compileSdkVersion = 27
     ext.targetSdkVersion = 27
     ext.javapoet = '1.9.0'
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

examples/build.gradle

@@ -1,5 +1,10 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    generateStubs = true
+}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -31,17 +36,17 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportVersion"
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    api project(':core')
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
 
+    api project(':core')
     api project(':annotations')
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:support-v4:27.1.0'
-    implementation 'com.android.support:design:27.1.0'
-    annotationProcessor project(':processor')
+    kapt project(':processor')
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 repositories {

examples/src/main/java/com/omega_r/omegaintentbuilder/CropImageActivity.java

@@ -9,14 +9,14 @@
 import android.widget.Toast;
 import com.omega_r.libs.omegaintentbuilder.OmegaIntentBuilder;
 import com.omega_r.libs.omegaintentbuilder.downloader.DownloadCallback;
-import com.omega_r.libs.omegaintentbuilder.handlers.ActivityResultCallback;
 import com.omega_r.libs.omegaintentbuilder.handlers.ContextIntentHandler;
 import com.omega_r.libs.omegaintentbuilder.types.MimeTypes;
 
 import org.jetbrains.annotations.NotNull;
 
 public class CropImageActivity extends BaseActivity implements View.OnClickListener {
 
+    private static final int REQUEST_CODE = 111;
     private static final int DEFAULT_OUTPUT_X = 200;
     private static final int DEFAULT_OUTPUT_Y = 200;
 
@@ -49,14 +49,9 @@ private void crop() {
                 .cropImage()
                 .property(DEFAULT_OUTPUT_X, DEFAULT_OUTPUT_Y)
                 .bitmap(BitmapFactory.decodeResource(getResources(), R.drawable.crop_image))
-                .createIntentHandler()
+                .createIntentHandler(this)
                 .failToast("You don't have app for cropping image")
-                .startActivityForResult(new ActivityResultCallback() {
-                    @Override
-                    public void onActivityResult(int resultCode, @NotNull Intent data) {
-                        onResult(resultCode, data);
-                    }
-                });
+                .startActivityForResult(REQUEST_CODE);
     }
 
     private void cropFromInternet() {
@@ -69,18 +64,14 @@ private void cropFromInternet() {
                     @Override
                     public void onDownloaded(boolean success, @NotNull ContextIntentHandler contextIntentHandler) {
                         hideProgress();
-                        contextIntentHandler.startActivityForResult(new ActivityResultCallback() {
-                            @Override
-                            public void onActivityResult(int resultCode, @NotNull Intent data) {
-                                onResult(resultCode, data);
-                            }
-                        });
+                        startActivityForResult(contextIntentHandler.getIntent(), REQUEST_CODE);
                     }
                 });
     }
 
-    private void onResult(int resultCode, Intent data) {
-        if (resultCode == RESULT_OK) {
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {
             Bundle extras = data.getExtras();
             if (extras != null) {
                 Bitmap cropped = extras.getParcelable("data");

examples/src/main/java/com/omega_r/omegaintentbuilder/PickImageActivity.java

@@ -17,6 +17,7 @@
 
 public class PickImageActivity extends BaseActivity implements View.OnClickListener {
 
+    private static final int REQUEST_CODE = 141;
     private ImageView imageView;
 
     @Override
@@ -34,20 +35,20 @@ public void onClick(View v) {
                 .image()
                 .multiply(false)
                 .createIntentHandler(this)
-                .startActivityForResult(new ActivityResultCallback() {
-                    @Override
-                    public void onActivityResult(int resultCode, @Nullable Intent data) {
-                        if (resultCode == RESULT_OK && data != null) {
-                            try {
-                                Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), data.getData());
-                                imageView.setImageBitmap(bitmap);
-                            } catch (IOException exc) {
-                                exc.printStackTrace();
-                            }
-                        } else if (resultCode == RESULT_CANCELED) {
-                            Toast.makeText(getApplicationContext(), "Pick cancelled", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-                });
+                .startActivityForResult(REQUEST_CODE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE && resultCode == RESULT_OK && data != null) {
+            try {
+                Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), data.getData());
+                imageView.setImageBitmap(bitmap);
+            } catch (IOException exc) {
+                exc.printStackTrace();
+            }
+        } else if (resultCode == RESULT_CANCELED) {
+            Toast.makeText(getApplicationContext(), "Pick cancelled", Toast.LENGTH_SHORT).show();
+        }
     }
 }