Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix initial scroll position if there's not enough vertical space to hide search bar.

Browse Source
This commit is contained in:
Alex Hart
2021-06-03 11:26:49 -03:00
parent c23215604d
commit 95dba15db8
2 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
View File

@@ -21,6 +21,8 @@ import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.Vari
import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView;
import org.thoughtcrime.securesms.util.MappingModelList;
import java.util.Objects;
public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
private static final String TAG = Log.tag(EmojiPageView.class);
@@ -96,7 +98,29 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
EmojiPageViewGridAdapter adapter = adapterFactory.create();
recyclerView.setAdapter(adapter);
adapter.submitList(getMappingModelList(), () -> layoutManager.scrollToPosition(1));
adapter.submitList(getMappingModelList(), () -> {
layoutManager.scrollToPosition(1);
recyclerView.post(() -> {
if (!searchEnabled || recyclerView.getAdapter() == null) {
return;
}
KeyboardPageSearchView searchView = (KeyboardPageSearchView) layoutManager.findViewByPosition(0);
if (searchView == null) {
return;
}
int allowedScrollDistance = recyclerView.computeVerticalScrollRange() - recyclerView.computeVerticalScrollExtent();
if (allowedScrollDistance < searchView.getMeasuredHeight()) {
View lastView = Objects.requireNonNull(layoutManager.findViewByPosition(recyclerView.getAdapter().getItemCount() - 1));
int scrollDelta = searchView.getMeasuredHeight() - allowedScrollDistance;
int distanceFromBottom = Math.max(0, recyclerView.getMeasuredHeight() - lastView.getBottom());
lastView.setPadding(lastView.getPaddingLeft(), lastView.getPaddingTop(), lastView.getPaddingRight(), lastView.getPaddingBottom() + scrollDelta + distanceFromBottom);
recyclerView.post(() -> layoutManager.scrollToPosition(1));
}
});
});
}
private @NonNull MappingModelList getMappingModelList() {