fixup! Implement ability to react with any emoji behind a flag.

signalapp · May 12, 2020 · d4de9bf · d4de9bf
1 parent 0c72af6
commit d4de9bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
@@ -133,7 +133,7 @@ public int getCount() {
 
     @Override
     public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener);
+      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener, true);
       page.setModel(pages.get(position));
       container.addView(page);
       return page;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
@@ -26,7 +26,8 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
 
   public EmojiPageView(@NonNull Context context,
                        @NonNull EmojiEventListener emojiSelectionListener,
-                       @NonNull VariationSelectorListener variationSelectorListener)
+                       @NonNull VariationSelectorListener variationSelectorListener,
+                       boolean allowVariations)
   {
     super(context);
     final View view = LayoutInflater.from(getContext()).inflate(R.layout.emoji_grid_layout, this, true);
@@ -40,7 +41,8 @@ public EmojiPageView(@NonNull Context context,
     adapter        = new EmojiPageViewGridAdapter(EmojiProvider.getInstance(context),
                                                   popup,
                                                   emojiSelectionListener,
-                                                  this);
+                                                  this,
+                                                  allowVariations);
 
     recyclerView.setLayoutManager(layoutManager);
     recyclerView.setAdapter(adapter);

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
@@ -22,17 +22,20 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
   private final EmojiVariationSelectorPopup popup;
   private final VariationSelectorListener   variationSelectorListener;
   private final EmojiEventListener          emojiEventListener;
+  private final boolean                     allowVariations;
 
   public EmojiPageViewGridAdapter(@NonNull EmojiProvider emojiProvider,
                                   @NonNull EmojiVariationSelectorPopup popup,
                                   @NonNull EmojiEventListener emojiEventListener,
-                                  @NonNull VariationSelectorListener variationSelectorListener)
+                                  @NonNull VariationSelectorListener variationSelectorListener,
+                                  boolean allowVariations)
   {
     this.emojiList                 = new ArrayList<>();
     this.emojiProvider             = emojiProvider;
     this.popup                     = popup;
     this.emojiEventListener        = emojiEventListener;
     this.variationSelectorListener = variationSelectorListener;
+    this.allowVariations           = allowVariations;
 
     popup.setOnDismissListener(this);
   }
@@ -65,7 +68,7 @@ public void onBindViewHolder(@NonNull EmojiViewHolder viewHolder, int i) {
       emojiEventListener.onEmojiSelected(emoji.getValue());
     });
 
-    if (emoji.getVariations().size() > 1) {
+    if (allowVariations && emoji.getVariations().size() > 1) {
       viewHolder.itemView.setOnLongClickListener(v -> {
         popup.dismiss();
         popup.setVariations(emoji.getVariations());

diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java
@@ -35,7 +35,7 @@ final class ReactWithAnyEmojiAdapter extends RecyclerView.Adapter<ReactWithAnyEm
 
   @Override
   public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-    return new ViewHolder(new EmojiPageView(parent.getContext(), emojiEventListener, variationSelectorListener));
+    return new ViewHolder(new EmojiPageView(parent.getContext(), emojiEventListener, variationSelectorListener, false));
   }
 
   @Override