From eb81adc512cee93ecc28df8c2868fefc1db51144 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 24 Aug 2019 16:39:53 +0200
Subject: [PATCH] Change crop feature

---
 app/build.gradle                                    |  2 +-
 app/src/main/AndroidManifest.xml                    |  6 ++----
 .../android/activities/PhotoEditorActivity.java     | 13 ++++++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 020937b5d..c95776d95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:4.0.0'
     playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
     implementation 'ja.burhanrashid52:photoeditor:0.4.0'
-    implementation 'com.github.yalantis:ucrop:2.2.3'
+    api 'com.theartofdev.edmodo:android-image-cropper:2.8.+'
 
     implementation "net.gotev:uploadservice:$uploadServiceVersion"
     implementation "net.gotev:uploadservice-okhttp:$uploadServiceVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc6012de3..65f63b27d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -194,10 +194,8 @@
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|screenSize"
             />
-        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:theme="@style/Base.Theme.AppCompat"/>
 
         <activity android:name="app.fedilab.android.activities.WebviewActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
index 408bbdd33..6829af629 100644
--- a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
@@ -60,7 +60,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 
-import com.yalantis.ucrop.UCrop;
+import com.theartofdev.edmodo.cropper.CropImage;
 
 import java.io.File;
 import java.io.IOException;
@@ -380,8 +380,9 @@ public class PhotoEditorActivity  extends BaseActivity implements OnPhotoEditorL
                         e.printStackTrace();
                     }
                     break;
-                case UCrop.REQUEST_CROP:
-                    final Uri resultUri = UCrop.getOutput(data);
+                case CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE:
+                    CropImage.ActivityResult result = CropImage.getActivityResult(data);
+                    Uri resultUri = result.getUri();
                     if( resultUri != null) {
                         mPhotoEditorView.getSource().setImageURI(resultUri);
                         mPhotoEditorView.getSource().setRotation(rotationInDegrees);
@@ -511,10 +512,8 @@ public class PhotoEditorActivity  extends BaseActivity implements OnPhotoEditorL
                 mStickerBSFragment.show(getSupportFragmentManager(), mStickerBSFragment.getTag());
                 break;
             case CROP:
-                String filename = System.currentTimeMillis()+"_"+Helper.getFileName(PhotoEditorActivity.this, uri);
-                tempname = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(new Date()) + filename;
-                UCrop.of(uri, Uri.fromFile(new File(getCacheDir(),tempname)))
-                        .start(PhotoEditorActivity.this);
+                CropImage.activity(uri)
+                        .start(this);
                 break;
         }
     }