updated deps and minor fixes, pre animation works (#172)

* updated deps and minor fixes, pre animation works

* minSdk to 14, fixed deps availability, deleted app and moved functions on Utils file.

Author: KirkBushman

BigImageViewer/src/main/java/com/github/piasy/biv/metadata/ImageInfoExtractor.java

@@ -71,6 +71,7 @@ public static int getImageType(File file) {
 
             inputStream.close();
         } catch (IOException e) {
+            e.printStackTrace();
         }
 
         return type;

BigImageViewer/src/main/java/com/github/piasy/biv/view/BigImageView.java

@@ -106,7 +106,7 @@ public class BigImageView extends FrameLayout implements ImageLoader.Callback {
 
     private OnClickListener mOnClickListener;
     private OnLongClickListener mOnLongClickListener;
-    private OnClickListener mFailureImageClickListener = new OnClickListener() {
+    private final OnClickListener mFailureImageClickListener = new OnClickListener() {
         @Override
         public void onClick(final View v) {
             // Retry loading when failure image is clicked

FrescoImageLoader/build.gradle

@@ -47,7 +47,8 @@ android {
 }
 
 dependencies {
-    api project(':BigImageViewer')
+    implementation project(':BigImageViewer')
 
     api "com.facebook.fresco:fresco:$rootProject.ext.frescoVersion"
+    implementation "androidx.annotation:annotation:$rootProject.ext.annotationVersion"
 }

FrescoImageLoader/src/main/java/com/github/piasy/biv/loader/fresco/FrescoImageLoader.java

@@ -24,6 +24,7 @@
 
 package com.github.piasy.biv.loader.fresco;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import com.facebook.binaryresource.FileBinaryResource;
@@ -77,6 +78,7 @@ public static FrescoImageLoader with(Context appContext,
         return new FrescoImageLoader(appContext);
     }
 
+    @SuppressLint("WrongThread")
     @Override
     public void loadImage(int requestId, Uri uri, final Callback callback) {
         ImageRequest request = ImageRequest.fromUri(uri);

FrescoImageViewFactory/build.gradle

@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    api project(':BigImageViewer')
+    implementation project(':BigImageViewer')
 
     api "com.facebook.fresco:fresco:$rootProject.ext.frescoVersion"
     api "com.facebook.fresco:animated-gif:$rootProject.ext.frescoVersion"

GlideImageLoader/build.gradle

@@ -47,9 +47,12 @@ android {
 }
 
 dependencies {
-    api project(':BigImageViewer')
+    implementation project(':BigImageViewer')
 
     api "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
     api "com.github.bumptech.glide:okhttp3-integration:$rootProject.ext.glideVersion"
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.ext.glideVersion"
+    implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+
+    implementation "androidx.annotation:annotation:$rootProject.ext.annotationVersion"
 }

GlideImageViewFactory/build.gradle

@@ -47,8 +47,8 @@ android {
 }
 
 dependencies {
-    api project(':BigImageViewer')
+    implementation project(':BigImageViewer')
 
     api "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
-    api 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
 }

ProgressPieIndicator/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-    api project(':BigImageViewer')
+    implementation project(':BigImageViewer')
 
-    api('com.github.filippudak.progresspieview:library:1.0.4')
+    api 'com.github.filippudak.progresspieview:library:1.0.4'
 }

app/build.gradle

@@ -38,6 +38,7 @@ android {
         applicationId "com.github.piasy.biv.example"
 
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -71,27 +72,27 @@ android {
 }
 
 dependencies {
-    api "androidx.appcompat:appcompat:$rootProject.ext.androidXVersion"
-    api "androidx.recyclerview:recyclerview:$rootProject.ext.androidXVersion"
-    annotationProcessor "androidx.annotation:annotation:$rootProject.ext.androidXVersion"
-
-    implementation('com.afollestad.material-dialogs:core:0.9.6.0')
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "com.google.android.material:material:$materialVersion"
 
     implementation('com.tbruyelle.rxpermissions2:rxpermissions:0.9.5') {
         exclude module: 'rxjava'
     }
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'com.github.akarnokd:rxjava2-interop:0.13.2'
-    implementation('com.github.piasy:RxQrCode:1.3.0')
-    implementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
+    implementation('com.github.akarnokd:rxjava2-interop:0.13.7') {
+        exclude module: 'rxjava'
+    }
+
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.13'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'com.github.piasy:RxQrCode:1.3.0'
+
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
 
     implementation project(':BigImageViewer')
     implementation project(':FrescoImageLoader')
     implementation project(':GlideImageLoader')
     implementation project(':FrescoImageViewFactory')
     implementation project(':GlideImageViewFactory')
-    annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.ext.glideVersion"
-
     implementation project(':ProgressPieIndicator')
 }

app/src/main/AndroidManifest.xml

@@ -24,13 +24,11 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
-        package="com.github.piasy.biv.example"
-        >
+        package="com.github.piasy.biv.example">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
-            android:name=".App"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"

app/src/main/java/com/github/piasy/biv/example/App.java

@@ -51,7 +51,7 @@ public void onClick(View v) {
                 bigImageView.setProgressIndicator(new ProgressPieIndicator());
                 bigImageView.showImage(
                         Uri.parse("http://img1.imgtn.bdimg.com/it/u=1520386803,778399414&fm=21&gp=0.jpg"),
-                        Uri.parse("http://youimg1.c-ctrip.com/target/tg/773/732/734/7ca19416b8cd423f8f6ef2d08366b7dc.jpg")
+                        Uri.parse("https://youimg1.c-ctrip.com/target/tg/773/732/734/7ca19416b8cd423f8f6ef2d08366b7dc.jpg")
                 );
             }
         });
@@ -62,9 +62,9 @@ protected void onDestroy() {
         super.onDestroy();
 
         long start = System.nanoTime();
-        App.fixLeakCanary696(getApplicationContext());
+        Utils.fixLeakCanary696(getApplicationContext());
         long end = System.nanoTime();
-        Log.w(App.TAG, "fixLeakCanary696: " + (end - start));
+        Log.w(Utils.TAG, "fixLeakCanary696: " + (end - start));
 
         BigImageViewer.imageLoader().cancelAll();
     }

app/src/main/java/com/github/piasy/biv/example/GlideLoaderActivity.java

@@ -25,13 +25,16 @@
 package com.github.piasy.biv.example;
 
 import android.Manifest;
+import android.app.Dialog;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
+import android.view.WindowManager;
+import android.widget.TextView;
 import android.widget.Toast;
+
 import androidx.appcompat.app.AppCompatActivity;
-import com.afollestad.materialdialogs.MaterialDialog;
+
 import com.github.piasy.biv.BigImageViewer;
 import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator;
 import com.github.piasy.biv.loader.fresco.FrescoImageLoader;
@@ -52,6 +55,8 @@ public class LongImageActivity extends AppCompatActivity {
     private Disposable mPermissionRequest;
     private Disposable mQrCodeDecode;
 
+    private Dialog dialog;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,24 +73,36 @@ public void onClick(View v) {
             }
         });
 
+        dialog = new Dialog(this);
+        dialog.setTitle(R.string.long_click_actions);
+        dialog.setContentView(R.layout.dialog_long_image);
+
+        final WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
+        lp.copyFrom(dialog.getWindow().getAttributes());
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        dialog.getWindow().setAttributes(lp);
+
+        final TextView textScan = dialog.findViewById(R.id.action_scan_qr);
+        final TextView textSave = dialog.findViewById(R.id.action_save_image);
+
+        textScan.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                decodeQrCode();
+            }
+        });
+
+        textSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveImage();
+            }
+        });
+
         mBigImageView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                new MaterialDialog.Builder(LongImageActivity.this)
