diff --git a/build.gradle b/build.gradle index 35cec7f..be6fe8a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,18 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.72' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.novoda:bintray-release:0.9.1' + classpath 'com.novoda:bintray-release:0.9.2' } } @@ -20,6 +20,8 @@ allprojects { repositories { google() jcenter() + maven { url "https://jitpack.io" } + mavenCentral() } tasks.withType(Javadoc) { options { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef3e366..b1f1cee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 490a552..bf57a23 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,15 @@ apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'maven' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 12 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" @@ -30,7 +33,9 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - compileOnly 'androidx.appcompat:appcompat:1.0.2' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + compileOnly 'androidx.appcompat:appcompat:1.1.0' + compileOnly 'androidx.core:core-ktx:1.2.0' } diff --git a/library/src/main/java/com/scwang/wave/MultiWaveHeader.java b/library/src/main/java/com/scwang/wave/MultiWaveHeader.java deleted file mode 100644 index a6ca03a..0000000 --- a/library/src/main/java/com/scwang/wave/MultiWaveHeader.java +++ /dev/null @@ -1,420 +0,0 @@ -package com.scwang.wave; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.LinearGradient; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.RectF; -import android.graphics.Shader; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; -import androidx.core.graphics.ColorUtils; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; -import android.view.animation.DecelerateInterpolator; -import android.view.animation.Interpolator; - -import java.util.ArrayList; -import java.util.List; - -import static java.lang.Float.parseFloat; - -/** - * 多重水波纹 - * Created by SCWANG on 2017/12/11. - */ -@SuppressWarnings("unused") -public class MultiWaveHeader extends ViewGroup { - - protected Path mPath; - protected ShapeType mShape = ShapeType.Rect; - protected Paint mPaint = new Paint(); - protected Matrix mMatrix = new Matrix(); - protected List mltWave = new ArrayList<>(); - protected float mCornerRadius; - protected int mWaveHeight; - protected int mStartColor; - protected int mCloseColor; - protected int mGradientAngle; - protected boolean mIsRunning; - protected boolean mEnableFullScreen; - protected float mVelocity; - protected float mColorAlpha; - protected float mProgress; - protected float mCurProgress; - protected long mLastTime = 0; - protected ValueAnimator reboundAnimator; - - public MultiWaveHeader(Context context) { - this(context, null, 0); - } - - public MultiWaveHeader(Context context, @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public MultiWaveHeader(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - - mPaint.setAntiAlias(true); - - TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.MultiWaveHeader); - - mWaveHeight = ta.getDimensionPixelOffset(R.styleable.MultiWaveHeader_mwhWaveHeight, Util.dp2px(50)); - mStartColor = ta.getColor(R.styleable.MultiWaveHeader_mwhStartColor, 0xFF056CD0); - mCloseColor = ta.getColor(R.styleable.MultiWaveHeader_mwhCloseColor, 0xFF31AFFE); - mColorAlpha = ta.getFloat(R.styleable.MultiWaveHeader_mwhColorAlpha, 0.45f); - mVelocity = ta.getFloat(R.styleable.MultiWaveHeader_mwhVelocity, 1f); - mGradientAngle = ta.getInt(R.styleable.MultiWaveHeader_mwhGradientAngle, 45); - mIsRunning = ta.getBoolean(R.styleable.MultiWaveHeader_mwhIsRunning, true); - mEnableFullScreen = ta.getBoolean(R.styleable.MultiWaveHeader_mwhEnableFullScreen, false); - mCornerRadius = ta.getDimensionPixelOffset(R.styleable.MultiWaveHeader_mwhCornerRadius, Util.dp2px(25)); - mShape = ShapeType.values()[ta.getInt(R.styleable.MultiWaveHeader_mwhShape, mShape.ordinal())]; - mProgress = mCurProgress = ta.getFloat(R.styleable.MultiWaveHeader_mwhProgress, 1f); - - if (ta.hasValue(R.styleable.MultiWaveHeader_mwhWaves)) { - setTag(ta.getString(R.styleable.MultiWaveHeader_mwhWaves)); - } else if (getTag() == null) { - setTag("70,25,1.4,1.4,-26\n" + - "100,5,1.4,1.2,15\n" + - "420,0,1.15,1,-10\n" + - "520,10,1.7,1.5,20\n" + - "220,0,1,1,-15"); - } - - ta.recycle(); - } - -// @Override -// protected void onFinishInflate() { -// super.onFinishInflate(); -// -// int count = getChildCount(); -// if (count > 0) { -// for (int i = 0; i < count; i++) { -// View child = getChildAt(i); -// if (child instanceof Wave) { -// child.setVisibility(GONE); -// } else { -// throw new RuntimeException("只能用Wave作为子视图，You can only use Wave as a subview."); -// } -// } -// } -// } - - @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - if (mltWave.isEmpty()) { - updateWavePath(); - updateWavePath(r - l, b - t); - } - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - updateShapePath(); - updateWavePath(w, h); - updateLinearGradient(w, h); - } - - @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); - if (mltWave.size() > 0) { - - if (mPath != null) { - canvas.save(); - canvas.clipPath(mPath); - } - - View thisView = this; - int height = thisView.getHeight(); - long thisTime = System.currentTimeMillis(); - for (Wave wave : mltWave) { - mMatrix.reset(); - canvas.save(); - if (mIsRunning && mLastTime > 0 && wave.velocity != 0) { - float offsetX = (wave.offsetX - (wave.velocity * mVelocity * (thisTime - mLastTime) / 1000f)); - if (-wave.velocity > 0) { - offsetX %= (float) wave.width / 2; - } else { - while (offsetX < 0) { - offsetX += ((float)wave.width / 2); - } - } - wave.offsetX = offsetX; - mMatrix.setTranslate(offsetX, (1 - mCurProgress) * height);//wave.offsetX = - canvas.translate(-offsetX, -wave.offsetY - (1 - mCurProgress) * height); - } else{ - mMatrix.setTranslate(wave.offsetX, (1 - mCurProgress) * height); - canvas.translate(-wave.offsetX, -wave.offsetY - (1 - mCurProgress) * height); - } - mPaint.getShader().setLocalMatrix(mMatrix); - canvas.drawPath(wave.path, mPaint); - canvas.restore(); - } - mLastTime = thisTime; - - if (mPath != null) { - canvas.restore(); - } - - if (mIsRunning) { - invalidate(); - } - } - } - - private void updateLinearGradient(int width, int height) { - int startColor = ColorUtils.setAlphaComponent(mStartColor, (int)(mColorAlpha*255)); - int closeColor = ColorUtils.setAlphaComponent(mCloseColor, (int)(mColorAlpha*255)); - //noinspection UnnecessaryLocalVariable - double w = width; - double h = height * mCurProgress; - double r = Math.sqrt(w * w + h * h) / 2; - double y = r * Math.sin(2 * Math.PI * mGradientAngle / 360); - double x = r * Math.cos(2 * Math.PI * mGradientAngle / 360); - mPaint.setShader(new LinearGradient((int)(w/2-x), (int)(h/2-y), (int)(w/2+x), (int)(h/2+y), startColor, closeColor, Shader.TileMode.CLAMP)); - } - - - protected void updateShapePath() { - View thisView = this; - int w = thisView.getWidth(); - int h = thisView.getHeight(); - if (w > 0 && h > 0 && mShape != null && mShape != ShapeType.Rect) { - mPath = new Path(); - switch (mShape) { - case RoundRect: - mPath.addRoundRect(new RectF(0, 0, w, h), mCornerRadius, mCornerRadius, Path.Direction.CW); - break; - case Oval: - mPath.addOval(new RectF(0, 0, w, h), Path.Direction.CW); - break; - } - } else { - mPath = null; - } - } - - protected void updateWavePath() { - mltWave.clear(); - if (getTag() instanceof String) { - String[] waves = getTag().toString().split("\\s+"); - if ("-1".equals(getTag())) { - waves = "70,25,1.4,1.4,-26\n100,5,1.4,1.2,15\n420,0,1.15,1,-10\n520,10,1.7,1.5,20\n220,0,1,1,-15".split("\\s+"); - } else if ("-2".equals(getTag())) { - waves = "0,0,1,0.5,90\n90,0,1,0.5,90".split("\\s+"); - } - for (String wave : waves) { - String[] args = wave.split ("\\s*,\\s*"); - if (args.length == 5) { - mltWave.add(new Wave(Util.dp2px(parseFloat(args[0])), Util.dp2px(parseFloat(args[1])), Util.dp2px(parseFloat(args[4])), parseFloat(args[2]), parseFloat(args[3]), mWaveHeight/2)); - } - } - } else { - mltWave.add(new Wave(Util.dp2px(50), Util.dp2px(0), Util.dp2px(5), 1.7f, 2f, mWaveHeight / 2)); - } - } - - - protected void updateWavePath(int w, int h) { - for (Wave wave : mltWave) { - wave.updateWavePath(w, h, mWaveHeight / 2, mEnableFullScreen, mCurProgress); - } - } - - /** - * 执行回弹动画 - * @param progress 目标值 - * @param interpolator 加速器 - * @param duration 时长 - */ - protected void animProgress(float progress, Interpolator interpolator, int duration) { - if (mCurProgress != progress) { - if (reboundAnimator != null) { - reboundAnimator.cancel(); - } - reboundAnimator = ValueAnimator.ofFloat(mCurProgress, progress); - reboundAnimator.setDuration(duration); - reboundAnimator.setInterpolator(interpolator); - reboundAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - reboundAnimator = null; - } - }); - reboundAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - updateProgress((float)animation.getAnimatedValue()); - } - }); - reboundAnimator.start(); - } - } - - - protected void updateProgress(float progress) { - View thisView = this; - mCurProgress = progress; - updateLinearGradient(thisView.getWidth(), thisView.getHeight()); - if (mEnableFullScreen) { - for (Wave wave : mltWave) { - wave.updateWavePath(thisView.getWidth(), thisView.getHeight(), mCurProgress); - } - } - if (!mIsRunning) { - invalidate(); - } - } - - // - public void setWaves(String waves) { - setTag(waves); - if (mLastTime > 0) { - View thisView = this; - updateWavePath(); - updateWavePath(thisView.getWidth(), thisView.getHeight()); - } - } - - public int getWaveHeight() { - return mWaveHeight; - } - - public void setWaveHeight(int waveHeight) { - this.mWaveHeight = Util.dp2px(waveHeight); - if (!mltWave.isEmpty()) { - View thisView = this; - updateWavePath(thisView.getWidth(), thisView.getHeight()); - } - } - - public float getVelocity() { - return mVelocity; - } - - public void setVelocity(float velocity) { - this.mVelocity = velocity; - } - - public float getProgress() { - return mProgress; - } - - public void setProgress(float progress) { - this.mProgress = progress; - if (!mIsRunning) { - updateProgress(progress); - } else { - animProgress(progress, new DecelerateInterpolator(), 300); - } - } - - public void setProgress(float progress, Interpolator interpolator, int duration) { - this.mProgress = progress; - animProgress(progress, new DecelerateInterpolator(), duration); - } - - public int getGradientAngle() { - return mGradientAngle; - } - - public void setGradientAngle(int angle) { - this.mGradientAngle = angle; - if (!mltWave.isEmpty()) { - View thisView = this; - updateLinearGradient(thisView.getWidth(), thisView.getHeight()); - } - } - - public int getStartColor() { - return mStartColor; - } - - public void setStartColor(int color) { - this.mStartColor = color; - if (!mltWave.isEmpty()) { - View thisView = this; - updateLinearGradient(thisView.getWidth(), thisView.getHeight()); - } - } - - public void setStartColorId(@ColorRes int colorId) { - final View thisView = this; - setStartColor(Util.getColor(thisView.getContext(), colorId)); - } - - public int getCloseColor() { - return mCloseColor; - } - - public void setCloseColor(int color) { - this.mCloseColor = color; - if (!mltWave.isEmpty()) { - View thisView = this; - updateLinearGradient(thisView.getWidth(), thisView.getHeight()); - } - } - - public void setCloseColorId(@ColorRes int colorId) { - final View thisView = this; - setCloseColor(Util.getColor(thisView.getContext(), colorId)); - } - - public float getColorAlpha() { - return mColorAlpha; - } - - public void setColorAlpha(float alpha) { - this.mColorAlpha = alpha; - if (!mltWave.isEmpty()) { - View thisView = this; - updateLinearGradient(thisView.getWidth(), thisView.getHeight()); - } - } - - public void start() { - if (!mIsRunning) { - mIsRunning = true; - mLastTime = System.currentTimeMillis(); - invalidate(); - } - } - - public void stop() { - mIsRunning = false; - } - - public boolean isRunning() { - return mIsRunning; - } - - public void setEnableFullScreen(boolean fullScreen) { - this.mEnableFullScreen = fullScreen; - } - - public boolean isEnableFullScreen() { - return mEnableFullScreen; - } - - public void setShape(ShapeType shape) { - this.mShape = shape; - updateShapePath(); - } - - public ShapeType getShape() { - return mShape; - } - - // -} diff --git a/library/src/main/java/com/scwang/wave/MultiWaveHeader.kt b/library/src/main/java/com/scwang/wave/MultiWaveHeader.kt new file mode 100644 index 0000000..c73508a --- /dev/null +++ b/library/src/main/java/com/scwang/wave/MultiWaveHeader.kt @@ -0,0 +1,354 @@ +package com.scwang.wave + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.* +import android.util.AttributeSet +import android.util.Log +import android.view.View +import android.view.ViewGroup +import android.view.animation.DecelerateInterpolator +import android.view.animation.Interpolator +import androidx.annotation.ColorRes +import androidx.core.graphics.ColorUtils +import androidx.core.view.ViewCompat +import java.util.* +import kotlin.math.cos +import kotlin.math.sin +import kotlin.math.sqrt + +/** + * 多重水波纹 + * Created by SCWANG on 2017/12/11. + */ +@Suppress("unused", "MemberVisibilityCanBePrivate") +open class MultiWaveHeader @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) { + protected var mPath: Path? = null + protected var mShape: ShapeType = ShapeType.Rect + protected var mPaint = Paint() + protected var mMatrix = Matrix() + protected var mltWave: MutableList = ArrayList() + protected var mCornerRadius: Float + protected var mWaveHeight: Int + protected var mStartColor: Int + protected var mCloseColor: Int + protected var mGradientAngle: Int + var isRunning: Boolean + protected set + var isEnableFullScreen: Boolean + var velocity: Float + protected var mColorAlpha: Float + protected var mProgress: Float + protected var mCurProgress: Float + protected var mLastTime: Long = 0 + protected var reboundAnimator: ValueAnimator? = null + + init { + mPaint.isAntiAlias = true + val ta = context.obtainStyledAttributes(attrs, R.styleable.MultiWaveHeader) + mWaveHeight = ta.getDimensionPixelOffset(R.styleable.MultiWaveHeader_mwhWaveHeight, Util.dp2px(50f).toInt()) + mStartColor = ta.getColor(R.styleable.MultiWaveHeader_mwhStartColor, -0xfa9330) + mCloseColor = ta.getColor(R.styleable.MultiWaveHeader_mwhCloseColor, -0xce5002) + mColorAlpha = ta.getFloat(R.styleable.MultiWaveHeader_mwhColorAlpha, 0.45f) + velocity = ta.getFloat(R.styleable.MultiWaveHeader_mwhVelocity, 1f) + mGradientAngle = ta.getInt(R.styleable.MultiWaveHeader_mwhGradientAngle, 45) + isRunning = ta.getBoolean(R.styleable.MultiWaveHeader_mwhIsRunning, true) + isEnableFullScreen = ta.getBoolean(R.styleable.MultiWaveHeader_mwhEnableFullScreen, false) + mCornerRadius = ta.getDimensionPixelOffset(R.styleable.MultiWaveHeader_mwhCornerRadius, Util.dp2px(25f).toInt()).toFloat() + mShape = ShapeType.values()[ta.getInt(R.styleable.MultiWaveHeader_mwhShape, mShape.ordinal)] + mCurProgress = ta.getFloat(R.styleable.MultiWaveHeader_mwhProgress, 1f) + mProgress = mCurProgress + if (ta.hasValue(R.styleable.MultiWaveHeader_mwhWaves)) { + tag = ta.getString(R.styleable.MultiWaveHeader_mwhWaves) + } else if (tag == null) { + tag = """ + 70,25,1.4,1.4,-26 + 100,5,1.4,1.2,15 + 420,0,1.15,1,-10 + 520,10,1.7,1.5,20 + 220,0,1,1,-15 + """.trimIndent() + } + ta.recycle() + } + + // @Override + // protected void onFinishInflate() { + // super.onFinishInflate(); + // + // int count = getChildCount(); + // if (count > 0) { + // for (int i = 0; i < count; i++) { + // View child = getChildAt(i); + // if (child instanceof Wave) { + // child.setVisibility(GONE); + // } else { + // throw new RuntimeException("只能用Wave作为子视图，You can only use Wave as a subview."); + // } + // } + // } + // } + override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) { + if (mltWave.isEmpty()) { + updateWavePath() + updateWavePath(r - l, b - t) + } + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + updateShapePath() + updateWavePath(w, h) + updateLinearGradient(w, h) + } + + override fun dispatchDraw(canvas: Canvas) { + super.dispatchDraw(canvas) + if (mltWave.size > 0) { + mPath?.let { + canvas.save() + canvas.clipPath(it) + } + val thisView: View = this + val height = thisView.height + val thisTime = System.currentTimeMillis() + for (wave in mltWave) { + mMatrix.reset() + canvas.save() + if (isRunning && mLastTime > 0 && wave.velocity != 0F) { + var offsetX = wave.offsetX - wave.velocity * velocity * (thisTime - mLastTime) / 1000f + if (-wave.velocity > 0) { + offsetX %= (wave.width / 2).toFloat() + } else { + while (offsetX < 0) { + offsetX += (wave.width / 2).toFloat() + } + } + wave.offsetX = offsetX + mMatrix.setTranslate(offsetX, (1 - mCurProgress) * height) //wave.offsetX = + canvas.translate(-offsetX, -wave.offsetY - (1 - mCurProgress) * height) + } else { + mMatrix.setTranslate(wave.offsetX, (1 - mCurProgress) * height) + canvas.translate(-wave.offsetX, -wave.offsetY - (1 - mCurProgress) * height) + } + mPaint.shader.setLocalMatrix(mMatrix) + canvas.drawPath(wave.path, mPaint) + canvas.restore() + } + mLastTime = thisTime + mPath?.let { + canvas.restore() + } + if (isRunning) { + ViewCompat.postInvalidateOnAnimation(this) + } + } + } + + private fun updateLinearGradient(width: Int, height: Int) { + val startColor = ColorUtils.setAlphaComponent(mStartColor, (mColorAlpha * 255).toInt()) + val closeColor = ColorUtils.setAlphaComponent(mCloseColor, (mColorAlpha * 255).toInt()) + val w = width.toDouble() + val h = height * mCurProgress.toDouble() + val r = sqrt(w * w + h * h) / 2 + val y = r * sin(2 * Math.PI * mGradientAngle / 360) + val x = r * cos(2 * Math.PI * mGradientAngle / 360) + mPaint.shader = LinearGradient((w / 2 - x).toFloat(), (h / 2 - y).toFloat(), (w / 2 + x).toFloat(), (h / 2 + y).toFloat(), startColor, closeColor, Shader.TileMode.CLAMP) + } + + protected fun updateShapePath() { + val thisView: View = this + val w = thisView.width + val h = thisView.height + if (w > 0 && h > 0) { + when (mShape) { + ShapeType.RoundRect -> { + mPath = Path() + mPath?.addRoundRect(RectF(0F, 0F, w.toFloat(), h.toFloat()), mCornerRadius, mCornerRadius, Path.Direction.CW) + } + ShapeType.Oval -> { + mPath = Path() + mPath?.addOval(RectF(0F, 0F, w.toFloat(), h.toFloat()), Path.Direction.CW) + } + else -> mPath = null + } + } + } + + protected fun updateWavePath() { + mltWave.clear() + if (tag is String) { + var waves = tag.toString().split("\\s+".toRegex()) + if ("-1" == tag) { + waves = "70,25,1.4,1.4,-26\n100,5,1.4,1.2,15\n420,0,1.15,1,-10\n520,10,1.7,1.5,20\n220,0,1,1,-15".split("\\s+".toRegex()) + } else if ("-2" == tag) { + waves = "0,0,1,0.5,90\n90,0,1,0.5,90".split("\\s+".toRegex()) + } + for (wave in waves) { + val args = wave.split("\\s*,\\s*".toRegex()) + if (args.size == 5) { + mltWave.add(Wave(Util.dp2px(args[0].toFloat()), Util.dp2px(args[1].toFloat()), Util.dp2px(args[4].toFloat()), args[2].toFloat(), args[3].toFloat(), mWaveHeight / 2)) + } else { + //Silently log + Log.e("MultiWaveHeader", "Incorrect Wave String Passed: wave") + } + } + } else { + val wave = Wave(Util.dp2px(50f), Util.dp2px(0f), Util.dp2px(5f), 1.7f, 2f, mWaveHeight / 2) + mltWave.add(wave) + } + } + + protected fun updateWavePath(w: Int, h: Int) { + for (wave in mltWave) { + wave.updateWavePath(w, h, mWaveHeight / 2, isEnableFullScreen, mCurProgress) + } + } + + /** + * 执行回弹动画 + * @param progress 目标值 + * @param interpolator 加速器 + * @param duration 时长 + */ + protected fun animProgress(progress: Float, interpolator: Interpolator?, duration: Int) { + if (mCurProgress != progress) { + if (reboundAnimator != null) { + reboundAnimator!!.cancel() + } + reboundAnimator = ValueAnimator.ofFloat(mCurProgress, progress) + reboundAnimator?.duration = duration.toLong() + reboundAnimator?.interpolator = interpolator + reboundAnimator?.addListener(object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + reboundAnimator = null + } + }) + reboundAnimator?.addUpdateListener { animation -> updateProgress(animation.animatedValue as Float) } + reboundAnimator?.start() + } + } + + protected fun updateProgress(progress: Float) { + val thisView: View = this + mCurProgress = progress + updateLinearGradient(thisView.width, thisView.height) + if (isEnableFullScreen) { + for (wave in mltWave) { + wave.updateWavePath(thisView.width, thisView.height, mCurProgress) + } + } + if (!isRunning) { + invalidate() + } + } + + // + fun setWaves(waves: String?) { + tag = waves + if (mLastTime > 0) { + val thisView: View = this + updateWavePath() + updateWavePath(thisView.width, thisView.height) + } + } + + var waveHeight: Int + get() = mWaveHeight + set(waveHeight) { + mWaveHeight = Util.dp2px(waveHeight.toFloat()).toInt() + if (mltWave.isNotEmpty()) { + val thisView: View = this + updateWavePath(thisView.width, thisView.height) + } + } + + var progress: Float + get() = mProgress + set(progress) { + mProgress = progress + if (!isRunning) { + updateProgress(progress) + } else { + @Suppress("MemberVisibilityCanBePrivate") + animProgress(progress, DecelerateInterpolator(), 300) + } + } + + fun setProgress(progress: Float, interpolator: Interpolator = DecelerateInterpolator(), duration: Int) { + mProgress = progress + animProgress(progress, interpolator, duration) + } + + var gradientAngle: Int + get() = mGradientAngle + set(angle) { + mGradientAngle = angle + if (mltWave.isNotEmpty()) { + val thisView: View = this + updateLinearGradient(thisView.width, thisView.height) + } + } + + var startColor: Int + get() = mStartColor + set(color) { + mStartColor = color + if (mltWave.isNotEmpty()) { + val thisView: View = this + updateLinearGradient(thisView.width, thisView.height) + } + } + + fun setStartColorId(@ColorRes colorId: Int) { + val thisView: View = this + startColor = Util.getColor(thisView.context, colorId) + } + + var closeColor: Int + get() = mCloseColor + set(color) { + mCloseColor = color + if (mltWave.isNotEmpty()) { + val thisView: View = this + updateLinearGradient(thisView.width, thisView.height) + } + } + + fun setCloseColorId(@ColorRes colorId: Int) { + val thisView: View = this + closeColor = Util.getColor(thisView.context, colorId) + } + + var colorAlpha: Float + get() = mColorAlpha + set(alpha) { + mColorAlpha = alpha + if (mltWave.isNotEmpty()) { + val thisView: View = this + updateLinearGradient(thisView.width, thisView.height) + } + } + + fun start() { + if (!isRunning) { + isRunning = true + mLastTime = System.currentTimeMillis() + invalidate() + } + } + + fun stop() { + isRunning = false + } + + var shape: ShapeType + get() = mShape + set(shape) { + mShape = shape + updateShapePath() + } + // +} \ No newline at end of file diff --git a/library/src/main/java/com/scwang/wave/ShapeType.java b/library/src/main/java/com/scwang/wave/ShapeType.java deleted file mode 100644 index 69dd7df..0000000 --- a/library/src/main/java/com/scwang/wave/ShapeType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.scwang.wave; - -public enum ShapeType { - Rect, - RoundRect, - Oval, -} \ No newline at end of file diff --git a/library/src/main/java/com/scwang/wave/ShapeType.kt b/library/src/main/java/com/scwang/wave/ShapeType.kt new file mode 100644 index 0000000..df15b94 --- /dev/null +++ b/library/src/main/java/com/scwang/wave/ShapeType.kt @@ -0,0 +1,5 @@ +package com.scwang.wave + +enum class ShapeType { + Rect, RoundRect, Oval +} \ No newline at end of file diff --git a/library/src/main/java/com/scwang/wave/Util.java b/library/src/main/java/com/scwang/wave/Util.java deleted file mode 100644 index 5ca088f..0000000 --- a/library/src/main/java/com/scwang/wave/Util.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.scwang.wave; - -import android.content.Context; -import android.content.res.Resources; -import android.os.Build; -import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; -import android.util.TypedValue; - -public class Util { - - /** - * 获取颜色 - * @param context 上下文 - * @param colorId 颜色ID - * @return 颜色 - */ - @ColorInt - public static int getColor(@NonNull Context context, @ColorRes int colorId) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - return context.getColor(colorId); - } - //noinspection deprecation - return context.getResources().getColor(colorId); - } - - /** - * dp转px - * @param dpVal dp 值 - * @return px - */ - public static int dp2px(float dpVal) { - return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, - dpVal, Resources.getSystem().getDisplayMetrics()); - } -} diff --git a/library/src/main/java/com/scwang/wave/Util.kt b/library/src/main/java/com/scwang/wave/Util.kt new file mode 100644 index 0000000..d719522 --- /dev/null +++ b/library/src/main/java/com/scwang/wave/Util.kt @@ -0,0 +1,33 @@ +package com.scwang.wave + +import android.content.Context +import android.content.res.Resources +import android.os.Build +import android.util.TypedValue +import androidx.annotation.ColorInt +import androidx.annotation.ColorRes + +object Util { + /** + * 获取颜色 + * @param context 上下文 + * @param colorId 颜色ID + * @return 颜色 + */ + @ColorInt + fun getColor(context: Context, @ColorRes colorId: Int): Int { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + context.getColor(colorId) + } else context.resources.getColor(colorId) + } + + /** + * dp转px + * @param dpVal dp 值 + * @return px + */ + fun dp2px(dpVal: Float): Float { + return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, + dpVal, Resources.getSystem().displayMetrics) + } +} \ No newline at end of file diff --git a/library/src/main/java/com/scwang/wave/Wave.java b/library/src/main/java/com/scwang/wave/Wave.java deleted file mode 100644 index 921aef0..0000000 --- a/library/src/main/java/com/scwang/wave/Wave.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.scwang.wave; - -import android.graphics.Path; - -/** - * 水波对象 - * Created by SCWANG on 2017/12/11. - */ -@SuppressWarnings("WeakerAccess") -class Wave /*extends View*/ { - - Path path; //水波路径 - int width; //画布宽度（2倍波长） - int wave; //波幅（振幅） - float offsetX; //水波的水平偏移量 - float offsetY; //水波的竖直偏移量 - float velocity; //水波移动速度（像素/秒） - private float scaleX; //水平拉伸比例 - private float scaleY; //竖直拉伸比例 - private int curWave; -// int startColor; //开始颜色 -// int closeColor; //结束颜色 -// float alpha; //颜色透明度 - - /** - * 通过参数构造一个水波对象 - * @param offsetX 水平偏移量 - * @param offsetY 竖直偏移量 - * @param velocity 移动速度（像素/秒） - * @param scaleX 水平拉伸量 - * @param scaleY 竖直拉伸量 - * @param wave 波幅（波宽度） - */ -// @SuppressWarnings("PointlessArithmeticExpression") - Wave(/*Context context, */int offsetX, int offsetY, int velocity, float scaleX, float scaleY, int wave) { -// super(context); - this.wave = wave; //波幅（波宽） - this.scaleX = scaleX; //水平拉伸量 - this.scaleY = scaleY; //竖直拉伸量 - this.offsetX = offsetX; //水平偏移量 - this.offsetY = offsetY; //竖直偏移量 - this.velocity = velocity; //移动速度（像素/秒） - this.path = new Path(); - } - -// /* -// * 根据 波长度、中轴线高度、波幅 绘制水波路径 -// */ -// public Wave(Context context) { -// this(context, null, 0); -// } -// -// public Wave(Context context, @Nullable AttributeSet attrs) { -// this(context, attrs, 0); -// } -// -// public Wave(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { -// super(context, attrs, defStyleAttr); -// -// TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.Wave); -// -//// startColor = ta.getColor(R.styleable.Wave_mwhStartColor, 0); -//// closeColor = ta.getColor(R.styleable.Wave_mwhCloseColor, 0); -//// alpha = ta.getFloat(R.styleable.Wave_mwhColorAlpha, 0f); -// scaleX = ta.getFloat(R.styleable.Wave_mwScaleX, 1); -// scaleY = ta.getFloat(R.styleable.Wave_mwScaleY, 1); -// offsetX = ta.getDimensionPixelOffset(R.styleable.Wave_mwOffsetX, 0); -// offsetY = ta.getDimensionPixelOffset(R.styleable.Wave_mwOffsetY, 0); -// velocity = ta.getDimensionPixelOffset(R.styleable.Wave_mwVelocity, Util.dp2px(10)); -// wave = ta.getDimensionPixelOffset(R.styleable.Wave_mwWaveHeight, 0) / 2; -// -// ta.recycle(); -// } - - protected void updateWavePath(int w, int h, int waveHeight, boolean fullScreen, float progress) { - this.wave = waveHeight; - this.width = (int) (2* scaleX * w); //画布宽度（2倍波长） - this.path = buildWavePath(width, h, fullScreen, progress); - } - - protected void updateWavePath(int w, int h, float progress) { - int wave = (int) (scaleY * this.wave);//计算拉伸之后的波幅 - float maxWave = h * Math.max(0, (1 - progress)); - if (wave > maxWave) { - wave = (int)maxWave; - } - - if (curWave != wave) { - this.width = (int) (2 * scaleX * w); //画布宽度（2倍波长） - this.path = buildWavePath(width, h, true, progress); - } - } - - protected Path buildWavePath(int width, int height, boolean fullScreen, float progress) { - int DP = Util.dp2px(1);//一个dp在当前设备表示的像素量（水波的绘制精度设为一个dp单位） - if (DP < 1) { - DP = 1; - } - - int wave = (int) (scaleY * this.wave);//计算拉伸之后的波幅 - - if (fullScreen) { - float maxWave = height * Math.max(0, (1 - progress)); - if (wave > maxWave) { - wave = (int) maxWave; - } - } - this.curWave = wave; - -// Path path = new Path(); - path.reset(); - - path.moveTo(0, 0); - path.lineTo(0, height - wave); - - if (wave > 0) { - for (int x = DP; x < width; x += DP) { - path.lineTo(x, height - wave - wave * (float) Math.sin(4.0 * Math.PI * x / width)); - } - } - - path.lineTo(width, height - wave); - path.lineTo(width, 0); - path.close(); - return path; - } -} \ No newline at end of file diff --git a/library/src/main/java/com/scwang/wave/Wave.kt b/library/src/main/java/com/scwang/wave/Wave.kt new file mode 100644 index 0000000..0a4c8dc --- /dev/null +++ b/library/src/main/java/com/scwang/wave/Wave.kt @@ -0,0 +1,100 @@ +package com.scwang.wave + +import android.graphics.Path +import kotlin.math.max + +/** + * 水波对象 + * Created by SCWANG on 2017/12/11. + */ +class Wave /*extends View*/( /*Context context, */ + var offsetX: Float, var offsetY: Float, var velocity: Float, //水平拉伸比例 + private val scaleX: Float, //竖直拉伸比例 + private val scaleY: Float, //波幅（振幅） + var wave: Int) { + var path //水波路径 + : Path = Path() + var width //画布宽度（2倍波长） + = 0 + private var curWave = 0 + + // /* + // * 根据 波长度、中轴线高度、波幅 绘制水波路径 + // */ + // public Wave(Context context) { + // this(context, null, 0); + // } + // + // public Wave(Context context, @Nullable AttributeSet attrs) { + // this(context, attrs, 0); + // } + // + // public Wave(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + // super(context, attrs, defStyleAttr); + // + // TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.Wave); + // + //// startColor = ta.getColor(R.styleable.Wave_mwhStartColor, 0); + //// closeColor = ta.getColor(R.styleable.Wave_mwhCloseColor, 0); + //// alpha = ta.getFloat(R.styleable.Wave_mwhColorAlpha, 0f); + // scaleX = ta.getFloat(R.styleable.Wave_mwScaleX, 1); + // scaleY = ta.getFloat(R.styleable.Wave_mwScaleY, 1); + // offsetX = ta.getDimensionPixelOffset(R.styleable.Wave_mwOffsetX, 0); + // offsetY = ta.getDimensionPixelOffset(R.styleable.Wave_mwOffsetY, 0); + // velocity = ta.getDimensionPixelOffset(R.styleable.Wave_mwVelocity, Util.dp2px(10)); + // wave = ta.getDimensionPixelOffset(R.styleable.Wave_mwWaveHeight, 0) / 2; + // + // ta.recycle(); + // } + fun updateWavePath(w: Int, h: Int, waveHeight: Int, fullScreen: Boolean, progress: Float) { + wave = waveHeight + width = (2 * scaleX * w).toInt() //画布宽度（2倍波长） + path = buildWavePath(width, h, fullScreen, progress) + } + + fun updateWavePath(w: Int, h: Int, progress: Float) { + var wave = (scaleY * wave).toInt() //计算拉伸之后的波幅 + val maxWave = h * Math.max(0f, 1 - progress) + if (wave > maxWave) { + wave = maxWave.toInt() + } + if (curWave != wave) { + width = (2 * scaleX * w).toInt() //画布宽度（2倍波长） + path = buildWavePath(width, h, true, progress) + } + } + + fun buildWavePath(width: Int, height: Int, fullScreen: Boolean, progress: Float): Path { + var DP = Util.dp2px(1f) //一个dp在当前设备表示的像素量（水波的绘制精度设为一个dp单位） + if (DP < 1) { + DP = 1F + } + var wave = (scaleY * wave).toInt() //计算拉伸之后的波幅 + if (fullScreen) { + val maxWave = height * max(0f, 1 - progress) + if (wave > maxWave) { + wave = maxWave.toInt() + } + } + curWave = wave + +// Path path = new Path(); + path.reset() + path.moveTo(0f, 0f) + path.lineTo(0f, height - wave.toFloat()) + if (wave > 0) { + var x = DP + while (x < width) { + path.lineTo(x.toFloat(), height - wave - wave * Math.sin(4.0 * Math.PI * x / width).toFloat()) + x += DP + } + } + path.lineTo(width.toFloat(), height - wave.toFloat()) + path.lineTo(width.toFloat(), 0f) + path.close() + return path + } + // int startColor; //开始颜色 + // int closeColor; //结束颜色 + // float alpha; //颜色透明度 +} \ No newline at end of file diff --git a/library/src/test/java/com/scwang/wave/ExampleUnitTest.java b/library/src/test/java/com/scwang/wave/ExampleUnitTest.java index 5cf1e18..5cfc7e0 100644 --- a/library/src/test/java/com/scwang/wave/ExampleUnitTest.java +++ b/library/src/test/java/com/scwang/wave/ExampleUnitTest.java @@ -2,6 +2,8 @@ import org.junit.Test; +import java.util.Arrays; + import static org.junit.Assert.*; /**