enable freeform cropping to close #91

Author: klinker24

app/build.gradle

@@ -186,7 +186,7 @@ dependencies {
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
     implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
     implementation 'com.flipboard:bottomsheet-core:1.5.0'
-    implementation 'com.yalantis:ucrop:1.5.0'
+    implementation 'com.github.yalantis:ucrop:2.2.2'
     implementation 'me.leolin:ShortcutBadger:1.1.14@aar'
     implementation 'com.github.ajalt.reprint:core:2.9.2@aar'
     implementation 'com.github.ajalt.reprint:reprint_spass:2.9.2@aar'

app/src/main/java/com/klinker/android/twitter_l/activities/DirectMessageConversation.java

@@ -526,6 +526,7 @@ private void startUcrop(Uri sourceUri) {
             options.setActiveWidgetColor(settings.themeColors.accentColor);
             options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
             options.setCompressionQuality(100);
+            options.setFreeStyleCropEnabled(true);
 
             File destination = File.createTempFile("ucrop", "jpg", getCacheDir());
             UCrop.of(sourceUri, Uri.fromFile(destination))

app/src/main/java/com/klinker/android/twitter_l/activities/compose/Compose.java

@@ -918,6 +918,7 @@ private void startUcrop(Uri sourceUri) {
             options.setActiveWidgetColor(settings.themeColors.accentColor);
             options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
             options.setCompressionQuality(100);
+            options.setFreeStyleCropEnabled(true);
 
             File destination = File.createTempFile("ucrop", "jpg", getCacheDir());
             UCrop.of(sourceUri, Uri.fromFile(destination))

app/src/main/java/com/klinker/android/twitter_l/activities/media_viewer/image/ImageFragment.kt

@@ -110,7 +110,7 @@ class ImageFragment : Fragment() {
             } catch (e: Exception) { }
 
 
-            return url ?: ""
+            return url?.replace("http://", "https://") ?: ""
         }
     }
 
@@ -126,7 +126,7 @@ class ImageFragment : Fragment() {
 
 
     fun downloadImage() {
-        TimeoutThread({
+        TimeoutThread {
             Looper.prepare()
             val url = getLink(arguments)
 
@@ -175,8 +175,8 @@ class ImageFragment : Fragment() {
 
                 var uri = IOUtils.saveImage(bitmap, name, activity)
                 val root = Environment.getExternalStorageDirectory().toString()
-                val myDir = File(root + "/Talon")
-                val file = File(myDir, name + ".jpg")
+                val myDir = File("$root/Talon")
+                val file = File(myDir, "$name.jpg")
 
                 try {
                     uri = FileProvider.getUriForFile(activity,
@@ -204,13 +204,13 @@ class ImageFragment : Fragment() {
                 mNotificationManager.notify(randomId, builder2.build())
             } catch (e: Exception) {
                 e.printStackTrace()
-                activity.runOnUiThread({
+                activity.runOnUiThread {
                     try {
                         PermissionModelUtils(activity).showStorageIssue(e)
                     } catch (x: Exception) {
                         e.printStackTrace()
                     }
-                })
+                }
 
                 try {
                     val builder2 = NotificationCompat.Builder(activity, NotificationChannelUtil.MEDIA_DOWNLOAD_CHANNEL)
@@ -225,7 +225,7 @@ class ImageFragment : Fragment() {
                 } catch (x: IllegalStateException) {
                 }
             }
-        }).start()
+        }.start()
     }
 
     fun shareImage() {
@@ -240,7 +240,7 @@ class ImageFragment : Fragment() {
                         .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                         .get()
 
-                activity.runOnUiThread({
+                activity.runOnUiThread {
                     // create the intent
                     val sharingIntent = Intent(android.content.Intent.ACTION_SEND)
                     sharingIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -252,7 +252,7 @@ class ImageFragment : Fragment() {
 
                     // start the chooser
                     activity.startActivity(Intent.createChooser(sharingIntent, activity.getString(R.string.menu_share) + ": "))
-                })
+                }
             } catch (e: Exception) {
 
             }

app/src/main/java/com/klinker/android/twitter_l/activities/profile_viewer/ProfilePager.java

@@ -1725,6 +1725,7 @@ private void startUcrop(Uri sourceUri) {
             options.setActiveWidgetColor(settings.themeColors.accentColor);
             options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
             options.setCompressionQuality(90);
+            options.setFreeStyleCropEnabled(true);
 
             File destination = File.createTempFile("ucrop", "jpg", getCacheDir());
             UCrop.of(sourceUri, Uri.fromFile(destination))