From 8fec757c7e9fb48517129623521f73dad0470bd0 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 17 Oct 2018 12:07:40 +0000 Subject: [PATCH] Make compose view scrollable --- .../eu/faircode/email/FragmentCompose.java | 8 +- app/src/main/res/layout/fragment_compose.xml | 360 +++++++++--------- 2 files changed, 182 insertions(+), 186 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 7eb54c2d..92b29827 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -114,7 +114,6 @@ public class FragmentCompose extends FragmentEx { private Group grpHeader; private Group grpAddresses; private Group grpAttachments; - private Group grpMessage; private AdapterAttachment adapter; @@ -147,7 +146,6 @@ public class FragmentCompose extends FragmentEx { grpHeader = view.findViewById(R.id.grpHeader); grpAddresses = view.findViewById(R.id.grpAddresses); grpAttachments = view.findViewById(R.id.grpAttachments); - grpMessage = view.findViewById(R.id.grpMessage); // Wire controls @@ -273,7 +271,8 @@ public class FragmentCompose extends FragmentEx { grpHeader.setVisibility(View.GONE); grpAddresses.setVisibility(View.GONE); grpAttachments.setVisibility(View.GONE); - grpMessage.setVisibility(View.GONE); + etBody.setVisibility(View.GONE); + bottom_navigation.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); getActivity().invalidateOptionsMenu(); @@ -1043,7 +1042,8 @@ public class FragmentCompose extends FragmentEx { pbWait.setVisibility(View.GONE); grpHeader.setVisibility(View.VISIBLE); grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE); - grpMessage.setVisibility(View.VISIBLE); + etBody.setVisibility(View.VISIBLE); + bottom_navigation.setVisibility(View.VISIBLE); DB db = DB.getInstance(getContext()); diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml index e1f01abc..6ad1f83a 100644 --- a/app/src/main/res/layout/fragment_compose.xml +++ b/app/src/main/res/layout/fragment_compose.xml @@ -4,170 +4,190 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent"> - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - \ No newline at end of file