-                        .items(R.array.big_image_ops)
-                        .itemsCallback(new MaterialDialog.ListCallback() {
-                            @Override
-                            public void onSelection(MaterialDialog dialog, View itemView,
-                                    int position, CharSequence text) {
-                                if (TextUtils.equals(text, getString(R.string.save_image))) {
-                                    saveImage();
-                                } else if (TextUtils.equals(text,
-                                        getString(R.string.scan_qr_code))) {
-                                    decodeQrCode();
-                                }
-                            }
-                        })
-                        .show();
+                dialog.show();
                 return true;
             }
         });
@@ -112,8 +129,7 @@ public void onFail(Throwable t) {
         findViewById(R.id.mBtnLoad).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mBigImageView.showImage(Uri.parse(
-                        "http://ww1.sinaimg.cn/mw690/005Fj2RDgw1f9mvl4pivvj30c82ougw3.jpg"));
+                mBigImageView.showImage(Uri.parse("https://ww1.sinaimg.cn/mw690/005Fj2RDgw1f9mvl4pivvj30c82ougw3.jpg"));
             }
         });
     }
@@ -125,6 +141,10 @@ protected void onDestroy() {
         disposePermissionRequest();
         disposeQrCodeDecode();
 
+        if (dialog.isShowing()) {
+            dialog.dismiss();
+        }
+
         BigImageViewer.imageLoader().cancelAll();
     }