diff --git a/glide-loader/.gitignore b/glide-loader/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/glide-loader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle deleted file mode 100644 index 6eaaa24..0000000 --- a/glide-loader/build.gradle +++ /dev/null @@ -1,125 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' -apply from: '../config/quality.gradle' - -group = 'fr.tvbarthel.intentshare' -version = rootProject.ext.versionName - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - - compile project(':library') - - compile 'com.github.bumptech.glide:glide:3.7.0' -} - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) -def bintrayUser = properties.getProperty('bintray.user') -def bintrayKey = properties.getProperty('bintray.apikey') - -bintray { - user = bintrayUser - key = bintrayKey - - - configurations = ['archives'] //When uploading configuration files - - dryRun = false //Whether to run this as dry-run, without deploying - publish = true //If version should be auto published after an upload - //Package configuration. The plugin will use the repo and name properties to check if the package already exists. In that case, there's no need to configure the other package properties (like userOrg, desc, etc). - pkg { - repo = 'maven' - name = 'GlideLoader' - desc = 'Icon loader based on Glide for IntentShare library.' - websiteUrl = 'https://github.com/tvbarthel/IntentShare' - issueTrackerUrl = 'https://github.com/tvbarthel/IntentShare/issues' - vcsUrl = 'https://github.com/tvbarthel/IntentShare.git' - licenses = ['Apache-2.0'] - labels = ['android', 'intent', 'sharing', 'share', 'glide'] - publicDownloadNumbers = true - version { - gpg { - sign = true //Determines whether to GPG sign the files. The default is false - } - } - - } -} - -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - name 'GlideLoader' - url 'https://github.com/tvbarthel/IntentShare' - description 'Icon loader based on Glide for IntentShare library.' - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id 'tbarthel-fr' - name 'Thomas Barthelemy' - email 'thomas.barthelemy.utc@gmail.com' - } - developer { - id 'vbarthel-fr' - name 'Vincent Barthelemy' - email 'vincent.barthelemy.perso@gmail.com' - } - } - scm { - connection 'https://github.com/tvbarthel/IntentShare.git' - developerConnection 'https://github.com/tvbarthel/IntentShare.git' - url 'https://github.com/tvbarthel/IntentShare' - - } - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - failOnError = false -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} diff --git a/glide-loader/proguard-rules.pro b/glide-loader/proguard-rules.pro deleted file mode 100644 index 4c0b463..0000000 --- a/glide-loader/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/thomasbarthelemy/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/glide-loader/src/main/AndroidManifest.xml b/glide-loader/src/main/AndroidManifest.xml deleted file mode 100644 index f432399..0000000 --- a/glide-loader/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/glide-loader/src/main/java/fr/tvbarthel/intentshare/loader/glide/GlideIconLoader.java b/glide-loader/src/main/java/fr/tvbarthel/intentshare/loader/glide/GlideIconLoader.java deleted file mode 100644 index d7cf09b..0000000 --- a/glide-loader/src/main/java/fr/tvbarthel/intentshare/loader/glide/GlideIconLoader.java +++ /dev/null @@ -1,69 +0,0 @@ -package fr.tvbarthel.intentshare.loader.glide; - -import android.net.Uri; -import android.os.Parcel; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.engine.DiskCacheStrategy; - -import fr.tvbarthel.intentshare.IconLoader; - -/** - * {@link fr.tvbarthel.intentshare.IconLoader} based on {@link com.bumptech.glide.Glide} - */ -public class GlideIconLoader implements IconLoader { - - /** - * Parcelable - */ - public static final Creator CREATOR = new Creator() { - @Override - public GlideIconLoader createFromParcel(Parcel source) { - return new GlideIconLoader(source); - } - - @Override - public GlideIconLoader[] newArray(int size) { - return new GlideIconLoader[size]; - } - }; - - /** - * {@link fr.tvbarthel.intentshare.IconLoader} based on {@link com.bumptech.glide.Glide} - */ - public GlideIconLoader() { - } - - /** - * {@link fr.tvbarthel.intentshare.IconLoader} based on {@link com.bumptech.glide.Glide} - * - * @param in parcel. - */ - protected GlideIconLoader(Parcel in) { - } - - @Override - public void load(Uri iconUri, ImageView imageView) { - Glide.with(imageView.getContext()) - .load(iconUri) - .fitCenter() - .diskCacheStrategy(DiskCacheStrategy.RESULT) - .into(imageView); - } - - @Override - public void cancel(ImageView imageView) { - Glide.clear(imageView); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - } - -} diff --git a/picasso-loader/.gitignore b/picasso-loader/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/picasso-loader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle deleted file mode 100644 index e73c99d..0000000 --- a/picasso-loader/build.gradle +++ /dev/null @@ -1,125 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' -apply from: '../config/quality.gradle' - -group = 'fr.tvbarthel.intentshare' -version = rootProject.ext.versionName - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode rootProject.ext.versionCode - versionName rootProject.ext.versionName - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - - compile 'com.squareup.picasso:picasso:2.5.2' - - compile project(':library') -} - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) -def bintrayUser = properties.getProperty('bintray.user') -def bintrayKey = properties.getProperty('bintray.apikey') - -bintray { - user = bintrayUser - key = bintrayKey - - - configurations = ['archives'] //When uploading configuration files - - dryRun = false //Whether to run this as dry-run, without deploying - publish = true //If version should be auto published after an upload - //Package configuration. The plugin will use the repo and name properties to check if the package already exists. In that case, there's no need to configure the other package properties (like userOrg, desc, etc). - pkg { - repo = 'maven' - name = 'PicassoLoader' - desc = 'Icon loader based on Picasso for IntentShare library.' - websiteUrl = 'https://github.com/tvbarthel/IntentShare' - issueTrackerUrl = 'https://github.com/tvbarthel/IntentShare/issues' - vcsUrl = 'https://github.com/tvbarthel/IntentShare.git' - licenses = ['Apache-2.0'] - labels = ['android', 'intent', 'sharing', 'share', 'picasso'] - publicDownloadNumbers = true - version { - gpg { - sign = true //Determines whether to GPG sign the files. The default is false - } - } - - } -} - -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - name 'PicassoLoader' - url 'https://github.com/tvbarthel/IntentShare' - description 'Icon loader based on Picasso for IntentShare library.' - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id 'tbarthel-fr' - name 'Thomas Barthelemy' - email 'thomas.barthelemy.utc@gmail.com' - } - developer { - id 'vbarthel-fr' - name 'Vincent Barthelemy' - email 'vincent.barthelemy.perso@gmail.com' - } - } - scm { - connection 'https://github.com/tvbarthel/IntentShare.git' - developerConnection 'https://github.com/tvbarthel/IntentShare.git' - url 'https://github.com/tvbarthel/IntentShare' - - } - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - failOnError = false -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} diff --git a/picasso-loader/proguard-rules.pro b/picasso-loader/proguard-rules.pro deleted file mode 100644 index 4c0b463..0000000 --- a/picasso-loader/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/thomasbarthelemy/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/picasso-loader/src/main/AndroidManifest.xml b/picasso-loader/src/main/AndroidManifest.xml deleted file mode 100644 index c12c9fc..0000000 --- a/picasso-loader/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/picasso-loader/src/main/java/fr/tvbarthel/intentshare/loader/picasso/PicassoIconLoader.java b/picasso-loader/src/main/java/fr/tvbarthel/intentshare/loader/picasso/PicassoIconLoader.java deleted file mode 100644 index 2d63c64..0000000 --- a/picasso-loader/src/main/java/fr/tvbarthel/intentshare/loader/picasso/PicassoIconLoader.java +++ /dev/null @@ -1,68 +0,0 @@ -package fr.tvbarthel.intentshare.loader.picasso; - -import android.net.Uri; -import android.os.Parcel; -import android.widget.ImageView; - -import com.squareup.picasso.Picasso; - -import fr.tvbarthel.intentshare.IconLoader; - -/** - * {@link IconLoader} based on {@link com.squareup.picasso.Picasso}. - */ -public class PicassoIconLoader implements IconLoader { - - /** - * Parcelable. - */ - public static final Creator CREATOR = new Creator() { - @Override - public PicassoIconLoader createFromParcel(Parcel source) { - return new PicassoIconLoader(source); - } - - @Override - public PicassoIconLoader[] newArray(int size) { - return new PicassoIconLoader[size]; - } - }; - - /** - * {@link IconLoader} based on {@link com.squareup.picasso.Picasso}. - */ - public PicassoIconLoader() { - } - - /** - * {@link IconLoader} based on {@link com.squareup.picasso.Picasso}. - * - * @param in parcel. - */ - protected PicassoIconLoader(Parcel in) { - } - - @Override - public void load(Uri iconUri, ImageView imageView) { - Picasso.with(imageView.getContext()) - .load(iconUri) - .fit() - .centerInside() - .into(imageView); - } - - @Override - public void cancel(ImageView imageView) { - Picasso.with(imageView.getContext()).cancelRequest(imageView); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - } - -} diff --git a/sample/src/main/java/fr/tvbarthel/intentsharesample/MainActivity.java b/sample/src/main/java/fr/tvbarthel/intentsharesample/MainActivity.java index 4af81ef..de0c8fb 100644 --- a/sample/src/main/java/fr/tvbarthel/intentsharesample/MainActivity.java +++ b/sample/src/main/java/fr/tvbarthel/intentsharesample/MainActivity.java @@ -27,8 +27,6 @@ import fr.tvbarthel.intentshare.IntentShare; import fr.tvbarthel.intentshare.IntentShareListener; import fr.tvbarthel.intentshare.TargetActivityComparatorProvider; -import fr.tvbarthel.intentshare.loader.glide.GlideIconLoader; -import fr.tvbarthel.intentshare.loader.picasso.PicassoIconLoader; public class MainActivity extends AppCompatActivity implements Adapter.Listener, View.OnClickListener, ExtraProviderDialogFragment.Callback { @@ -48,10 +46,8 @@ public class MainActivity extends AppCompatActivity implements private IntentShareListener intentShareListener; - private PicassoIconLoader picassoIconLoader; private IconLoader iconLoader; private TargetActivityComparatorProvider customComparatorProvider; - private GlideIconLoader glideIconLoader; private String targetPackage; private String dialogTitle; @@ -111,18 +107,6 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.sample_icon_loader_default: iconLoader = null; break; - case R.id.sample_icon_loader_picasso: - if (picassoIconLoader == null) { - picassoIconLoader = new PicassoIconLoader(); - } - iconLoader = picassoIconLoader; - break; - case R.id.sample_icon_loader_glide: - if (glideIconLoader == null) { - glideIconLoader = new GlideIconLoader(); - } - iconLoader = picassoIconLoader; - break; case R.id.sorting_default: customComparatorProvider = null; break; diff --git a/settings.gradle b/settings.gradle index a0b86f8..f171b1f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':library', ':sample', ':picasso-loader', ':glide-loader' \ No newline at end of file +include ':library', ':sample' \ No newline at end of file