From d8060b30418e6c08477c7b364209b524bae65a39 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 24 Jan 2021 02:22:09 -0500
Subject: [PATCH] Fix inset issues in landscape.

---
 .../components/InsetAwareConstraintLayout.java    | 10 ++++++++++
 app/src/main/res/layout/conversation_activity.xml | 15 +++++++++------
 .../res/layout/conversation_reaction_scrubber.xml |  4 +++-
 app/src/main/res/layout/system_ui_guidelines.xml  | 14 ++++++++++++++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
index 63587a357..34f6e3fd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
@@ -33,6 +33,8 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
   protected boolean fitSystemWindows(Rect insets) {
     Guideline statusBarGuideline     = findViewById(R.id.status_bar_guideline);
     Guideline navigationBarGuideline = findViewById(R.id.navigation_bar_guideline);
+    Guideline parentStartGuideline   = findViewById(R.id.parent_start_guideline);
+    Guideline parentEndGuideline     = findViewById(R.id.parent_end_guideline);
 
     if (statusBarGuideline != null) {
       statusBarGuideline.setGuidelineBegin(insets.top);
@@ -42,6 +44,14 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
       navigationBarGuideline.setGuidelineEnd(insets.bottom);
     }
 
+    if (parentStartGuideline != null) {
+      parentStartGuideline.setGuidelineBegin(insets.left);
+    }
+
+    if (parentEndGuideline != null) {
+      parentEndGuideline.setGuidelineEnd(insets.right);
+    }
+
     return true;
   }
 }
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index a0123259d..183e423fd 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -25,10 +25,11 @@
         tools:visibility="visible" />
 
     <com.google.android.material.appbar.AppBarLayout
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
+        app:layout_constraintTop_toTopOf="@id/status_bar_guideline">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -76,10 +77,12 @@
 
     <org.thoughtcrime.securesms.components.InputAwareLayout
         android:id="@+id/layout_container"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
-        app:layout_constraintBottom_toBottomOf="@id/navigation_bar_guideline">
+        app:layout_constraintBottom_toBottomOf="@id/navigation_bar_guideline"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline">
 
         <LinearLayout
             android:id="@+id/conversation_container"
diff --git a/app/src/main/res/layout/conversation_reaction_scrubber.xml b/app/src/main/res/layout/conversation_reaction_scrubber.xml
index b3fe2bf11..ff33416cf 100644
--- a/app/src/main/res/layout/conversation_reaction_scrubber.xml
+++ b/app/src/main/res/layout/conversation_reaction_scrubber.xml
@@ -3,10 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_reaction_scrubber"
-    android:layout_width="match_parent"
+    android:layout_width="0dp"
     android:layout_height="0dp"
     app:layout_constraintTop_toTopOf="@+id/status_bar_guideline"
     app:layout_constraintBottom_toBottomOf="@+id/navigation_bar_guideline"
+    app:layout_constraintStart_toStartOf="@+id/parent_start_guideline"
+    app:layout_constraintEnd_toEndOf="@+id/parent_end_guideline"
     android:elevation="1000dp"
     android:visibility="gone"
     tools:visibility="visible">
diff --git a/app/src/main/res/layout/system_ui_guidelines.xml b/app/src/main/res/layout/system_ui_guidelines.xml
index 9b52deb8d..48cba9fc7 100644
--- a/app/src/main/res/layout/system_ui_guidelines.xml
+++ b/app/src/main/res/layout/system_ui_guidelines.xml
@@ -14,4 +14,18 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         tools:layout_constraintGuide_end="48dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/parent_start_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_constraintGuide_begin="5dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/parent_end_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_constraintGuide_end="5dp" />
 </merge>
\ No newline at end of file