Fix merge and added iOS code

Author: NGhebreial

.metadata

@@ -4,12 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-<<<<<<< HEAD
-  revision: 20e59316b8b8474554b38493b8ca888794b0234a
-  channel: stable
-=======
   revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
   channel: beta
->>>>>>> 4d92dc5f90835ff359f6354c50e7a5e4ac764ace
 
 project_type: plugin

CHANGELOG.md

@@ -1,5 +1,36 @@
+## 0.2.6
+
+* Some iOS fix 
+
 ## 0.2.5
 
 * Added iOS code made by @Bhagatcliffex 
 
 ## 0.2.4
+
+* Added new method that returns the file without saving it in the gallery
+
+## 0.2.3
+
+* Fixed bug that makes the app crash when deny the permissions 
+
+## 0.2.2
+
+* Fixed the way of request the permissions
+
+## 0.2.1
+
+* Fixed bug on permissions
+
+## 0.2.0
+
+* Migrate to AndroidX on android support library. 
+If you are using the android support library and you want to use that version, you should migrate to Androidx your project. 
+
+## 0.1.1
+
+* Some changes on readme.md
+
+## 0.1.0
+
+* Initial release

LICENSE

@@ -1 +1,29 @@
-TODO: Add your license here.
+BSD 3-Clause License
+
+Copyright (c) 2019, Nadia Ghebreial
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

android/build.gradle

@@ -1,4 +1,4 @@
-group 'com.cliffex.flutter_exif_rotation'
+group 'io.flutter.plugins.flutterexifrotation'
 version '1.0-SNAPSHOT'
 
 buildscript {
@@ -26,13 +26,13 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.0.2'
+    api 'androidx.core:core:1.0.0'
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.cliffex.flutter_exif_rotation">
-</manifest>
+<manifest package="io.flutter.plugins.flutterexifrotation"></manifest>

android/src/main/java/com/cliffex/flutter_exif_rotation/FlutterExifRotationPlugin.java renamed to android/src/main/java/io/flutter/plugins/flutterexifrotation/FlutterExifRotationPlugin.java

@@ -1,4 +1,4 @@
-package com.cliffex.flutter_exif_rotation;
+package io.flutter.plugins.flutterexifrotation;
 
 import android.Manifest;
 import android.app.Activity;
@@ -8,7 +8,6 @@
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.provider.MediaStore;
-import android.util.Log;
 
 import androidx.core.app.ActivityCompat;
 
@@ -27,6 +26,8 @@
  * FlutterExifRotationPlugin
  */
 public class FlutterExifRotationPlugin implements MethodCallHandler, PluginRegistry.RequestPermissionsResultListener {
+
+
     private final Registrar registrar;
 
     private Result result;
@@ -35,8 +36,7 @@ public class FlutterExifRotationPlugin implements MethodCallHandler, PluginRegis
     private final PermissionManager permissionManager;
 
 
-    static final int REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION = 2344;
-
+    static final int REQUEST_EXTERNAL_IMAGE_STORAGE_PERMISSION = 23483;
 
     interface PermissionManager {
         boolean isPermissionGranted(String permissionName);
@@ -116,7 +116,7 @@ public void rotateImage() {
 
         if (!permissionManager.isPermissionGranted(Manifest.permission.READ_EXTERNAL_STORAGE) ||
                 !permissionManager.isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            Log.w("rotateImage", "rotate image request permission");
+
             permissionManager.askForPermission(new String[]{
                             Manifest.permission.READ_EXTERNAL_STORAGE,
                             Manifest.permission.WRITE_EXTERNAL_STORAGE},
@@ -172,12 +172,11 @@ public void launchRotateImage() {
             fOut.flush(); // Not really required
             fOut.close(); // do not forget to close the stream
 
-            if (save)
+            if( save )
                 MediaStore.Images.Media.insertImage(registrar.activity().getContentResolver(), file.getAbsolutePath(), file.getName(), file.getName());
 
             result.success(file.getPath());
         } catch (IOException e) {
-            Log.w("rotateImage error", e.getMessage() + "");
             result.error("error", "IOexception", null);
             e.printStackTrace();
         }
@@ -190,5 +189,4 @@ private static Bitmap rotate(Bitmap source, float angle) {
         return Bitmap.createBitmap(source, 0, 0, source.getWidth(), source.getHeight(),
                 matrix, true);
     }
-
 }

example/.gitignore

@@ -1,5 +1,6 @@
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp
@@ -15,10 +16,8 @@
 *.iws
 .idea/
 
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
+# Visual Studio Code related
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -27,7 +26,7 @@
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
 
 # Android related
 **/android/**/gradle-wrapper.jar

example/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 20e59316b8b8474554b38493b8ca888794b0234a
-  channel: stable
+  revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
+  channel: beta
 
 project_type: app

example/README.md

@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
 
 A few resources to get you started if this is your first Flutter project:
 
-- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
+- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
 
-For help getting started with Flutter, view our
-[online documentation](https://flutter.dev/docs), which offers tutorials,
+For help getting started with Flutter, view our 
+[online documentation](https://flutter.io/docs), which offers tutorials, 
 samples, guidance on mobile development, and a full API reference.

example/android/app/build.gradle

@@ -33,12 +33,12 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.cliffex.flutter_exif_rotation_example"
+        applicationId "io.flutter.plugins.flutterexifrotationexample"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -56,6 +56,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }