support recently used emoji

closes #832
sk22 · Oct 7, 2023 · 0cc8cdd · 0cc8cdd
1 parent 4428ef7
commit 0cc8cdd
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 11 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
@@ -12,6 +12,7 @@
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ContentType;
+import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -39,14 +40,15 @@ public class AccountLocalPreferences{
 	public String publishButtonText;
 	public String timelineReplyVisibility; // akkoma-only
 	public boolean keepOnlyLatestNotification;
-
 	public boolean emojiReactionsEnabled;
 	public ShowEmojiReactions showEmojiReactions;
 	public ColorPreference color;
 	public boolean likeIcon;
+	public ArrayList<Emoji> recentCustomEmoji;
 
-	private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
-	private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
+	private final static Type timelinesType=new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentCustomEmojiType=new TypeToken<ArrayList<Emoji>>() {}.getType();
 
 	public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		this.prefs=prefs;
@@ -73,6 +75,7 @@ public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
 		color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
 		likeIcon=prefs.getBoolean("likeIcon", false);
+		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());
 	}
 
 	public long getNotificationsPauseEndTime(){
@@ -108,6 +111,7 @@ public void save(){
 				.putString("showEmojiReactions", showEmojiReactions.name())
 				.putString("color", color.name())
 				.putBoolean("likeIcon", likeIcon)
+				.putString("recentCustomEmoji", gson.toJson(recentCustomEmoji))
 				.apply();
 	}
 

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -294,7 +294,7 @@ public void onDetach(){
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
-		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain);
+		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), accountID, customEmojis, instanceDomain);
 		emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
 			@Override
 			public void onEmojiSelected(Emoji emoji){