Fix color offset on devices with notches.

Author: alex-signal

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java

@@ -10,6 +10,7 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -207,9 +208,9 @@ public void disableBubbleBackground() {
     setBackground(null);
   }
 
-  public @Nullable Projection getProjection() {
+  public @Nullable Projection getProjection(@NonNull ViewGroup coordinateRoot) {
     if (getVisibility() == VISIBLE) {
-      return Projection.relativeToViewRoot(this, new Projection.Corners(ViewUtil.dpToPx(11)));
+      return Projection.relativeToParent(coordinateRoot, this, new Projection.Corners(ViewUtil.dpToPx(11)));
     } else {
       return null;
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java

@@ -691,8 +691,8 @@ public boolean canPlayContent() {
     }
 
     @Override
-    public @NonNull List<Projection> getColorizerProjections() {
-      return getBindable().getColorizerProjections();
+    public @NonNull List<Projection> getColorizerProjections(@NonNull ViewGroup coordinateRoot) {
+      return getBindable().getColorizerProjections(coordinateRoot);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -1715,18 +1715,18 @@ public boolean canPlayContent() {
   }
 
   @Override
-  public @NonNull List<Projection> getColorizerProjections() {
+  public @NonNull List<Projection> getColorizerProjections(@NonNull ViewGroup coordinateRoot) {
     List<Projection> projections = new LinkedList<>();
 
     if (messageRecord.isOutgoing()      &&
         !hasNoBubble(messageRecord)     &&
         !messageRecord.isRemoteDelete() &&
         bodyBubbleCorners != null)
     {
-      Projection bodyBubbleToRoot = Projection.relativeToViewRoot(bodyBubble, bodyBubbleCorners).translateX(bodyBubble.getTranslationX());
+      Projection bodyBubbleToRoot = Projection.relativeToParent(coordinateRoot, bodyBubble, bodyBubbleCorners).translateX(bodyBubble.getTranslationX());
       Projection videoToBubble    = bodyBubble.getVideoPlayerProjection();
       if (videoToBubble != null) {
-        Projection videoToRoot = Projection.translateFromDescendantToParentCoords(videoToBubble, bodyBubble, (ViewGroup) getRootView());
+        Projection videoToRoot = Projection.translateFromDescendantToParentCoords(videoToBubble, bodyBubble, coordinateRoot);
         projections.addAll(Projection.getCapAndTail(bodyBubbleToRoot, videoToRoot));
       } else {
         projections.add(bodyBubbleToRoot);
@@ -1737,7 +1737,7 @@ public boolean canPlayContent() {
         hasNoBubble(messageRecord) &&
         hasWallpaper)
     {
-      Projection footerProjection = getActiveFooter(messageRecord).getProjection();
+      Projection footerProjection = getActiveFooter(messageRecord).getProjection(coordinateRoot);
       if (footerProjection != null) {
         projections.add(footerProjection.translateX(bodyBubble.getTranslationX()));
       }
@@ -1748,7 +1748,7 @@ public boolean canPlayContent() {
         quoteView != null)
     {
       bodyBubble.setQuoteViewProjection(quoteView.getProjection(bodyBubble));
-      projections.add(quoteView.getProjection((ViewGroup) getRootView()).translateX(bodyBubble.getTranslationX() + this.getTranslationX()));
+      projections.add(quoteView.getProjection(coordinateRoot).translateX(bodyBubble.getTranslationX() + this.getTranslationX()));
     }
 
     return projections;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -221,7 +221,7 @@ public boolean canPlayContent() {
   }
 
   @Override
-  public @NonNull List<Projection> getColorizerProjections() {
+  public @NonNull List<Projection> getColorizerProjections(@NonNull ViewGroup coordinateRoot) {
     return Collections.emptyList();
   }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/Colorizable.kt

@@ -1,11 +1,12 @@
 package org.thoughtcrime.securesms.conversation.colors
 
+import android.view.ViewGroup
 import org.thoughtcrime.securesms.util.Projection
 
 /**
  * Denotes that a class can be colorized. The class is responsible for
  * generating its own projection.
  */
 interface Colorizable {
-  val colorizerProjections: List<Projection>
+  fun getColorizerProjections(coordinateRoot: ViewGroup): List<Projection>
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer.kt

@@ -98,7 +98,7 @@ class RecyclerViewColorizer(private val recyclerView: RecyclerView) {
         if (child != null) {
           val holder = parent.getChildViewHolder(child)
           if (holder is Colorizable) {
-            holder.colorizerProjections.forEach {
+            holder.getColorizerProjections(parent).forEach {
               c.drawPath(it.path, holePunchPaint)
             }
           }

app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt

@@ -127,7 +127,7 @@ class MultiselectItemDecoration(
 
       val parts: MultiselectCollection = child.conversationMessage.multiselectCollection
 
-      val projections: List<Projection> = child.colorizerProjections + if (child.canPlayContent()) listOf(child.getGiphyMp4PlayableProjection(child.rootView as ViewGroup)) else emptyList()
+      val projections: List<Projection> = child.getColorizerProjections(parent) + if (child.canPlayContent()) listOf(child.getGiphyMp4PlayableProjection(parent)) else emptyList()
       path.reset()
       projections.forEach { it.applyToPath(path) }
 
@@ -307,7 +307,7 @@ class MultiselectItemDecoration(
       parent.forEach { child ->
         if (child is Multiselectable && child.conversationMessage == inFocus.conversationMessage) {
           path.addRect(child.left.toFloat(), child.top.toFloat(), child.right.toFloat(), child.bottom.toFloat(), Path.Direction.CW)
-          child.colorizerProjections.forEach {
+          child.getColorizerProjections(parent).forEach {
             path.op(it.path, Path.Op.DIFFERENCE)
           }
 

app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java

@@ -250,11 +250,8 @@ public boolean canPlayContent() {
   }
 
   @Override
-  public @NonNull List<Projection> getColorizerProjections() {
-    return conversationItem.getColorizerProjections()
-                           .stream()
-                           .map(p -> Projection.translateFromRootToDescendantCoords(p, (ViewGroup) itemView.getParent()))
-                           .collect(Collectors.toList());
+  public @NonNull List<Projection> getColorizerProjections(@NonNull ViewGroup coordinateRoot) {
+    return conversationItem.getColorizerProjections(coordinateRoot);
   }
 
   private class ExpiresUpdater implements Runnable {

app/src/main/java/org/thoughtcrime/securesms/util/Projection.java

@@ -142,16 +142,6 @@ public void applyToPath(@NonNull Path path) {
     return new Projection(viewBounds.left, viewBounds.top, toProject.getWidth(), toProject.getHeight(), corners);
   }
 
-  public static @NonNull Projection translateFromRootToDescendantCoords(@NonNull Projection rootProjection, @NonNull View descendant) {
-    Rect viewBounds = new Rect();
-
-    viewBounds.set((int) rootProjection.x, (int) rootProjection.y, (int) rootProjection.x + rootProjection.width, (int) rootProjection.y + rootProjection.height);
-
-    ((ViewGroup) descendant.getRootView()).offsetRectIntoDescendantCoords(descendant, viewBounds);
-
-    return new Projection(viewBounds.left, viewBounds.top, rootProjection.width, rootProjection.height, rootProjection.corners);
-  }
-
   public static @NonNull Projection translateFromDescendantToParentCoords(@NonNull Projection descendantProjection, @NonNull View descendant, @NonNull ViewGroup parent) {
     Rect viewBounds = new Rect();