From 7a13d45dc156ce8f813cbf97c0befdbde994bea1 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Mon, 26 Aug 2024 11:10:39 +0300
Subject: [PATCH] Added the final version of MotionLayout in the message
 details screen.| #74

---
 .../layout/fragment_new_message_details.xml   |  2 +-
 .../fragment_new_message_details_scene.xml    | 35 ++++++++-----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
index 3eeef3340..b8c10c536 100644
--- a/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
@@ -97,7 +97,7 @@
         layout="@layout/reply_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/default_margin_content_small"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/FlowCrypt/src/main/res/xml/fragment_new_message_details_scene.xml b/FlowCrypt/src/main/res/xml/fragment_new_message_details_scene.xml
index aedca987c..047368751 100644
--- a/FlowCrypt/src/main/res/xml/fragment_new_message_details_scene.xml
+++ b/FlowCrypt/src/main/res/xml/fragment_new_message_details_scene.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  Copyright (C) 2018 The Android Open Source Project
-  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.
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
   -->
 <MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:motion="http://schemas.android.com/apk/res-auto">
@@ -40,18 +30,19 @@
             android:id="@id/recyclerViewMessages"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintBottom_toTopOf="@+id/layoutReplyButtons"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintTop_toBottomOf="@+id/header" />
 
         <Constraint
             android:id="@id/layoutReplyButtons"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
-            android:visibility="invisible"
-            motion:layout_constraintRight_toRightOf="parent"
-            motion:layout_constraintTop_toBottomOf="parent" />
+            android:layout_marginBottom="@dimen/default_margin_content_small"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent" />
 
     </ConstraintSet>
 
@@ -69,14 +60,16 @@
             android:id="@id/recyclerViewMessages"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintBottom_toTopOf="@+id/layoutReplyButtons"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintTop_toBottomOf="@+id/header" />
 
         <Constraint
             android:id="@id/layoutReplyButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="@dimen/default_margin_content_small"
             motion:layout_constraintBottom_toBottomOf="parent"
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent" />