Skip to content

Commit

Permalink
feat(android): capInsets and tintColor support for each image types (T…
Browse files Browse the repository at this point in the history 
…encent#3461)

* feat(android): capInsets and tintColor support for each image types

* feat(android): support animatable drawable playing

---------

Co-authored-by: siguangli <[email protected]>
Co-authored-by: OpenHippy <[email protected]>
  • Loading branch information
@iPel @siguangli @open-hippy
3 people authored Dec 6, 2023
1 parent d520921 commit 95ebc78
Show file tree
Hide file tree
Showing 6 changed files with 260 additions and 53 deletions.
10 changes: 10 additions & 0 deletions framework/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,3 +317,13 @@ task dealAfterAssembleRelease() {
}
}
}

project.afterEvaluate {
project.android.libraryVariants.all { variant ->
def variantName = variant.name.capitalize()
def taskMergeClasses = project.tasks.named("mergeClasses${variantName}")
project.tasks.named("bundleLibCompileToJar${variantName}").configure {
dependsOn(taskMergeClasses)
}
}
}
23 changes: 16 additions & 7 deletions renderer/native/android/src/main/java/com/tencent/renderer/component/Component.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.Px;

import androidx.core.graphics.Insets;
import com.tencent.mtt.hippy.utils.PixelUtil;
import com.tencent.renderer.component.drawable.BackgroundDrawable;
import com.tencent.renderer.component.drawable.BackgroundDrawable.BorderArc;
Expand Down Expand Up @@ -79,7 +80,8 @@ public Component(RenderNode node) {
}

public int getHostId() {
return (mHostRef.get() != null) ? mHostRef.get().getId() : -1;
final RenderNode host = mHostRef.get();
return (host != null) ? host.getId() : -1;
}

