Migrate to androidx and add builder method for save

hsmnzaydn · May 10, 2020 · b67541a · b67541a
1 parent 4bfbafc
commit b67541a
Show file tree

Hide file tree

Showing 18 changed files with 214 additions and 90 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -47,24 +47,22 @@ allprojects {
 <h3>Save Image As File</h3>
        
 
- **Step 1.** Init ImageViewZoomConfig and set saveProperty field as "true"
-
+ **Step 1.** </br>
+ <b>Init ImageViewZoomConfig</b> </br>
+ Set saveProperty field as "true"
+ </br>
+ </br>
+ <b>Init saveMethod </b></br>
+ If you want show save option to user only when open dialog you have to set "ImageViewZoomConfig.ImageViewZoomConfigSaveMethod" as "onlyOnDialog" </br>
+ If you want save image when run code you have to set "ImageViewZoomConfig.ImageViewZoomConfigSaveMethod" as "always".
 
-    ImageViewZoomConfig imageViewZoomConfig=new ImageViewZoomConfig();  
-    imageViewZoomConfig.saveProperty(true);
-**Step 2.** Init "ImageViewZoomConfig.ImageViewZoomConfigSaveMethod" 
-      **Note:** If you want show save option to user only when open dialog you have to set "ImageViewZoomConfig.ImageViewZoomConfigSaveMethod" as "onlyOnDialog"
-      If you want save image when run code you have to set "ImageViewZoomConfig.ImageViewZoomConfigSaveMethod" as "always".
-
-
-    ImageViewZoomConfig.ImageViewZoomConfigSaveMethod imageViewZoomConfigSaveMethod = ImageViewZoomConfig.ImageViewZoomConfigSaveMethod.onlyOnDialog; // You can use always
-    imageViewZoomConfig.setImageViewZoomConfigSaveMethod(imageViewZoomConfigSaveMethod);
+     ImageViewZoomConfig imageViewZoomConfig =new ImageViewZoomConfig.Builder().saveProperty(true).saveMethod(ImageViewZoomConfig.ImageViewZoomConfigSaveMethod.onlyOnDialog).build();
 
-**Step 3.** Set Config
+**Step 2.** Set Config
 
     imageViewZoom.setConfig(imageViewZoomConfig);
 
-**Step 4.** Use "saveImage()" method
+**Step 3.** Use "saveImage()" method
 
     imageViewZoom.saveImage(MainActivity.this, "ImageViewZoom", "test", Bitmap.CompressFormat.JPEG, 1, imageViewZoomConfig,new SaveFileListener() {  
       @Override   

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,10 +20,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0-beta01'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     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.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     compile project(path: ':image-zoom-view')
 }
diff --git a/app/src/androidTest/java/ozaydin/serkan/com/imagezoom/ExampleInstrumentedTest.java b/app/src/androidTest/java/ozaydin/serkan/com/imagezoom/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package ozaydin.serkan.com.imagezoom;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/ozaydin/serkan/com/imagezoom/MainActivity.java b/app/src/main/java/ozaydin/serkan/com/imagezoom/MainActivity.java
@@ -1,8 +1,10 @@
 package ozaydin.serkan.com.imagezoom;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.widget.Toast;
 
@@ -19,40 +21,39 @@
 public class MainActivity extends AppCompatActivity {
 
     ImageViewZoom imageViewZoom;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        imageViewZoom=findViewById(R.id.activity_main_image_view);
+        imageViewZoom = findViewById(R.id.activity_main_image_view);
         // Return Image's base 64 code
         imageViewZoom.getBase64();
 
         // ImageViewZoomConfig
-        ImageViewZoomConfig imageViewZoomConfig=new ImageViewZoomConfig();
-        imageViewZoomConfig.saveProperty(true);
-
         // OnlyDialog Enum work only user when click to save choose
         // Always Enum work when use saveImage() method and user when click to save choose
-        ImageViewZoomConfig.ImageViewZoomConfigSaveMethod imageViewZoomConfigSaveMethod= ImageViewZoomConfig.ImageViewZoomConfigSaveMethod.onlyOnDialog;
-        imageViewZoomConfig.setImageViewZoomConfigSaveMethod(imageViewZoomConfigSaveMethod);
+        ImageViewZoomConfig imageViewZoomConfig =new ImageViewZoomConfig.Builder().saveProperty(true).saveMethod(ImageViewZoomConfig.ImageViewZoomConfigSaveMethod.onlyOnDialog).build();
+
+
         imageViewZoom.setConfig(imageViewZoomConfig);
 
 
         // Save Image
-        imageViewZoom.saveImage(MainActivity.this, "ImageViewZoom", "test", Bitmap.CompressFormat.JPEG, 1, imageViewZoomConfig,new SaveFileListener() {
+        imageViewZoom.saveImage(MainActivity.this, "ImageViewZoom", "test", Bitmap.CompressFormat.JPEG, 1, imageViewZoomConfig, new SaveFileListener() {
             @Override
             public void onSuccess(File file) {
-                Toast.makeText(MainActivity.this,"Success",Toast.LENGTH_SHORT).show();
+                Toast.makeText(MainActivity.this, "Success", Toast.LENGTH_SHORT).show();
             }
+
             @Override
             public void onFail(Exception excepti) {
-                Toast.makeText(MainActivity.this,"Error Save",Toast.LENGTH_SHORT).show();
+                Toast.makeText(MainActivity.this, "Error Save", Toast.LENGTH_SHORT).show();
             }
         });
 
 
-
     }
 
     @Override

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Aug 04 00:48:54 EET 2018
+#Sun May 10 05:18:13 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/image-zoom-view/build.gradle b/image-zoom-view/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -27,12 +27,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:design:27.1.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 
 

diff --git a/...view/src/androidTest/java/ozaydin/serkan/com/image_zoom_view/ExampleInstrumentedTest.java b/...view/src/androidTest/java/ozaydin/serkan/com/image_zoom_view/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package ozaydin.serkan.com.image_zoom_view;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/image-zoom-view/src/main/java/ozaydin/serkan/com/image_zoom_view/Dialog.java b/image-zoom-view/src/main/java/ozaydin/serkan/com/image_zoom_view/Dialog.java
@@ -4,19 +4,16 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.SwipeDismissBehavior;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
-import android.util.DisplayMetrics;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;

diff --git a/image-zoom-view/src/main/java/ozaydin/serkan/com/image_zoom_view/ImageViewZoom.java b/image-zoom-view/src/main/java/ozaydin/serkan/com/image_zoom_view/ImageViewZoom.java
@@ -12,8 +12,8 @@
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;