Master non native

README.md

@@ -13,21 +13,21 @@
 
 <a href="https://play.google.com/store/apps/details?id=com.yalantis.ucrop.sample&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="185" height="70"/></a>
 
-1. Include the library as local library project.
+1. Include the library as a local library project.
 
 	```
 	allprojects {
 	   repositories {
-	      jcenter()
+	      ...
 	      maven { url "https://jitpack.io" }
 	   }
 	}
 	```
 
-    ``` compile 'com.github.yalantis:ucrop:2.2.2' ``` - lightweight general solution 
-    
-    ``` compile 'com.github.yalantis:ucrop:2.2.2-native' ``` - get power of the native code to preserve image quality (+ about 1.5 MB to an apk size)
-    
+    ``` implementation 'com.github.yalantis:ucrop:2.2.3' ``` - lightweight general solution 
+
+    ``` implementation 'com.github.yalantis:ucrop:2.2.3-native' ``` - get power of the native code to preserve image quality (+ about 1.5 MB to an apk size)
+
 2. Add UCropActivity into your AndroidManifest.xml
 
     ```
@@ -73,29 +73,46 @@ If you want to let your users choose crop ratio dynamically, just do not call `w
 
 uCrop builder class has method `withOptions(UCrop.Options options)` which extends library configurations.
 
-Currently you can change:
+Currently, you can change:
 
    * image compression format (e.g. PNG, JPEG, WEBP), compression
    * image compression quality [0 - 100]. PNG which is lossless, will ignore the quality setting.
    * whether all gestures are enabled simultaneously
-   * maximum size for Bitmap that is decoded from source Uri and used within crop view. If you want to override default behaviour.
+   * maximum size for Bitmap that is decoded from source Uri and used within crop view. If you want to override the default behaviour.
    * toggle whether to show crop frame/guidelines
    * setup color/width/count of crop frame/rows/columns
-   * choose whether you want rectangle or oval crop area
+   * choose whether you want rectangle or oval(`options.setCircleDimmedLayer(true)`) crop area
    * the UI colors (Toolbar, StatusBar, active widget state)
    * and more...
-
+
+Since version 2.2.7 in case if you need to change transport protocol, setup timeout etc. You may set your `OkHttpClient` next way:
+
+    ```java
+    new UCropInitializer().setOkHttpClient(client);
+    ``` 
+
 # Compatibility
-  
+
   * Library - Android ICS 4.0+ (API 14) (Android GINGERBREAD 2.3+ (API 10) for versions <= 1.3.2)
   * Sample - Android ICS 4.0+ (API 14)
   * CPU - armeabi armeabi-v7a x86 x86_64 arm64-v8a (for versions >= 2.1.2)
-  
+
 # Changelog
-### Version: 2.2.2
 
