diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b17889b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +[*] +indent_size = 2 +max_line_length = off +insert_final_newline = true + +[*.{kt, kts}] +kotlin_imports_layout = ascii diff --git a/.gitignore b/.gitignore index d5aa662..9ef0bff 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,9 @@ captures/ .idea/modules.xml .idea/navEditor.xml .idea/markdown* +.idea/jarRepositories.xml +.idea/inspectionProfiles/Project_Default.xml +.idea/compiler.xml projectFilesBackup/ # Keystore files diff --git a/CHANGELOG.md b/CHANGELOG.md index b1e7ef1..19ff61e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,17 @@ Change Log ========== +Version 4.2.0 *(2020-09-15)* +---------------------------- + +Update: +- Compile & Target SDK Version 28 -> 30 +- GPUImage 2.0.3 -> 2.0.4 +- Glide 4.9.0 -> 4.11.0 + +Bugfix: +- RoundedCornersTransformation with DIAGONAL_FROM_TOP_LEFT does not work [#178](https://github.com/wasabeef/glide-transformations/pull/178) + Version 4.1.0 *(2019-08-15)* ---------------------------- diff --git a/README.md b/README.md index 2a3be93..1bbf162 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ Thanks License ------- - Copyright 2018 Wasabeef + Copyright (C) 2020 Wasabeef Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/build.gradle b/build.gradle index 2f59197..3a5bcea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,27 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext { - kotlin_version = '1.3.41' - glide_version = '4.9.0' - gpuimage_version = '2.0.3' - } + ext { + kotlin_version = '1.3.72' + glide_version = '4.11.0' + gpuimage_version = '2.0.4' + } - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.6.0-alpha05' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:4.2.0-alpha10' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } } allprojects { - repositories { - google() - jcenter() - } + repositories { + google() + jcenter() + } } diff --git a/example/build.gradle b/example/build.gradle index 5042d21..ef6283c 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -8,61 +8,37 @@ android { defaultConfig { minSdkVersion MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int - versionCode "git rev-list origin/master --count".execute().text.toInteger() + versionCode VERSION_CODE as int versionName VERSION_NAME renderscriptTargetApi TARGET_SDK_VERSION as int renderscriptSupportModeEnabled true } - signingConfigs { - release { - storeFile file(keyStoreProperty) - keyAlias keyAliasProperty - storePassword keyStorePasswordProperty - keyPassword keyAliasPasswordProperty - } - } + // SigningConfigs + apply from: '../signingConfigs/debug.gradle', to: android buildTypes { debug { debuggable true - zipAlignEnabled true + signingConfig signingConfigs.debug } release { debuggable false zipAlignEnabled true minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' shrinkResources true - signingConfig signingConfigs.release } } } -def getKeyStoreProperty() { - return hasProperty('WASABEEF_KEYSTORE') ? WASABEEF_KEYSTORE : "debug.keystore" -} - -def getKeyAliasProperty() { - return hasProperty('WASABEEF_KEYALIAS') ? WASABEEF_KEYALIAS : "android" -} - -def getKeyStorePasswordProperty() { - return hasProperty('WASABEEF_KEYSTOREPASSWORD') ? WASABEEF_KEYSTOREPASSWORD : "androiddebugkey" -} - -def getKeyAliasPasswordProperty() { - return hasProperty('WASABEEF_KEYALIASPASSWORD') ? WASABEEF_KEYALIASPASSWORD : "android" -} - dependencies { implementation project(':transformations') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.github.bumptech.glide:glide:$glide_version" kapt "com.github.bumptech.glide:compiler:$glide_version" implementation "jp.co.cyberagent.android:gpuimage:$gpuimage_version" - implementation "androidx.appcompat:appcompat:1.1.0-rc01" - implementation "androidx.recyclerview:recyclerview:1.1.0-beta02" - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation "androidx.appcompat:appcompat:1.3.0-alpha02" + implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05" + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' } diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml index d4a3358..2c18882 100644 --- a/example/src/main/AndroidManifest.xml +++ b/example/src/main/AndroidManifest.xml @@ -1,23 +1,21 @@ + xmlns:tools="http://schemas.android.com/tools" + package="jp.wasabeef.example.glide"> + tools:ignore="GoogleAppIndexingWarning"> + android:label="@string/app_name"> - + - + diff --git a/example/src/main/java/jp/wasabeef/example/glide/Ext.kt b/example/src/main/java/jp/wasabeef/example/glide/Ext.kt index 322f5ce..850935e 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/Ext.kt +++ b/example/src/main/java/jp/wasabeef/example/glide/Ext.kt @@ -1,7 +1,7 @@ package jp.wasabeef.example.glide /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.kt b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.kt index 6de283b..d1b6bf8 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainActivity.kt +++ b/example/src/main/java/jp/wasabeef/example/glide/MainActivity.kt @@ -15,9 +15,9 @@ class MainActivity : AppCompatActivity() { findViewById(R.id.list).apply { layoutManager = LinearLayoutManager(context) adapter = MainAdapter(context, mutableListOf( - Mask, NinePatchMask, RoundedCorners, CropTop, CropCenter, CropBottom, CropSquare, CropCircle, - CropCircleWithBorder, Grayscale, Blur, SupportRSBlur, Toon, Sepia, Contrast, Invert, - Pixel, Sketch, Swirl, Brightness, Kuawahara, Vignette + Mask, NinePatchMask, RoundedCorners, CropTop, CropCenter, CropBottom, CropSquare, CropCircle, + CropCircleWithBorder, Grayscale, Blur, SupportRSBlur, Toon, Sepia, Contrast, Invert, + Pixel, Sketch, Swirl, Brightness, Kuawahara, Vignette )) } } diff --git a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.kt b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.kt index f1ece8d..3d6a350 100644 --- a/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.kt +++ b/example/src/main/java/jp/wasabeef/example/glide/MainAdapter.kt @@ -25,8 +25,8 @@ import jp.wasabeef.glide.transformations.internal.Utils * Created by Wasabeef on 2015/01/11. */ class MainAdapter( - private val context: Context, - private val dataSet: MutableList + private val context: Context, + private val dataSet: MutableList ) : RecyclerView.Adapter() { enum class Type { @@ -69,129 +69,129 @@ class MainAdapter( when (dataSet[position]) { Mask -> { Glide.with(context) - .load(R.drawable.check) - .apply(overrideOf(266.px, 252.px)) - .apply(bitmapTransform(MultiTransformation(CenterCrop(), - MaskTransformation(R.drawable.mask_starfish)))) - .into(holder.image) + .load(R.drawable.check) + .apply(overrideOf(266.px, 252.px)) + .apply(bitmapTransform(MultiTransformation(CenterCrop(), + MaskTransformation(R.drawable.mask_starfish)))) + .into(holder.image) } NinePatchMask -> { Glide.with(context) - .load(R.drawable.check) - .apply(overrideOf(300.px, 200.px)) - .apply(bitmapTransform(MultiTransformation(CenterCrop(), - MaskTransformation(R.drawable.mask_chat_right)))) - .into(holder.image) + .load(R.drawable.check) + .apply(overrideOf(300.px, 200.px)) + .apply(bitmapTransform(MultiTransformation(CenterCrop(), + MaskTransformation(R.drawable.mask_chat_right)))) + .into(holder.image) } CropTop -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.TOP))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.TOP))) + .into(holder.image) CropCenter -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.CENTER))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.CENTER))) + .into(holder.image) CropBottom -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.BOTTOM))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(CropTransformation(300.px, 100.px, CropType.BOTTOM))) + .into(holder.image) CropSquare -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(CropSquareTransformation())) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(CropSquareTransformation())) + .into(holder.image) CropCircle -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(CropCircleTransformation())) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(CropCircleTransformation())) + .into(holder.image) CropCircleWithBorder -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform( - CropCircleWithBorderTransformation(Utils.toDp(4), Color.rgb(0, 145, 86)))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform( + CropCircleWithBorderTransformation(Utils.toDp(4), Color.rgb(0, 145, 86)))) + .into(holder.image) ColorFilter -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(ColorFilterTransformation(Color.argb(80, 255, 0, 0)))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(ColorFilterTransformation(Color.argb(80, 255, 0, 0)))) + .into(holder.image) Grayscale -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(GrayscaleTransformation())) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(GrayscaleTransformation())) + .into(holder.image) RoundedCorners -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(RoundedCornersTransformation(45, 0, - RoundedCornersTransformation.CornerType.BOTTOM))) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(RoundedCornersTransformation(120, 0, + RoundedCornersTransformation.CornerType.DIAGONAL_FROM_TOP_LEFT))) + .into(holder.image) Blur -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(BlurTransformation(25))) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(BlurTransformation(25))) + .into(holder.image) SupportRSBlur -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(SupportRSBlurTransformation(25, 10))) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(SupportRSBlurTransformation(25, 10))) + .into(holder.image) Toon -> Glide.with(context) - .load(R.drawable.demo) - .apply(bitmapTransform(ToonFilterTransformation())) - .into(holder.image) + .load(R.drawable.demo) + .apply(bitmapTransform(ToonFilterTransformation())) + .into(holder.image) Sepia -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(SepiaFilterTransformation())) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(SepiaFilterTransformation())) + .into(holder.image) Contrast -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(ContrastFilterTransformation(2.0f))) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(ContrastFilterTransformation(2.0f))) + .into(holder.image) Invert -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(InvertFilterTransformation())) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(InvertFilterTransformation())) + .into(holder.image) Pixel -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(PixelationFilterTransformation(20f))) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(PixelationFilterTransformation(20f))) + .into(holder.image) Sketch -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(SketchFilterTransformation())) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(SketchFilterTransformation())) + .into(holder.image) Swirl -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform( - SwirlFilterTransformation(0.5f, 1.0f, PointF(0.5f, 0.5f))).dontAnimate()) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform( + SwirlFilterTransformation(0.5f, 1.0f, PointF(0.5f, 0.5f))).dontAnimate()) + .into(holder.image) Brightness -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(BrightnessFilterTransformation(0.5f)).dontAnimate()) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(BrightnessFilterTransformation(0.5f)).dontAnimate()) + .into(holder.image) Kuawahara -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(KuwaharaFilterTransformation(25)).dontAnimate()) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(KuwaharaFilterTransformation(25)).dontAnimate()) + .into(holder.image) Vignette -> Glide.with(context) - .load(R.drawable.check) - .apply(bitmapTransform(VignetteFilterTransformation(PointF(0.5f, 0.5f), - floatArrayOf(0.0f, 0.0f, 0.0f), 0f, 0.75f)).dontAnimate()) - .into(holder.image) + .load(R.drawable.check) + .apply(bitmapTransform(VignetteFilterTransformation(PointF(0.5f, 0.5f), + floatArrayOf(0.0f, 0.0f, 0.0f), 0f, 0.75f)).dontAnimate()) + .into(holder.image) } holder.title.text = dataSet[position].name } diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml index 56e7bdd..f05bb14 100644 --- a/example/src/main/res/layout/activity_main.xml +++ b/example/src/main/res/layout/activity_main.xml @@ -1,10 +1,8 @@ - + android:layout_height="match_parent"> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/example/src/main/res/layout/layout_list_item.xml b/example/src/main/res/layout/layout_list_item.xml index 2f0e092..395a426 100644 --- a/example/src/main/res/layout/layout_list_item.xml +++ b/example/src/main/res/layout/layout_list_item.xml @@ -1,10 +1,8 @@ - + android:layout_height="wrap_content"> + app:layout_constraintTop_toTopOf="parent" /> + + app:layout_constraintStart_toStartOf="parent" /> diff --git a/gradle.properties b/gradle.properties index 7874581..11e3750 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,19 +17,13 @@ org.gradle.caching=true android.enableBuildCache=true android.useAndroidX=true android.enableJetifier=true - # Use R8 instead of ProGuard for code shrinking. android.enableR8=true android.enableR8.fullMode=true -# Enable rudimentary R class namespacing where each library only contains -# references to the resources it declares instead of declarations plus all -# transitive dependency references. -android.namespacedRClass=true - -VERSION_NAME=4.1.0 +VERSION_NAME=4.2.0 +VERSION_CODE=420 GROUP=jp.wasabeef - -COMPILE_SDK_VERSION=28 -TARGET_SDK_VERSION=28 -MIN_SDK_VERSION=14 \ No newline at end of file +COMPILE_SDK_VERSION=30 +TARGET_SDK_VERSION=30 +MIN_SDK_VERSION=14 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0acbdc..12d38de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 8e25e6c..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -125,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -154,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 24467a1..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/signingConfigs/debug.gradle b/signingConfigs/debug.gradle new file mode 100644 index 0000000..d3bd148 --- /dev/null +++ b/signingConfigs/debug.gradle @@ -0,0 +1,14 @@ +signingConfigs { + debug { + storeFile file("debug.keystore") + storePassword "android" + keyAlias "androiddebugkey" + keyPassword "android" + } +} + +// $ keytool -v -list -keystore +// Certificate fingerprints: +// MD5: 28:22:7C:A4:B9:2F:6E:C7:D5:58:62:48:EB:7E:82:C3 +// SHA1: 94:25:A9:50:9C:0E:AE:AA:00:37:5E:D6:71:E3:BC:ED:17:E5:0C:A3 +// SHA256: 04:92:39:09:3D:1C:B6:16:BE:55:58:A3:5F:3B:BB:CB:0B:E7:F1:DA:AA:26:C5:2D:BD:2F:44:CF:AE:47:CF:87 diff --git a/signingConfigs/debug.keystore b/signingConfigs/debug.keystore new file mode 100644 index 0000000..e9341eb Binary files /dev/null and b/signingConfigs/debug.keystore differ diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/BitmapTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/BitmapTransformation.java index 3b6b8d6..f5a35f2 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/BitmapTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/BitmapTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef * Copyright 2014 Google, Inc. All rights reserved. *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -40,8 +40,8 @@ public abstract class BitmapTransformation implements Transformation { int outWidth, int outHeight) { if (!Util.isValidDimensions(outWidth, outHeight)) { throw new IllegalArgumentException( - "Cannot apply transformation on width: " + outWidth + " or height: " + outHeight - + " less than or equal to zero and not Target.SIZE_ORIGINAL"); + "Cannot apply transformation on width: " + outWidth + " or height: " + outHeight + + " less than or equal to zero and not Target.SIZE_ORIGINAL"); } BitmapPool bitmapPool = Glide.get(context).getBitmapPool(); Bitmap toTransform = resource.get(); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java index 185ca40..c9247c2 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class BlurTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.BlurTransformation." + VERSION; + "jp.wasabeef.glide.transformations.BlurTransformation." + VERSION; private static int MAX_RADIUS = 25; private static int DEFAULT_DOWN_SAMPLING = 1; @@ -86,8 +86,8 @@ public class BlurTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof BlurTransformation && - ((BlurTransformation) o).radius == radius && - ((BlurTransformation) o).sampling == sampling; + ((BlurTransformation) o).radius == radius && + ((BlurTransformation) o).sampling == sampling; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java index e98b341..936b55b 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class ColorFilterTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.ColorFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.ColorFilterTransformation." + VERSION; private int color; @@ -48,7 +48,7 @@ public class ColorFilterTransformation extends BitmapTransformation { int height = toTransform.getHeight(); Bitmap.Config config = - toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; + toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; Bitmap bitmap = pool.get(width, height, config); setCanvasBitmapDensity(toTransform, bitmap); @@ -70,7 +70,7 @@ public class ColorFilterTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof ColorFilterTransformation && - ((ColorFilterTransformation) o).color == color; + ((ColorFilterTransformation) o).color == color; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java index b3a2277..0a681e1 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ public class CropCircleTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.CropCircleTransformation." + VERSION; + "jp.wasabeef.glide.transformations.CropCircleTransformation." + VERSION; @Override protected Bitmap transform(@NonNull Context context, @NonNull BitmapPool pool, diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleWithBorderTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleWithBorderTransformation.java index 6825107..664ba6b 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleWithBorderTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleWithBorderTransformation.java @@ -17,7 +17,7 @@ import java.security.MessageDigest; import jp.wasabeef.glide.transformations.internal.Utils; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,10 +68,10 @@ public class CropCircleWithBorderTransformation extends BitmapTransformation { Canvas canvas = new Canvas(bitmap); canvas.drawCircle( - outWidth / 2f, - outHeight / 2f, - Math.max(outWidth, outHeight) / 2f - borderSize / 2f, - paint + outWidth / 2f, + outHeight / 2f, + Math.max(outWidth, outHeight) / 2f - borderSize / 2f, + paint ); return bitmap; @@ -85,12 +85,12 @@ public class CropCircleWithBorderTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof CropCircleWithBorderTransformation && - ((CropCircleWithBorderTransformation) o).borderSize == borderSize && - ((CropCircleWithBorderTransformation) o).borderColor == borderColor; + ((CropCircleWithBorderTransformation) o).borderSize == borderSize && + ((CropCircleWithBorderTransformation) o).borderColor == borderColor; } @Override public int hashCode() { return ID.hashCode() + borderSize * 100 + borderColor + 10; } -} \ No newline at end of file +} diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java index 678a9ea..b8f41d9 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class CropSquareTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.CropSquareTransformation." + VERSION; + "jp.wasabeef.glide.transformations.CropSquareTransformation." + VERSION; private int size; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java index c70ca4c..8dbcd4b 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class CropTransformation extends BitmapTransformation { height = height == 0 ? toTransform.getHeight() : height; Bitmap.Config config = - toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; + toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; Bitmap bitmap = pool.get(width, height, config); bitmap.setHasAlpha(true); @@ -105,9 +105,9 @@ public class CropTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof CropTransformation && - ((CropTransformation) o).width == width && - ((CropTransformation) o).height == height && - ((CropTransformation) o).cropType == cropType; + ((CropTransformation) o).width == width && + ((CropTransformation) o).height == height && + ((CropTransformation) o).cropType == cropType; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java index 66b8930..1a2fe43 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class GrayscaleTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.GrayscaleTransformation." + VERSION; + "jp.wasabeef.glide.transformations.GrayscaleTransformation." + VERSION; @Override protected Bitmap transform(@NonNull Context context, @NonNull BitmapPool pool, @@ -42,7 +42,7 @@ public class GrayscaleTransformation extends BitmapTransformation { int height = toTransform.getHeight(); Bitmap.Config config = - toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; + toTransform.getConfig() != null ? toTransform.getConfig() : Bitmap.Config.ARGB_8888; Bitmap bitmap = pool.get(width, height, config); setCanvasBitmapDensity(toTransform, bitmap); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java index e57a7ea..2d5f93e 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class MaskTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.MaskTransformation." + VERSION; + "jp.wasabeef.glide.transformations.MaskTransformation." + VERSION; private static Paint paint = new Paint(); private int maskId; @@ -83,7 +83,7 @@ public class MaskTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof MaskTransformation && - ((MaskTransformation) o).maskId == maskId; + ((MaskTransformation) o).maskId == maskId; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java index 9538f1e..a8c218c 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -136,47 +136,47 @@ public class RoundedCornersTransformation extends BitmapTransformation { private void drawTopLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, margin + diameter, margin + diameter), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin + radius, margin + radius, bottom), paint); canvas.drawRect(new RectF(margin + radius, margin, right, bottom), paint); } private void drawTopRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(right - diameter, margin, right, margin + diameter), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin, right - radius, bottom), paint); canvas.drawRect(new RectF(right - radius, margin + radius, right, bottom), paint); } private void drawBottomLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, bottom - diameter, margin + diameter, bottom), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin, margin + diameter, bottom - radius), paint); canvas.drawRect(new RectF(margin + radius, margin, right, bottom), paint); } private void drawBottomRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(right - diameter, bottom - diameter, right, bottom), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin, right - radius, bottom), paint); canvas.drawRect(new RectF(right - radius, margin, right, bottom - radius), paint); } private void drawTopRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, right, margin + diameter), radius, radius, - paint); + paint); canvas.drawRect(new RectF(margin, margin + radius, right, bottom), paint); } private void drawBottomRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, bottom - diameter, right, bottom), radius, radius, - paint); + paint); canvas.drawRect(new RectF(margin, margin, right, bottom - radius), paint); } private void drawLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, margin + diameter, bottom), radius, radius, - paint); + paint); canvas.drawRect(new RectF(margin + radius, margin, right, bottom), paint); } @@ -187,22 +187,22 @@ public class RoundedCornersTransformation extends BitmapTransformation { private void drawOtherTopLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, bottom - diameter, right, bottom), radius, radius, - paint); + paint); canvas.drawRoundRect(new RectF(right - diameter, margin, right, bottom), radius, radius, paint); canvas.drawRect(new RectF(margin, margin, right - radius, bottom - radius), paint); } private void drawOtherTopRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, margin + diameter, bottom), radius, radius, - paint); + paint); canvas.drawRoundRect(new RectF(margin, bottom - diameter, right, bottom), radius, radius, - paint); + paint); canvas.drawRect(new RectF(margin + radius, margin, right, bottom - radius), paint); } private void drawOtherBottomLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, right, margin + diameter), radius, radius, - paint); + paint); canvas.drawRoundRect(new RectF(right - diameter, margin, right, bottom), radius, radius, paint); canvas.drawRect(new RectF(margin, margin + radius, right - radius, bottom), paint); } @@ -210,18 +210,18 @@ public class RoundedCornersTransformation extends BitmapTransformation { private void drawOtherBottomRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, right, margin + diameter), radius, radius, - paint); + paint); canvas.drawRoundRect(new RectF(margin, margin, margin + diameter, bottom), radius, radius, - paint); + paint); canvas.drawRect(new RectF(margin + radius, margin + radius, right, bottom), paint); } private void drawDiagonalFromTopLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(margin, margin, margin + diameter, margin + diameter), radius, - radius, paint); + radius, paint); canvas.drawRoundRect(new RectF(right - diameter, bottom - diameter, right, bottom), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin + radius, right - radius, bottom), paint); canvas.drawRect(new RectF(margin + radius, margin, right, bottom - radius), paint); } @@ -229,9 +229,9 @@ public class RoundedCornersTransformation extends BitmapTransformation { private void drawDiagonalFromTopRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) { canvas.drawRoundRect(new RectF(right - diameter, margin, right, margin + diameter), radius, - radius, paint); + radius, paint); canvas.drawRoundRect(new RectF(margin, bottom - diameter, margin + diameter, bottom), radius, - radius, paint); + radius, paint); canvas.drawRect(new RectF(margin, margin, right - radius, bottom - radius), paint); canvas.drawRect(new RectF(margin + radius, margin + radius, right, bottom), paint); } @@ -239,16 +239,16 @@ public class RoundedCornersTransformation extends BitmapTransformation { @Override public String toString() { return "RoundedTransformation(radius=" + radius + ", margin=" + margin + ", diameter=" - + diameter + ", cornerType=" + cornerType.name() + ")"; + + diameter + ", cornerType=" + cornerType.name() + ")"; } @Override public boolean equals(Object o) { return o instanceof RoundedCornersTransformation && - ((RoundedCornersTransformation) o).radius == radius && - ((RoundedCornersTransformation) o).diameter == diameter && - ((RoundedCornersTransformation) o).margin == margin && - ((RoundedCornersTransformation) o).cornerType == cornerType; + ((RoundedCornersTransformation) o).radius == radius && + ((RoundedCornersTransformation) o).diameter == diameter && + ((RoundedCornersTransformation) o).margin == margin && + ((RoundedCornersTransformation) o).cornerType == cornerType; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java index 8554f27..3b97281 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class SupportRSBlurTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.SupportRSBlurTransformation." + VERSION; + "jp.wasabeef.glide.transformations.SupportRSBlurTransformation." + VERSION; private static int MAX_RADIUS = 25; private static int DEFAULT_DOWN_SAMPLING = 1; @@ -99,8 +99,8 @@ public class SupportRSBlurTransformation extends BitmapTransformation { @Override public boolean equals(Object o) { return o instanceof SupportRSBlurTransformation && - ((SupportRSBlurTransformation) o).radius == radius && - ((SupportRSBlurTransformation) o).sampling == sampling; + ((SupportRSBlurTransformation) o).radius == radius && + ((SupportRSBlurTransformation) o).sampling == sampling; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java index fe0a83f..ce731c5 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ public class BrightnessFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.BrightnessFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.BrightnessFilterTransformation." + VERSION; private float brightness; @@ -52,7 +52,7 @@ public class BrightnessFilterTransformation extends GPUFilterTransformation { @Override public boolean equals(Object o) { return o instanceof BrightnessFilterTransformation && - ((BrightnessFilterTransformation) o).brightness == brightness; + ((BrightnessFilterTransformation) o).brightness == brightness; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java index d2ef994..8fbf5c0 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ public class ContrastFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.ContrastFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.ContrastFilterTransformation." + VERSION; private float contrast; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java index 0dfcf97..bc8b780 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class GPUFilterTransformation extends BitmapTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.GPUFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.GPUFilterTransformation." + VERSION; private static final byte[] ID_BYTES = ID.getBytes(CHARSET); private GPUImageFilter gpuImageFilter; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java index 50f098a..7e6503e 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ public class InvertFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.InvertFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.InvertFilterTransformation." + VERSION; public InvertFilterTransformation() { super(new GPUImageColorInvertFilter()); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java index 72e2d63..b7a619c 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import jp.co.cyberagent.android.gpuimage.filter.GPUImageKuwaharaFilter; /** * Kuwahara all the colors in the image. - * + *

