Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delay loading of emojis until emoji picker is opened #560

Closed
wants to merge 2 commits into from
Closed

Delay loading of emojis until emoji picker is opened #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23bec0
Delay loading of emojis until emoji picker is opened
likeazir Oct 27, 2024
540dcd8
don't load adapters if they already exist
likeazir Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,13 @@ public int getSpanSize(int position){
list.setPadding(V.dp(16), 0, V.dp(16), 0);
imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);

List<Emoji> recentEmoji=new ArrayList<>(lp.recentCustomEmoji);
if(!recentEmoji.isEmpty())
adapter.addAdapter(new SingleCategoryAdapter(recentEmojiCategory=new EmojiCategory(activity.getString(R.string.mo_emoji_recent), recentEmoji)));

for(EmojiCategory category:emojis)
adapter.addAdapter(new SingleCategoryAdapter(category));
if (!forReaction){
List<Emoji> recentEmoji=new ArrayList<>(lp.recentCustomEmoji);
if(!recentEmoji.isEmpty())
adapter.addAdapter(new SingleCategoryAdapter(recentEmojiCategory=new EmojiCategory(activity.getString(R.string.mo_emoji_recent), recentEmoji)));
for(EmojiCategory category : emojis)
adapter.addAdapter(new SingleCategoryAdapter(category));
}
list.setAdapter(adapter);
list.addItemDecoration(new RecyclerView.ItemDecoration(){
@Override
Expand Down Expand Up @@ -229,6 +230,17 @@ public void onEmojiUpdated(EmojiUpdatedEvent ev){
}
}

public void customToggleKeyboardPopup(){
if (adapter.getAdapterCount() == 0){
List<Emoji> recentEmoji=new ArrayList<>(lp.recentCustomEmoji);
if(!recentEmoji.isEmpty())
adapter.addAdapter(new SingleCategoryAdapter(recentEmojiCategory=new EmojiCategory(activity.getString(R.string.mo_emoji_recent), recentEmoji)));
for(EmojiCategory category : emojis)
adapter.addAdapter(new SingleCategoryAdapter(category));
}
super.toggleKeyboardPopup(null);
}

private class SingleCategoryAdapter extends UsableRecyclerView.Adapter<RecyclerView.ViewHolder> implements ImageLoaderRecyclerAdapter, Filterable{
private EmojiCategory category;

Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private void addEmojiReaction(String emoji, Emoji info) {
public void onBackspace() {}

private void onReactClick(View v){
emojiKeyboard.toggleKeyboardPopup(null);
emojiKeyboard.customToggleKeyboardPopup();
v.setSelected(emojiKeyboard.isVisible());
space.setVisibility(emojiKeyboard.isVisible() ? View.VISIBLE : View.GONE);
DisplayMetrics displayMetrics = new DisplayMetrics();
Expand Down