commit 0dcc71bfba22985e042ee29c1cd4ca4c9788b60f
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Sep 25 13:23:44 2019 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Sep 25 13:23:57 2019 -0400
tree 42a78ac5e168c0c5320622cfe1221a991369c1b8
parent 8d25e14f50d8fef70f960a7f6b600c63920e4e59

conversation: use proper bottom padding for non-contacts

Change-Id: Ibeb6865cac07d3d6d7b65b4afae9fea3cbc59805

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 0fd691d..c622544 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -116,6 +116,7 @@
     private MenuItem mAudioCallBtn = null;
     private MenuItem mVideoCallBtn = null;
 
+    private View currentBottomView = null;
     private ConversationAdapter mAdapter = null;
     private NumberAdapter mNumberAdapter = null;
     private int marginPx;
@@ -177,8 +178,8 @@
     }
 
     private void updateListPadding() {
-        if (binding.msgInputTxt.getHeight() != 0)
-            setBottomPadding(binding.histList, binding.msgInputTxt.getHeight() + marginPxTotal);
+        if (currentBottomView != null && currentBottomView.getHeight() != 0)
+            setBottomPadding(binding.histList, currentBottomView.getHeight() + marginPxTotal);
     }
 
     @Nullable
@@ -262,7 +263,7 @@
             } else {
                 if (animation.isStarted())
                     animation.cancel();
-                animation.setIntValues(binding.histList.getPaddingBottom(), binding.msgInputTxt.getHeight() + marginPxTotal);
+                animation.setIntValues(binding.histList.getPaddingBottom(), (currentBottomView == null ? 0 : currentBottomView.getHeight()) + marginPxTotal);
                 animation.start();
             }
         });
@@ -731,7 +732,9 @@
         binding.trustRequestPrompt.setVisibility(View.GONE);
         binding.tvTrustRequestMessage.setText(String.format(getString(R.string.message_contact_not_trusted), contactDisplayName));
         binding.trustRequestMessageLayout.setVisibility(View.VISIBLE);
+        currentBottomView = binding.unknownContactPrompt;
         requireActivity().invalidateOptionsMenu();
+        updateListPadding();
     }
 
     @Override
@@ -741,7 +744,9 @@
         binding.trustRequestPrompt.setVisibility(View.VISIBLE);
         binding.tvTrustRequestMessage.setText(String.format(getString(R.string.message_contact_not_trusted_yet), contactDisplayName));
         binding.trustRequestMessageLayout.setVisibility(View.VISIBLE);
+        currentBottomView = binding.trustRequestPrompt;
         requireActivity().invalidateOptionsMenu();
+        updateListPadding();
     }
 
     @Override
@@ -750,7 +755,9 @@
         binding.unknownContactPrompt.setVisibility(View.GONE);
         binding.trustRequestPrompt.setVisibility(View.GONE);
         binding.trustRequestMessageLayout.setVisibility(View.GONE);
+        currentBottomView = binding.cvMessageInput;
         requireActivity().invalidateOptionsMenu();
+        updateListPadding();
     }
 
     @Override