From b6f5e4a217e3eaf6be94bc5efae41273d27944bc Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 6 Oct 2014 22:03:01 +0200 Subject: [PATCH] cleanung up the scroll fix a little --- res/layout/message_null.xml | 2 +- src/eu/siacs/conversations/ui/ConversationActivity.java | 2 +- src/eu/siacs/conversations/ui/ConversationFragment.java | 4 +--- src/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 7 +++++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/layout/message_null.xml b/res/layout/message_null.xml index 36eb860dd..0e0f1c924 100644 --- a/res/layout/message_null.xml +++ b/res/layout/message_null.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index f94d6b733..6817a3865 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -670,7 +670,7 @@ public class ConversationActivity extends XmppActivity implements @Override public void onSaveInstanceState(Bundle savedInstanceState) { Conversation conversation = getSelectedConversation(); - if (conversation!=null) { + if (conversation != null) { savedInstanceState.putString(STATE_OPEN_CONVERSATION, conversation.getUuid()); } diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 716e299ef..928bb6f39 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -522,9 +522,7 @@ public class ConversationFragment extends Fragment { private void messageSent() { int size = this.messageList.size(); - if (size >= 1 && this.messagesView.getLastVisiblePosition() != size - 1) { - messagesView.setSelection(size - 1); - } + messagesView.setSelection(size - 1); mEditMessage.setText(""); updateChatMsgHint(); } diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 035d18c52..c8dd1f0e3 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -418,6 +418,13 @@ public class MessageAdapter extends ArrayAdapter { } if (type == STATUS || type == NULL) { + if (position == getCount() - 1) { + view.getLayoutParams().height = 1; + } else { + view.getLayoutParams().height = 0; + + } + view.setLayoutParams(view.getLayoutParams()); return view; }