Custom Emoji: Part 1

app/src/main/java/org/thunderdog/challegram/BaseActivity.java

@@ -62,6 +62,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.collection.SparseArrayCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.drinkless.tdlib.TdApi;
 import org.drinkmore.Tracer;
@@ -130,6 +131,7 @@
 import org.thunderdog.challegram.widget.ForceTouchView;
 import org.thunderdog.challegram.widget.NetworkStatusBarView;
 import org.thunderdog.challegram.widget.PopupLayout;
+import org.thunderdog.challegram.widget.StickersSuggestionsLayout;
 
 import java.lang.ref.Reference;
 import java.util.ArrayList;
@@ -235,6 +237,16 @@ public void addToRoot (View view, boolean ignoreStatusBar) {
     if (tooltipIndex != -1) {
       i = i == -1 ? tooltipIndex : Math.min(tooltipIndex, i);
     }
+
+    if (view == inlineResultsView) {
+      View customEmojiSuggestonsView = rootView.findViewById(R.id.view_customEmojiSuggestions);
+      int customEmojiSuggestionsIndex = customEmojiSuggestonsView != null ?
+        rootView.indexOfChild(customEmojiSuggestonsView) : -1;
+      if (customEmojiSuggestionsIndex != -1) {
+        i = i == -1 ? customEmojiSuggestionsIndex : Math.min(customEmojiSuggestionsIndex, i);
+      }
+    }
+
     if (i != -1) {
       rootView.addView(view, i);
     } else {
@@ -1946,9 +1958,13 @@ public void closeForceTouch () {
 
   // Inline results
 
+  private StickersSuggestionsLayout emojiSuggestionsWrap;
   private InlineResultsWrap inlineResultsView;
 
   public void updateHackyOverlaysPositions () {
+    if (emojiSuggestionsWrap != null && emojiSuggestionsWrap.getParent() != null) {
+      emojiSuggestionsWrap.updatePosition(true);
+    }
     if (inlineResultsView != null && inlineResultsView.getParent() != null) {
       inlineResultsView.updatePosition(true);
     }
@@ -1962,6 +1978,10 @@ public void updateHackyOverlaysPositions () {
   }
 
   public void showInlineResults (ViewController<?> context, Tdlib tdlib, @Nullable ArrayList<InlineResult<?>> results, boolean needBackground, @Nullable InlineResultsWrap.LoadMoreCallback callback) {
+    showInlineResults(context, tdlib, results, needBackground, callback, null, null);
+  }
+
+  public void showInlineResults (ViewController<?> context, Tdlib tdlib, @Nullable ArrayList<InlineResult<?>> results, boolean needBackground, @Nullable InlineResultsWrap.LoadMoreCallback callback, @Nullable RecyclerView.OnScrollListener scrollCallback, @Nullable StickerSmallView.StickerMovementCallback stickerMovementCallback) {
     if (inlineResultsView == null) {
       if (results == null || results.isEmpty()) {
         return;
@@ -1974,12 +1994,16 @@ public void showInlineResults (ViewController<?> context, Tdlib tdlib, @Nullable
       addToRoot(inlineResultsView, false);
     }
 
-    inlineResultsView.showItems(context, results, needBackground, callback, !context.isFocused());
+    inlineResultsView.showItems(context, results, needBackground, callback, scrollCallback, stickerMovementCallback, !context.isFocused());
   }
 
   public void addInlineResults (ViewController<?> context, ArrayList<InlineResult<?>> results, InlineResultsWrap.LoadMoreCallback callback) {
+    addInlineResults(context, results, callback, null, null);
+  }
+
+  public void addInlineResults (ViewController<?> context, ArrayList<InlineResult<?>> results, InlineResultsWrap.LoadMoreCallback callback, @Nullable RecyclerView.OnScrollListener scrollCallback, @Nullable StickerSmallView.StickerMovementCallback stickerMovementCallback) {
     if (inlineResultsView != null) {
-      inlineResultsView.addItems(context, results, callback);
+      inlineResultsView.addItems(context, results, callback, scrollCallback, stickerMovementCallback);
     }
   }
 
@@ -1994,6 +2018,56 @@ public boolean areInlineResultsVisible () {
     return inlineResultsView != null && inlineResultsView.isDisplayingItems();
   }
 
+  @Nullable
+  public InlineResultsWrap getInlineResultsView () {
+    return inlineResultsView;
+  }
+
+  public void setEmojiSuggestions (MessagesController context, @Nullable ArrayList<TGStickerObj> stickers, @Nullable RecyclerView.OnScrollListener scrollCallback, StickersSuggestionsLayout.Delegate choosingDelegate) {
+    if (emojiSuggestionsWrap == null) {
+      emojiSuggestionsWrap = new StickersSuggestionsLayout(context.context());
+      emojiSuggestionsWrap.setId(R.id.view_customEmojiSuggestions);
+      emojiSuggestionsWrap.init(context, true);
+    }
+    emojiSuggestionsWrap.setChoosingDelegate(choosingDelegate);
+    emojiSuggestionsWrap.setOnScrollListener(scrollCallback);
+    emojiSuggestionsWrap.setStickers(context, stickers);
+  }
+
+  public void updateEmojiSuggestionsPosition (boolean needTranslate) {
+    if (emojiSuggestionsWrap != null) {
+      emojiSuggestionsWrap.updatePosition(needTranslate);
+    }
+  }
+
+  public void addEmojiSuggestions (MessagesController context, ArrayList<TGStickerObj> stickers) {
+    if (emojiSuggestionsWrap != null && stickers != null && !stickers.isEmpty()) {
+      emojiSuggestionsWrap.addStickers(context, stickers);
+    }
+  }
+
+  public void setEmojiSuggestionsVisible (boolean visible) {
+    if (emojiSuggestionsWrap != null) {
+      if (visible) {
+        emojiSuggestionsWrap.updatePosition(false);
+      }
+      emojiSuggestionsWrap.setStickersVisible(visible);
+    }
+  }
+
+  public boolean hasEmojiSuggestions () {
+    return emojiSuggestionsWrap != null && emojiSuggestionsWrap.hasStickers();
+  }
+
+  public boolean isEmojiSuggestionsVisible () {
+    return emojiSuggestionsWrap != null && emojiSuggestionsWrap.isStickersVisible();
+  }
+
+  @Nullable
+  public StickersSuggestionsLayout getEmojiSuggestionsView () {
+    return emojiSuggestionsWrap;
+  }
+
   // etc
 
   @Override

app/src/main/java/org/thunderdog/challegram/U.java

@@ -412,7 +412,7 @@ private static File getRootOfInnerSdCardFolder (File file) {
       String output = out.toString();
       if (!output.trim().isEmpty()) {
         String[] devicePoints = output.split("\n");
-        for (String voldPoint: devicePoints) {
+        for (String voldPoint : devicePoints) {
           String path = voldPoint.split(" ")[2];
           if (!StringUtils.equalsOrBothEmpty(ignorePath, path)) {
             if (results == null) {

app/src/main/java/org/thunderdog/challegram/component/attach/MediaLayout.java

@@ -1856,21 +1856,21 @@ public void update (TdApi.MessageSender sender) {
     }
 
     private void update (TdApi.MessageSender sender, boolean isPersonal, boolean isAnonymous) {
-      this.senderAvatarView.setVisibility(sender != null ? VISIBLE: GONE);
+      this.senderAvatarView.setVisibility(sender != null ? VISIBLE : GONE);
       this.senderAvatarView.setMessageSender(tdlib, sender);
       this.isAnonymous = isAnonymous;
       this.isPersonal = isPersonal;
-      setVisibility(!isPersonal ? VISIBLE: GONE);
+      setVisibility(!isPersonal ? VISIBLE : GONE);
       invalidate();
     }
 
     public HapticMenuHelper.MenuItem createHapticSenderItem (TdApi.Chat chat) {
       if (isAnonymous()) {
-        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId): null, R.drawable.dot_baseline_acc_anon_24);
+        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId) : null, R.drawable.dot_baseline_acc_anon_24);
       } else if (isPersonal()) {
-        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId): null, R.drawable.dot_baseline_acc_personal_24);
+        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId) : null, R.drawable.dot_baseline_acc_personal_24);
       } else {
-        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId): null, 0, tdlib, chat != null ? chat.messageSenderId: null, false);
+        return new HapticMenuHelper.MenuItem(R.id.btn_openSendersMenu, Lang.getString(R.string.SendAs), chat != null ? tdlib.getMessageSenderTitle(chat.messageSenderId) : null, 0, tdlib, chat != null ? chat.messageSenderId : null, false);
       }
     }
   }

app/src/main/java/org/thunderdog/challegram/component/base/SettingView.java

@@ -40,14 +40,15 @@
 import org.thunderdog.challegram.component.user.RemoveHelper;
 import org.thunderdog.challegram.core.Lang;
 import org.thunderdog.challegram.loader.ComplexReceiver;
+import org.thunderdog.challegram.loader.ComplexReceiverProvider;
 import org.thunderdog.challegram.loader.ImageReceiver;
 import org.thunderdog.challegram.navigation.TooltipOverlayView;
 import org.thunderdog.challegram.navigation.ViewController;
 import org.thunderdog.challegram.support.RippleSupport;
 import org.thunderdog.challegram.telegram.TGLegacyManager;
 import org.thunderdog.challegram.telegram.Tdlib;
-import org.thunderdog.challegram.theme.Theme;
 import org.thunderdog.challegram.theme.ColorId;
+import org.thunderdog.challegram.theme.Theme;
 import org.thunderdog.challegram.tool.Drawables;
 import org.thunderdog.challegram.tool.Paints;
 import org.thunderdog.challegram.tool.Screen;
@@ -79,7 +80,7 @@
 import me.vkryl.core.StringUtils;
 import me.vkryl.core.lambda.Destroyable;
 
-public class SettingView extends FrameLayoutFix implements FactorAnimator.Target, TGLegacyManager.EmojiLoadListener, AttachDelegate, Destroyable, RemoveHelper.RemoveDelegate, TextColorSet, TooltipOverlayView.LocationProvider {
+public class SettingView extends FrameLayoutFix implements FactorAnimator.Target, TGLegacyManager.EmojiLoadListener, AttachDelegate, Destroyable, RemoveHelper.RemoveDelegate, TextColorSet, TooltipOverlayView.LocationProvider, ComplexReceiverProvider {
   public static final int TYPE_INFO = 0x01;
   public static final int TYPE_SETTING = 0x02;
   public static final int TYPE_RADIO = 0x03;
@@ -238,6 +239,7 @@ public ImageReceiver getReceiver () {
     return receiver;
   }
 
+  @Override
   public ComplexReceiver getComplexReceiver () {
     return complexReceiver;
   }

app/src/main/java/org/thunderdog/challegram/component/chat/ChatHeaderView.java

@@ -111,7 +111,7 @@ public void setChat (Tdlib tdlib, TdApi.Chat chat, @Nullable ThreadInfo messageT
       setUseRedHighlight(false);
       attachChatStatus(messageThread.getChatId(), messageThread.getMessageThreadId());
     } else {
-      setEmojiStatus(tdlib.isSelfChat(chat) ? null: tdlib.chatUser(chat));
+      setEmojiStatus(tdlib.isSelfChat(chat) ? null : tdlib.chatUser(chat));
       setText(tdlib.chatTitle(chat), !StringUtils.isEmpty(forcedSubtitle) ? forcedSubtitle : tdlib.status().chatStatus(chat));
       setExpandedSubtitle(tdlib.status().chatStatusExpanded(chat));
       setUseRedHighlight(tdlib.isRedTeam(chat.id));

app/src/main/java/org/thunderdog/challegram/component/chat/ChatMembersSearcher.java

@@ -209,7 +209,7 @@ private boolean queryUserCheck (long userId, String query) {
   }
 
   private void performRequestForUserChat (long userId, String query, Handler handler) {
-    long otherUserId = ChatId.isSecret(userId) ? tdlib.chatUserId(userId): userId;
+    long otherUserId = ChatId.isSecret(userId) ? tdlib.chatUserId(userId) : userId;
     long myUserId = tdlib.myUserId();
 
     boolean otherUserOk = queryUserCheck(otherUserId, query);