* The radius to sample from when creating the brush-stroke effect, with a default of 25. * The larger the radius, the slower the filter. */ @@ -32,7 +32,7 @@ public class KuwaharaFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.KuwaharaFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.KuwaharaFilterTransformation." + VERSION; private int radius; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java index 3d29f32..548ed5c 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,14 +24,14 @@ import jp.co.cyberagent.android.gpuimage.filter.GPUImagePixelationFilter; /** * Applies a Pixelation effect to the image. - * + *

* The pixel with a default of 10.0. */ public class PixelationFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.PixelationFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.PixelationFilterTransformation." + VERSION; private float pixel; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java index aae6655..eb4e47f 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ public class SepiaFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.SepiaFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.SepiaFilterTransformation." + VERSION; private float intensity; diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java index 800e284..d737a29 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ public class SketchFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.SketchFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.SketchFilterTransformation." + VERSION; public SketchFilterTransformation() { super(new GPUImageSketchFilter()); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java index 42358e4..73394c7 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ public class SwirlFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.SwirlFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.SwirlFilterTransformation." + VERSION; private float radius; private float angle; @@ -60,15 +60,15 @@ public class SwirlFilterTransformation extends GPUFilterTransformation { @Override public String toString() { return "SwirlFilterTransformation(radius=" + radius + ",angle=" + angle + ",center=" - + center.toString() + ")"; + + center.toString() + ")"; } @Override public boolean equals(Object o) { return o instanceof SwirlFilterTransformation && - ((SwirlFilterTransformation) o).radius == radius && - ((SwirlFilterTransformation) o).angle == radius && - ((SwirlFilterTransformation) o).center.equals(center.x, center.y); + ((SwirlFilterTransformation) o).radius == radius && + ((SwirlFilterTransformation) o).angle == radius && + ((SwirlFilterTransformation) o).center.equals(center.x, center.y); } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java index cece2bc..8d531b4 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ public class ToonFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.ToonFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.ToonFilterTransformation." + VERSION; private float threshold; private float quantizationLevels; @@ -52,14 +52,14 @@ public class ToonFilterTransformation extends GPUFilterTransformation { @Override public String toString() { return "ToonFilterTransformation(threshold=" + threshold + ",quantizationLevels=" - + quantizationLevels + ")"; + + quantizationLevels + ")"; } @Override public boolean equals(Object o) { return o instanceof ToonFilterTransformation && - ((ToonFilterTransformation) o).threshold == threshold && - ((ToonFilterTransformation) o).quantizationLevels == quantizationLevels; + ((ToonFilterTransformation) o).threshold == threshold && + ((ToonFilterTransformation) o).quantizationLevels == quantizationLevels; } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java index f76d3a0..a92617d 100755 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java @@ -1,7 +1,7 @@ package jp.wasabeef.glide.transformations.gpu; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ public class VignetteFilterTransformation extends GPUFilterTransformation { private static final int VERSION = 1; private static final String ID = - "jp.wasabeef.glide.transformations.gpu.VignetteFilterTransformation." + VERSION; + "jp.wasabeef.glide.transformations.gpu.VignetteFilterTransformation." + VERSION; private PointF center; private float[] vignetteColor; @@ -61,22 +61,22 @@ public class VignetteFilterTransformation extends GPUFilterTransformation { @Override public String toString() { return "VignetteFilterTransformation(center=" + center.toString() + ",color=" + Arrays.toString( - vignetteColor) + ",start=" + vignetteStart + ",end=" + vignetteEnd + ")"; + vignetteColor) + ",start=" + vignetteStart + ",end=" + vignetteEnd + ")"; } @Override public boolean equals(Object o) { return o instanceof VignetteFilterTransformation && - ((VignetteFilterTransformation) o).center.equals(center.x, center.y) && - Arrays.equals(((VignetteFilterTransformation) o).vignetteColor, vignetteColor) && - ((VignetteFilterTransformation) o).vignetteStart == vignetteStart && - ((VignetteFilterTransformation) o).vignetteEnd == vignetteEnd; + ((VignetteFilterTransformation) o).center.equals(center.x, center.y) && + Arrays.equals(((VignetteFilterTransformation) o).vignetteColor, vignetteColor) && + ((VignetteFilterTransformation) o).vignetteStart == vignetteStart && + ((VignetteFilterTransformation) o).vignetteEnd == vignetteEnd; } @Override public int hashCode() { return ID.hashCode() + center.hashCode() + Arrays.hashCode(vignetteColor) + - (int) (vignetteStart * 100) + (int) (vignetteEnd * 10); + (int) (vignetteStart * 100) + (int) (vignetteEnd * 10); } @Override diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java index 822ca2a..3275b86 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java @@ -3,7 +3,7 @@ package jp.wasabeef.glide.transformations.internal; import android.graphics.Bitmap; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -254,4 +254,4 @@ public class FastBlur { return (bitmap); } -} \ No newline at end of file +} diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java index 137ddda..2093387 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java @@ -11,7 +11,7 @@ import android.renderscript.RenderScript; import android.renderscript.ScriptIntrinsicBlur; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class RSBlur { rs = RenderScript.create(context); rs.setMessageHandler(new RenderScript.RSMessageHandler()); input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE, - Allocation.USAGE_SCRIPT); + Allocation.USAGE_SCRIPT); output = Allocation.createTyped(rs, input.getType()); blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java index 9775b44..ada3409 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java @@ -12,7 +12,7 @@ import androidx.renderscript.RenderScript; import androidx.renderscript.ScriptIntrinsicBlur; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class SupportRSBlur { rs = RenderScript.create(context); rs.setMessageHandler(new RenderScript.RSMessageHandler()); input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE, - Allocation.USAGE_SCRIPT); + Allocation.USAGE_SCRIPT); output = Allocation.createTyped(rs, input.getType()); blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs)); diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java index 36ad066..21bc619 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java @@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable; import android.os.Build; /** - * Copyright (C) 2019 Wasabeef + * Copyright (C) 2020 Wasabeef *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.