From b7a5e3f9631f2bcb290424513514592198c7da58 Mon Sep 17 00:00:00 2001 From: Jin Ang Date: Sun, 13 Oct 2024 15:49:22 +1100 Subject: [PATCH 1/2] Testing to see whether changes to dependencies work or not across our devices --- app/build.gradle | 19 +++++++++++++++---- .../createpdf/adapter/PreviewAdapter.java | 4 ++-- .../adapter/RearrangeImagesAdapter.java | 2 +- build.gradle | 15 ++++++++++++--- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a97d30c..bc63ab3b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,17 @@ configurations { repositories { mavenCentral() maven { url 'https://jitpack.io' } + maven { + url "https://repo1.maven.org/maven2/" + } + maven { + url "https://repository.jboss.org/maven2" + } + maven { + url 'https://repo.jenkins-ci.org/public/' + } maven { url "https://repository.aspose.com/repo/" } + maven { url 'https://maven.scijava.org/content/repositories/public' } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') @@ -103,15 +113,16 @@ dependencies { // Picasso, image editor, image cropper implementation 'com.squareup.picasso:picasso:2.5.2' - implementation 'jp.wasabeef:picasso-transformations:2.2.1' + implementation 'jp.wasabeef:picasso-transformations:2.4.0' implementation 'ja.burhanrashid52:photoeditor:0.2.1' - implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' + implementation "com.github.ArthurHub:Android-Image-Cropper:2.7.0" + api 'com.theartofdev.edmodo:android-image-cropper:2.7.+' // Viewpager transformation implementation 'com.eftimoff:android-viewpager-transformers:1.0.1@aar' // Image picker, and folder picker - implementation 'com.zhihu.android:matisse:0.5.3-beta3' + implementation 'com.github.zhihu:matisse:0.5.3-beta3' implementation 'lib.kashif:folderpicker:2.4' // Zxing - for scanning qr code @@ -119,7 +130,7 @@ dependencies { implementation 'com.journeyapps:zxing-android-embedded:3.4.0' // color picker - implementation 'com.github.danielnilsson9:color-picker-view:1.4.0@aar' + implementation 'com.github.danielnilsson9:color-picker-view:master' implementation 'org.bouncycastle:bcpkix-jdk15to18:1.68' implementation 'org.bouncycastle:bcprov-jdk15to18:1.68' diff --git a/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java b/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java index 69051703..99c36e55 100644 --- a/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java +++ b/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java @@ -36,7 +36,7 @@ public Object instantiateItem(@NonNull ViewGroup view, int position) { final ImageView imageView = layout.findViewById(R.id.image); String path = mPreviewItems.get(position); File fileLocation = new File(path); - Picasso.with(mContext).load(fileLocation).into(imageView); + Picasso.get().load(fileLocation).into(imageView); TextView fileName = layout.findViewById(R.id.tvFileName); String fileNameString = fileLocation.getName(); fileName.setText(fileNameString); @@ -69,4 +69,4 @@ public void setData(ArrayList images) { mPreviewItems.clear(); mPreviewItems.addAll(images); } -} +} \ No newline at end of file diff --git a/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java b/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java index 0d06eb50..8102ac63 100644 --- a/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java +++ b/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java @@ -55,7 +55,7 @@ public void onBindViewHolder(@NonNull RearrangeImagesAdapter.ViewHolder holder, } else { holder.buttonDown.setVisibility(View.VISIBLE); } - Picasso.with(mContext).load(imageFile).into(holder.imageView); + Picasso.get().load(imageFile).into(holder.imageView); holder.pageNumber.setText(String.valueOf(position + 1)); } diff --git a/build.gradle b/build.gradle index 94ee7844..ccbcce55 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,19 @@ buildscript { repositories { + mavenCentral() maven { - url "https://jcenter.bintray.com" + url "https://repo1.maven.org/maven2/" + } + maven { + url "https://repo.spring.io/release" + } + maven { + url "https://repository.jboss.org/maven2" + } + maven { + url 'https://repo.jenkins-ci.org/public/' } - google() } dependencies { @@ -20,7 +29,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } From c33131e93353a440c7f7474c340caf4526a5eafa Mon Sep 17 00:00:00 2001 From: Jin Ang Date: Sun, 13 Oct 2024 16:45:09 +1100 Subject: [PATCH 2/2] Second push to use with(context) syntax --- app/build.gradle | 7 ++++++- .../java/swati4star/createpdf/adapter/PreviewAdapter.java | 2 +- .../createpdf/adapter/RearrangeImagesAdapter.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc63ab3b..20e4a6a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,6 +54,11 @@ configurations { exclude module: 'httpclient' } } +configurations.configureEach { + resolutionStrategy { + force 'com.squareup.picasso:picasso:2.5.2' + } +} repositories { mavenCentral() maven { url 'https://jitpack.io' } @@ -122,7 +127,7 @@ dependencies { implementation 'com.eftimoff:android-viewpager-transformers:1.0.1@aar' // Image picker, and folder picker - implementation 'com.github.zhihu:matisse:0.5.3-beta3' + implementation 'com.github.zhihu:Matisse:v0.5.3-beta3' implementation 'lib.kashif:folderpicker:2.4' // Zxing - for scanning qr code diff --git a/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java b/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java index 99c36e55..d9328345 100644 --- a/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java +++ b/app/src/main/java/swati4star/createpdf/adapter/PreviewAdapter.java @@ -36,7 +36,7 @@ public Object instantiateItem(@NonNull ViewGroup view, int position) { final ImageView imageView = layout.findViewById(R.id.image); String path = mPreviewItems.get(position); File fileLocation = new File(path); - Picasso.get().load(fileLocation).into(imageView); + Picasso.with(mContext).load(fileLocation).into(imageView); TextView fileName = layout.findViewById(R.id.tvFileName); String fileNameString = fileLocation.getName(); fileName.setText(fileNameString); diff --git a/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java b/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java index 8102ac63..0d06eb50 100644 --- a/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java +++ b/app/src/main/java/swati4star/createpdf/adapter/RearrangeImagesAdapter.java @@ -55,7 +55,7 @@ public void onBindViewHolder(@NonNull RearrangeImagesAdapter.ViewHolder holder, } else { holder.buttonDown.setVisibility(View.VISIBLE); } - Picasso.get().load(imageFile).into(holder.imageView); + Picasso.with(mContext).load(imageFile).into(holder.imageView); holder.pageNumber.setText(String.valueOf(position + 1)); }