Chat Folders: Shareable folders & Redesign (#502)

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

@@ -88,6 +88,7 @@
 import org.thunderdog.challegram.ui.SettingsPrivacyController;
 import org.thunderdog.challegram.ui.SettingsPrivacyKeyController;
 import org.thunderdog.challegram.ui.SettingsThemeController;
+import org.thunderdog.challegram.ui.EditChatFolderInviteLinkController;
 import org.thunderdog.challegram.unsorted.Settings;
 import org.thunderdog.challegram.util.Crash;
 import org.thunderdog.challegram.widget.GearView;
@@ -1245,6 +1246,8 @@ private static ViewController<?> restoreController (BaseActivity context, Tdlib
       restore = new SettingsFoldersController(context, tdlib);
     } else if (id == R.id.controller_editChatFolders) {
       restore = new EditChatFolderController(context, tdlib);
+    } else if (id == R.id.controller_editChatFolderInviteLink) {
+      restore = new EditChatFolderInviteLinkController(context, tdlib);
     } else if (id == R.id.controller_bug_killer) {
       restore = new SettingsBugController(context, tdlib);
     } else {

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

@@ -107,7 +107,6 @@
 import org.thunderdog.challegram.core.Background;
 import org.thunderdog.challegram.core.Lang;
 import org.thunderdog.challegram.data.TD;
-import org.thunderdog.challegram.emoji.EmojiSpan;
 import org.thunderdog.challegram.loader.ImageGalleryFile;
 import org.thunderdog.challegram.loader.ImageLoader;
 import org.thunderdog.challegram.loader.ImageReader;
@@ -128,6 +127,7 @@
 import org.thunderdog.challegram.util.AppBuildInfo;
 import org.thunderdog.challegram.util.AppInstallationUtil;
 import org.thunderdog.challegram.util.Permissions;
+import org.thunderdog.challegram.util.text.TextReplacementSpan;
 import org.thunderdog.challegram.widget.NoScrollTextView;
 
 import java.io.BufferedReader;
@@ -2056,7 +2056,7 @@ public static float measureEmojiText (@Nullable CharSequence in, final int start
     }
 
     final Spannable s = (Spannable) in;
-    EmojiSpan[] spans = s.getSpans(start, end, EmojiSpan.class);
+    TextReplacementSpan[] spans = s.getSpans(start, end, TextReplacementSpan.class);
     if (spans == null || spans.length == 0) {
       return measureText(in, start, end, p);
     }
@@ -2069,7 +2069,7 @@ public static float measureEmojiText (@Nullable CharSequence in, final int start
 
     float textWidth = 0;
     int startIndex = start;
-    for (EmojiSpan span : spans) {
+    for (TextReplacementSpan span : spans) {
       int spanStart = s.getSpanStart(span);
       if (startIndex < spanStart) {
         textWidth += measureText(in, startIndex, spanStart, p);
@@ -3682,4 +3682,10 @@ public static Set<Long> unmodifiableTreeSetOf (long[] array) {
     }
     return Collections.unmodifiableSet(set);
   }
+
+  public static long[] concat (long[] first, long[] second) {
+    long[] result = Arrays.copyOf(first, first.length + second.length);
+    System.arraycopy(second, 0, result, first.length, second.length);
+    return result;
+  }
 }

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

@@ -91,6 +91,7 @@ public class SettingView extends FrameLayoutFix implements FactorAnimator.Target
   public static final int TYPE_SETTING_INACTIVE = 0x04;
   public static final int TYPE_INFO_MULTILINE = 0x05;
   public static final int TYPE_INFO_COMPACT = 0x07;
+  public static final int TYPE_INFO_SUPERCOMPACT = 0x08;
 
   private static final int FLAG_CENTER_ICON = 1 << 3;
   private static final int FLAG_DATA_SUBTITLE = 1 << 5;
@@ -170,7 +171,8 @@ public void setType (int type) {
         break;
       }
       case TYPE_SETTING:
-      case TYPE_SETTING_INACTIVE: {
+      case TYPE_SETTING_INACTIVE:
+      case TYPE_INFO_SUPERCOMPACT: {
         setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(55f)));
         break;
       }
@@ -340,8 +342,8 @@ public void setIconOverlay (IconOverlay overlay) {
     this.overlay = overlay;
   }
 
-  public void setCenterIcon () {
-    flags |= FLAG_CENTER_ICON;
+  public void setCenterIcon (boolean centerIcon) {
+    flags = BitwiseUtils.setFlag(flags, FLAG_CENTER_ICON, centerIcon);
   }
 
   private int lastIconResource;
@@ -590,7 +592,10 @@ private void buildLayout (int totalWidth, int totalHeight) {
 
     availWidth -= emojiStatusHelper.getWidth(Screen.dp(6));
 
-    if (type == TYPE_INFO_COMPACT) {
+    if (type == TYPE_INFO_SUPERCOMPACT) {
+      boolean hasName = !StringUtils.isEmpty(swapDataAndName ? itemData : itemName);
+      pTop = Screen.dp((hasName ? 10f : 21f) + 13f);
+    } else if (type == TYPE_INFO_COMPACT) {
       pTop = Screen.dp(15f + 13f);
     } else {
       pTop = Screen.dp(21f + 13f);
@@ -604,7 +609,7 @@ private void buildLayout (int totalWidth, int totalHeight) {
       displayItemName = itemName;
     }
 
-    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || type == TYPE_INFO_MULTILINE) {
+    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || type == TYPE_INFO_SUPERCOMPACT || type == TYPE_INFO_MULTILINE) {
       pDataLeft = pLeft;
       pDataTop = pTop;
       pTop = pTop + Screen.dp(20f);
@@ -766,9 +771,19 @@ public void setUnreadCounter (int unreadCount, boolean muted, boolean animated)
     counter.setCount(unreadCount, muted, animated);
   }
 
+  private @Nullable TooltipOverlayView.LocationProvider tooltipLocationProvider;
+
+  public void setTooltipLocationProvider (@Nullable TooltipOverlayView.LocationProvider tooltipLocationProvider) {
+    this.tooltipLocationProvider = tooltipLocationProvider;
+  }
+
   @Override
   public void getTargetBounds (View targetView, Rect outRect) {
-    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || (type == TYPE_INFO_MULTILINE && text == null)) {
+    if (tooltipLocationProvider != null) {
+      tooltipLocationProvider.getTargetBounds(targetView, outRect);
+      return;
+    }
+    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || type == TYPE_INFO_SUPERCOMPACT || (type == TYPE_INFO_MULTILINE && text == null)) {
       if (itemData != null) {
         int dataTop = (int) (pDataTop - Screen.dp(13f));
         Paint.FontMetricsInt fm = Paints.getTextPaint16().getFontMetricsInt();
@@ -864,7 +879,7 @@ protected void onDraw (Canvas c) {
 
     final int dataColor = defaultTextColor();
 
-    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || (type == TYPE_INFO_MULTILINE && text == null)) {
+    if (type == TYPE_INFO || type == TYPE_INFO_COMPACT || type == TYPE_INFO_SUPERCOMPACT || (type == TYPE_INFO_MULTILINE && text == null)) {
       if (displayItemName != null) {
         int subtitleColor = Theme.getColor(dataColorId != 0 ? dataColorId : ColorId.textLight);
         if ((flags & FLAG_DATA_SUBTITLE) != 0) {