protected boolean checkComponentFlag(int flag) {
Expand Down Expand Up @@ -129,14 +131,16 @@ public void onDraw(@NonNull Canvas canvas, int left, int top, int right, int bot
}

protected void invalidate() {
if (mHostRef.get() != null) {
mHostRef.get().invalidate();
final RenderNode host = mHostRef.get();
if (host != null) {
host.invalidate();
}
}

protected void postInvalidateDelayed(long delayMilliseconds) {
if (mHostRef.get() != null) {
mHostRef.get().postInvalidateDelayed(delayMilliseconds);
final RenderNode host = mHostRef.get();
if (host != null) {
host.postInvalidateDelayed(delayMilliseconds);
}
}

Expand Down Expand Up @@ -347,8 +351,9 @@ public int getZIndex() {

public void setZIndex(int zIndex) {
mZIndex = zIndex;
if (mHostRef.get() != null) {
mHostRef.get().onZIndexChanged();
final RenderNode host = mHostRef.get();
if (host != null) {
host.onZIndexChanged();
}
}

Expand Down Expand Up @@ -467,4 +472,8 @@ public void setShadowRadius(@Px float radius) {
public void setShadowColor(@ColorInt int color) {
ensureBackgroundDrawable().setShadowColor(color);
}

public void setNinePatchCoordinate(Insets insets) {
ensureContentDrawable().setNinePatchCoordinate(insets);
}
}
151 changes: 107 additions & 44 deletions ...native/android/src/main/java/com/tencent/renderer/component/drawable/ContentDrawable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,6 @@
* limitations under the License.
*/

/* Tencent is pleased to support the open source community by making Hippy available.
* Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.tencent.renderer.component.drawable;

import android.graphics.Bitmap;
Expand All @@ -48,17 +32,20 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Shader;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;

import android.graphics.drawable.NinePatchDrawable;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;

import androidx.core.graphics.Insets;
import com.tencent.mtt.hippy.utils.PixelUtil;
import com.tencent.renderer.component.image.ImageDataSupplier;

public class ContentDrawable extends Drawable {

private static final Runnable NO_OP = () -> {};
private int mTintColor;
private int mImagePositionX;
private int mImagePositionY;
Expand All @@ -74,6 +61,14 @@ public class ContentDrawable extends Drawable {
private GifMovieState mGifMovieState;
@Nullable
private BackgroundHolder mBackgroundHolder;
@Nullable
private Insets mNinePatchInsets;
@Nullable
private NinePatchHelper.DrawFunction<?> mNinePatchDrawFunc;
@Nullable
private PorterDuffColorFilter mColorFilter;
@Nullable
private Shader mShader;

public enum ScaleType {
FIT_XY,
Expand Down Expand Up @@ -129,10 +124,14 @@ public void setColorFilter(ColorFilter colorFilter) {
public void clear() {
mGifMovieState = null;
mImageHolder = null;
mNinePatchDrawFunc = null;
mShader = null;
}

public void setImageData(@NonNull ImageDataSupplier imageHolder) {
mImageHolder = imageHolder;
mNinePatchDrawFunc = null;
mShader = null;
}

private void updateContentRegionIfNeeded() {
Expand All @@ -159,20 +158,14 @@ public void draw(@NonNull Canvas canvas) {
} else {
canvas.clipRect(mContentRegion);
}
if (mColorFilter == null && mTintColor != Color.TRANSPARENT) {
mColorFilter = new PorterDuffColorFilter(mTintColor, mTintColorBlendMode);
}
if (mImageHolder.getDrawable() != null) {
mImageHolder.getDrawable().draw(canvas);
drawDrawable(canvas, mImageHolder.getDrawable());
} else if (mImageHolder.isAnimated()) {
drawGif(canvas, mImageHolder.getGifMovie());
} else {
if (mPaint == null) {
mPaint = new Paint();
} else {
mPaint.reset();
}
mPaint.setAntiAlias(true);
if (mTintColor != Color.TRANSPARENT) {
mPaint.setColorFilter(new PorterDuffColorFilter(mTintColor, mTintColorBlendMode));
}
Bitmap bitmap = mImageHolder.getBitmap();
if (bitmap != null) {
drawBitmap(canvas, bitmap);
Expand All @@ -181,6 +174,38 @@ public void draw(@NonNull Canvas canvas) {
canvas.restore();
}

private void drawDrawable(@NonNull Canvas canvas, Drawable drawable) {
final boolean clearColorFilter;
if (drawable.getColorFilter() == null && mColorFilter != null) {
clearColorFilter = true;
drawable.setColorFilter(mColorFilter);
} else {
clearColorFilter = false;
}
if (drawable instanceof Animatable && !((Animatable) drawable).isRunning()) {
((Animatable) drawable).start();
}
if (mNinePatchInsets != null && !mNinePatchInsets.equals(Insets.NONE)
&& !(drawable instanceof NinePatchDrawable)
&& drawable.getIntrinsicWidth() > 0
&& drawable.getIntrinsicHeight() > 0
) {
@SuppressWarnings("unchecked")
NinePatchHelper.DrawFunction<Drawable> func = (NinePatchHelper.DrawFunction<Drawable>) mNinePatchDrawFunc;
if (func == null) {
mNinePatchDrawFunc = func = (c, d) -> d.draw(c);
}
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
NinePatchHelper.draw(canvas, func, drawable, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
PixelUtil.getDensity(), mContentRegion, mNinePatchInsets);
} else {
drawable.draw(canvas);
}
if (clearColorFilter) {
drawable.setColorFilter(null);
}
}

private void updateBitmapMatrix(@NonNull Bitmap bitmap) {
final RectF dst = new RectF(mContentRegion);
final float bitmapWidth = bitmap.getWidth();
Expand Down Expand Up @@ -231,15 +256,39 @@ private void updateBitmapMatrix(@NonNull Bitmap bitmap) {
}

private void drawBitmap(@NonNull Canvas canvas, @NonNull Bitmap bitmap) {
assert mPaint != null;
updateBitmapMatrix(bitmap);
if (mScaleType == ScaleType.REPEAT) {
BitmapShader bitmapShader = new BitmapShader(bitmap, Shader.TileMode.REPEAT,
Shader.TileMode.REPEAT);
mPaint.setShader(bitmapShader);
if (mNinePatchInsets != null && !mNinePatchInsets.equals(Insets.NONE)) {
@SuppressWarnings("unchecked")
NinePatchHelper.DrawFunction<Bitmap> func = (NinePatchHelper.DrawFunction<Bitmap>) mNinePatchDrawFunc;
if (func == null) {
mNinePatchDrawFunc = func = (c, b) -> c.drawBitmap(b, 0, 0, getPaint());
}
NinePatchHelper.draw(canvas, func, bitmap, bitmap.getWidth(), bitmap.getHeight(), PixelUtil.getDensity(),
mContentRegion, mNinePatchInsets);
} else {
Paint paint = getPaint();
updateBitmapMatrix(bitmap);
if (mScaleType == ScaleType.REPEAT) {
if (mShader == null) {
mShader = new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
}
paint.setShader(mShader);
}
canvas.drawBitmap(bitmap, mBitmapMatrix, paint);
}
}

private Paint getPaint() {
if (mPaint == null) {
mPaint = new Paint();
} else {
mPaint.reset();
}
mPaint.setAntiAlias(true);
mPaint.setFilterBitmap(true);
canvas.drawBitmap(bitmap, mBitmapMatrix, mPaint);
if (mColorFilter != null) {
mPaint.setColorFilter(mColorFilter);
}
return mPaint;
}

private void drawGif(@NonNull Canvas canvas, @Nullable Movie movie) {
Expand All @@ -265,20 +314,27 @@ private void drawGif(@NonNull Canvas canvas, @Nullable Movie movie) {
int progress =
mGifMovieState.progress > Integer.MAX_VALUE ? 0 : (int) mGifMovieState.progress;
movie.setTime(progress);
canvas.save();
canvas.scale(mGifMovieState.scaleX, mGifMovieState.scaleY);
movie.draw(canvas, mGifMovieState.startX, mGifMovieState.startY + 1.0f);
canvas.restore();
scheduleSelf(new Runnable() {
@Override
public void run() {

if (mNinePatchInsets != null && !mNinePatchInsets.equals(Insets.NONE)) {
@SuppressWarnings("unchecked")
NinePatchHelper.DrawFunction<Movie> func = (NinePatchHelper.DrawFunction<Movie>) mNinePatchDrawFunc;
if (func == null) {
mNinePatchDrawFunc = func = (c, m) -> m.draw(c, 0, 0, getPaint());
}
}, 40);
NinePatchHelper.draw(canvas, func, movie, movie.width(), movie.height(), PixelUtil.getDensity(),
mContentRegion, mNinePatchInsets);
} else {
Paint paint = getPaint();
canvas.save();
canvas.scale(mGifMovieState.scaleX, mGifMovieState.scaleY);
movie.draw(canvas, mGifMovieState.startX, mGifMovieState.startY + 1.0f, paint);
canvas.restore();
}
scheduleSelf(NO_OP, 40);
}

public void setScaleType(ScaleType scaleType) {
mScaleType = scaleType;
mShader = null;
}

public void setImagePositionX(@Px int positionX) {
Expand All @@ -291,10 +347,17 @@ public void setImagePositionY(@Px int positionY) {

public void setTintColor(@ColorInt int tintColor) {
mTintColor = tintColor;
mColorFilter = null;
}

public void setTintColorBlendMode(int tintColorBlendMode) {
mTintColorBlendMode = convertToPorterDuffMode(tintColorBlendMode);
mColorFilter = null;
}

public void setNinePatchCoordinate(Insets insets) {
mNinePatchInsets = insets;
mNinePatchDrawFunc = null;
}

private Mode convertToPorterDuffMode(int val) {
Expand Down
Loading

0 comments on commit 95ebc78

Please sign in to comment.