TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 22:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for blurring faces.

Browse Source 
Co-authored-by: Alan Evans <alan@signal.org>
This commit is contained in:
Greyson Parrelli
2020-06-02 20:35:44 -04:00
parent 514048171b
commit c8dd4e5254
21 changed files with 601 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
View File

@@ -29,7 +29,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
if (challenge != null) {
handlePushChallenge(challenge);
} else {
handleReceivedNotification(getApplicationContext());
handleReceivedNotification(ApplicationDependencies.getApplication());
}
}
@@ -37,7 +37,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
public void onNewToken(String token) {
Log.i(TAG, "onNewToken()");
if (!TextSecurePreferences.isPushRegistered(getApplicationContext())) {
if (!TextSecurePreferences.isPushRegistered(ApplicationDependencies.getApplication())) {
Log.i(TAG, "Got a new FCM token, but the user isn't registered.");
return;
}

13
app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
View File

@@ -311,7 +311,7 @@ public final class ImageEditorView extends FrameLayout {
}
private @Nullable EditSession startEdit(@NonNull Matrix inverse, @NonNull PointF point, @Nullable EditorElement selected) {
if (mode == Mode.Draw) {
if (mode == Mode.Draw || mode == Mode.Blur) {
return startADrawingSession(point);
} else {
return startAMoveAndResizeSession(inverse, point, selected);
@@ -320,7 +320,7 @@ public final class ImageEditorView extends FrameLayout {
private EditSession startADrawingSession(@NonNull PointF point) {
BezierDrawingRenderer renderer = new BezierDrawingRenderer(color, thickness * Bounds.FULL_BOUNDS.width(), cap, model.findCropRelativeToRoot());
EditorElement element = new EditorElement(renderer, EditorModel.Z_DRAWING);
EditorElement element = new EditorElement(renderer, mode == Mode.Blur ? EditorModel.Z_MASK : EditorModel.Z_DRAWING);
model.addElementCentered(element, 1);
Matrix elementInverseMatrix = model.findElementInverseMatrix(element, viewMatrix);
@@ -354,10 +354,10 @@ public final class ImageEditorView extends FrameLayout {
this.mode = mode;
}
public void startDrawing(float thickness, @NonNull Paint.Cap cap) {
public void startDrawing(float thickness, @NonNull Paint.Cap cap, boolean blur) {
this.thickness = thickness;
this.cap = cap;
setMode(Mode.Draw);
setMode(blur ? Mode.Blur : Mode.Draw);
}
public void setDrawingBrushColor(int color) {
@@ -448,12 +448,13 @@ public final class ImageEditorView extends FrameLayout {
}
private boolean allowTaps() {
return !model.isCropping() && mode != Mode.Draw;
return !model.isCropping() && mode != Mode.Draw && mode != Mode.Blur;
}
public enum Mode {
MoveAndResize,
Draw
Draw,
Blur
}
public interface DrawingChangedListener {

38
app/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
View File

@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.imageeditor.Renderer;
import org.thoughtcrime.securesms.imageeditor.RendererContext;
import org.thoughtcrime.securesms.imageeditor.UndoRedoStackListener;
import org.thoughtcrime.securesms.imageeditor.renderers.MultiLineTextRenderer;
import org.thoughtcrime.securesms.imageeditor.renderers.FaceBlurRenderer;
import java.util.HashMap;
import java.util.LinkedHashSet;
@@ -662,7 +663,10 @@ public final class EditorModel implements Parcelable, RendererContext.Ready {
*/
public void addElement(@NonNull EditorElement element) {
pushUndoPoint();
addElementWithoutPushUndo(element);
}
public void addElementWithoutPushUndo(@NonNull EditorElement element) {
EditorElement mainImage = editorElementHierarchy.getMainImage();
EditorElement parent = mainImage != null ? mainImage : editorElementHierarchy.getImageRoot();
@@ -675,6 +679,36 @@ public final class EditorModel implements Parcelable, RendererContext.Ready {
updateUndoRedoAvailableState(undoRedoStacks);
}
public void clearFaceRenderers() {
EditorElement mainImage = editorElementHierarchy.getMainImage();
if (mainImage != null) {
boolean hasPushedUndo = false;
for (int i = mainImage.getChildCount() - 1; i >= 0; i--) {
if (mainImage.getChild(i).getRenderer() instanceof FaceBlurRenderer) {
if (!hasPushedUndo) {
pushUndoPoint();
hasPushedUndo = true;
}
mainImage.deleteChild(mainImage.getChild(i), invalidate);
}
}
}
}
public boolean hasFaceRenderer() {
EditorElement mainImage = editorElementHierarchy.getMainImage();
if (mainImage != null) {
for (int i = mainImage.getChildCount() - 1; i >= 0; i--) {
if (mainImage.getChild(i).getRenderer() instanceof FaceBlurRenderer) {
return true;
}
}
}
return false;
}
public boolean isChanged() {
return undoRedoStacks.isChanged(editorElementHierarchy.getRoot());
}
@@ -741,6 +775,10 @@ public final class EditorModel implements Parcelable, RendererContext.Ready {
return editorElementHierarchy.getRoot();
}
public EditorElement getMainImage() {
return editorElementHierarchy.getMainImage();
}
public void delete(@NonNull EditorElement editorElement) {
editorElementHierarchy.getImageRoot().forAllInTree(element -> element.deleteChild(editorElement, invalidate));
}

86
app/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/FaceBlurRenderer.java Normal file
View File

@@ -0,0 +1,86 @@
package org.thoughtcrime.securesms.imageeditor.renderers;
import android.graphics.Matrix;
import android.graphics.Point;
import android.graphics.RectF;
import android.os.Parcel;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.imageeditor.Bounds;
import org.thoughtcrime.securesms.imageeditor.Renderer;
import org.thoughtcrime.securesms.imageeditor.RendererContext;
import org.thoughtcrime.securesms.util.ViewUtil;
/**
* A rectangle that will be rendered on the blur mask layer. Intended for blurring faces.
*/
public class FaceBlurRenderer implements Renderer {
private static final int CORNER_RADIUS = 0;
private final RectF faceRect;
private final Point imageDimensions;
private final Matrix scaleMatrix;
public FaceBlurRenderer(@NonNull RectF faceRect, @NonNull Matrix matrix) {
this.faceRect = faceRect;
this.imageDimensions = new Point(0, 0);
this.scaleMatrix = matrix;
}
public FaceBlurRenderer(@NonNull RectF faceRect, @NonNull Point imageDimensions) {
this.faceRect = faceRect;
this.imageDimensions = imageDimensions;
this.scaleMatrix = new Matrix();
scaleMatrix.setRectToRect(new RectF(0, 0, this.imageDimensions.x, this.imageDimensions.y), Bounds.FULL_BOUNDS, Matrix.ScaleToFit.CENTER);
}
@Override
public void render(@NonNull RendererContext rendererContext) {
rendererContext.canvas.save();
rendererContext.canvas.concat(scaleMatrix);
rendererContext.canvas.drawRoundRect(faceRect, CORNER_RADIUS, CORNER_RADIUS, rendererContext.getMaskPaint());
rendererContext.canvas.restore();
}
@Override
public boolean hitTest(float x, float y) {
return false;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeFloat(faceRect.left);
dest.writeFloat(faceRect.top);
dest.writeFloat(faceRect.right);
dest.writeFloat(faceRect.bottom);
dest.writeInt(imageDimensions.x);
dest.writeInt(imageDimensions.y);
}
public static final Creator<FaceBlurRenderer> CREATOR = new Creator<FaceBlurRenderer>() {
@Override
public FaceBlurRenderer createFromParcel(Parcel in) {
float left = in.readFloat();
float top = in.readFloat();
float right = in.readFloat();
float bottom = in.readFloat();
int x = in.readInt();
int y = in.readInt();
return new FaceBlurRenderer(new RectF(left, top, right, bottom), new Point(x, y));
}
@Override
public FaceBlurRenderer[] newArray(int size) {
return new FaceBlurRenderer[size];
}
};
}

14
app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.java
View File

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.keyvalue;
import androidx.annotation.NonNull;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceDataStore;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -19,6 +20,7 @@ public final class SignalStore {
public static void onFirstEverAppLaunch() {
registrationValues().onFirstEverAppLaunch();
uiHints().onFirstEverAppLaunch();
tooltips().onFirstEverAppLaunch();
}
public static @NonNull KbsValues kbsValues() {
@@ -41,6 +43,14 @@ public final class SignalStore {
return new StorageServiceValues(getStore());
}
public static @NonNull UiHints uiHints() {
return new UiHints(getStore());
}
public static @NonNull TooltipValues tooltips() {
return new TooltipValues(getStore());
}
public static @NonNull GroupsV2AuthorizationSignalStoreCache groupsV2AuthorizationCache() {
return new GroupsV2AuthorizationSignalStoreCache(getStore());
}
@@ -61,10 +71,6 @@ public final class SignalStore {
putLong(MESSAGE_REQUEST_ENABLE_TIME, time);
}
public static UiHints uiHints() {
return new UiHints(getStore());
}
public static @NonNull PreferenceDataStore getPreferenceDataStore() {
return new SignalPreferenceDataStore(getStore());
}

36
app/src/main/java/org/thoughtcrime/securesms/keyvalue/TooltipValues.java Normal file
View File

@@ -0,0 +1,36 @@
package org.thoughtcrime.securesms.keyvalue;
import androidx.annotation.NonNull;
import org.whispersystems.signalservice.api.storage.StorageKey;
public class TooltipValues {
private static final String BLUR_HUD_ICON = "tooltip.blur_hud_icon";
private static final String AUTO_BLUR_FACES = "tooltip.auto_blur_faces";
private final KeyValueStore store;
TooltipValues(@NonNull KeyValueStore store) {
this.store = store;
}
public void onFirstEverAppLaunch() {
}
public boolean hasSeenBlurHudIconTooltip() {
return store.getBoolean(BLUR_HUD_ICON, false);
}
public void markBlurHudIconTooltipSeen() {
store.beginWrite().putBoolean(BLUR_HUD_ICON, true).apply();
}
public boolean hasSeenAutoBlurFacesTooltip() {
return store.getBoolean(AUTO_BLUR_FACES, false);
}
public void markAutoBlurFacesTooltipSeen() {
store.beginWrite().putBoolean(AUTO_BLUR_FACES, true).apply();
}
}

10
app/src/main/java/org/thoughtcrime/securesms/scribbles/FaceDetector.java Normal file
View File

@@ -0,0 +1,10 @@
package org.thoughtcrime.securesms.scribbles;
import android.graphics.Bitmap;
import android.graphics.RectF;
import java.util.List;
interface FaceDetector {
List<RectF> detect(Bitmap bitmap);
}

79
app/src/main/java/org/thoughtcrime/securesms/scribbles/FirebaseFaceDetector.java Normal file
View File

@@ -0,0 +1,79 @@
package org.thoughtcrime.securesms.scribbles;
import android.graphics.Bitmap;
import android.graphics.RectF;
import android.os.Build;
import com.annimon.stream.Stream;
import com.google.firebase.ml.vision.FirebaseVision;
import com.google.firebase.ml.vision.common.FirebaseVisionImage;
import com.google.firebase.ml.vision.face.FirebaseVisionFace;
import com.google.firebase.ml.vision.face.FirebaseVisionFaceDetector;
import com.google.firebase.ml.vision.face.FirebaseVisionFaceDetectorOptions;
import org.thoughtcrime.securesms.logging.Log;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
class FirebaseFaceDetector implements FaceDetector {
private static final String TAG = Log.tag(FirebaseFaceDetector.class);
private static final long MAX_SIZE = 1000 * 1000;
@Override
public List<RectF> detect(Bitmap source) {
long startTime = System.currentTimeMillis();
int performanceMode = getPerformanceMode(source);
Log.d(TAG, "Using performance mode " + performanceMode + " (API " + Build.VERSION.SDK_INT + ", " + source.getWidth() + "x" + source.getHeight() + ")");
FirebaseVisionFaceDetectorOptions options = new FirebaseVisionFaceDetectorOptions.Builder()
.setPerformanceMode(performanceMode)
.setMinFaceSize(0.05f)
.setContourMode(FirebaseVisionFaceDetectorOptions.NO_CONTOURS)
.setLandmarkMode(FirebaseVisionFaceDetectorOptions.NO_LANDMARKS)
.setClassificationMode(FirebaseVisionFaceDetectorOptions.NO_CLASSIFICATIONS)
.build();
FirebaseVisionImage image = FirebaseVisionImage.fromBitmap(source);
List<RectF> output = new ArrayList<>();
try (FirebaseVisionFaceDetector detector = FirebaseVision.getInstance().getVisionFaceDetector(options)) {
CountDownLatch latch = new CountDownLatch(1);
detector.detectInImage(image)
.addOnSuccessListener(firebaseVisionFaces -> {
output.addAll(Stream.of(firebaseVisionFaces)
.map(FirebaseVisionFace::getBoundingBox)
.map(r -> new RectF(r.left, r.top, r.right, r.bottom))
.toList());
latch.countDown();
})
.addOnFailureListener(e -> latch.countDown());
latch.await(15, TimeUnit.SECONDS);
} catch (IOException e) {
Log.w(TAG, "Failed to close!", e);
} catch (InterruptedException e) {
Log.w(TAG, e);
}
Log.d(TAG, "Finished in " + (System.currentTimeMillis() - startTime) + " ms");
return output;
}
private static int getPerformanceMode(Bitmap source) {
if (Build.VERSION.SDK_INT < 28) {
return FirebaseVisionFaceDetectorOptions.FAST;
}
return source.getWidth() * source.getHeight() < MAX_SIZE ? FirebaseVisionFaceDetectorOptions.ACCURATE
: FirebaseVisionFaceDetectorOptions.FAST;
}
}

107
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
View File

@@ -4,6 +4,8 @@ import android.Manifest;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.RectF;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -13,15 +15,19 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.TooltipPopup;
import org.thoughtcrime.securesms.imageeditor.ColorableRenderer;
import org.thoughtcrime.securesms.imageeditor.ImageEditorView;
import org.thoughtcrime.securesms.imageeditor.Renderer;
import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
import org.thoughtcrime.securesms.imageeditor.model.EditorModel;
import org.thoughtcrime.securesms.imageeditor.renderers.MultiLineTextRenderer;
import org.thoughtcrime.securesms.imageeditor.renderers.FaceBlurRenderer;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mediasend.MediaSendPageFragment;
import org.thoughtcrime.securesms.mms.MediaConstraints;
@@ -29,15 +35,18 @@ import org.thoughtcrime.securesms.mms.PushMediaConstraints;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.scribbles.widget.VerticalSlideColorPicker;
import org.thoughtcrime.securesms.stickers.StickerSearchRepository;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.ParcelUtil;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
import org.whispersystems.libsignal.util.Pair;
import java.io.ByteArrayOutputStream;
import java.util.Collections;
import java.util.List;
import static android.app.Activity.RESULT_OK;
@@ -54,6 +63,8 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
private EditorModel restoredModel;
private Pair<Uri, FaceDetectionResult> cachedFaceDetection;
@Nullable private EditorElement currentSelection;
private int imageMaxHeight;
private int imageMaxWidth;
@@ -84,10 +95,10 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
}
}
private Uri imageUri;
private Controller controller;
private ImageEditorHud imageEditorHud;
private ImageEditorView imageEditorView;
private Uri imageUri;
private Controller controller;
private ImageEditorHud imageEditorHud;
private ImageEditorView imageEditorView;
public static ImageEditorFragment newInstanceForAvatar(@NonNull Uri imageUri) {
ImageEditorFragment fragment = newInstance(imageUri);
@@ -169,6 +180,11 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
imageEditorView.setModel(editorModel);
if (!SignalStore.tooltips().hasSeenBlurHudIconTooltip()) {
imageEditorHud.showBlurHudTooltip();
SignalStore.tooltips().markBlurHudIconTooltipSeen();
}
refreshUniqueColors();
}
@@ -279,12 +295,22 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
}
case DRAW: {
imageEditorView.startDrawing(0.01f, Paint.Cap.ROUND);
imageEditorView.startDrawing(0.01f, Paint.Cap.ROUND, false);
break;
}
case HIGHLIGHT: {
imageEditorView.startDrawing(0.03f, Paint.Cap.SQUARE);
imageEditorView.startDrawing(0.03f, Paint.Cap.SQUARE, false);
break;
}
case BLUR: {
imageEditorView.startDrawing(0.055f, Paint.Cap.ROUND, true);
imageEditorHud.setBlurFacesToggleEnabled(imageEditorView.getModel().hasFaceRenderer());
if (!SignalStore.tooltips().hasSeenAutoBlurFacesTooltip()) {
imageEditorHud.showAutoBlurFacesTooltip();
SignalStore.tooltips().markAutoBlurFacesTooltipSeen();
}
break;
}
@@ -316,10 +342,42 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
changeEntityColor(color);
}
@Override
public void onBlurFacesToggled(boolean enabled) {
if (!enabled) {
imageEditorView.getModel().clearFaceRenderers();
return;
}
if (cachedFaceDetection != null && cachedFaceDetection.first().equals(getUri())) {
renderFaceBlurs(cachedFaceDetection.second());
return;
} else if (cachedFaceDetection != null && !cachedFaceDetection.first().equals(getUri())) {
cachedFaceDetection = null;
}
AlertDialog progress = SimpleProgressDialog.show(requireContext());
SimpleTask.run(() -> {
Bitmap bitmap = ((UriGlideRenderer) imageEditorView.getModel().getMainImage().getRenderer()).getBitmap();
if (bitmap != null) {
FaceDetector detector = new FirebaseFaceDetector();
return new FaceDetectionResult(detector.detect(bitmap), new Point(bitmap.getWidth(), bitmap.getHeight()));
} else {
return new FaceDetectionResult(Collections.emptyList(), new Point(0, 0));
}
}, result -> {
renderFaceBlurs(result);
progress.dismiss();
});
}
@Override
public void onUndo() {
imageEditorView.getModel().undo();
refreshUniqueColors();
imageEditorHud.setBlurFacesToggleEnabled(imageEditorView.getModel().hasFaceRenderer());
}
@Override
@@ -396,7 +454,30 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
imageEditorHud.setUndoAvailability(undoAvailable);
}
private final ImageEditorView.TapListener selectionListener = new ImageEditorView.TapListener() {
private void renderFaceBlurs(@NonNull FaceDetectionResult result) {
List<RectF> faces = result.rects;
Point size = result.imageSize;
if (faces.isEmpty()) {
Toast.makeText(requireContext(), R.string.ImageEditorFragment_no_faces_detected, Toast.LENGTH_SHORT).show();
imageEditorHud.setBlurFacesToggleEnabled(false);
cachedFaceDetection = null;
return;
}
imageEditorView.getModel().pushUndoPoint();
for (RectF face : faces) {
FaceBlurRenderer faceBlurRenderer = new FaceBlurRenderer(face, size);
imageEditorView.getModel().addElementWithoutPushUndo(new EditorElement(faceBlurRenderer, EditorModel.Z_MASK));
}
imageEditorView.invalidate();
cachedFaceDetection = new Pair<>(getUri(), result);
}
private final ImageEditorView.TapListener selectionListener = new ImageEditorView.TapListener() {
@Override
public void onEntityDown(@Nullable EditorElement editorElement) {
@@ -449,4 +530,14 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
void onDoneEditing();
}
private static class FaceDetectionResult {
private final List<RectF> rects;
private final Point imageSize;
private FaceDetectionResult(@NonNull List<RectF> rects, @NonNull Point imageSize) {
this.rects = rects;
this.imageSize = imageSize;
}
}
}

72
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
View File

@@ -4,15 +4,19 @@ import android.content.Context;
import android.graphics.Color;
import android.util.AttributeSet;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Switch;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.TooltipPopup;
import org.thoughtcrime.securesms.scribbles.widget.ColorPaletteAdapter;
import org.thoughtcrime.securesms.scribbles.widget.VerticalSlideColorPicker;
@@ -34,6 +38,7 @@ public final class ImageEditorHud extends LinearLayout {
private ImageView cropAspectLock;
private View drawButton;
private View highlightButton;
private View blurButton;
private View textButton;
private View stickerButton;
private View undoButton;
@@ -41,6 +46,8 @@ public final class ImageEditorHud extends LinearLayout {
private View deleteButton;
private View confirmButton;
private View doneButton;
private View blurToggleContainer;
private Switch blurToggle;
private VerticalSlideColorPicker colorPicker;
private RecyclerView colorPalette;
@@ -74,21 +81,24 @@ public final class ImageEditorHud extends LinearLayout {
inflate(getContext(), R.layout.image_editor_hud, this);
setOrientation(VERTICAL);
cropButton = findViewById(R.id.scribble_crop_button);
cropFlipButton = findViewById(R.id.scribble_crop_flip);
cropRotateButton = findViewById(R.id.scribble_crop_rotate);
cropAspectLock = findViewById(R.id.scribble_crop_aspect_lock);
colorPalette = findViewById(R.id.scribble_color_palette);
drawButton = findViewById(R.id.scribble_draw_button);
highlightButton = findViewById(R.id.scribble_highlight_button);
textButton = findViewById(R.id.scribble_text_button);
stickerButton = findViewById(R.id.scribble_sticker_button);
undoButton = findViewById(R.id.scribble_undo_button);
saveButton = findViewById(R.id.scribble_save_button);
deleteButton = findViewById(R.id.scribble_delete_button);
confirmButton = findViewById(R.id.scribble_confirm_button);
colorPicker = findViewById(R.id.scribble_color_picker);
doneButton = findViewById(R.id.scribble_done_button);
cropButton = findViewById(R.id.scribble_crop_button);
cropFlipButton = findViewById(R.id.scribble_crop_flip);
cropRotateButton = findViewById(R.id.scribble_crop_rotate);
cropAspectLock = findViewById(R.id.scribble_crop_aspect_lock);
colorPalette = findViewById(R.id.scribble_color_palette);
drawButton = findViewById(R.id.scribble_draw_button);
highlightButton = findViewById(R.id.scribble_highlight_button);
blurButton = findViewById(R.id.scribble_blur_button);
textButton = findViewById(R.id.scribble_text_button);
stickerButton = findViewById(R.id.scribble_sticker_button);
undoButton = findViewById(R.id.scribble_undo_button);
saveButton = findViewById(R.id.scribble_save_button);
deleteButton = findViewById(R.id.scribble_delete_button);
confirmButton = findViewById(R.id.scribble_confirm_button);
colorPicker = findViewById(R.id.scribble_color_picker);
doneButton = findViewById(R.id.scribble_done_button);
blurToggleContainer = findViewById(R.id.scribble_blur_toggle_container);
blurToggle = findViewById(R.id.scribble_blur_toggle);
cropAspectLock.setOnClickListener(v -> {
eventListener.onCropAspectLock(!eventListener.isCropAspectLocked());
@@ -105,12 +115,14 @@ public final class ImageEditorHud extends LinearLayout {
}
private void initializeVisibilityMap() {
setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, stickerButton, cropButton, undoButton, saveButton);
setVisibleViewsWhenInMode(Mode.NONE, drawButton, blurButton, textButton, stickerButton, cropButton, undoButton, saveButton);
setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette);
setVisibleViewsWhenInMode(Mode.HIGHLIGHT, confirmButton, undoButton, colorPicker, colorPalette);
setVisibleViewsWhenInMode(Mode.BLUR, confirmButton, undoButton, blurToggleContainer);
setVisibleViewsWhenInMode(Mode.TEXT, confirmButton, deleteButton, colorPicker, colorPalette);
setVisibleViewsWhenInMode(Mode.MOVE_DELETE, confirmButton, deleteButton);
@@ -152,11 +164,13 @@ public final class ImageEditorHud extends LinearLayout {
colorPalette.setAdapter(colorPaletteAdapter);
drawButton.setOnClickListener(v -> setMode(Mode.DRAW));
blurButton.setOnClickListener(v -> setMode(Mode.BLUR));
highlightButton.setOnClickListener(v -> setMode(Mode.HIGHLIGHT));
textButton.setOnClickListener(v -> setMode(Mode.TEXT));
stickerButton.setOnClickListener(v -> setMode(Mode.INSERT_STICKER));
saveButton.setOnClickListener(v -> eventListener.onSave());
doneButton.setOnClickListener(v -> eventListener.onDone());
blurToggle.setOnCheckedChangeListener((button, enabled) -> eventListener.onBlurFacesToggled(enabled));
}
public void setUpForAvatarEditing() {
@@ -186,6 +200,26 @@ public final class ImageEditorHud extends LinearLayout {
colorPicker.setActiveColor(color);
}
public void setBlurFacesToggleEnabled(boolean enabled) {
blurToggle.setChecked(enabled);
}
public void showBlurHudTooltip() {
TooltipPopup.forTarget(blurButton)
.setText(R.string.ImageEditorHud_new_auto_blur_faces_and_blur_brush)
.setBackgroundTint(ContextCompat.getColor(getContext(), R.color.core_ultramarine))
.setTextColor(ContextCompat.getColor(getContext(), R.color.core_white))
.show(TooltipPopup.POSITION_BELOW);
}
public void showAutoBlurFacesTooltip() {
TooltipPopup.forTarget(blurToggleContainer)
.setText(R.string.ImageEditorHud_draw_to_blur_or_try_auto_blur)
.setBackgroundTint(ContextCompat.getColor(getContext(), R.color.core_ultramarine))
.setTextColor(ContextCompat.getColor(getContext(), R.color.core_white))
.show(TooltipPopup.POSITION_ABOVE);
}
public void setEventListener(@Nullable EventListener eventListener) {
this.eventListener = eventListener != null ? eventListener : NULL_EVENT_LISTENER;
}
@@ -267,6 +301,7 @@ public final class ImageEditorHud extends LinearLayout {
TEXT,
DRAW,
HIGHLIGHT,
BLUR,
MOVE_DELETE,
INSERT_STICKER,
}
@@ -274,6 +309,7 @@ public final class ImageEditorHud extends LinearLayout {
public interface EventListener {
void onModeStarted(@NonNull Mode mode);
void onColorChange(int color);
void onBlurFacesToggled(boolean enabled);
void onUndo();
void onDelete();
void onSave();
@@ -295,6 +331,10 @@ public final class ImageEditorHud extends LinearLayout {
public void onColorChange(int color) {
}
@Override
public void onBlurFacesToggled(boolean enabled) {
}
@Override
public void onUndo() {
}

60
app/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
View File

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.scribbles;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BlurMaskFilter;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Point;
@@ -29,9 +28,11 @@ import org.thoughtcrime.securesms.imageeditor.Renderer;
import org.thoughtcrime.securesms.imageeditor.RendererContext;
import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
import org.thoughtcrime.securesms.imageeditor.model.EditorModel;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequest;
import org.thoughtcrime.securesms.util.BitmapUtil;
import java.util.concurrent.ExecutionException;
@@ -42,12 +43,16 @@ import java.util.concurrent.ExecutionException;
*/
final class UriGlideRenderer implements Renderer {
private static final String TAG = Log.tag(UriGlideRenderer.class);
private static final int PREVIEW_DIMENSION_LIMIT = 2048;
private static final int MAX_BLUR_DIMENSION = 300;
private final Uri imageUri;
private final Paint paint = new Paint();
private final Matrix imageProjectionMatrix = new Matrix();
private final Matrix temp = new Matrix();
private final Matrix blurScaleMatrix = new Matrix();
private final boolean decryptable;
private final int maxWidth;
private final int maxHeight;
@@ -55,7 +60,6 @@ final class UriGlideRenderer implements Renderer {
@Nullable private Bitmap bitmap;
@Nullable private Bitmap blurredBitmap;
@Nullable private Paint blurPaint;
@Nullable private BlurMaskFilter blurMaskFilter;
UriGlideRenderer(@NonNull Uri imageUri, boolean decryptable, int maxWidth, int maxHeight) {
this.imageUri = imageUri;
@@ -124,12 +128,8 @@ final class UriGlideRenderer implements Renderer {
for (EditorElement child : rendererContext.getChildren()) {
if (child.getZOrder() == EditorModel.Z_MASK) {
renderMask = true;
if (blurMaskFilter == null) {
blurMaskFilter = new BlurMaskFilter(4, BlurMaskFilter.Blur.NORMAL); // This blurs edges of the mask shapes
}
if (blurPaint == null) {
blurPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
blurPaint.setMaskFilter(blurMaskFilter);
}
blurPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
rendererContext.setMaskPaint(blurPaint);
@@ -143,7 +143,16 @@ final class UriGlideRenderer implements Renderer {
blurPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_ATOP));
blurPaint.setMaskFilter(null);
if (blurredBitmap == null) blurredBitmap = blur(bitmap, rendererContext.context);
if (blurredBitmap == null) {
blurredBitmap = blur(bitmap, rendererContext.context);
blurScaleMatrix.setRectToRect(new RectF(0, 0, blurredBitmap.getWidth(), blurredBitmap.getHeight()),
new RectF(0, 0, bitmap.getWidth(), bitmap.getHeight()),
Matrix.ScaleToFit.FILL);
}
rendererContext.canvas.concat(blurScaleMatrix);
rendererContext.canvas.drawBitmap(blurredBitmap, 0, 0, blurPaint);
blurPaint.setXfermode(null);
@@ -197,7 +206,7 @@ final class UriGlideRenderer implements Renderer {
* Always use this getter, as Bitmap is kept in Glide's LRUCache, so it could have been recycled
* by Glide. If it has, or was never set, this method returns null.
*/
private @Nullable Bitmap getBitmap() {
public @Nullable Bitmap getBitmap() {
if (bitmap != null && bitmap.isRecycled()) {
bitmap = null;
}
@@ -223,21 +232,48 @@ final class UriGlideRenderer implements Renderer {
return matrix;
}
private static @NonNull Bitmap blur(@NonNull Bitmap bitmap, @NonNull Context context) {
private static @NonNull Bitmap blur(Bitmap bitmap, Context context) {
Point previewSize = scaleKeepingAspectRatio(new Point(bitmap.getWidth(), bitmap.getHeight()), PREVIEW_DIMENSION_LIMIT);
Point blurSize = scaleKeepingAspectRatio(new Point(previewSize.x / 2, previewSize.y / 2 ), MAX_BLUR_DIMENSION);
Bitmap small = BitmapUtil.createScaledBitmap(bitmap, blurSize.x, blurSize.y);
Log.d(TAG, "Bitmap: " + bitmap.getWidth() + "x" + bitmap.getHeight() + ", Blur: " + blurSize.x + "x" + blurSize.y);
RenderScript rs = RenderScript.create(context);
Allocation input = Allocation.createFromBitmap(rs, bitmap);
Allocation output = Allocation.createTyped (rs, input.getType());
Allocation input = Allocation.createFromBitmap(rs, small);
Allocation output = Allocation.createTyped(rs, input.getType());
ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
script.setRadius(25f);
script.setInput(input);
script.forEach(output);
Bitmap blurred = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig());
Bitmap blurred = Bitmap.createBitmap(small.getWidth(), small.getHeight(), small.getConfig());
output.copyTo(blurred);
return blurred;
}
private static @NonNull Point scaleKeepingAspectRatio(@NonNull Point dimens, int maxDimen) {
int outX = dimens.x;
int outY = dimens.y;
if (dimens.x > maxDimen || dimens.y > maxDimen) {
outX = maxDimen;
outY = maxDimen;
float widthRatio = dimens.x / (float) maxDimen;
float heightRatio = dimens.y / (float) maxDimen;
if (widthRatio > heightRatio) {
outY = (int) (dimens.y / widthRatio);
} else {
outX = (int) (dimens.x / heightRatio);
}
}
return new Point(outX, outY);
}
public static final Creator<UriGlideRenderer> CREATOR = new Creator<UriGlideRenderer>() {
@Override
public UriGlideRenderer createFromParcel(Parcel in) {