-* uCrop fragment added
-* bugfix
+### Version: 2.2.8
+
+*   Merged pending pull requests with improvements and bugfixes
+*   Update compileSdk and targetSdk versions up to 31
+*   Add localizations
+*   Fixed [#609](https://github.com/Yalantis/uCrop/issues/609)
+*   Fixed [#794](https://github.com/Yalantis/uCrop/issues/794)
+
+### Version: 2.2.3
+
+  * Several fixes including [#445](https://github.com/Yalantis/uCrop/issues/445), [#465](https://github.com/Yalantis/uCrop/issues/465) and more!
+  * Material design support
+  * uCrop fragment as child fragment
+  * Added the Italian language
 
 ### Version: 2.2.2
 
@@ -114,7 +131,7 @@ Currently you can change:
 ### Version: 2.1
 
   * Fixes issue with EXIF data (images taken on front camera with Samsung devices mostly) [#130](https://github.com/Yalantis/uCrop/issues/130) [#111](https://github.com/Yalantis/uCrop/issues/111)
-  * Added API to set custom set of aspect ratio options for user. [#131](https://github.com/Yalantis/uCrop/issues/131)
+  * Added API to set custom set of aspect ratio options for the user. [#131](https://github.com/Yalantis/uCrop/issues/131)
   * Added API to set all configs via UCrop.Options class. [#126](https://github.com/Yalantis/uCrop/issues/126)
   * Added ABI x86_64 support. [#105](https://github.com/Yalantis/uCrop/issues/105)
 
@@ -123,7 +140,7 @@ Currently you can change:
   * Native image crop (able to crop high-resolution images, e.g. 16MP & 32MP images on Nexus 5X).
   * WebP compression format is not supported at the moment (choose JPEG or PNG).
   * Now library copies EXIF data to cropped image (size and orientation are updated).
-  
+
 ### Version: 1.5
 
   * Introduced "Freestyle" crop (you can resize crop rectangle by dragging it corners) [#32](https://github.com/Yalantis/uCrop/issues/32)
@@ -132,21 +149,21 @@ Currently you can change:
 
 ### Version: 1.4
 
-  * Introduced http(s) Uri support!
-  * Image is cropped in background thread.
+  * Introduced HTTP(s) Uri support!
+  * Image is cropped in a background thread.
   * Showing loader while Bitmap is processed (both loading and cropping).
   * Several bug fixes.
   * Couple new things to configure.
   * Updated minSdkVersion to Android ICS 4.0 (no reason to support couple percents of old phones).
 
 ### Version: 1.3
 
-  * Image is loaded in background thread. Better error-handling for image decoding.
+  * Image is loaded in a background thread. Better error-handling for image decoding.
   * Improved EXIF data support (rotation and mirror).
   * Small UI updates.
   * Couple new things to configure.
-  
-  * Sample updated with possibility to choose custom aspect ratio.
+
+  * Sample updated with the possibility to choose custom aspect ratio.
 
 ### Version: 1.2
 
@@ -162,7 +179,7 @@ Currently you can change:
 
 ### Let us know!
 
-We’d be really happy if you sent us links to your projects where you use our component. Just send an email to [email protected] And do let us know if you have any questions or suggestion regarding the library. 
+We’d be really happy if you sent us links to your projects where you use our component. Just send an email to [email protected] And do let us know if you have any questions or suggestion regarding the library.
 
 #### Apps using uCrop
 

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
     ext {
-        androidx_appcompat_version = "1.1.0"
+        androidx_appcompat_version = "1.3.0"
         androidx_core_version = "1.1.0"
-        androidx_exifinterface_version = "1.1.0-beta01"
-        androidx_transition_version = "1.2.0-rc01"
+        androidx_exifinterface_version = "1.3.2"
+        androidx_transition_version = "1.4.1"
         constraintlayout_version = "1.1.3"
     }
 
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
@@ -28,7 +28,7 @@ allprojects {
     group = GROUP
 
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'

gradle.properties

@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=2.2.2-non-native
-VERSION_CODE=24
+VERSION_NAME=2.2.8-native
+VERSION_CODE=26
 GROUP=com.yalantis
 
 POM_DESCRIPTION=Android Library for cropping images

sample/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "com.yalantis.ucrop.sample"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 13
         versionName "1.2.4"
     }
@@ -38,5 +38,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.1.0"
     implementation "androidx.core:core:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "com.squareup.okhttp3:okhttp:3.12.13"
     implementation project(':ucrop')
 }

sample/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".SampleApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -23,7 +24,8 @@
 
         <activity
             android:name=".SampleActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

sample/src/main/java/com/yalantis/ucrop/sample/ResultActivity.java

@@ -18,24 +18,30 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.FileProvider;
+
+import com.yalantis.ucrop.util.BitmapLoadUtils;
 import com.yalantis.ucrop.view.UCropView;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.channels.FileChannel;
 import java.util.Calendar;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
-import androidx.core.content.FileProvider;
-
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 import static android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
 
@@ -59,27 +65,58 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_result);
         Uri uri = getIntent().getData();
+        int width = 0;
+        int height = 0;
         if (uri != null) {
             try {
                 UCropView uCropView = findViewById(R.id.ucrop);
                 uCropView.getCropImageView().setImageUri(uri, null);
                 uCropView.getOverlayView().setShowCropFrame(false);
                 uCropView.getOverlayView().setShowCropGrid(false);
                 uCropView.getOverlayView().setDimmedColor(Color.TRANSPARENT);
+
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && "content".equals(uri.getScheme())) {
+                    TextView textViewExifWarning = findViewById(R.id.text_view_content_warning);
+                    textViewExifWarning.setVisibility(View.VISIBLE);
+                }
             } catch (Exception e) {
                 Log.e(TAG, "setImageUri", e);
                 Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
             }
+
+            final BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+
+            if ("content".equals(uri.getScheme())) {
+                InputStream is = null;
+                try {
+                    is = getContentResolver().openInputStream(uri);
+                    BitmapFactory.decodeStream(is, null, options);
+                } catch (FileNotFoundException e) {
+                    Log.d(TAG, e.getMessage(), e);
+                } finally {
+                    if (is != null) {
+                        try {
+                            is.close();
+                        } catch (IOException e) {
+                            Log.e(TAG, e.getMessage(), e);
+                        }
+                    }
+                }
+            } else {
+                File file = new File(getIntent().getData().getPath());
+                BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+            }
+
+            width = options.outWidth;
+            height = options.outHeight;
         }
-        final BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-        BitmapFactory.decodeFile(new File(getIntent().getData().getPath()).getAbsolutePath(), options);
 
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(getString(R.string.format_crop_result_d_d, options.outWidth, options.outHeight));
+            actionBar.setTitle(getString(R.string.format_crop_result_d_d, width, height));
         }
     }
 
@@ -131,6 +168,9 @@ private void saveCroppedImage() {
                     Toast.makeText(ResultActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
                     Log.e(TAG, imageUri.toString(), e);
                 }
+            } else if (BitmapLoadUtils.hasContentScheme(imageUri)){
+                Toast.makeText(ResultActivity.this, getString(R.string.toast_already_saved), Toast.LENGTH_SHORT).show();
+                finish();
             } else {
                 Toast.makeText(ResultActivity.this, getString(R.string.toast_unexpected_error), Toast.LENGTH_SHORT).show();
             }