diff --git a/README.md b/README.md
index 93ea7dd..d4aef64 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ You can take a look at [sample project][sample] for more information.
Download via **Gradle**:
```gradle
-compile 'com.github.stfalcon:frescoimageviewer:0.5.0'
+compile 'com.github.stfalcon:frescoimageviewer:0.6.0'
```
or **Maven**:
@@ -154,7 +154,7 @@ or **Maven**:
com.github.stfalcon
frescoimageviewer
- 0.5.0
+ 0.6.0
pom
```
diff --git a/build.gradle b/build.gradle
index 8d50c5a..af773a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,14 @@
buildscript {
repositories {
jcenter()
+ maven {
+ url "https://maven.google.com"
+ }
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.1'
- classpath 'com.novoda:bintray-release:0.3.4'
+ classpath 'com.android.tools.build:gradle:7.0.3'
+ classpath 'com.novoda:bintray-release:0.8.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -16,6 +20,10 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven {
+ url "https://maven.google.com"
+ }
+ google()
}
}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5b43222..072b2fc 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 0.6.0 (2022/09/19)
+* replaced android support libraries by AndroidX
+* updated android sdk target version to 31
+
## Version 0.5.0 (2017/03/14)
* formatter for custom objects collections;
diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle
index e2db440..f5cc85f 100644
--- a/frescoimageviewer/build.gradle
+++ b/frescoimageviewer/build.gradle
@@ -1,15 +1,13 @@
apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ compileSdkVersion 31
defaultConfig {
- minSdkVersion 14
- targetSdkVersion 25
- versionCode 1
- versionName "0.5.0"
+ minSdkVersion 15
+ targetSdkVersion 31
+ versionCode 2
+ versionName "0.6.0"
}
buildTypes {
release {
@@ -25,19 +23,10 @@ android {
}
-publish {
- groupId = 'com.github.stfalcon'
- artifactId = 'frescoimageviewer'
- publishVersion = '0.5.0'
- desc = 'Customizable full screen image viewer based on Fresco library, that includes "pinch to zoom" and "swipe to dismiss" gestures'
- licences = ['Apache-2.0']
- uploadName = 'FrescoImageViewer'
- website = 'https://github.com/stfalcon-studio/FrescoImageViewer.git'
-}
-
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:25.1.1'
- compile 'me.relex:photodraweeview:1.1.0'
- provided 'com.facebook.fresco:fresco:0.12.0'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ implementation 'me.relex:photodraweeview:2.0.0'
+ implementation 'com.facebook.fresco:fresco:2.6.0'
+ implementation 'android.support.v4'
}
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/FrescoWrapper.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/FrescoWrapper.java
new file mode 100644
index 0000000..8f330b3
--- /dev/null
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/FrescoWrapper.java
@@ -0,0 +1,11 @@
+package com.stfalcon.frescoimageviewer;
+
+import com.facebook.drawee.backends.pipeline.Fresco;
+import android.content.Context;
+
+public class FrescoWrapper {
+ public static void Initialize(Context context)
+ {
+ Fresco.initialize(context);
+ }
+}
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewer.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewer.java
index 4032f4c..13484d0 100644
--- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewer.java
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewer.java
@@ -20,12 +20,12 @@
import android.content.DialogInterface;
import android.graphics.Color;
import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.StyleRes;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewerView.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewerView.java
index 6a28515..2b34a5d 100644
--- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewerView.java
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/ImageViewerView.java
@@ -17,8 +17,8 @@
package com.stfalcon.frescoimageviewer;
import android.content.Context;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v4.view.ViewPager;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.MotionEvent;
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/MultiTouchViewPager.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/MultiTouchViewPager.java
index f35f5d4..0332cae 100644
--- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/MultiTouchViewPager.java
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/MultiTouchViewPager.java
@@ -17,8 +17,8 @@
package com.stfalcon.frescoimageviewer;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/adapter/RecyclingPagerAdapter.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/adapter/RecyclingPagerAdapter.java
index d77d475..ac2beb9 100644
--- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/adapter/RecyclingPagerAdapter.java
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/adapter/RecyclingPagerAdapter.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
import android.util.SparseArray;
import android.view.View;
import android.view.ViewGroup;
diff --git a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java
index bd28ef2..9fdb42d 100644
--- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java
+++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java
@@ -18,7 +18,7 @@
import android.content.Context;
import android.graphics.Canvas;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.MotionEvent;
@@ -105,6 +105,8 @@ public float getMaximumScale() {
return attacher.getMaximumScale();
}
+ public void setOrientation(int orientation) { }
+
@Override
public void setMinimumScale(float minimumScale) {
attacher.setMinimumScale(minimumScale);
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d50e549..1e35f66 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 11 09:58:14 EEST 2017
+#Fri Sep 16 13:12:09 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index f87d0e6..5e5eff2 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ compileSdkVersion 31
defaultConfig {
applicationId "com.stfalcon.frescoimageviewersample"
minSdkVersion 15
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
+ targetSdkVersion 31
+ versionCode 2
+ versionName "2.0"
renderscriptTargetApi 25
renderscriptSupportModeEnabled true
@@ -33,17 +32,17 @@ ext {
}
dependencies {
- compile project(':frescoimageviewer')
- compile "com.android.support:design:$supportVersion"
- compile "com.android.support:appcompat-v7:$supportVersion"
- compile "com.android.support:support-v4:$supportVersion"
- compile "com.android.support:cardview-v7:$supportVersion"
+ implementation project(':frescoimageviewer')
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.cardview:cardview:1.0.0'
- compile "com.facebook.fresco:fresco:$frescoVersion"
+ implementation "com.facebook.fresco:fresco:$frescoVersion"
- compile 'com.github.mmin18:realtimeblurview:1.1.0'
- compile 'me.relex:circleindicator:1.2.2@aar'
+ implementation 'com.github.mmin18:realtimeblurview:1.1.0'
+ implementation 'me.relex:circleindicator:1.2.2@aar'
- compile 'jp.wasabeef:fresco-processors:2.0.0'
- compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
+ implementation 'jp.wasabeef:fresco-processors:2.0.0'
+ implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
}
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 90d3f4b..f553d42 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/demo/DemoActivity.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/demo/DemoActivity.java
index fad1d20..03daf3f 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/demo/DemoActivity.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/demo/DemoActivity.java
@@ -1,7 +1,7 @@
package com.stfalcon.frescoimageviewersample.features.demo;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import com.facebook.drawee.view.SimpleDraweeView;
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/DemoCardFragment.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/DemoCardFragment.java
index 1093305..dbaef61 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/DemoCardFragment.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/DemoCardFragment.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivity.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivity.java
index 7895d9f..a2bb545 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivity.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivity.java
@@ -2,7 +2,7 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import com.stfalcon.frescoimageviewersample.R;
import com.stfalcon.frescoimageviewersample.features.demo.DemoActivity;
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivityPagerAdapter.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivityPagerAdapter.java
index a074b1c..b3fd699 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivityPagerAdapter.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/features/main/MainActivityPagerAdapter.java
@@ -1,9 +1,9 @@
package com.stfalcon.frescoimageviewersample.features.main;
import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
import com.stfalcon.frescoimageviewersample.R;
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java
index bc94262..c543dcc 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java
@@ -2,9 +2,10 @@
import android.content.Context;
import android.os.Handler;
-import android.support.annotation.StringRes;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.StringRes;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
+import com.google.android.material.snackbar.Snackbar;
+
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
@@ -59,7 +60,7 @@ public void onClick(View view) {
}
private static Snackbar multilineSnackbar(Snackbar snackbar) {
- TextView textView = (TextView) snackbar.getView().findViewById(android.support.design.R.id.snackbar_text);
+ TextView textView = snackbar.getView().findViewById(com.google.android.material.R.id.snackbar_text);
textView.setMaxLines(5);
return snackbar;
}
diff --git a/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/StylingOptions.java b/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/StylingOptions.java
index 0790833..14952ce 100644
--- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/StylingOptions.java
+++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/StylingOptions.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
import com.stfalcon.frescoimageviewersample.R;
diff --git a/sample/src/main/res/layout/activity_demo.xml b/sample/src/main/res/layout/activity_demo.xml
index b34b940..8f7d449 100644
--- a/sample/src/main/res/layout/activity_demo.xml
+++ b/sample/src/main/res/layout/activity_demo.xml
@@ -1,4 +1,4 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 3b8acbb..4cba40a 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/sample/src/main/res/layout/fragment_demo_card.xml b/sample/src/main/res/layout/fragment_demo_card.xml
index 611cb30..ce670a5 100644
--- a/sample/src/main/res/layout/fragment_demo_card.xml
+++ b/sample/src/main/res/layout/fragment_demo_card.xml
@@ -1,4 +1,4 @@
-
-
+