EmojiKeyboard: add recents

app/src/main/java/com/keylesspalace/tusky/adapter/UnicodeEmojiAdapter.java

@@ -12,13 +12,16 @@ import androidx.emoji.text.EmojiCompat;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.view.EmojiKeyboard;
 import com.keylesspalace.tusky.util.Emojis;
+import java.util.*;
 
 public class UnicodeEmojiAdapter
     extends RecyclerView.Adapter<SingleViewHolder>
-    implements TabLayoutMediator.TabConfigurationStrategy  {
+    implements TabLayoutMediator.TabConfigurationStrategy, EmojiKeyboard.EmojiKeyboardAdapter {
     
     private String id;
+    private List<String> recents;
     private EmojiKeyboard.OnEmojiSelectedListener listener;
+    private RecyclerView recentsView;
     
     private final static float BUTTON_WIDTH_DP = 65.0f; // empirically found value :(
     
@@ -30,17 +33,27 @@ public class UnicodeEmojiAdapter
     
     @Override
     public void onConfigureTab(TabLayout.Tab tab, int position) {
-        tab.setText(Emojis.EMOJIS[position][0]);
+        if(position == 0) {
+            tab.setIcon(R.drawable.ic_access_time);
+        } else {
+            tab.setText(Emojis.EMOJIS[position - 1][0]);
+        }
     }
         
     @Override
     public int getItemCount() {
-        return Emojis.EMOJIS.length;
+        return Emojis.EMOJIS.length + 1;
     }
     
     @Override
     public void onBindViewHolder(SingleViewHolder holder, int position) {
-        ((RecyclerView)holder.itemView).setAdapter(new UnicodeEmojiPageAdapter(Emojis.EMOJIS[position], id, listener));
+        if(position == 0) {
+            recentsView = ((RecyclerView)holder.itemView);
+            recentsView.setAdapter(new UnicodeEmojiPageAdapter(recents, id, listener));
+        } else {
+            ((RecyclerView)holder.itemView).setAdapter(
+                new UnicodeEmojiPageAdapter(Arrays.asList(Emojis.EMOJIS[position - 1]), id, listener));
+        }
     }
     
     @Override
@@ -56,26 +69,29 @@ public class UnicodeEmojiAdapter
         ((RecyclerView)view).setLayoutManager(new GridLayoutManager(view.getContext(), rows));
         return holder;
     }
-
+    
-    private class UnicodeEmojiPageAdapter extends RecyclerView.Adapter<SingleViewHolder> {
+    @Override
-        private final String[] emojis;
+    public void onRecentsUpdate(Set<String> set) {
-        private final String id;
+        recents = new ArrayList<String>(set);
+        Collections.reverse(recents);
+        if(recentsView != null) 
+            recentsView.getAdapter().notifyDataSetChanged();
+    }
+    
+    private abstract class UnicodeEmojiBasePageAdapter extends RecyclerView.Adapter<SingleViewHolder> {
         private final EmojiKeyboard.OnEmojiSelectedListener listener;
+        private final String id;
         
-        public UnicodeEmojiPageAdapter(String[] emojis, String id, EmojiKeyboard.OnEmojiSelectedListener listener) {
+        public UnicodeEmojiBasePageAdapter(String id, EmojiKeyboard.OnEmojiSelectedListener listener) {
-            this.emojis = emojis;
             this.id = id;
             this.listener = listener;
         }
         
-        @Override
+        abstract public String getEmoji(int position);
-        public int getItemCount() {
-            return emojis.length;
-        }
         
         @Override
         public void onBindViewHolder(SingleViewHolder holder, int position) {
-            String emoji = emojis[position];
+            String emoji = getEmoji(position);
             EmojiAppCompatButton btn = (EmojiAppCompatButton)holder.itemView;
             
             btn.setText(emoji);
@@ -90,5 +106,24 @@ public class UnicodeEmojiAdapter
         }
     }
     
+    private class UnicodeEmojiPageAdapter extends UnicodeEmojiBasePageAdapter {
+        private final List<String> emojis;
+        
+        public UnicodeEmojiPageAdapter(List<String> emojis, String id, EmojiKeyboard.OnEmojiSelectedListener listener) {
+            super(id, listener);
+            this.emojis = emojis;
+        }
+        
+        @Override
+        public int getItemCount() {
+            return emojis.size();
+        }
+        
+        @Override
+        public String getEmoji(int position) {
+            return emojis.get(position);
+        }
+    }
+    
 }
  

app/src/main/java/com/keylesspalace/tusky/view/EmojiKeyboard.java

@@ -9,13 +9,22 @@ import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import androidx.viewpager2.widget.ViewPager2;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.preference.PreferenceManager;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.adapter.UnicodeEmojiAdapter;
+import java.util.*;
 
 public class EmojiKeyboard extends LinearLayout {
     private TabLayout tabs;
     private ViewPager2 pager;
     private TabLayoutMediator currentMediator;
+    private String preferenceKey;
+    private SharedPreferences pref;
+    private Set<String> recents;
+    private boolean isSticky = false; // TODO    
+    private String RECENTS_DELIM = "; ";
+    private int MAX_RECENTS_ITEMS = 50;
+    private RecyclerView.Adapter adapter;
 
     public EmojiKeyboard(Context context) {
         super(context);
@@ -31,10 +40,11 @@ public class EmojiKeyboard extends LinearLayout {
         super(context, attrs, defStyleAttr);
         init(context);
     }
-        
+
     void init(Context context) {
         inflate(context, R.layout.item_emoji_picker, this);
         
+        pref = PreferenceManager.getDefaultSharedPreferences(context);
         tabs = findViewById(R.id.picker_tabs);
         pager = findViewById(R.id.picker_pager);
     }
@@ -44,34 +54,67 @@ public class EmojiKeyboard extends LinearLayout {
     public static final int STICKER_MODE = 2;
     
     void setupKeyboard(String id, int mode, OnEmojiSelectedListener listener) {
-        RecyclerView.Adapter adapter;
-    
         switch(mode) {
-	        case CUSTOM_MODE:
+            case CUSTOM_MODE:
-	        // UNDONE
+                preferenceKey = "CUSTOM_RECENTS";
-            //break;
+                break;
             case STICKER_MODE:
-            // UNDONE
+                preferenceKey = "STICKER_RECENTS";
-            //break;
+                break;
             default:
             case UNICODE_MODE:
+                preferenceKey = "UNICODE_RECENTS";
                 adapter = new UnicodeEmojiAdapter(id, listener);
-            break;
+                break;
         }
         
+        List<String> list = Arrays.asList(pref.getString(preferenceKey, "").split(RECENTS_DELIM));
+        recents = new LinkedHashSet<String>(list);
+        ((EmojiKeyboardAdapter)adapter).onRecentsUpdate(recents);
+        
         pager.setAdapter(adapter);
         
         if(currentMediator != null)
-	        currentMediator.detach();
+            currentMediator.detach();
         
         currentMediator = new TabLayoutMediator(tabs, pager, (TabLayoutMediator.TabConfigurationStrategy)adapter);
         currentMediator.attach();
     }
     
+    void appendToRecents(String id) {
+        recents.remove(id);
+        recents.add(id);
+        int size = recents.size();
+        String joined;
+        final SharedPreferences.Editor editor = pref.edit();
+        if(size > MAX_RECENTS_ITEMS) {
+            List<String> list = new ArrayList<String>(recents);
+            list = list.subList(size - MAX_RECENTS_ITEMS, size);
+            joined = String.join(RECENTS_DELIM, list);
+            if(isSticky) {
+                recents = new LinkedHashSet<String>(list);
+            }
+        } else {
+            joined = String.join(RECENTS_DELIM, recents);
+        }
+        
+        editor.putString(preferenceKey, joined);
+        editor.apply();
+        
+        // no point on updating view if we are will be closed
+        if(isSticky) {
+            ((EmojiKeyboardAdapter)adapter).onRecentsUpdate(recents);
+        }
+    }
+
     public interface OnEmojiSelectedListener {
         void onEmojiSelected(String id, String emoji);
     }
     
+    public interface EmojiKeyboardAdapter {
+        void onRecentsUpdate(Set<String> set);
+    }
+    
     public static void show(Context ctx, String id, int mode, OnEmojiSelectedListener listener) {
         final Dialog dialog = new Dialog(ctx);
         
@@ -81,7 +124,9 @@ public class EmojiKeyboard extends LinearLayout {
         EmojiKeyboard kbd = (EmojiKeyboard)dialog.findViewById(R.id.dialog_emoji_keyboard);
         kbd.setupKeyboard(id, mode, (_id, _emoji) -> {
             listener.onEmojiSelected(_id, _emoji);
-            dialog.dismiss();
+            kbd.appendToRecents(_emoji);
+            if(!kbd.isSticky)
+                dialog.dismiss();
         });
         
         dialog.show();