From 25ce9ddeb39acb543abb767c66f9cf7908641b70 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 13 Apr 2020 18:38:35 +0200
Subject: [PATCH] Fixed scroll on select

---
 .../eu/faircode/email/FragmentCompose.java    | 21 ++++++++++++-------
 app/src/main/res/layout/fragment_compose.xml  |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9840d37a66..3c4e7c225e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -47,7 +47,6 @@ import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.OperationCanceledException;
@@ -585,12 +584,6 @@ public class FragmentCompose extends FragmentBase {
         etBody.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT);
         tvReference.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            etBody.setRevealOnFocusHint(false); // Doesn't work
-            tvSignature.setRevealOnFocusHint(false);
-            tvReference.setRevealOnFocusHint(false);
-        }
-
         style_bar.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
@@ -4472,6 +4465,8 @@ public class FragmentCompose extends FragmentBase {
                 ibReferenceEdit.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
                 ibReferenceImages.setVisibility(ref_has_images && !show_images ? View.VISIBLE : View.GONE);
 
+                setBodyPadding();
+
                 state = State.LOADED;
 
                 final Context context = getContext();
@@ -4508,6 +4503,14 @@ public class FragmentCompose extends FragmentBase {
         }.execute(this, args, "compose:show");
     }
 
+    private void setBodyPadding() {
+        // Keep room for the style toolbar
+        boolean pad =
+                (grpSignature.getVisibility() == View.GONE &&
+                        tvReference.getVisibility() == View.GONE);
+        etBody.setPadding(0, 0, 0, pad ? Helper.dp2pixels(getContext(), 36) : 0);
+    }
+
     private AdapterView.OnItemSelectedListener identitySelected = new AdapterView.OnItemSelectedListener() {
         @Override
         public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -4528,6 +4531,8 @@ public class FragmentCompose extends FragmentBase {
                 }, null);
             tvSignature.setText(signature);
             grpSignature.setVisibility(signature == null ? View.GONE : View.VISIBLE);
+
+            setBodyPadding();
         }
 
         @Override
@@ -4537,6 +4542,8 @@ public class FragmentCompose extends FragmentBase {
 
             tvSignature.setText(null);
             grpSignature.setVisibility(View.GONE);
+
+            setBodyPadding();
         }
     };
 
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 1683f83002..5b818f44f0 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -14,7 +14,7 @@
         <eu.faircode.email.ScrollViewEx
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/style_bar"
+            app:layout_constraintBottom_toTopOf="@+id/media_bar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">