From a37f749303524c40861e97ef6cc15c0caaa271cd Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 13:00:09 +0200 Subject: [PATCH 01/10] added maven google repository to gradle, updated gradle from 2.3.1 to 3.2.0 --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d50c5a..e9dcad6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,12 @@ buildscript { repositories { jcenter() + maven { + url "https://maven.google.com" + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.2.0' classpath 'com.novoda:bintray-release:0.3.4' // NOTE: Do not place your application dependencies here; they belong @@ -16,6 +19,9 @@ buildscript { allprojects { repositories { jcenter() + maven { + url "https://maven.google.com" + } } } From bd7ddbac14ec7327be99c2ecd6b01664f70f5a92 Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 13:22:31 +0200 Subject: [PATCH 02/10] updated gradle to 7.0.3 and commented out novoda --- build.gradle | 4 ++-- frescoimageviewer/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e9dcad6..fe956e9 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' - 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 diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index e2db440..4cbb499 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.library' -apply plugin: 'com.novoda.bintray-release' +// apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion 25 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 From cc20bd0075116cefb3153d54ffacf60ca2c04b2a Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 20:17:58 +0200 Subject: [PATCH 03/10] Updated obsolete Gradle commands --- build.gradle | 2 +- frescoimageviewer/build.gradle | 18 ++++-------------- sample/build.gradle | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index fe956e9..2bc082f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.0.3' - // classpath 'com.novoda:bintray-release:0.8.0' + 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 diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index 4cbb499..643517b 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -25,19 +25,9 @@ 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 'com.android.support:appcompat-v7:25.1.1' + implementation 'me.relex:photodraweeview:1.1.0' + implementation 'com.facebook.fresco:fresco:0.12.0' } diff --git a/sample/build.gradle b/sample/build.gradle index f87d0e6..873deda 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -33,17 +33,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.android.support:design:$supportVersion" + implementation "com.android.support:appcompat-v7:$supportVersion" + implementation "com.android.support:support-v4:$supportVersion" + implementation "com.android.support:cardview-v7:$supportVersion" - 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' } From 966125370d71853e84710a9ecd09dd41865e4ffd Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 20:29:04 +0200 Subject: [PATCH 04/10] Updated targetSdkVersion and compileSdkVersion to 31. Added exported=true to activities that had an intent filter to be compliant with targetSdkVersion 31 --- frescoimageviewer/build.gradle | 8 +++----- sample/build.gradle | 5 ++--- sample/src/main/AndroidManifest.xml | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index 643517b..232a239 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -1,13 +1,11 @@ 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 + minSdkVersion 15 + targetSdkVersion 31 versionCode 1 versionName "0.5.0" } diff --git a/sample/build.gradle b/sample/build.gradle index 873deda..531bbb7 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 31 defaultConfig { applicationId "com.stfalcon.frescoimageviewersample" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 31 versionCode 1 versionName "1.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 @@ From 10d8fbcac9df14fcf33fcf433501a641a9108f5b Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 20:36:46 +0200 Subject: [PATCH 05/10] updated version of Fresco dependency --- frescoimageviewer/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index 232a239..0236ac6 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -27,5 +27,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:25.1.1' implementation 'me.relex:photodraweeview:1.1.0' - implementation 'com.facebook.fresco:fresco:0.12.0' + implementation 'com.facebook.fresco:fresco:1.2.0' } From e447f848a1ed254b7e236d2dd56f1560f0e9dabc Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Fri, 16 Sep 2022 23:47:49 +0200 Subject: [PATCH 06/10] Migrated libraries from android support to AndroidX --- build.gradle | 5 +++++ frescoimageviewer/build.gradle | 6 +++--- .../com/stfalcon/frescoimageviewer/ImageViewer.java | 12 ++++++------ .../stfalcon/frescoimageviewer/ImageViewerView.java | 4 ++-- .../frescoimageviewer/MultiTouchViewPager.java | 4 ++-- .../adapter/RecyclingPagerAdapter.java | 2 +- .../frescoimageviewer/drawee/ZoomableDraweeView.java | 2 +- gradle.properties | 4 +++- sample/build.gradle | 12 ++++++------ .../features/demo/DemoActivity.java | 2 +- .../features/main/DemoCardFragment.java | 2 +- .../features/main/MainActivity.java | 2 +- .../features/main/MainActivityPagerAdapter.java | 6 +++--- .../frescoimageviewersample/utils/AppUtils.java | 10 ++++++---- .../utils/StylingOptions.java | 2 +- sample/src/main/res/layout/activity_demo.xml | 4 ++-- sample/src/main/res/layout/activity_main.xml | 8 ++++---- sample/src/main/res/layout/fragment_demo_card.xml | 4 ++-- 18 files changed, 50 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index 2bc082f..465f371 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { maven { url "https://maven.google.com" } + google() } dependencies { classpath 'com.android.tools.build:gradle:7.0.3' @@ -17,11 +18,15 @@ buildscript { } allprojects { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:deprecation" + } repositories { jcenter() maven { url "https://maven.google.com" } + google() } } diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index 0236ac6..a10c17a 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 31 - versionCode 1 - versionName "0.5.0" + versionCode 2 + versionName "0.6.0" } buildTypes { release { @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:25.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'me.relex:photodraweeview:1.1.0' implementation 'com.facebook.fresco:fresco:1.2.0' } 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..d4005cb 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; 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/sample/build.gradle b/sample/build.gradle index 531bbb7..5e5eff2 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.stfalcon.frescoimageviewersample" minSdkVersion 15 targetSdkVersion 31 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "2.0" renderscriptTargetApi 25 renderscriptSupportModeEnabled true @@ -33,10 +33,10 @@ ext { dependencies { implementation project(':frescoimageviewer') - implementation "com.android.support:design:$supportVersion" - implementation "com.android.support:appcompat-v7:$supportVersion" - implementation "com.android.support:support-v4:$supportVersion" - implementation "com.android.support:cardview-v7:$supportVersion" + 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' implementation "com.facebook.fresco:fresco:$frescoVersion" 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..a4a8218 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,11 @@ 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.os.Looper; import android.view.View; import android.widget.TextView; import android.widget.Toast; @@ -59,7 +61,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 @@ - - + From 8fff898d45de2ef0a3f03be5c9a450afed9c8260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Armangu=C3=A9=20Soler?= Date: Sat, 17 Sep 2022 00:52:21 +0200 Subject: [PATCH 07/10] removed unnecessary import --- .../com/stfalcon/frescoimageviewersample/utils/AppUtils.java | 1 - 1 file changed, 1 deletion(-) 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 a4a8218..c543dcc 100644 --- a/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java +++ b/sample/src/main/java/com/stfalcon/frescoimageviewersample/utils/AppUtils.java @@ -6,7 +6,6 @@ import com.google.android.material.snackbar.BaseTransientBottomBar; import com.google.android.material.snackbar.Snackbar; -import android.os.Looper; import android.view.View; import android.widget.TextView; import android.widget.Toast; From 39f607a93dab161187c12e6322aa92f944099c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Armangu=C3=A9=20Soler?= Date: Sat, 17 Sep 2022 00:57:01 +0200 Subject: [PATCH 08/10] removed unnecessary compilation flag --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 465f371..af773a3 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,6 @@ buildscript { } allprojects { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:deprecation" - } repositories { jcenter() maven { From 39f8fff129cea4be4203b7ba3964d79a5e4eb015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Armangu=C3=A9=20Soler?= Date: Mon, 19 Sep 2022 09:52:31 +0200 Subject: [PATCH 09/10] Updated version number into changelog and readme --- README.md | 4 ++-- docs/CHANGELOG.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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/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; From fdc95825a3d84834237a9b577a8bd14651faa5af Mon Sep 17 00:00:00 2001 From: jarmanso7 Date: Wed, 21 Sep 2022 11:37:35 +0200 Subject: [PATCH 10/10] zoomabledraweeview --- frescoimageviewer/build.gradle | 7 ++++--- .../com/stfalcon/frescoimageviewer/FrescoWrapper.java | 11 +++++++++++ .../frescoimageviewer/drawee/ZoomableDraweeView.java | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/FrescoWrapper.java diff --git a/frescoimageviewer/build.gradle b/frescoimageviewer/build.gradle index a10c17a..f5cc85f 100644 --- a/frescoimageviewer/build.gradle +++ b/frescoimageviewer/build.gradle @@ -25,7 +25,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'me.relex:photodraweeview:1.1.0' - implementation 'com.facebook.fresco:fresco:1.2.0' + 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/drawee/ZoomableDraweeView.java b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java index d4005cb..9fdb42d 100644 --- a/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java +++ b/frescoimageviewer/src/main/java/com/stfalcon/frescoimageviewer/drawee/ZoomableDraweeView.java @@ -105,6 +105,8 @@ public float getMaximumScale() { return attacher.getMaximumScale(); } + public void setOrientation(int orientation) { } + @Override public void setMinimumScale(float minimumScale) { attacher.setMinimumScale(minimumScale);