Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

[android] Only scroll conversation list to bottom, when already at bottom

Browse Source 
Closes #1467
This commit is contained in:
Torsten Grote
2018-11-20 13:36:57 -02:00
parent 6e17709f46
commit b8ca5ab557
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -148,6 +148,7 @@ public class ConversationActivity extends BriarActivity
private ImageView toolbarStatus; private ImageView toolbarStatus;
private TextView toolbarTitle; private TextView toolbarTitle;
private BriarRecyclerView list; private BriarRecyclerView list;
private LinearLayoutManager layoutManager;
private TextInputView textInputView; private TextInputView textInputView;
// Fields that are accessed from background threads must be volatile // Fields that are accessed from background threads must be volatile
@@ -227,7 +228,8 @@ public class ConversationActivity extends BriarActivity
viewModel.getContactDisplayName()); viewModel.getContactDisplayName());
adapter = new ConversationAdapter(this, this); adapter = new ConversationAdapter(this, this);
list = findViewById(R.id.conversationView); list = findViewById(R.id.conversationView);
list.setLayoutManager(new LinearLayoutManager(this)); layoutManager = new LinearLayoutManager(this);
list.setLayoutManager(layoutManager);
list.setAdapter(adapter); list.setAdapter(adapter);
list.setEmptyText(getString(R.string.no_private_messages)); list.setEmptyText(getString(R.string.no_private_messages));
@@ -434,8 +436,9 @@ public class ConversationActivity extends BriarActivity
adapter.getMessageItem(m); adapter.getMessageItem(m);
if (pair != null) { if (pair != null) {
pair.getSecond().setText(text); pair.getSecond().setText(text);
boolean bottom = adapter.isScrolledToBottom(layoutManager);
adapter.notifyItemChanged(pair.getFirst()); adapter.notifyItemChanged(pair.getFirst());
list.scrollToPosition(adapter.getItemCount() - 1); if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
} }
}); });
} }
@@ -464,8 +467,9 @@ public class ConversationActivity extends BriarActivity
adapter.getMessageItem(m); adapter.getMessageItem(m);
if (pair != null) { if (pair != null) {
pair.getSecond().setAttachments(items); pair.getSecond().setAttachments(items);
boolean bottom = adapter.isScrolledToBottom(layoutManager);
adapter.notifyItemChanged(pair.getFirst()); adapter.notifyItemChanged(pair.getFirst());
list.scrollToPosition(adapter.getItemCount() - 1); if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
} }
}); });
} }
@@ -514,10 +518,10 @@ public class ConversationActivity extends BriarActivity
private void addConversationItem(ConversationItem item) { private void addConversationItem(ConversationItem item) {
runOnUiThreadUnlessDestroyed(() -> { runOnUiThreadUnlessDestroyed(() -> {
boolean bottom = adapter.isScrolledToBottom(layoutManager);
adapter.incrementRevision(); adapter.incrementRevision();
adapter.add(item); adapter.add(item);
// Scroll to the bottom if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
list.scrollToPosition(adapter.getItemCount() - 1);
}); });
} }

5
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
View File

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.conversation;
import android.content.Context; import android.content.Context;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.v7.widget.LinearLayoutManager;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -112,4 +113,8 @@ class ConversationAdapter
return null; return null;
} }
boolean isScrolledToBottom(LinearLayoutManager layoutManager) {
return layoutManager.findLastVisibleItemPosition() == items.size() - 1;
}
} }