From 2273173b0435895e02584c16d640b8f3ccbc198a Mon Sep 17 00:00:00 2001
From: vkryl <6242627+vkryl@users.noreply.github.com>
Date: Mon, 15 Jan 2024 23:38:48 +0400
Subject: [PATCH 01/61] Upgraded TDLib to tdlib/td@0f98d76
---
tdlib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tdlib b/tdlib
index e432e4644e..55041be25f 160000
--- a/tdlib
+++ b/tdlib
@@ -1 +1 @@
-Subproject commit e432e4644eb4d11475e0a1de2dbe0e05f2a9bd99
+Subproject commit 55041be25fa2384dcd6902be08316bb26afaae56
From 267172baf0208d15409c94b9183543c6d0ead20f Mon Sep 17 00:00:00 2001
From: Nick <64551534+null-nick@users.noreply.github.com>
Date: Mon, 15 Jan 2024 21:03:44 +0100
Subject: [PATCH 02/61] WIP: Show `Convert to Broadcast Group` in group
settings
* init
* Update
* Fixes
* Update
* Fixes
* Fixed typo
* Little fixes
* Some changes suggested by @vkryl
* Update app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
* code indentation fixes
* applied suggestion by @vkryl
* Crash fixes
* Update app/src/main/res/values/strings.xml
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Update app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
* Design and logic fixes
* Revert `version.properties`
---------
Co-authored-by: Vyacheslav <6242627+vkryl@users.noreply.github.com>
---
.../thunderdog/challegram/telegram/Tdlib.java | 3 +
.../challegram/ui/ProfileController.java | 60 +++++++++++++++++--
app/src/main/res/values/ids.xml | 7 ++-
app/src/main/res/values/strings.xml | 7 +++
4 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java b/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
index b3f8a59d92..109a75772a 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
@@ -10693,6 +10693,9 @@ public boolean suggestConvertToBroadcastGroup (long chatId) {
if (supergroup == null || supergroup.isChannel || supergroup.isBroadcastGroup || !TD.isCreator(supergroup.status)) {
return false;
}
+ if (isDebugInstance() || BuildConfig.DEBUG) {
+ return true;
+ }
synchronized (dataLock) {
for (TdApi.SuggestedAction action : suggestedActions) {
if (action.getConstructor() == TdApi.SuggestedActionConvertToBroadcastGroup.CONSTRUCTOR) {
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java b/app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
index 05b0dfcf90..f7d4f8ed80 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ProfileController.java
@@ -15,14 +15,12 @@
package org.thunderdog.challegram.ui;
import android.annotation.SuppressLint;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect;
-import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.InputFilter;
@@ -68,7 +66,6 @@
import org.thunderdog.challegram.data.ThreadInfo;
import org.thunderdog.challegram.data.TranslationsManager;
import org.thunderdog.challegram.emoji.EmojiFilter;
-import org.thunderdog.challegram.filegen.SimpleGenerationInfo;
import org.thunderdog.challegram.loader.AvatarReceiver;
import org.thunderdog.challegram.mediaview.MediaViewController;
import org.thunderdog.challegram.mediaview.data.MediaStack;
@@ -99,7 +96,6 @@
import org.thunderdog.challegram.theme.ColorId;
import org.thunderdog.challegram.theme.ColorState;
import org.thunderdog.challegram.theme.Theme;
-import org.thunderdog.challegram.tool.Intents;
import org.thunderdog.challegram.tool.Keyboard;
import org.thunderdog.challegram.tool.Paints;
import org.thunderdog.challegram.tool.Screen;
@@ -131,7 +127,6 @@
import org.thunderdog.challegram.widget.ViewPager;
import org.thunderdog.challegram.widget.rtl.RtlViewPager;
-import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -3835,6 +3830,13 @@ private void buildEditCells () {
items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.AggressiveAntiSpamDesc));
}
+ if (tdlib.suggestConvertToBroadcastGroup(chat.id)) {
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_convertToBroadcastGroup, 0, R.string.ConvertToBroadcastGroup));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, Lang.pluralBold(R.string.ConvertToBroadcastGroupDesc, tdlib.supergroupMaxSize())));
+ }
+
if ((supergroupFull != null && supergroupFull.canHideMembers) || (groupFull != null && groupFull.canHideMembers && tdlib.canUpgradeChat(chat.id))) {
boolean membersHidden = supergroupFull != null && supergroupFull.hasHiddenMembers;
items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
@@ -4628,9 +4630,57 @@ public void onClick (View v) {
toggleContentProtection(v);
} else if (viewId == R.id.btn_toggleJoinByRequest) {
toggleJoinByRequests(v);
+ } else if (viewId == R.id.btn_convertToBroadcastGroup) {
+ showOptions(
+ Lang.getMarkdownString(this, R.string.ConvertToBroadcastGroupHint),
+ new int[] {R.id.btn_confirmConvertBroadcast, R.id.btn_cancel},
+ new String[] {
+ Lang.getString(R.string.ConvertToBroadcastGroupButton),
+ Lang.getString(R.string.Cancel)
+ },
+ new int[] {
+ OPTION_COLOR_RED,
+ OPTION_COLOR_NORMAL
+ },
+ new int[] {
+ R.drawable.baseline_bullhorn_24,
+ R.drawable.baseline_cancel_24
+ },
+ (itemView, optionId) -> {
+ if (optionId == R.id.btn_confirmConvertBroadcast) {
+ convertToBroadcastGroup();
+ }
+ return true;
+ });
}
}
+ private void convertToBroadcastGroup () {
+ showOptions(
+ Lang.getMarkdownString(this, R.string.ConvertToBroadcastGroupConfirmHint),
+ new int[] {R.id.btn_convertBroadcastGroup, R.id.btn_cancel},
+ new String[] {
+ Lang.getString(R.string.ConvertToBroadcastGroupConfirm),
+ Lang.getString(R.string.Cancel)
+ },
+ new int[] {
+ OPTION_COLOR_RED,
+ OPTION_COLOR_NORMAL
+ },
+ new int[] {
+ R.drawable.baseline_check_24,
+ R.drawable.baseline_cancel_24
+ },
+ (itemView, optionId) -> {
+ if (optionId == R.id.btn_convertBroadcastGroup) {
+ if (supergroup != null) {
+ tdlib.send(new TdApi.ToggleSupergroupIsBroadcastGroup(supergroup.id), tdlib.typedOkHandler());
+ }
+ }
+ return true;
+ });
+ }
+
private boolean canSetUsername () {
return (supergroup != null && TD.isCreator(supergroup.status)) || (group != null && TD.isCreator(group.status));
}
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index bf624d7e0e..f68f91940d 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1362,6 +1362,11 @@
- items;
private int maxItemWidth;
@@ -247,16 +260,19 @@ public void checkRtl () {
public void setItemPadding (@Px int itemPadding) {
if (this.itemPadding != itemPadding) {
this.itemPadding = itemPadding;
- this.lastMeasuredWidth = 0;
- requestLayout();
+ if (items != null && !items.isEmpty()) {
+ relayout();
+ }
}
}
public void setItemSpacing (@Px int itemSpacing) {
if (this.itemSpacing != itemSpacing) {
this.itemSpacing = itemSpacing;
- this.lastMeasuredWidth = 0;
- requestLayout();
+ if (items != null && !items.isEmpty()) {
+ measureItems();
+ relayout();
+ }
}
}
@@ -277,6 +293,18 @@ public boolean isDrawSelectionAtTop () {
return drawSelectionAtTop;
}
+ private boolean showLabelOnActiveOnly;
+
+ public void setShowLabelOnActiveOnly (boolean showLabelOnActiveOnly) {
+ if (this.showLabelOnActiveOnly != showLabelOnActiveOnly) {
+ this.showLabelOnActiveOnly = showLabelOnActiveOnly;
+ if (items != null && !items.isEmpty()) {
+ measureItems();
+ relayout();
+ }
+ }
+ }
+
private OnItemClickListener listener;
public void setOnItemClickListener (OnItemClickListener listener) {
@@ -382,19 +410,11 @@ public void setItemAt (int index, String text) {
}
public void setItemAt (int index, Item item) {
- Item oldItem = this.items.get(index);
this.items.set(index, item);
onUpdateItems();
- totalWidth -= oldItem.width + itemPadding * 2;
- int textColor = Theme.headerTextColor();
- TextPaint paint = Paints.getViewPagerTextPaint(textColor, item.needFakeBold);
- item.calculateWidth(paint, itemSpacing);
- totalWidth += item.width + itemPadding * 2;
- maxItemWidth = totalWidth / items.size();
-
- this.lastMeasuredWidth = 0;
- requestLayout();
+ measureItem(item, index, getItemTextPaint(item));
+ relayout();
invalidate();
}
@@ -427,18 +447,11 @@ public void setItems (@NonNull List
- items) {
this.items = items;
onUpdateItems();
- this.totalWidth = 0;
- this.lastMeasuredWidth = 0;
- int i = 0;
- int textColor = Theme.headerTextColor();
- for (Item item : items) {
- TextPaint paint = Paints.getViewPagerTextPaint(textColor, item.needFakeBold);
- item.calculateWidth(paint, itemSpacing);
- totalWidth += item.width + itemPadding * 2;
+ measureItems();
+ for (int i = 0; i < items.size(); i++) {
addView(newBackgroundView(i));
- i++;
}
- maxItemWidth = items.isEmpty() ? 0 : totalWidth / items.size();
+ relayout();
}
public void addItem (String item) {
@@ -469,20 +482,19 @@ public void addItemAtIndex (Item item, int index) {
}
onUpdateItems();
- int textColor = Theme.headerTextColor();
- TextPaint paint = Paints.getViewPagerTextPaint(textColor, item.needFakeBold);
- item.calculateWidth(paint, itemSpacing);
+ if (index <= (int) selectionFactor) {
+ selectionFactor++;
+ }
+
+ TextPaint paint = getItemTextPaint(item);
+ measureItem(item, index, paint);
int width = item.width;
totalWidth += width + itemPadding * 2;
maxItemWidth = totalWidth / items.size();
commonItemWidth = calculateCommonItemWidth(width);
- if (index <= (int) selectionFactor) {
- selectionFactor++;
- }
-
final int availTextWidth = commonItemWidth - itemPadding * 2;
if (!shouldWrapContent() && width < availTextWidth) {
item.trimString(availTextWidth, paint);
@@ -515,14 +527,42 @@ public void removeItemAt (int index) {
invalidate();
}
+ private TextPaint getItemTextPaint (Item item) {
+ return Paints.getViewPagerTextPaint(Theme.headerTextColor(), item.needFakeBold);
+ }
+
+ private void relayout () {
+ this.totalWidth = calculateTotalWidth();
+ this.maxItemWidth = items == null || items.isEmpty() ? 0 : (totalWidth / items.size());
+ this.lastMeasuredWidth = 0; // force layout
+ requestLayout();
+ }
+
+ private void measureItems () {
+ if (items == null || items.isEmpty()) {
+ return;
+ }
+ for (int i = 0; i < items.size(); i++) {
+ Item item = items.get(i);
+ measureItem(item, i, getItemTextPaint(item));
+ }
+ }
+
+ private void measureItem (Item item, int itemIndex, TextPaint paint) {
+ item.calculateWidth(paint, itemSpacing, getLabelFactor(itemIndex));
+ }
+
private boolean shouldWrapContent () {
return getLayoutParams().width == ViewGroup.LayoutParams.WRAP_CONTENT;
}
- private int getTotalWidth () {
+ private int calculateTotalWidth () {
+ if (items == null || items.isEmpty()) {
+ return 0;
+ }
int sum = 0;
for (Item item : items) {
- sum += item.width;
+ sum += item.width + itemPadding * 2;
}
return sum;
}
@@ -549,7 +589,10 @@ public void requestItemLayoutAt (int index) {
@Override
protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec) {
if (shouldWrapContent()) {
- int totalWidth = itemPadding * 2 * items.size() + getTotalWidth();
+ int totalWidth = calculateTotalWidth();
+ if (totalWidth != this.totalWidth && BuildConfig.DEBUG) {
+ throw new IllegalStateException("this.totalWidth = " + this.totalWidth + ", totalWidth = " + totalWidth);
+ }
super.onMeasure(MeasureSpec.makeMeasureSpec(totalWidth, MeasureSpec.EXACTLY), heightMeasureSpec);
layout(totalWidth, true);
} else {
@@ -580,12 +623,11 @@ private void layout (int width, boolean wrapContent) {
lastMeasuredWidth = width;
commonItemWidth = calculateCommonItemWidth(width);
- int textColor = Theme.headerTextColor();
final int availTextWidth = commonItemWidth - itemPadding * 2;
for (Item item : items) {
- TextPaint textPaint = Paints.getViewPagerTextPaint(textColor, item.needFakeBold);
+ TextPaint textPaint = getItemTextPaint(item);
if (!wrapContent && item.width < availTextWidth) {
item.trimString(availTextWidth, textPaint);
} else {
@@ -679,7 +721,12 @@ public void setSelectionFactor (float factor) {
fromIndex = toIndex = -1;
}
- recalculateSelection(selectionFactor, true);
+ if (showLabelOnActiveOnly) {
+ measureItems();
+ relayout();
+ } else {
+ recalculateSelection(selectionFactor, true);
+ }
invalidate();
}
}
@@ -815,24 +862,7 @@ public void draw (Canvas c) {
c.translate(item.translationX, 0f);
}
- float factor;
- if (fromIndex != -1 && toIndex != -1) {
- int diff = Math.abs(toIndex - fromIndex);
- if (itemIndex == toIndex) {
- factor = Math.abs(selectionFactor - fromIndex) / (float) diff;
- } else if (itemIndex == fromIndex) {
- factor = 1f - Math.abs(selectionFactor - fromIndex) / (float) diff;
- } else {
- factor = 0f;
- }
- } else {
- float abs = Math.abs(selectionFactor - (float) itemIndex);
- if (abs <= 1f) {
- factor = 1f - abs;
- } else {
- factor = 0f;
- }
- }
+ float factor = getSelectionFactor(itemIndex);
final int itemWidth;
if (wrapContent) {
@@ -867,10 +897,7 @@ public void draw (Canvas c) {
stringX = cx + horizontalPadding;
}
int stringY = viewHeight / 2 - item.ellipsizedStringLayout.getHeight() / 2;
- c.translate(stringX, stringY);
- item.ellipsizedStringLayout.getPaint().setColor(color);
- item.ellipsizedStringLayout.draw(c);
- c.translate(-stringX, -stringY);
+ drawLabel(c, item.ellipsizedStringLayout, stringX, stringY, color, factor);
item.counter.draw(c, cx + itemWidth - horizontalPadding - item.counter.getWidth() / 2f, viewHeight / 2f, Gravity.CENTER, textAlpha, backgroundAlpha, imageAlpha, item.provider, ColorId.NONE);
} else if (item.imageReceiver != null) {
int size = item.imageReceiverSize;
@@ -898,10 +925,7 @@ public void draw (Canvas c) {
stringX = cx + itemWidth / 2 - item.actualWidth / 2;
}
int stringY = viewHeight / 2 - item.ellipsizedStringLayout.getHeight() / 2;
- c.translate(stringX, stringY);
- item.ellipsizedStringLayout.getPaint().setColor(color);
- item.ellipsizedStringLayout.draw(c);
- c.translate(-stringX, -stringY);
+ drawLabel(c, item.ellipsizedStringLayout, stringX, stringY, color, factor);
} else if (item.iconRes != 0) {
Drawable drawable = item.getIcon();
Drawables.draw(c, drawable, cx + itemWidth / 2 - drawable.getMinimumWidth() / 2, viewHeight / 2 - drawable.getMinimumHeight() / 2, Paints.getPorterDuffPaint(color));
@@ -940,6 +964,76 @@ public void draw (Canvas c) {
}
}
+ public boolean getItemRect (int position, Rect outRect) {
+ View child = getChildAt(position);
+ if (child != null) {
+ outRect.set(0, 0, child.getWidth(), child.getHeight());
+ outRect.offset((int) child.getX(), (int) child.getY());
+ return true;
+ }
+ return false;
+ }
+
+ private void drawLabel (Canvas c, Layout layout, float x, float y, int color, float selectionFactor) {
+ float labelFactor = getLabelFactorBySelectionFactor(selectionFactor);
+ if (labelFactor <= 0f) {
+ return;
+ }
+ float textWidth = layout.getWidth();
+ float clipRight = x + textWidth * labelFactor;
+ boolean isVisible = clipRight - x >= 1f;
+ boolean clipText = labelFactor < 1f && isVisible;
+ if (clipText) {
+ c.save();
+ c.clipRect(x, 0, clipRight, getHeight());
+ }
+ if (isVisible) {
+ c.translate(x, y);
+ layout.getPaint().setColor(color);
+ layout.draw(c);
+ c.translate(-x, -y);
+ }
+ if (clipText) {
+ c.restore();
+ }
+ }
+
+ private float getLabelFactor (int itemIndex) {
+ if (showLabelOnActiveOnly) {
+ return getLabelFactorBySelectionFactor(getSelectionFactor(itemIndex));
+ }
+ return 1f;
+ }
+
+ private float getLabelFactorBySelectionFactor (float selectionFactor) {
+ if (showLabelOnActiveOnly) {
+ return AnimatorUtils.ACCELERATE_DECELERATE_INTERPOLATOR.getInterpolation(selectionFactor);
+ }
+ return 1f;
+ }
+
+ private float getSelectionFactor (int itemIndex) {
+ float factor;
+ if (fromIndex != -1 && toIndex != -1) {
+ int diff = Math.abs(toIndex - fromIndex);
+ if (itemIndex == toIndex) {
+ factor = Math.abs(selectionFactor - fromIndex) / (float) diff;
+ } else if (itemIndex == fromIndex) {
+ factor = 1f - Math.abs(selectionFactor - fromIndex) / (float) diff;
+ } else {
+ factor = 0f;
+ }
+ } else {
+ float abs = Math.abs(selectionFactor - (float) itemIndex);
+ if (abs <= 1f) {
+ factor = 1f - abs;
+ } else {
+ factor = 0f;
+ }
+ }
+ return factor;
+ }
+
private static final CounterAlphaProvider DEFAULT_COUNTER_ALPHA_PROVIDER = new CounterAlphaProvider() {
};
@@ -1067,7 +1161,7 @@ public boolean onTouchEvent (MotionEvent e) {
return true;
}
- public boolean inSlideOff() {
+ public boolean inSlideOff () {
return inSlideOff;
}
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderListener.java b/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderListener.java
new file mode 100644
index 0000000000..fb7838cf5e
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderListener.java
@@ -0,0 +1,34 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.telegram;
+
+import org.drinkless.tdlib.TdApi;
+
+public interface ChatFolderListener {
+ default void onChatFolderNewChatsChanged (int chatFolderId) {
+ }
+
+ default void onChatFolderInviteLinkDeleted (int chatFolderId, String inviteLink) {
+
+ }
+
+ default void onChatFolderInviteLinkChanged (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+
+ }
+
+ default void onChatFolderInviteLinkCreated (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderStyle.java b/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderStyle.java
index fc78afce52..f747c13658 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderStyle.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/ChatFolderStyle.java
@@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.SOURCE)
-@IntDef({ChatFolderStyle.LABEL_ONLY, ChatFolderStyle.ICON_ONLY, ChatFolderStyle.LABEL_AND_ICON})
+@IntDef({ChatFolderStyle.LABEL_ONLY, ChatFolderStyle.ICON_ONLY, ChatFolderStyle.LABEL_AND_ICON, ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE})
public @interface ChatFolderStyle {
- int LABEL_ONLY = 0, ICON_ONLY = 1, LABEL_AND_ICON = 2;
+ int LABEL_ONLY = 0, ICON_ONLY = 1, LABEL_AND_ICON = 2, ICON_WITH_LABEL_ON_ACTIVE = 3;
}
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java b/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
index b9ff9c34dc..97a3f5b8bb 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/Tdlib.java
@@ -1793,6 +1793,15 @@ static Client.ResultHandler toTdlibHandler (ResultHandl
}
};
}
+
+ default ResultHandler doOnResult (RunnableData action) {
+ return (result, error) -> {
+ onResult(result, error);
+ if (result != null) {
+ action.runWithData(result);
+ }
+ };
+ }
}
public void send (TdApi.Function function, ResultHandler handler) {
@@ -3487,7 +3496,36 @@ public boolean chatPinned (TdApi.ChatList chatList, long chatId) {
}
}
- public int chatFoldersCount () {
+ public boolean isFolderShareable (int chatFolderId) {
+ TdApi.ChatFolderInfo chatFolderInfo = chatFolderInfo(chatFolderId);
+ return chatFolderInfo != null && chatFolderInfo.isShareable;
+ }
+
+ public boolean canAddShareableFolder () {
+ return shareableChatFolderCount() < addedShareableChatFolderCountMax();
+ }
+
+ public int shareableChatFolderCount () {
+ synchronized (dataLock) {
+ int count = 0;
+ for (TdApi.ChatFolderInfo chatFolder : chatFolders) {
+ if (chatFolder.isShareable) {
+ count++;
+ }
+ }
+ return count;
+ }
+ }
+
+ public int addedShareableChatFolderCountMax () {
+ return addedShareableChatFolderMaxCount;
+ }
+
+ public boolean canCreateChatFolder () {
+ return chatFolderCount() < chatFolderCountMax();
+ }
+
+ public int chatFolderCount () {
synchronized (dataLock) {
return chatFolders.length;
}
@@ -3506,6 +3544,9 @@ public int mainChatListPosition () {
}
public TdApi.ChatFolderInfo chatFolderInfo (int chatFolderId) {
+ if (chatFolderId == 0) {
+ return null;
+ }
synchronized (dataLock) {
if (chatFolders != null) {
for (TdApi.ChatFolderInfo filter : chatFolders) {
@@ -7023,15 +7064,23 @@ public boolean suggestOnlyApiStickers () {
public int maxMessageTextLength () {
return maxMessageTextLength;
}
-
- public long chatFolderCountMax () {
+
+ public int chatFolderCountMax () {
return chatFolderMaxCount;
}
- public long chatFolderChosenChatCountMax () {
+ public int chatFolderChosenChatCountMax () {
return folderChosenChatMaxCount;
}
+ public int chatFolderInviteLinkCountMax () {
+ return chatFolderInviteLinkMaxCount;
+ }
+
+ public long chatFolderUpdatePeriodMillis () {
+ return TimeUnit.SECONDS.toMillis(chatFolderUpdatePeriod);
+ }
+
public long telegramAntiSpamUserId () {
return antiSpamBotUserId;
}
@@ -8351,7 +8400,7 @@ public TdApi.ChatActiveStories getActiveStories (long chatId, boolean allowReque
}
return null;
}
-
+
@TdlibThread
private void updateStoryListChatCount (TdApi.UpdateStoryListChatCount update) {
synchronized (dataLock) {
@@ -11589,4 +11638,28 @@ public void removeChatsFromChatFolder (int chatFolderId, TdApi.ChatFolder chatFo
}
});
}
+
+ public void processChatFolderNewChats (int chatFolderId, long[] addedChatIds, ResultHandler resultHandler) {
+ send(new TdApi.ProcessChatFolderNewChats(chatFolderId, addedChatIds), resultHandler.doOnResult((result) -> {
+ listeners().notifyChatFolderNewChatsChanged(chatFolderId);
+ }));
+ }
+
+ public void deleteChatFolderInviteLink (int chatFolderId, String inviteLink, ResultHandler resultHandler) {
+ send(new TdApi.DeleteChatFolderInviteLink(chatFolderId, inviteLink), resultHandler.doOnResult((result) -> {
+ listeners().notifyChatFolderInviteLinkDeleted(chatFolderId, inviteLink);
+ }));
+ }
+
+ public void createChatFolderInviteLink (int chatFolderId, String name, long[] chatIds, ResultHandler resultHandler) {
+ send(new TdApi.CreateChatFolderInviteLink(chatFolderId, name, chatIds), resultHandler.doOnResult((result) -> {
+ listeners().notifyChatFolderInviteLinkCreated(chatFolderId, result);
+ }));
+ }
+
+ public void editChatFolderInviteLink (int chatFolderId, String inviteLink, String name, long[] chatIds, ResultHandler resultHandler) {
+ send(new TdApi.EditChatFolderInviteLink(chatFolderId, inviteLink, name, chatIds), resultHandler.doOnResult((result) -> {
+ listeners().notifyChatFolderInviteLinkChanged(chatFolderId, result);
+ }));
+ }
}
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibListeners.java b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibListeners.java
index a2540a06ee..b0d64398a5 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibListeners.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibListeners.java
@@ -41,6 +41,7 @@ public class TdlibListeners {
final ReferenceList messageEditListeners;
final ReferenceList chatListeners;
final ReferenceList chatFoldersListeners;
+ final ReferenceIntMap chatFolderListeners;
final ReferenceMap chatListListeners;
final ReferenceList storyListeners;
final ReferenceList settingsListeners;
@@ -84,6 +85,7 @@ public TdlibListeners (Tdlib tdlib) {
this.storyListeners = new ReferenceList<>();
this.chatListListeners = new ReferenceMap<>(true);
this.chatFoldersListeners = new ReferenceList<>(true);
+ this.chatFolderListeners = new ReferenceIntMap<>(true);
this.settingsListeners = new ReferenceList<>(true);
this.stickersListeners = new ReferenceList<>(true);
this.animationsListeners = new ReferenceList<>();
@@ -430,6 +432,21 @@ public void unsubscribeFromChatFoldersUpdates (ChatFoldersListener listener) {
chatFoldersListeners.remove(listener);
}
+ @AnyThread
+ public void addChatFolderListener (int chatFolderId, ChatFolderListener listener) {
+ if (chatFolderId != 0) {
+ chatFolderListeners.add(chatFolderId, listener);
+ }
+
+ }
+
+ @AnyThread
+ public void removeChatFolderListener (int chatFolderId, ChatFolderListener listener) {
+ if (chatFolderId != 0) {
+ chatFolderListeners.remove(chatFolderId, listener);
+ }
+ }
+
@AnyThread
public void addReactionLoadListener (String reactionKey, ReactionLoadListener listener) {
reactionLoadListeners.add(reactionKey, listener);
@@ -828,6 +845,32 @@ public void notifyReactionLoaded (String reactionKey) {
}
}
+ // notifyChatFolder*
+
+ public void notifyChatFolderNewChatsChanged (int chatFolderId) {
+ runUpdate(chatFolderListeners.iterator(chatFolderId), (listener) -> {
+ listener.onChatFolderNewChatsChanged(chatFolderId);
+ });
+ }
+
+ public void notifyChatFolderInviteLinkDeleted (int chatFolderId, String inviteLink) {
+ runUpdate(chatFolderListeners.iterator(chatFolderId), (listener) -> {
+ listener.onChatFolderInviteLinkDeleted(chatFolderId, inviteLink);
+ });
+ }
+
+ public void notifyChatFolderInviteLinkChanged (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+ runUpdate(chatFolderListeners.iterator(chatFolderId), (listener) -> {
+ listener.onChatFolderInviteLinkChanged(chatFolderId, inviteLink);
+ });
+ }
+
+ public void notifyChatFolderInviteLinkCreated (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+ runUpdate(chatFolderListeners.iterator(chatFolderId), (listener) -> {
+ listener.onChatFolderInviteLinkCreated(chatFolderId, inviteLink);
+ });
+ }
+
// updateMessageInteractionInfo
private static void updateMessageInteractionInfo (TdApi.UpdateMessageInteractionInfo update, @Nullable Iterator list) {
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibSettingsManager.java b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibSettingsManager.java
index 798c833c26..2324b3a9c2 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibSettingsManager.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibSettingsManager.java
@@ -1073,6 +1073,9 @@ public boolean hasNotificationProblems () {
private static final int DEFAULT_CHAT_FOLDER_BADGE_FLAGS = 0;
private boolean isMainChatListEnabled () {
+ if (Config.RESTRICT_HIDING_MAIN_LIST) {
+ return true;
+ }
if (_mainChatListEnabled == null) {
_mainChatListEnabled = Settings.instance().getBoolean(key(MAIN_CHAT_LIST_ENABLED, tdlib.accountId()), DEFAULT_MAIN_CHAT_LIST_ENABLED);
}
@@ -1080,6 +1083,9 @@ private boolean isMainChatListEnabled () {
}
private void setMainChatListEnabled (boolean isMainChatListEnabled) {
+ if (Config.RESTRICT_HIDING_MAIN_LIST && !isMainChatListEnabled) {
+ return;
+ }
if (isMainChatListEnabled() != isMainChatListEnabled) {
_mainChatListEnabled = isMainChatListEnabled;
Settings.instance().putBoolean(key(MAIN_CHAT_LIST_ENABLED, tdlib.accountId()), isMainChatListEnabled);
@@ -1134,6 +1140,29 @@ public boolean isChatFolderEnabled (int chatFolderId) {
return !disabledChatFolderIds.has(chatFolderId);
}
+ public void setChatFolderEnabled (int chatFolderId, boolean isEnabled) {
+ if (isChatFolderEnabled(chatFolderId) == isEnabled) {
+ return;
+ }
+ IntSet disabledChatFolderIds = disabledChatFolderIds();
+ if (isEnabled) {
+ disabledChatFolderIds.remove(chatFolderId);
+ } else {
+ disabledChatFolderIds.add(chatFolderId);
+ }
+ if (disabledChatFolderIds.isEmpty()) {
+ Settings.instance().remove(key(DISABLED_CHAT_FILTER_IDS, tdlib.accountId()));
+ } else {
+ Settings.instance().putIntArray(key(DISABLED_CHAT_FILTER_IDS, tdlib.accountId()), disabledChatFolderIds.toArray());
+ }
+ if (chatListPositionListeners != null) {
+ TdApi.ChatListFolder chatList = new TdApi.ChatListFolder(chatFolderId);
+ for (ChatListPositionListener chatListPositionListener : chatListPositionListeners) {
+ chatListPositionListener.onChatListStateChanged(tdlib, chatList, isEnabled);
+ }
+ }
+ }
+
public boolean isChatListEnabled (TdApi.ChatList chatList) {
switch (chatList.getConstructor()) {
case TdApi.ChatListMain.CONSTRUCTOR: {
@@ -1171,17 +1200,7 @@ public void setChatListEnabled (TdApi.ChatList chatList, boolean isEnabled) {
}
case TdApi.ChatListFolder.CONSTRUCTOR: {
int chatFolderId = ((TdApi.ChatListFolder) chatList).chatFolderId;
- IntSet disabledChatFolderIds = disabledChatFolderIds();
- if (isEnabled) {
- disabledChatFolderIds.remove(chatFolderId);
- } else {
- disabledChatFolderIds.add(chatFolderId);
- }
- if (disabledChatFolderIds.isEmpty()) {
- Settings.instance().remove(key(DISABLED_CHAT_FILTER_IDS, tdlib.accountId()));
- } else {
- Settings.instance().putIntArray(key(DISABLED_CHAT_FILTER_IDS, tdlib.accountId()), disabledChatFolderIds.toArray());
- }
+ setChatFolderEnabled(chatFolderId, isEnabled);
break;
}
default: {
@@ -1189,11 +1208,6 @@ public void setChatListEnabled (TdApi.ChatList chatList, boolean isEnabled) {
throw Td.unsupported(chatList);
}
}
- if (chatListPositionListeners != null) {
- for (ChatListPositionListener chatListPositionListener : chatListPositionListeners) {
- chatListPositionListener.onChatListStateChanged(tdlib, chatList, isEnabled);
- }
- }
}
private IntSet disabledChatFolderIds () {
diff --git a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibUi.java b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibUi.java
index 8da681a2c9..19fb3b5922 100644
--- a/app/src/main/java/org/thunderdog/challegram/telegram/TdlibUi.java
+++ b/app/src/main/java/org/thunderdog/challegram/telegram/TdlibUi.java
@@ -42,6 +42,7 @@
import androidx.annotation.StringRes;
import androidx.collection.LongSparseArray;
import androidx.core.os.CancellationSignal;
+import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -100,6 +101,7 @@
import org.thunderdog.challegram.tool.Strings;
import org.thunderdog.challegram.tool.UI;
import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.ui.ChatFolderInviteLinkController;
import org.thunderdog.challegram.ui.ChatJoinRequestsController;
import org.thunderdog.challegram.ui.ChatLinkMembersController;
import org.thunderdog.challegram.ui.ChatLinksController;
@@ -160,6 +162,7 @@
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -1459,6 +1462,10 @@ private void shareUser (ViewController context, TdApi.User user) {
}
}
+ public void shareUrl (TdlibDelegate context, String url) {
+ shareUrl(context, url, null, url, null);
+ }
+
public void shareUrl (TdlibDelegate context, String url, String internalShareText, String externalShareText, String externalShareButton) {
if (!StringUtils.isEmpty(url)) {
ShareController c = new ShareController(context.context(), context.tdlib());
@@ -2534,6 +2541,28 @@ private void checkInviteLink (final TdlibDelegate context, final String inviteLi
});
}
+ private static void checkChatFolderInviteLink(TdlibDelegate context, String inviteLinkUrl, TdApi.InternalLinkTypeChatFolderInvite invite, @Nullable UrlOpenParameters openParameters) {
+ context.tdlib().send(new TdApi.CheckChatFolderInviteLink(invite.inviteLink), (result, error) -> {
+ if (error != null) {
+ showLinkTooltip(context.tdlib(), R.drawable.baseline_error_24, TD.toErrorString(error), openParameters);
+ } else {
+ showChatFolderInviteLinkInfo(context, inviteLinkUrl, result);
+ }
+ });
+ }
+
+ private static void showChatFolderInviteLinkInfo (TdlibDelegate context, String inviteLinkUrl, TdApi.ChatFolderInviteLinkInfo inviteLinkInfo) {
+ if (TdlibManager.inBackgroundThread()) {
+ context.tdlib().ui().post(() -> {
+ showChatFolderInviteLinkInfo(context, inviteLinkUrl, inviteLinkInfo);
+ });
+ return;
+ }
+ ChatFolderInviteLinkController controller = new ChatFolderInviteLinkController(context.context(), context.tdlib());
+ controller.setArguments(new ChatFolderInviteLinkController.Arguments(inviteLinkUrl, inviteLinkInfo));
+ controller.show();
+ }
+
private boolean installLanguage (final TdlibDelegate context, final String languagePackId, @Nullable UrlOpenParameters openParameters) {
if (TD.isLocalLanguagePackId(languagePackId)) {
Log.e("Attempt to install custom local languagePackId:%s", languagePackId);
@@ -3553,7 +3582,6 @@ public void openInternalLinkType (TdlibDelegate context, @Nullable String origin
}
case TdApi.InternalLinkTypeStory.CONSTRUCTOR:
- case TdApi.InternalLinkTypeChatFolderInvite.CONSTRUCTOR:
case TdApi.InternalLinkTypeDefaultMessageAutoDeleteTimerSettings.CONSTRUCTOR:
case TdApi.InternalLinkTypeAttachmentMenuBot.CONSTRUCTOR:
@@ -3639,6 +3667,15 @@ public void openInternalLinkType (TdlibDelegate context, @Nullable String origin
}
break;
}
+ case TdApi.InternalLinkTypeChatFolderInvite.CONSTRUCTOR: {
+ if (Settings.instance().chatFoldersEnabled()) {
+ TdApi.InternalLinkTypeChatFolderInvite invite = (TdApi.InternalLinkTypeChatFolderInvite) linkType;
+ checkChatFolderInviteLink(context, originalUrl, invite, openParameters);
+ } else {
+ showLinkTooltip(tdlib, R.drawable.baseline_warning_24, Lang.getString(R.string.InternalUrlUnsupported), openParameters);
+ }
+ break;
+ }
case TdApi.InternalLinkTypeUnknownDeepLink.CONSTRUCTOR: {
// TODO progress
TdApi.InternalLinkTypeUnknownDeepLink unknownDeepLink = (TdApi.InternalLinkTypeUnknownDeepLink) linkType;
@@ -3713,7 +3750,7 @@ public void showUrlOptions (TdlibDelegate context, String url, Future context, long[] chatI
for (TdApi.ChatFolderInfo chatFolderInfo : chatFolders) {
items.add(new ListItem(ListItem.TYPE_SETTING, R.id.chatFolder, TD.findFolderIcon(chatFolderInfo.icon, R.drawable.baseline_folder_24), chatFolderInfo.title).setIntValue(chatFolderInfo.id));
}
- if (tdlib.chatFoldersCount() < tdlib.chatFolderCountMax()) {
+ if (tdlib.canCreateChatFolder()) {
items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_createNewFolder, R.drawable.baseline_create_new_folder_24, R.string.CreateNewFolder).setTextColorId(ColorId.textNeutral));
}
SettingsWrap[] settings = new SettingsWrap[1];
@@ -4891,6 +4928,13 @@ public void showAddChatsToFolderOptions (ViewController context, long[] chatI
}));
}
+ public void showDeleteChatFolderConfirm (ViewController context, boolean hasMyInviteLinks, Runnable after) {
+ // TODO(nikita-toropov) wording
+ int infoRes = hasMyInviteLinks ? R.string.DeleteFolderWithInviteLinksConfirm : R.string.RemoveFolderConfirm;
+ int actionRes = hasMyInviteLinks ? R.string.Delete : R.string.Remove;
+ context.showConfirm(Lang.getMarkdownString(context, infoRes), Lang.getString(actionRes), R.drawable.baseline_delete_24, ViewController.OptionColor.RED, after);
+ }
+
public boolean processChatAction (ViewController context, final TdApi.ChatList chatList, final long chatId, final @Nullable ThreadInfo messageThread, final TdApi.MessageSource source, final int actionId, @Nullable Runnable after) {
TdApi.Chat chat = tdlib.chat(chatId);
if (chat == null)
@@ -6605,7 +6649,24 @@ public static CharSequence getTdlibVersionSignature () {
RESTRICT_VOICE_AND_VIDEO_MESSAGES = 2;
}
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({
+ PremiumLimit.SHAREABLE_FOLDER_COUNT,
+ PremiumLimit.CHAT_FOLDER_COUNT,
+ PremiumLimit.CHAT_FOLDER_INVITE_LINK_COUNT,
+ })
+ public @interface PremiumLimit {
+ int
+ SHAREABLE_FOLDER_COUNT = 1,
+ CHAT_FOLDER_COUNT = 2,
+ CHAT_FOLDER_INVITE_LINK_COUNT = 3;
+ }
+
public boolean showPremiumAlert (ViewController context, View view, @PremiumFeature int premiumFeature) {
+ return showPremiumAlert(context, context.context().tooltipManager(), view, premiumFeature);
+ }
+
+ public boolean showPremiumAlert (ViewController context, TooltipOverlayView tooltipManager, View view, @PremiumFeature int premiumFeature) {
if (tdlib.hasPremium())
return false;
int stringRes;
@@ -6619,21 +6680,51 @@ public boolean showPremiumAlert (ViewController context, View view, @PremiumF
default:
throw new IllegalStateException();
}
- // TODO proper alert with sections
- context
- .context()
- .tooltipManager()
+ showPremiumRequiredTooltip(context, tooltipManager, view, stringRes);
+ return true;
+ }
+
+ public void showPremiumLimitInfo (ViewController context, View view, @PremiumLimit int premiumLimit) {
+ showPremiumLimitInfo(context, context.context().tooltipManager(), view, premiumLimit);
+ }
+
+ public void showPremiumLimitInfo (ViewController context, TooltipOverlayView tooltipManager, View view, @PremiumLimit int premiumLimit) {
+ if (tdlib.hasPremium())
+ return;
+ switch (premiumLimit) {
+ case PremiumLimit.SHAREABLE_FOLDER_COUNT:
+ showPremiumLimitTooltip(context, tooltipManager, view, R.string.PremiumRequiredAddShareableFolder, new TdApi.PremiumLimitTypeShareableChatFolderCount());
+ break;
+ case PremiumLimit.CHAT_FOLDER_COUNT:
+ showPremiumLimitTooltip(context, tooltipManager, view, R.string.PremiumRequiredCreateFolder, new TdApi.PremiumLimitTypeChatFolderCount());
+ break;
+ case PremiumLimit.CHAT_FOLDER_INVITE_LINK_COUNT:
+ showPremiumRequiredTooltip(context, tooltipManager, view, R.string.PremiumRequiredCreateChatFolderInviteLink);
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ private void showPremiumLimitTooltip (ViewController context, TooltipOverlayView tooltipManager, View view, @StringRes int markdownStringRes, TdApi.PremiumLimitType premiumLimitType) {
+ WeakReference viewRef = new WeakReference<>(view);
+ Object viewTag = view.getTag();
+ tdlib.send(new TdApi.GetPremiumLimit(premiumLimitType), (result, error) -> context.runOnUiThreadOptional(() -> {
+ View targetView = viewRef.get();
+ if (targetView != null && ViewCompat.isAttachedToWindow(targetView) && viewTag == targetView.getTag() && result.defaultValue < result.premiumValue) {
+ showPremiumRequiredTooltip(context, tooltipManager, targetView, markdownStringRes, result.defaultValue, result.premiumValue);
+ }
+ }));
+ }
+
+ private void showPremiumRequiredTooltip (ViewController context, TooltipOverlayView tooltipManager, View view, @StringRes int markdownStringRes, Object... formatArgs) {
+ // TODO proper alert with sections
+ tooltipManager
.builder(view)
.icon(R.drawable.baseline_warning_24)
.controller(context)
- .show(tdlib,
- Strings.buildMarkdown(context,
- Lang.getString(stringRes),
- null
- )
- )
+ .show(tdlib, Lang.getMarkdownString(context, markdownStringRes, formatArgs))
.hideDelayed();
- return true;
}
// Video Chats & Live Streams
diff --git a/app/src/main/java/org/thunderdog/challegram/tool/Views.java b/app/src/main/java/org/thunderdog/challegram/tool/Views.java
index e7008c7d3e..59f75e1207 100644
--- a/app/src/main/java/org/thunderdog/challegram/tool/Views.java
+++ b/app/src/main/java/org/thunderdog/challegram/tool/Views.java
@@ -864,6 +864,16 @@ public static void setRightMargin (View view, int margin) {
}
}
+ public static void setLeftMargin (View view, int margin) {
+ if (view != null) {
+ ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+ if (params.leftMargin != margin) {
+ params.leftMargin = margin;
+ view.setLayoutParams(params);
+ }
+ }
+ }
+
public static int getTopMargin (View view) {
if (view != null) {
ViewGroup.LayoutParams params = view.getLayoutParams();
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderIconSelector.java b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderIconSelector.java
index 8e9b0f72a7..0aabce6f2a 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderIconSelector.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderIconSelector.java
@@ -14,16 +14,15 @@
*/
package org.thunderdog.challegram.ui;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
import android.content.Context;
+import android.graphics.Canvas;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.Nullable;
+import androidx.core.util.ObjectsCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -35,6 +34,7 @@
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;
import org.thunderdog.challegram.tool.Views;
import org.thunderdog.challegram.widget.PopupLayout;
@@ -44,6 +44,7 @@
import java.util.List;
import me.vkryl.android.widget.FrameLayoutFix;
+import me.vkryl.core.ObjectUtils;
import me.vkryl.core.StringUtils;
public class ChatFolderIconSelector {
@@ -52,12 +53,14 @@ public class ChatFolderIconSelector {
private final Delegate delegate;
private final View popupView;
private final GridLayoutManager layoutManager;
+ private final @Nullable String selectedIconName;
private PopupLayout popupLayout;
- public ChatFolderIconSelector (ViewController owner, Delegate delegate) {
+ public ChatFolderIconSelector (ViewController owner, @Nullable String selectedIconName, Delegate delegate) {
this.context = owner.context();
this.delegate = delegate;
+ this.selectedIconName = selectedIconName;
List items = new ArrayList<>(TD.ICON_NAMES.length);
for (String iconName : TD.ICON_NAMES) {
@@ -72,10 +75,18 @@ protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec) {
int size = MeasureSpec.getSize(widthMeasureSpec);
setMeasuredDimension(size, size);
}
+
+ @Override
+ protected void onDraw (Canvas canvas) {
+ ListItem item = (ListItem) getTag();
+ String iconName = item.getStringValue();
+ if (isSelectedIcon(iconName)) {
+ canvas.drawCircle(getWidth() / 2f, getHeight() / 2f, Screen.dp(24f), Paints.fillingPaint(Theme.fillingColor()));
+ }
+ super.onDraw(canvas);
+ }
};
imageView.setScaleType(ImageView.ScaleType.CENTER);
- imageView.setColorFilter(Theme.getColor(ColorId.icon));
- owner.addThemeFilterListener(imageView, ColorId.icon);
Views.setClickable(imageView);
imageView.setOnClickListener(v -> {
ListItem item = (ListItem) imageView.getTag();
@@ -94,6 +105,12 @@ protected void setCustom (ListItem item, SettingHolder holder, int position) {
int iconResource = item.getIconResource();
if (iconResource != 0) {
imageView.setImageDrawable(Drawables.get(imageView.getResources(), iconResource));
+ String iconName = item.getStringValue();
+ boolean isSelected = ObjectsCompat.equals(iconName, selectedIconName);
+ int iconColorId = isSelected ? ColorId.iconActive : ColorId.icon;
+ imageView.setColorFilter(Theme.getColor(iconColorId));
+ owner.removeThemeListenerByTarget(imageView);
+ owner.addThemeFilterListener(imageView, iconColorId);
} else {
imageView.setImageDrawable(null);
}
@@ -112,9 +129,9 @@ protected void setCustom (ListItem item, SettingHolder holder, int position) {
owner.addThemeInvalidateListener(shadowView);
FrameLayoutFix popupView = new FrameLayoutFix(context);
- popupView.addView(shadowView, FrameLayoutFix.newParams(MATCH_PARENT, Screen.dp(7f), Gravity.TOP));
- popupView.addView(recyclerView, FrameLayoutFix.newParams(MATCH_PARENT, WRAP_CONTENT, Gravity.TOP, 0, Screen.dp(7f), 0, 0));
- popupView.setLayoutParams(FrameLayoutFix.newParams(MATCH_PARENT, WRAP_CONTENT, Gravity.BOTTOM));
+ popupView.addView(shadowView, FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(7f), Gravity.TOP));
+ popupView.addView(recyclerView, FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP, 0, Screen.dp(7f), 0, 0));
+ popupView.setLayoutParams(FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM));
this.popupView = popupView;
}
@@ -152,6 +169,18 @@ private int computeSpanCount (int width) {
return Math.max(width / itemSize, 3);
}
+ private boolean isSelectedIcon (@Nullable String iconName) {
+ return isSameIcon(selectedIconName, iconName);
+ }
+
+ private static boolean isSameIcon (@Nullable String a, @Nullable String b) {
+ return ObjectUtils.equals(a, b) || (isFolderIcon(a) && isFolderIcon(b));
+ }
+
+ private static boolean isFolderIcon (@Nullable String iconName) {
+ return StringUtils.isEmpty(iconName) || "Custom".equals(iconName);
+ }
+
public interface Delegate {
void onIconClick (@Nullable TdApi.ChatFolderIcon icon);
@@ -160,8 +189,8 @@ default void onShow () {}
default void onDismiss () {}
}
- public static ChatFolderIconSelector show (ViewController owner, Delegate delegate) {
- ChatFolderIconSelector selector = new ChatFolderIconSelector(owner, delegate);
+ public static ChatFolderIconSelector show (ViewController owner, @Nullable String selectedIconName, Delegate delegate) {
+ ChatFolderIconSelector selector = new ChatFolderIconSelector(owner, selectedIconName, delegate);
selector.show();
return selector;
}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkController.java b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkController.java
new file mode 100644
index 0000000000..fbeec2a6df
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkController.java
@@ -0,0 +1,181 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.ui;
+
+import android.content.Context;
+import android.view.WindowManager;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.drinkless.tdlib.TdApi;
+import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.navigation.HeaderView;
+import org.thunderdog.challegram.navigation.ViewController;
+import org.thunderdog.challegram.telegram.Tdlib;
+import org.thunderdog.challegram.theme.ColorId;
+import org.thunderdog.challegram.theme.ColorState;
+import org.thunderdog.challegram.theme.Theme;
+import org.thunderdog.challegram.tool.Screen;
+import org.thunderdog.challegram.widget.PopupLayout;
+import org.thunderdog.challegram.widget.ViewPager;
+
+import me.vkryl.android.widget.FrameLayoutFix;
+import me.vkryl.core.ObjectUtils;
+
+public class ChatFolderInviteLinkController extends BottomSheetViewController {
+
+ @IntDef({MODE_INVITE_LINK, MODE_NEW_CHATS, MODE_DELETE_FOLDER})
+ public @interface Mode {
+ }
+
+ public static final int MODE_INVITE_LINK = 0;
+ public static final int MODE_NEW_CHATS = 1;
+ public static final int MODE_DELETE_FOLDER = 2;
+
+ public static class Arguments {
+ public final @Mode int mode;
+ public final int chatFolderId;
+ public final String chatFolderTitle;
+ public final long[] selectableChatIds;
+ public final @Nullable String inviteLinkUrl;
+ public final @Nullable TdApi.ChatFolderInviteLinkInfo inviteLinkInfo;
+
+ public Arguments (@NonNull String inviteLink, @NonNull TdApi.ChatFolderInviteLinkInfo inviteLinkInfo) {
+ this.mode = MODE_INVITE_LINK;
+ this.chatFolderId = inviteLinkInfo.chatFolderInfo.id;
+ this.chatFolderTitle = inviteLinkInfo.chatFolderInfo.title;
+ this.selectableChatIds = inviteLinkInfo.missingChatIds;
+ this.inviteLinkUrl = ObjectUtils.requireNonNull(inviteLink);
+ this.inviteLinkInfo = ObjectUtils.requireNonNull(inviteLinkInfo);
+ }
+
+ private Arguments (@Mode int mode, int chatFolderId, String chatFolderTitle, long[] chatIds) {
+ this.mode = mode;
+ this.chatFolderId = chatFolderId;
+ this.chatFolderTitle = chatFolderTitle;
+ this.selectableChatIds = chatIds;
+ this.inviteLinkUrl = null;
+ this.inviteLinkInfo = null;
+ }
+
+ public static Arguments newChats (TdApi.ChatFolderInfo chatFolderInfo, long[] chatIds) {
+ return newChats(chatFolderInfo.id, chatFolderInfo.title, chatIds);
+ }
+
+ public static Arguments newChats (int chatFolderId, String chatFolderTitle, long[] chatIds) {
+ return new Arguments(MODE_NEW_CHATS, chatFolderId, chatFolderTitle, chatIds);
+ }
+
+ public static Arguments deleteFolder (TdApi.ChatFolderInfo chatFolderInfo, long[] chatIds) {
+ return deleteFolder(chatFolderInfo.id, chatFolderInfo.title, chatIds);
+ }
+
+ public static Arguments deleteFolder (int chatFolderId, String chatFolderTitle, long[] chatIds) {
+ return new Arguments(MODE_DELETE_FOLDER, chatFolderId, chatFolderTitle, chatIds);
+ }
+ }
+
+ private final ChatFolderInviteLinkControllerPage singlePage;
+
+ public ChatFolderInviteLinkController (Context context, Tdlib tdlib) {
+ super(context, tdlib);
+ this.singlePage = new ChatFolderInviteLinkControllerPage(this);
+ }
+
+ @Override
+ public int getId () {
+ return R.id.controller_chatFolderInviteLink;
+ }
+
+ @Override
+ protected int getPagerItemCount () {
+ return 1;
+ }
+
+ @Override
+ protected void onBeforeCreateView () {
+ singlePage.getValue();
+ }
+
+ @Override
+ protected void onAfterCreateView () {
+ setLickViewColor(Theme.getColor(ColorId.headerLightBackground));
+ }
+
+ @Override
+ public void onThemeColorsChanged (boolean areTemp, ColorState state) {
+ super.onThemeColorsChanged(areTemp, state);
+ setLickViewColor(Theme.getColor(ColorId.headerLightBackground));
+ }
+
+ @Override
+ public void setArguments (Arguments args) {
+ super.setArguments(args);
+ singlePage.setArguments(args);
+ }
+
+ @Override
+ protected void onCreateView (Context context, FrameLayoutFix contentView, ViewPager pager) {
+ pager.setOffscreenPageLimit(1);
+ tdlib.ui().post(this::launchOpenAnimation);
+ }
+
+ @Override
+ protected ViewController onCreatePagerItemForPosition (Context context, int position) {
+ if (position != 0) return null;
+ setHeaderPosition(getContentOffset() + HeaderView.getTopOffset());
+ setDefaultListenersAndDecorators(singlePage);
+ return singlePage;
+ }
+
+ @Override
+ protected int getHeaderHeight () {
+ return Screen.dp(56f);
+ }
+
+ @Override
+ protected int getContentOffset () {
+ return (getTargetHeight() - getHeaderHeight(true)) / 2;
+ }
+
+ @Override
+ protected boolean canHideByScroll () {
+ return true;
+ }
+
+ @Override
+ protected HeaderView onCreateHeaderView () {
+ return singlePage.getHeaderView();
+ }
+
+ @Override
+ public boolean needsTempUpdates () {
+ return true;
+ }
+
+ @Override
+ protected void setupPopupLayout (PopupLayout popupLayout) {
+ popupLayout.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+ popupLayout.setBoundController(singlePage);
+ popupLayout.setPopupHeightProvider(this);
+ popupLayout.init(true);
+ popupLayout.setHideKeyboard();
+ popupLayout.setNeedRootInsets();
+ popupLayout.setTouchProvider(this);
+ popupLayout.setIgnoreHorizontal();
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkControllerPage.java b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkControllerPage.java
new file mode 100644
index 0000000000..f5a17b4023
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ChatFolderInviteLinkControllerPage.java
@@ -0,0 +1,553 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.ui;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.drinkless.tdlib.TdApi;
+import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.charts.LayoutHelper;
+import org.thunderdog.challegram.core.Lang;
+import org.thunderdog.challegram.data.DoubleTextWrapper;
+import org.thunderdog.challegram.navigation.BackHeaderButton;
+import org.thunderdog.challegram.navigation.HeaderView;
+import org.thunderdog.challegram.navigation.ViewController;
+import org.thunderdog.challegram.support.RippleSupport;
+import org.thunderdog.challegram.telegram.TdlibUi;
+import org.thunderdog.challegram.theme.ColorId;
+import org.thunderdog.challegram.theme.ColorState;
+import org.thunderdog.challegram.theme.Theme;
+import org.thunderdog.challegram.tool.Fonts;
+import org.thunderdog.challegram.tool.Screen;
+import org.thunderdog.challegram.tool.UI;
+import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.ui.ChatFolderInviteLinkController.Arguments;
+import org.thunderdog.challegram.v.CustomRecyclerView;
+import org.thunderdog.challegram.widget.CheckBoxView;
+import org.thunderdog.challegram.widget.SeparatorView;
+import org.thunderdog.challegram.widget.SmallChatView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.vkryl.android.widget.FrameLayoutFix;
+import me.vkryl.core.ArrayUtils;
+import me.vkryl.core.collection.LongSet;
+
+public class ChatFolderInviteLinkControllerPage extends BottomSheetViewController.BottomSheetBaseRecyclerViewController implements View.OnClickListener {
+
+ private static final int NO_CHAT_FOLDER_ID = 0;
+ private static final float BUTTON_HEIGHT_DP = 56f;
+
+ private final BottomSheetViewController parent;
+ private final LongSet selectedChatIds = new LongSet();
+
+ private @ChatFolderInviteLinkController.Mode int mode = ChatFolderInviteLinkController.MODE_INVITE_LINK;
+ private int chatFolderId = NO_CHAT_FOLDER_ID;
+ private String chatFolderTitle;
+ private long[] selectableChatIds = ArrayUtils.EMPTY_LONGS;
+ private @Nullable String inviteLinkUrl;
+ private @Nullable TdApi.ChatFolderInviteLinkInfo inviteLinkInfo;
+ private SettingsAdapter adapter;
+ private FrameLayoutFix actionButton;
+
+ public ChatFolderInviteLinkControllerPage (BottomSheetViewController parent) {
+ super(parent.context(), parent.tdlib());
+ this.parent = parent;
+ }
+
+ @Override
+ public void setArguments (Arguments args) {
+ super.setArguments(args);
+ mode = args.mode;
+ chatFolderId = args.chatFolderId;
+ chatFolderTitle = args.chatFolderTitle;
+ inviteLinkUrl = args.inviteLinkUrl;
+ inviteLinkInfo = args.inviteLinkInfo;
+ selectableChatIds = args.selectableChatIds;
+ selectedChatIds.addAll(selectableChatIds);
+ }
+
+ @Override
+ public int getId () {
+ return R.id.controller_chatFolderInviteLink;
+ }
+
+ public HeaderView getHeaderView () {
+ if (headerView == null) {
+ headerView = new HeaderView(context);
+ headerView.initWithSingleController(this, false);
+ headerView.getFilling().setColor(Theme.fillingColor());
+ headerView.getFilling().setShadowAlpha(1f);
+ headerView.setWillNotDraw(false);
+ addThemeInvalidateListener(headerView);
+ }
+ return headerView;
+ }
+
+ @Override
+ public int getItemsHeight (RecyclerView parent) {
+ int totalHeight = 0;
+ List items = adapter.getItems();
+ for (ListItem item : items) {
+ int itemHeight;
+ if (item.getViewType() == ListItem.TYPE_DESCRIPTION) {
+ itemHeight = Math.max(Screen.dp(20f), item.getHeight());
+ } else {
+ itemHeight = SettingHolder.measureHeightForType(item);
+ }
+ totalHeight += itemHeight;
+ }
+ return totalHeight;
+ }
+
+ @Override
+ protected View onCreateView (Context context) {
+ View view = super.onCreateView(context);
+
+ FrameLayoutFix wrap = (FrameLayoutFix) view;
+ wrap.addView(actionButton = createActionButton(), LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, BUTTON_HEIGHT_DP, Gravity.BOTTOM));
+ updateActionButton();
+
+ SeparatorView bottomShadowView = SeparatorView.simpleSeparator(context, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 1f, Gravity.BOTTOM), false);
+ bottomShadowView.setAlignBottom();
+ wrap.addView(bottomShadowView);
+
+ int buttonHeight = Screen.dp(BUTTON_HEIGHT_DP);
+ Views.setBottomMargin(getRecyclerView(), buttonHeight);
+ Views.setBottomMargin(bottomShadowView, buttonHeight);
+ return view;
+ }
+
+ @Override
+ protected void onCreateView (Context context, CustomRecyclerView recyclerView) {
+ getHeaderView();
+ addThemeInvalidateListener(recyclerView);
+
+ recyclerView.setItemAnimator(null);
+ recyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+ recyclerView.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
+
+ adapter = new Adapter(this);
+ adapter.setNoEmptyProgress();
+ recyclerView.setAdapter(adapter);
+ buildCells();
+ }
+
+ private FrameLayoutFix createActionButton () {
+ TextView button = new TextView(context);
+ button.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16f);
+ button.setTypeface(Fonts.getRobotoMedium());
+ button.setPadding(Screen.dp(12f), 0, Screen.dp(12f), 0);
+ button.setEllipsize(TextUtils.TruncateAt.END);
+ button.setGravity(Gravity.CENTER);
+ button.setAllCaps(true);
+
+ FrameLayoutFix frame = new FrameLayoutFix(context);
+ frame.setOnClickListener(this);
+ frame.setId(R.id.btn_done);
+ frame.addView(button, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.CENTER_HORIZONTAL));
+ RippleSupport.setSimpleWhiteBackground(frame, this);
+ return frame;
+ }
+
+ private void updateActionButton () {
+ boolean enabled = !isFinishing();
+ actionButton.setEnabled(enabled);
+ int textColorId;
+ if (enabled) {
+ textColorId = mode == ChatFolderInviteLinkController.MODE_DELETE_FOLDER ? ColorId.textNegative : ColorId.textLink;
+ } else {
+ textColorId = ColorId.textLight;
+ }
+ TextView textView = (TextView) actionButton.getChildAt(0);
+ textView.setTextColor(Theme.getColor(textColorId));
+ removeThemeListenerByTarget(textView);
+ addThemeTextColorListener(textView, textColorId);
+ CharSequence text;
+ switch (mode) {
+ case ChatFolderInviteLinkController.MODE_INVITE_LINK:
+ case ChatFolderInviteLinkController.MODE_NEW_CHATS:
+ text = getJoinChatsActionText();
+ break;
+ case ChatFolderInviteLinkController.MODE_DELETE_FOLDER:
+ text = getDeleteFolderActionText();
+ break;
+ default:
+ throw new IllegalStateException("mode = " + mode);
+ }
+ Views.setMediumText(textView, text);
+ }
+
+ private CharSequence getJoinChatsActionText () {
+ boolean hasFolder = chatFolderId != NO_CHAT_FOLDER_ID;
+ if (selectableChatIds.length == 0) {
+ return Lang.getString(R.string.OK);
+ }
+ int selectedChatCount = selectedChatIds.size();
+ if (selectedChatCount == 0) {
+ return Lang.getString(hasFolder ? R.string.DoNotJoinAnyChats : R.string.DoNotAddFolder);
+ }
+ return Lang.plural(hasFolder ? R.string.JoinXChats : R.string.AddFolderAndJoinXChats, selectedChatCount);
+ }
+
+ private CharSequence getDeleteFolderActionText () {
+ int selectedChatCount = selectedChatIds.size();
+ if (selectedChatCount == 0) {
+ return Lang.getString(R.string.DeleteFolder);
+ }
+ return Lang.plural(R.string.DeleteFolderAndLeaveXChats, selectedChatCount);
+ }
+
+ private void buildCells () {
+ List items = new ArrayList<>();
+
+ int selectableChatCount = selectableChatIds.length;
+ if (selectableChatCount > 0) {
+ int headerPluralRes;
+ int headerViewType;
+ switch (mode) {
+ case ChatFolderInviteLinkController.MODE_INVITE_LINK:
+ headerPluralRes = R.string.xChatsToJoin;
+ headerViewType = ListItem.TYPE_HEADER_WITH_CHECKBOX;
+ break;
+ case ChatFolderInviteLinkController.MODE_NEW_CHATS:
+ headerPluralRes = R.string.xNewChatsToJoin;
+ headerViewType = ListItem.TYPE_HEADER_WITH_CHECKBOX;
+ break;
+ case ChatFolderInviteLinkController.MODE_DELETE_FOLDER:
+ headerPluralRes = R.string.xChatsToLeave;
+ headerViewType = ListItem.TYPE_HEADER_WITH_CHECKBOX;
+ break;
+ default:
+ throw new IllegalStateException("mode = " + mode);
+ }
+ items.add(new ListItem(ListItem.TYPE_EMPTY_OFFSET_SMALL));
+ items.add(new ListItem(headerViewType, R.id.btn_check, 0, Lang.plural(headerPluralRes, selectableChatCount)));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ addChats(items, selectableChatIds, true);
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ int descriptionRes;
+ switch (mode) {
+ case ChatFolderInviteLinkController.MODE_INVITE_LINK:
+ case ChatFolderInviteLinkController.MODE_NEW_CHATS:
+ descriptionRes = R.string.ChatFolderInviteLinkJoinChatsHint;
+ break;
+ case ChatFolderInviteLinkController.MODE_DELETE_FOLDER:
+ descriptionRes = R.string.ChatFolderInviteLinkLeaveChatsHint;
+ break;
+ default:
+ descriptionRes = ResourcesCompat.ID_NULL;
+ break;
+ }
+ if (descriptionRes != ResourcesCompat.ID_NULL) {
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, descriptionRes));
+ }
+ }
+
+ int addedChatCount = inviteLinkInfo != null ? inviteLinkInfo.addedChatIds.length : 0;
+ if (addedChatCount > 0) {
+ items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, Lang.plural(R.string.xChatsAlreadyJoined, addedChatCount)));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ addChats(items, inviteLinkInfo.addedChatIds, false);
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ }
+
+ adapter.replaceItems(items);
+ }
+
+ private void addChats (List outList, long[] chatIds, boolean selectable) {
+ for (int index = 0; index < chatIds.length; index++) {
+ if (index > 0) {
+ outList.add(new ListItem(ListItem.TYPE_SEPARATOR));
+ }
+ long chatId = chatIds[index];
+ outList.add(chatItem(chatId, selectable));
+ }
+ }
+
+ private ListItem chatItem (long chatId, boolean selectable) {
+ TdApi.Chat chat = tdlib.chatStrict(chatId);
+ boolean isPublic = tdlib.chatPublic(chatId);
+ CharSequence subtitle;
+ if (tdlib.isChannel(chatId)) {
+ subtitle = Lang.getString(isPublic ? R.string.ChannelPublic : R.string.ChannelPrivate);
+ } else if (tdlib.isMultiChat(chat)) {
+ subtitle = Lang.getString(isPublic ? R.string.GroupPublic : R.string.GroupPrivate);
+ } else {
+ subtitle = "";
+ }
+ DoubleTextWrapper data = new DoubleTextWrapper(tdlib, chat);
+ data.setForcedSubtitle(subtitle);
+ data.setAdminSignVisible(false, false);
+ data.setIsChecked(selectedChatIds.has(chatId), /* animated */ false);
+
+ ListItem item = new ListItem(ListItem.TYPE_CHAT_SMALL, R.id.chat);
+ item.setBoolValue(selectable);
+ item.setLongId(chatId);
+ item.setData(data);
+ return item;
+ }
+
+ @Override
+ public CharSequence getName () {
+ return chatFolderTitle;
+ }
+
+ @Override
+ public void onThemeColorsChanged (boolean areTemp, ColorState state) {
+ super.onThemeColorsChanged(areTemp, state);
+ if (headerView != null) {
+ headerView.resetColors(this, null);
+ }
+ }
+
+ @Override
+ protected void openMoreMenu () {
+ if (isFinishing()) return;
+ Options.Builder builder = new Options.Builder();
+ builder.item(new OptionItem(R.id.btn_copyLink, Lang.getString(R.string.InviteLinkCopy), OptionColor.NORMAL, R.drawable.baseline_content_copy_24));
+ builder.item(new OptionItem(R.id.btn_shareFolder, Lang.getString(R.string.ShareFolder), OptionColor.NORMAL, R.drawable.baseline_share_arrow_24));
+ Options options = builder.build();
+ showOptions(options, (view, id) -> {
+ if (id == R.id.btn_copyLink) {
+ UI.copyText(inviteLinkUrl, R.string.CopiedLink);
+ } else if (id == R.id.btn_shareFolder) {
+ parent.setDismissListener((popup) -> {
+ popup.setDismissListener(null);
+ tdlib.ui().shareUrl(this, inviteLinkUrl);
+ });
+ parent.hidePopupWindow(true);
+ } else {
+ throw new UnsupportedOperationException();
+ }
+ return true;
+ });
+ }
+
+ private boolean isFinishing () {
+ return parent.getPopupLayout().isWindowHidden();
+ }
+
+ @Override
+ protected int getBackButton () {
+ return BackHeaderButton.TYPE_CLOSE;
+ }
+
+ @Override
+ protected int getMenuId () {
+ Arguments arguments = getArgumentsStrict();
+ return arguments.mode == ChatFolderInviteLinkController.MODE_INVITE_LINK ? R.id.menu_more : 0;
+ }
+
+ @Override
+ protected int getHeaderTextColorId () {
+ return ColorId.text;
+ }
+
+ @Override
+ protected int getHeaderColorId () {
+ return ColorId.filling;
+ }
+
+ @Override
+ protected int getHeaderIconColorId () {
+ return ColorId.icon;
+ }
+
+ @Override
+ public boolean needsTempUpdates () {
+ return true;
+ }
+
+ @Override
+ public void onClick (View v) {
+ if (isFinishing()) return;
+ if (v.getId() == R.id.chat) {
+ onChatItemClicked((ListItem) v.getTag());
+ } else if (v.getId() == R.id.btn_done) {
+ switch (mode) {
+ case ChatFolderInviteLinkController.MODE_INVITE_LINK:
+ if (selectedChatIds.isEmpty()) {
+ parent.hidePopupWindow(true);
+ } else {
+ joinSelectedChats();
+ }
+ break;
+ case ChatFolderInviteLinkController.MODE_NEW_CHATS:
+ processNewChats();
+ break;
+ case ChatFolderInviteLinkController.MODE_DELETE_FOLDER:
+ showDeleteFolderConfirm();
+ break;
+ }
+ } else if (v.getId() == R.id.btn_check) {
+ if (selectedChatIds.size() < selectableChatIds.length) {
+ selectedChatIds.addAll(selectableChatIds);
+ } else {
+ selectedChatIds.clear();
+ }
+ adapter.updateAllValuedSettingsById(R.id.chat);
+ onSelectedChatCountChanged();
+ }
+ }
+
+ private void showDeleteFolderConfirm () {
+ TdApi.ChatFolderInfo chatFolderInfo = tdlib.chatFolderInfo(chatFolderId);
+ boolean hasMyInviteLinks = chatFolderInfo != null && chatFolderInfo.hasMyInviteLinks;
+ tdlib.ui().showDeleteChatFolderConfirm(this, hasMyInviteLinks, this::deleteFolder);
+ }
+
+ private void onChatItemClicked (ListItem item) {
+ boolean selectable = item.getBoolValue();
+ if (!selectable) {
+ return;
+ }
+ long chatId = item.getLongId();
+ boolean isChecked = selectedChatIds.add(chatId) || !selectedChatIds.remove(chatId);
+ DoubleTextWrapper data = (DoubleTextWrapper) item.getData();
+ data.setIsChecked(isChecked, /* animated */ true);
+ onSelectedChatCountChanged();
+ }
+
+ private void onSelectedChatCountChanged () {
+ adapter.updateValuedSettingById(R.id.btn_check);
+ updateActionButton();
+ }
+
+ private void joinSelectedChats () {
+ if (mode != ChatFolderInviteLinkController.MODE_INVITE_LINK) {
+ throw new IllegalStateException("mode = " + mode);
+ }
+ if (selectedChatIds.isEmpty()) {
+ return;
+ }
+ if (chatFolderId == NO_CHAT_FOLDER_ID) {
+ if (!tdlib.canAddShareableFolder()) {
+ UI.forceVibrateError(actionButton);
+ if (tdlib.hasPremium()) {
+ showTooltip(actionButton, R.string.ShareableFoldersLimitReached, tdlib.addedShareableChatFolderCountMax());
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, actionButton, TdlibUi.PremiumLimit.SHAREABLE_FOLDER_COUNT);
+ }
+ return;
+ }
+
+ if (!tdlib.canCreateChatFolder()) {
+ UI.forceVibrateError(actionButton);
+ if (tdlib.hasPremium()) {
+ showTooltip(actionButton, R.string.ChatFolderLimitReached, tdlib.chatFolderCountMax());
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, actionButton, TdlibUi.PremiumLimit.CHAT_FOLDER_COUNT);
+ }
+ return;
+ }
+ }
+ long[] chatIds = selectedChatIds.toArray();
+ tdlib.send(new TdApi.AddChatFolderByInviteLink(inviteLinkUrl, chatIds), tdlib.typedOkHandler(() -> {
+ UI.showToast(R.string.Done, Toast.LENGTH_SHORT);
+ }));
+ parent.hidePopupWindow(true);
+ }
+
+ private void processNewChats () {
+ if (mode != ChatFolderInviteLinkController.MODE_NEW_CHATS) {
+ throw new IllegalStateException("mode = " + mode);
+ }
+ long[] chatIds = selectedChatIds.toArray();
+ tdlib.processChatFolderNewChats(chatFolderId, chatIds, tdlib.typedOkHandler(() -> {
+ UI.showToast(R.string.Done, Toast.LENGTH_SHORT);
+ }));
+ parent.hidePopupWindow(true);
+ }
+
+ private void deleteFolder () {
+ if (mode != ChatFolderInviteLinkController.MODE_DELETE_FOLDER) {
+ throw new IllegalStateException("mode = " + mode);
+ }
+ long[] leaveChatIds = selectedChatIds.toArray();
+ tdlib.send(new TdApi.DeleteChatFolder(chatFolderId, leaveChatIds), tdlib.typedOkHandler(() -> {
+ UI.showToast(R.string.Done, Toast.LENGTH_SHORT);
+ }));
+ parent.hidePopupWindow(true);
+ }
+
+ private void showTooltip (View view, @StringRes int markdownStringRes, Object... formatArgs) {
+ showTooltip(view, Lang.getMarkdownString(this, markdownStringRes, formatArgs));
+ }
+
+ private void showTooltip (View view, CharSequence text) {
+ context()
+ .tooltipManager()
+ .builder(view)
+ .controller(this)
+ .show(tdlib, text)
+ .hideDelayed();
+ }
+
+ private class Adapter extends SettingsAdapter {
+ public Adapter (ViewController context) {
+ super(context);
+ }
+
+ @NonNull
+ @Override
+ public SettingHolder onCreateViewHolder (@NonNull ViewGroup parent, int viewType) {
+ SettingHolder viewHolder = super.onCreateViewHolder(parent, viewType);
+ if (viewType == ListItem.TYPE_DESCRIPTION) {
+ viewHolder.itemView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+ ListItem item = (ListItem) v.getTag();
+ item.setHeight(bottom - top);
+ });
+ }
+ return viewHolder;
+ }
+
+ @Override
+ protected void modifyChatView (ListItem item, SmallChatView chatView, @Nullable CheckBoxView checkBox, boolean isUpdate) {
+ if (item.getId() == R.id.chat) {
+ chatView.setEnabled(item.getBoolValue());
+
+ DoubleTextWrapper data = (DoubleTextWrapper) item.getData();
+ data.setIsChecked(selectedChatIds.has(item.getLongId()), isUpdate);
+ }
+ }
+
+ @Override
+ protected void setHeaderCheckBoxState (ListItem item, CheckBoxView checkBox, boolean isUpdate) {
+ if (item.getId() == R.id.btn_check) {
+ checkBox.setChecked(selectedChatIds.size() > 0, isUpdate);
+ checkBox.setDisabled(selectableChatIds.length == 0, isUpdate);
+ checkBox.setPartially(selectedChatIds.size() < selectableChatIds.length, isUpdate);
+ } else {
+ super.setHeaderCheckBoxState(item, checkBox, isUpdate);
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ChatsController.java b/app/src/main/java/org/thunderdog/challegram/ui/ChatsController.java
index 66f96248ab..75a3685465 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/ChatsController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ChatsController.java
@@ -47,6 +47,7 @@
import org.thunderdog.challegram.component.chat.MessagesManager;
import org.thunderdog.challegram.component.dialogs.ChatView;
import org.thunderdog.challegram.component.dialogs.ChatsAdapter;
+import org.thunderdog.challegram.component.dialogs.ChatsViewHolder;
import org.thunderdog.challegram.component.dialogs.SearchManager;
import org.thunderdog.challegram.config.Config;
import org.thunderdog.challegram.core.Lang;
@@ -70,6 +71,7 @@
import org.thunderdog.challegram.navigation.ViewPagerController;
import org.thunderdog.challegram.support.ViewSupport;
import org.thunderdog.challegram.telegram.ChatFilter;
+import org.thunderdog.challegram.telegram.ChatFolderListener;
import org.thunderdog.challegram.telegram.ChatListListener;
import org.thunderdog.challegram.telegram.ChatListener;
import org.thunderdog.challegram.telegram.ConnectionListener;
@@ -100,6 +102,7 @@
import org.thunderdog.challegram.tool.Views;
import org.thunderdog.challegram.unsorted.Settings;
import org.thunderdog.challegram.unsorted.Test;
+import org.thunderdog.challegram.util.Poller;
import org.thunderdog.challegram.util.StringList;
import org.thunderdog.challegram.v.ChatsRecyclerView;
import org.thunderdog.challegram.widget.BaseView;
@@ -142,7 +145,9 @@ public class ChatsController extends TelegramViewController chatFolderNewChatsPoller;
+
private Intent shareIntent;
public ChatsController (Context context, Tdlib tdlib) {
@@ -206,6 +213,14 @@ public boolean isPicker () {
return chatList;
}
+ public int chatFolderId () {
+ TdApi.ChatList chatList = chatList();
+ if (TD.isChatListFolder(chatList)) {
+ return ((TdApi.ChatListFolder) chatList).chatFolderId;
+ }
+ return NO_CHAT_FOLDER_ID;
+ }
+
private boolean needMessagesSearch;
@Override
@@ -243,7 +258,7 @@ public ChatPinSeparatorDecoration (ChatsController context) {
}
@Override
- public void onDraw (Canvas c, RecyclerView parent, RecyclerView.State state) {
+ public void onDraw (@NonNull Canvas c, RecyclerView parent, @NonNull RecyclerView.State state) {
final int childCount = parent.getChildCount();
final int separatorLeft = Screen.dp(72f);
final int separatorHeight = Math.max(1, Screen.dp(.5f, 3f));
@@ -257,16 +272,37 @@ public void onDraw (Canvas c, RecyclerView parent, RecyclerView.State state) {
for (int i = 0; i < childCount; i++) {
View view = parent.getChildAt(i);
+ RecyclerView.ViewHolder viewHolder = parent.getChildViewHolder(view);
+ int viewType = viewHolder.getItemViewType();
+ final int offsetTop, right;
if (view instanceof ChatView) {
- final int offsetTop = ((ChatView) view).isDragging() || (context.animatorFlags & ANIMATOR_FLAG_DRAGGING) != 0 ? 0 : (int) view.getTranslationY();
+ offsetTop = ((ChatView) view).isDragging() || (context.animatorFlags & ANIMATOR_FLAG_DRAGGING) != 0 ? 0 : (int) view.getTranslationY();
TGChat chat = ((ChatView) view).getChat();
- final int right = view.getMeasuredWidth();
+ right = view.getMeasuredWidth();
boolean needSeparator = true;
if (chat != null) {
int adapterPosition = parent.getChildAdapterPosition(view);
if (adapterPosition != RecyclerView.NO_POSITION) {
- TGChat nextChat = context.adapter.getChatAt(adapterPosition + 1);
+ TGChat nextChat = context.adapter.getChatByItemPosition(adapterPosition + 1);
boolean needSplit = nextChat != null && (chat.isArchive() != nextChat.isArchive() || chat.isPinnedOrSpecial() != nextChat.isPinnedOrSpecial());
+ boolean needShadowTop = adapterPosition > 0 && context.adapter.getItemViewType(adapterPosition - 1) == ChatsAdapter.VIEW_TYPE_SUGGESTED_CHATS;
+
+ if (needShadowTop) {
+ int top = view.getTop() + offsetTop;
+ if (shadowFactor != 0f) {
+
+ final int alpha = (int) (255f * maxAlpha * shadowFactor);
+ topShadowPaint.setAlpha(alpha);
+ c.save();
+ c.translate(0, top - ShadowView.simpleTopShadowHeight());
+ c.drawRect(0, 0, right, ShadowView.simpleTopShadowHeight(), topShadowPaint);
+ c.restore();
+ }
+ if (lineFactor != 0f) {
+ final int color = ColorUtils.alphaColor(lineFactor, Theme.separatorColor());
+ c.drawRect(0, top - separatorHeight, right, top, Paints.fillingPaint(color));
+ }
+ }
if (needSplit) {
final int top = view.getBottom() + offsetTop;
@@ -298,42 +334,6 @@ public void onDraw (Canvas c, RecyclerView parent, RecyclerView.State state) {
needSeparator = false;
}
-
- if (context.liveLocationHelper != null && (adapterPosition == context.getLiveLocationPosition())) {
- int decoratedTop = parent.getLayoutManager().getDecoratedTop(view) + offsetTop;
- int top = view.getTop() + offsetTop;
- int fillingTop = decoratedTop;
- if (adapterPosition > 0) {
- View prevView = parent.getLayoutManager().findViewByPosition(adapterPosition - 1);
- if (prevView != null) {
- fillingTop = Math.max(fillingTop, prevView.getBottom() + (int) prevView.getTranslationY());
- }
- }
- if (decoratedTop < top && top > 0) {
- c.drawRect(0, fillingTop, right, top, Paints.fillingPaint(Theme.backgroundColor()));
- needLiveLocation = true;
- liveLocationClipTop = fillingTop;
- liveLocationRight = right;
- liveLocationBottom = top;
- liveLocationTop = decoratedTop;
-
- if (adapterPosition == 0) {
- if (shadowFactor != 0f) {
- final int alpha = (int) (255f * maxAlpha * shadowFactor);
- topShadowPaint.setAlpha(alpha);
- c.save();
- c.translate(0, top);
- c.drawRect(0, 0, right, ShadowView.simpleTopShadowHeight(), topShadowPaint);
- c.restore();
- }
-
- if (lineFactor != 0f) {
- final int color = ColorUtils.alphaColor(lineFactor, Theme.separatorColor());
- c.drawRect(0, top - separatorHeight, right, top, Paints.fillingPaint(color));
- }
- }
- }
- }
}
}
if (needSeparator) {
@@ -344,6 +344,50 @@ public void onDraw (Canvas c, RecyclerView parent, RecyclerView.State state) {
c.drawRect(separatorLeft, separatorTop, right, separatorTop + separatorHeight, Paints.fillingPaint(separatorColor));
}
}
+ } else if (viewType == ChatsAdapter.VIEW_TYPE_SUGGESTED_CHATS) {
+ offsetTop = (int) view.getTranslationY();
+ right = view.getWidth();
+ c.drawRect(view.getX(), view.getY(), view.getX() + view.getWidth(), view.getY() + view.getHeight(), Paints.fillingPaint(Theme.backgroundColor()));
+ } else {
+ offsetTop = (int) view.getTranslationY();
+ right = view.getWidth();
+ }
+
+ int adapterPosition = parent.getChildAdapterPosition(view);
+ if (context.liveLocationHelper != null && (adapterPosition == context.getLiveLocationPosition())) {
+ int decoratedTop = parent.getLayoutManager().getDecoratedTop(view) + offsetTop;
+ int top = view.getTop() + offsetTop;
+ int fillingTop = decoratedTop;
+ if (adapterPosition > 0) {
+ View prevView = parent.getLayoutManager().findViewByPosition(adapterPosition - 1);
+ if (prevView != null) {
+ fillingTop = Math.max(fillingTop, prevView.getBottom() + (int) prevView.getTranslationY());
+ }
+ }
+ if (decoratedTop < top && top > 0) {
+ c.drawRect(0, fillingTop, right, top, Paints.fillingPaint(Theme.backgroundColor()));
+ needLiveLocation = true;
+ liveLocationClipTop = fillingTop;
+ liveLocationRight = right;
+ liveLocationBottom = top;
+ liveLocationTop = decoratedTop;
+
+ if (adapterPosition == 0 && viewType == ChatsAdapter.VIEW_TYPE_CHAT) {
+ if (shadowFactor != 0f) {
+ final int alpha = (int) (255f * maxAlpha * shadowFactor);
+ topShadowPaint.setAlpha(alpha);
+ c.save();
+ c.translate(0, top);
+ c.drawRect(0, 0, right, ShadowView.simpleTopShadowHeight(), topShadowPaint);
+ c.restore();
+ }
+
+ if (lineFactor != 0f) {
+ final int color = ColorUtils.alphaColor(lineFactor, Theme.separatorColor());
+ c.drawRect(0, top - separatorHeight, right, top, Paints.fillingPaint(color));
+ }
+ }
+ }
}
}
@@ -356,22 +400,29 @@ public void onDraw (Canvas c, RecyclerView parent, RecyclerView.State state) {
}
@Override
- public void getItemOffsets (Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+ public void getItemOffsets (@NonNull Rect outRect, @NonNull View view, RecyclerView parent, @NonNull RecyclerView.State state) {
int position = parent.getChildAdapterPosition(view);
if (position == RecyclerView.NO_POSITION) {
outRect.bottom = outRect.top = 0;
return;
}
- TGChat current = context.adapter.getChatAt(position);
+ TGChat current = context.adapter.getChatByItemPosition(position);
if (current == null) {
if (context.adapter.getItemCount() > 0 && context.adapter.hasArchive() && context.hideArchive && position == context.adapter.getItemCount() - 1) {
outRect.bottom = Math.max(0, parent.getMeasuredHeight() - context.calculateTotalScrollContentHeight());
+ } else {
+ outRect.bottom = 0;
+ }
+ if (context.liveLocationHelper != null && context.liveLocationHelper.isVisible() && position == context.getLiveLocationPosition()) {
+ outRect.top = LiveLocationHelper.height();
+ } else {
+ outRect.top = 0;
}
return;
}
- TGChat next = context.adapter.getChatAt(position + 1);
+ TGChat next = context.adapter.getChatByItemPosition(position + 1);
if (next != null && (current.isArchive() != next.isArchive() || current.isPinnedOrSpecial() != next.isPinnedOrSpecial())) {
outRect.bottom = Screen.dp(12f);
} else {
@@ -428,7 +479,7 @@ protected View onCreateView (Context context) {
chatsView = (ChatsRecyclerView) Views.inflate(context(), R.layout.recycler_chats, contentView);
chatsView.setMeasureListener((v, oldWidth, oldHeight, newWidth, newHeight) -> {
if (newHeight != oldHeight && adapter.hasArchive() && hideArchive && adapter.getItemCount() > 0) {
- adapter.notifyItemChanged(adapter.getItemCount() - 1);
+ adapter.notifyLastItemChanged();
}
});
chatsView.setItemAnimator(null);
@@ -441,7 +492,7 @@ protected View onCreateView (Context context) {
touchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
@Override
- public int getMovementFlags (RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+ public int getMovementFlags (@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
if (viewHolder.getItemViewType() == ChatsAdapter.VIEW_TYPE_CHAT) {
TGChat chat = ((ChatView) viewHolder.itemView).getChat();
if (chat != null && chat.isPinned() && adapter.canDragPinnedChats() && filter == null) {
@@ -458,7 +509,7 @@ public boolean isLongPressDragEnabled () {
}
@Override
- public void onMoved (RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y) {
+ public void onMoved (@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, int fromPos, @NonNull RecyclerView.ViewHolder target, int toPos, int x, int y) {
super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
viewHolder.itemView.invalidate();
target.itemView.invalidate();
@@ -471,12 +522,12 @@ public void onMoved (RecyclerView recyclerView, RecyclerView.ViewHolder viewHold
private int dragTo = -1;
@Override
- public boolean onMove (RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
- int fromPosition = viewHolder.getAdapterPosition();
- int toPosition = target.getAdapterPosition();
+ public boolean onMove (@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+ int fromPosition = viewHolder.getBindingAdapterPosition();
+ int toPosition = target.getBindingAdapterPosition();
- TGChat fromChat = adapter.getChatAt(fromPosition);
- TGChat toChat = adapter.getChatAt(toPosition);
+ TGChat fromChat = adapter.getChatByItemPosition(fromPosition);
+ TGChat toChat = adapter.getChatByItemPosition(toPosition);
if (fromChat == null || toChat == null || !fromChat.isPinned() || !toChat.isPinned()) {
return false;
@@ -504,7 +555,7 @@ public void onSelectedChanged (RecyclerView.ViewHolder viewHolder, int actionSta
}
@Override
- public void clearView (RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+ public void clearView (@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
super.clearView(recyclerView, viewHolder);
if (dragFrom != -1 && dragTo != -1 && dragFrom != dragTo) {
adapter.savePinnedChats();
@@ -512,7 +563,9 @@ public void clearView (RecyclerView recyclerView, RecyclerView.ViewHolder viewHo
dragFrom = dragTo = -1;
chatsView.setItemAnimator(null);
setAnimatorFlag(ANIMATOR_FLAG_DRAGGING, false);
- ((ChatView) viewHolder.itemView).setIsDragging(false);
+ if (viewHolder.getItemViewType() == ChatsAdapter.VIEW_TYPE_CHAT) {
+ ((ChatView) viewHolder.itemView).setIsDragging(false);
+ }
if (dragTooltip != null) {
dragTooltip.hideDelayed();
}
@@ -546,6 +599,7 @@ public void onSwiped (@NonNull RecyclerView.ViewHolder viewHolder, int direction
Settings.instance().addChatListModeListener(this);
TGLegacyManager.instance().addEmojiListener(this);
tdlib.context().dateManager().addListener(this);
+ tdlib.listeners().addChatFolderListener(chatFolderId(), this);
tdlib.awaitMyUserOrUnauthorizedState(() -> {
executeOnUiThreadOptional(() -> {
@@ -590,7 +644,7 @@ public void onScrollStateChanged (@NonNull RecyclerView recyclerView, int newSta
setArchiveCollapsed(false);
View view = manager.findViewByPosition(firstVisiblePosition);
int top = view != null ? -manager.getDecoratedTop(view) : 0;
- int itemHeight = ChatView.getViewHeight(Settings.instance().getChatListMode());
+ int itemHeight = ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_CHAT);
if (top < itemHeight / 2) {
chatsView.smoothScrollBy(0, -top);
} else {
@@ -666,6 +720,36 @@ public void onChatListItemChanged (TdlibChatList chatList, TdApi.Chat chat, @Ite
return contentView;
}
+ @Override
+ protected void onFocusStateChanged () {
+ super.onFocusStateChanged();
+ if (isFocused()) {
+ int chatFolderId = chatFolderId();
+ if (chatFolderId != NO_CHAT_FOLDER_ID && tdlib.isFolderShareable(chatFolderId) && !isFiltered()) {
+ startChatFolderNewChatsPolling(chatFolderId);
+ }
+ } else {
+ stopChatFolderNewChatsPolling();
+ }
+ }
+
+ private void startChatFolderNewChatsPolling (int chatFolderId) {
+ stopChatFolderNewChatsPolling();
+ chatFolderNewChatsPoller = new Poller<>(tdlib, tdlib::chatFolderUpdatePeriodMillis, () -> new TdApi.GetChatFolderNewChats(chatFolderId), (result, error) -> {
+ if (result != null) {
+ adapter.setSuggestedChatIds(result.chatIds);
+ }
+ });
+ chatFolderNewChatsPoller.start();
+ }
+
+ private void stopChatFolderNewChatsPolling () {
+ if (chatFolderNewChatsPoller != null) {
+ chatFolderNewChatsPoller.stop();
+ chatFolderNewChatsPoller = null;
+ }
+ }
+
@TdlibThread
private void displayChats (List entries) {
int initialLoadCount = chatsView.getInitialLoadCount();
@@ -689,7 +773,7 @@ public boolean isPullingArchive () {
if (!hideArchive || adapter == null || !adapter.hasArchive())
return false;
LinearLayoutManager manager = (LinearLayoutManager) chatsView.getLayoutManager();
- return manager.findFirstVisibleItemPosition() == 0;
+ return manager.findFirstVisibleItemPosition() == adapter.getArchiveItemPosition();
}
private void setArchiveCollapsed (boolean collapsed) {
@@ -700,9 +784,12 @@ private void setArchiveCollapsed (boolean collapsed) {
this.archiveCollapsed = collapsed;
UI.post(() -> {
if (!isDestroyed()) {
- chatsView.saveScrollPosition();
- adapter.notifyItemChanged(0);
- chatsView.restoreScrollPosition();
+ int archivePosition = adapter.getArchiveItemPosition();
+ if (archivePosition != -1) {
+ chatsView.saveScrollPosition();
+ adapter.notifyItemChanged(archivePosition);
+ chatsView.restoreScrollPosition();
+ }
}
});
}
@@ -715,7 +802,7 @@ private void setHideArchive (boolean hide) {
if (chatsView == null) {
return;
}
- adapter.notifyItemChanged(adapter.getItemCount() - 1);
+ adapter.notifyLastItemChanged();
if (hide) {
onHideArchiveRequested();
// TODO scroll by so it becomes invisible
@@ -764,7 +851,7 @@ public void onLiveLocationClick (float x, float y) {
int top = view != null ? view.getTop() : 0;
if (top > 0) {
int decoratedTop = manager.getDecoratedTop(view);
- if (view instanceof ChatView && decoratedTop < top && y < top && y >= decoratedTop) {
+ if (/*view instanceof ChatView && */decoratedTop < top && y < top && y >= decoratedTop) {
y -= decoratedTop;
chatsView.stopScroll();
liveLocationHelper.onClickAt(x, y);
@@ -775,7 +862,7 @@ public void onLiveLocationClick (float x, float y) {
@Override
public boolean onBeforeVisibilityStateChanged (LiveLocationHelper helper, boolean isVisible, boolean willAnimate) {
- if (chatsView == null || !(parentController != null ? parentController.isFocused() : isFocused()) || adapter.getChats().isEmpty()) {
+ if (chatsView == null || !(parentController != null ? parentController.isFocused() : isFocused()) || !adapter.hasChats()) {
return false;
}
@@ -795,20 +882,26 @@ public boolean onBeforeVisibilityStateChanged (LiveLocationHelper helper, boolea
@Override
public void onAfterVisibilityStateChanged (LiveLocationHelper helper, boolean isVisible, boolean willAnimate) {
- if (chatsView != null && !adapter.getChats().isEmpty()) {
+ if (chatsView != null && adapter.hasChats()) {
int position = getLiveLocationPosition();
adapter.notifyItemChanged(position);
if (position > 0) {
adapter.notifyItemChanged(position - 1);
}
if (adapter.hasArchive() && hideArchive) {
- adapter.notifyItemChanged(adapter.getItemCount() - 1);
+ adapter.notifyLastItemChanged();
}
}
}
public int getLiveLocationPosition () {
- return adapter.hasArchive() ? 1 : 0;
+ if (adapter.hasSuggestedChats()) {
+ return 0;
+ }
+ if (adapter.hasChats()) {
+ return adapter.getFirstChatItemPosition() + (adapter.hasArchive() ? 1 : 0);
+ }
+ return 0;
}
@Override
@@ -898,16 +991,16 @@ public void onScrollToTopRequested () {
LinearLayoutManager manager = (LinearLayoutManager) chatsView.getLayoutManager();
int pinnedItemCount = adapter.getHeaderChatCount(true, null);
- int itemHeight = ChatView.getViewHeight(Settings.instance().getChatListMode());
+ int chatItemHeight = ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_CHAT);
int firstVisiblePosition = manager.findFirstVisibleItemPosition();
if (firstVisiblePosition == RecyclerView.NO_POSITION) {
return;
}
- int totalScrollBy = itemHeight * firstVisiblePosition;
+ int totalScrollBy = chatItemHeight * firstVisiblePosition;
int separatorItemCount = firstVisiblePosition;
- int chatsCount = adapter.getItemCount() - 1;
+ int chatsCount = adapter.getChatCount();
if (adapter.hasArchive() && chatsCount > 1 && firstVisiblePosition > 0) {
separatorItemCount--;
@@ -928,7 +1021,11 @@ public void onScrollToTopRequested () {
totalScrollBy += separatorItemCount * Screen.separatorSize();
if (adapter.hasArchive() && hideArchive) {
- totalScrollBy -= itemHeight + (liveLocationHelper != null && liveLocationHelper.isVisible() ? Screen.dp(1f) : Screen.dp(12f));
+ totalScrollBy -= chatItemHeight + (liveLocationHelper != null && liveLocationHelper.isVisible() ? Screen.dp(1f) : Screen.dp(12f));
+ }
+
+ if (adapter.hasSuggestedChats()) {
+ totalScrollBy += ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_SUGGESTED_CHATS);
}
View firstView = manager.findViewByPosition(firstVisiblePosition);
@@ -941,11 +1038,11 @@ public void onScrollToTopRequested () {
protected int calculateTotalScrollContentHeight () {
int pinnedItemCount = adapter.getHeaderChatCount(true, null);
- int itemHeight = ChatView.getViewHeight(Settings.instance().getChatListMode());
+ int chatHeight = ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_CHAT);
- int chatsCount = adapter.getItemCount() - 1;
+ int chatsCount = adapter.getChatCount();
- int totalScrollBy = itemHeight * chatsCount;
+ int totalScrollBy = chatHeight * chatsCount;
int separatorItemCount = chatsCount;
if (adapter.hasArchive() && chatsCount > 1) {
@@ -967,10 +1064,14 @@ protected int calculateTotalScrollContentHeight () {
totalScrollBy += separatorItemCount * Screen.separatorSize();
if (adapter.hasArchive() && hideArchive) {
- totalScrollBy -= itemHeight + (liveLocationHelper != null && liveLocationHelper.isVisible() ? Screen.dp(1f) : Screen.dp(12f));
+ totalScrollBy -= chatHeight + (liveLocationHelper != null && liveLocationHelper.isVisible() ? Screen.dp(1f) : Screen.dp(12f));
}
- totalScrollBy += SettingHolder.measureHeightForType(ListItem.TYPE_LIST_INFO_VIEW);
+ totalScrollBy += ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_INFO);
+
+ if (adapter.hasSuggestedChats()) {
+ totalScrollBy += ChatsViewHolder.measureHeightForType(ChatsAdapter.VIEW_TYPE_SUGGESTED_CHATS);
+ }
return totalScrollBy;
}
@@ -995,7 +1096,7 @@ public int getBackButton () {
}
private boolean isBaseController () {
- return pickerDelegate == null && ((getArguments() != null && getArguments().isBaseController) || chatList().getConstructor() == TdApi.ChatListMain.CONSTRUCTOR); // FIXME replace with indexInStack() == 0
+ return pickerDelegate == null && ((getArguments() != null && getArguments().isBaseController) || TD.isChatListMain(chatList())); // FIXME replace with indexInStack() == 0
}
@Override
@@ -1004,7 +1105,7 @@ protected int getMenuId () {
}
private boolean isArchiveChatList () {
- return pickerDelegate == null && filter == null && chatList().getConstructor() == TdApi.ChatListArchive.CONSTRUCTOR;
+ return pickerDelegate == null && !isFiltered() && TD.isChatListArchive(chatList());
}
@Override
@@ -1637,14 +1738,14 @@ public void onMoreItemPressed (int id) {
}
};
if (id == R.id.more_btn_archiveUnarchive) {
- boolean isUnarchvie = chatList().getConstructor() == TdApi.ChatListArchive.CONSTRUCTOR;
+ boolean isUnarchive = chatList().getConstructor() == TdApi.ChatListArchive.CONSTRUCTOR;
showOptions(
- Lang.pluralBold(isUnarchvie ? R.string.UnarchiveXChats : R.string.ArchiveXChats, selectedChats.size()),
+ Lang.pluralBold(isUnarchive ? R.string.UnarchiveXChats : R.string.ArchiveXChats, selectedChats.size()),
new int[] {R.id.btn_archiveUnarchiveChat, R.id.btn_cancel},
- new String[] {Lang.getString(isUnarchvie ? R.string.Unarchive : R.string.Archive), Lang.getString(R.string.Cancel)}, null,
- new int[] {isUnarchvie ? R.drawable.baseline_unarchive_24 : R.drawable.baseline_archive_24, R.drawable.baseline_cancel_24}, (v, optionId) -> {
+ new String[] {Lang.getString(isUnarchive ? R.string.Unarchive : R.string.Archive), Lang.getString(R.string.Cancel)}, null,
+ new int[] {isUnarchive ? R.drawable.baseline_unarchive_24 : R.drawable.baseline_archive_24, R.drawable.baseline_cancel_24}, (v, optionId) -> {
if (optionId == R.id.btn_archiveUnarchiveChat) {
- TdApi.ChatList chatList = isUnarchvie ? new TdApi.ChatListMain() : new TdApi.ChatListArchive();
+ TdApi.ChatList chatList = isUnarchive ? new TdApi.ChatListMain() : new TdApi.ChatListArchive();
for (int i = 0; i < selectedChats.size(); i++) {
tdlib.client().send(new TdApi.AddChatToList(selectedChats.keyAt(i), chatList), result -> {
switch (result.getConstructor()) {
@@ -1963,6 +2064,14 @@ public void onClick (View v) {
onClick(chat.getChat());
}
}
+ } else if (v.getId() == R.id.btn_chatsSuggestion) {
+ long[] suggestedChatIds = adapter.getSuggestedChatIds();
+ TdApi.ChatFolderInfo chatFolderInfo = tdlib.chatFolderInfo(chatFolderId());
+ if (suggestedChatIds.length > 0 && chatFolderInfo != null) {
+ ChatFolderInviteLinkController controller = new ChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(ChatFolderInviteLinkController.Arguments.newChats(chatFolderInfo, suggestedChatIds));
+ controller.show();
+ }
}
}
@@ -2217,7 +2326,7 @@ public final void checkDisplayProgress () {
public final void checkDisplayNoChats () {
adapter.checkArchive();
- boolean noChats = list.isEndReached() && adapter.getChats().size() == 0;
+ boolean noChats = list.isEndReached() && !adapter.hasChats();
setDisplayNoChats(noChats);
}
@@ -2298,7 +2407,7 @@ private void prepareNoChats () {
parentController.navigateTo(c);
}
} else if (viewId == R.id.btn_editFolder) {
- int chatFolderId = ((TdApi.ChatListFolder) chatList()).chatFolderId;
+ int chatFolderId = chatFolderId();
tdlib.send(new TdApi.GetChatFolder(chatFolderId), (chatFolder, error) -> runOnUiThreadOptional(() -> {
if (parentController == null)
return;
@@ -2320,7 +2429,7 @@ private void prepareNoChats () {
} else if (chatList instanceof TdApi.ChatListArchive) {
items.add(new ListItem(ListItem.TYPE_EMPTY, 0, 0, R.string.NoArchive));
} else if (chatList instanceof TdApi.ChatListFolder) {
- items.add(new ListItem(ListItem.TYPE_ICONIZED_EMPTY, R.id.changePhoneText, R.drawable.baseline_folder_96, Lang.getMarkdownString(this, R.string.FolderNoChatsToDisplay)));
+ items.add(new ListItem(ListItem.TYPE_ICONIZED_EMPTY, R.id.changePhoneText, R.drawable.baseline_folder_open_96, Lang.getMarkdownString(this, R.string.FolderNoChatsToDisplay)));
items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
items.add(new ListItem(ListItem.TYPE_BUTTON, R.id.btn_editFolder, 0, R.string.EditFolder));
items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
@@ -2576,6 +2685,7 @@ public void destroy () {
TGLegacyManager.instance().removeEmojiListener(this);
tdlib.contacts().removeListener(this);
tdlib.context().dateManager().removeListener(this);
+ tdlib.listeners().removeChatFolderListener(chatFolderId(), this);
}
// Updates
@@ -2885,6 +2995,15 @@ public void onUserStatusChanged (long userId, TdApi.UserStatus status, boolean u
}
}
+ @Override
+ public void onChatFolderNewChatsChanged (int chatFolderId) {
+ runOnUiThreadOptional(() -> {
+ if (chatFolderId == chatFolderId() && chatFolderNewChatsPoller != null && chatFolderNewChatsPoller.isStarted()) {
+ chatFolderNewChatsPoller.restart();
+ }
+ });
+ }
+
// System sharing
public void shareIntent (Intent intent) {
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/EditBaseController.java b/app/src/main/java/org/thunderdog/challegram/ui/EditBaseController.java
index 520f7b85eb..dff6f3f5dd 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/EditBaseController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/EditBaseController.java
@@ -109,6 +109,10 @@ protected View onCreateView (Context context) {
return wrapper;
}
+ public RecyclerView getRecyclerView () {
+ return recyclerView;
+ }
+
@Override
public int getRootColorId () {
return getRecyclerBackgroundColorId();
@@ -169,6 +173,10 @@ protected boolean isDoneVisible () {
return doneVisible;
}
+ protected void onDoneVisibleChanged (boolean isVisible) {
+ // override
+ }
+
protected void setDoneVisible (boolean isVisible) {
if (this.doneVisible != isVisible) {
this.doneVisible = isVisible;
@@ -189,6 +197,7 @@ protected void setDoneVisible (boolean isVisible) {
}
doneButton.setIsVisible(isVisible, false);
}
+ onDoneVisibleChanged(isVisible);
}
}
@@ -198,6 +207,7 @@ protected void setInstantDoneVisible (boolean isVisible) {
this.doneVisibilityFactor = 1f;
doneButton.setMaximumAlpha(1f);
doneButton.setIsVisible(isVisible, false);
+ onDoneVisibleChanged(isVisible);
}
}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderController.java b/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderController.java
index a4c5ff24da..42e3020c15 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderController.java
@@ -14,23 +14,26 @@
*/
package org.thunderdog.challegram.ui;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
import android.content.Context;
+import android.graphics.Rect;
import android.os.Bundle;
+import android.text.InputFilter;
import android.text.InputType;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import android.widget.LinearLayout;
+import androidx.annotation.AnyThread;
import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import androidx.core.util.ObjectsCompat;
import androidx.core.view.ViewCompat;
+import androidx.core.widget.TextViewKt;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
@@ -39,25 +42,32 @@
import org.thunderdog.challegram.component.attach.CustomItemAnimator;
import org.thunderdog.challegram.component.base.SettingView;
import org.thunderdog.challegram.component.user.RemoveHelper;
+import org.thunderdog.challegram.config.Config;
import org.thunderdog.challegram.core.Lang;
import org.thunderdog.challegram.data.AvatarPlaceholder;
import org.thunderdog.challegram.data.TD;
import org.thunderdog.challegram.data.TGFoundChat;
-import org.thunderdog.challegram.navigation.HeaderView;
+import org.thunderdog.challegram.navigation.EditHeaderView;
+import org.thunderdog.challegram.navigation.NavigationController;
import org.thunderdog.challegram.navigation.ViewController;
import org.thunderdog.challegram.support.RippleSupport;
import org.thunderdog.challegram.support.ViewSupport;
+import org.thunderdog.challegram.telegram.ChatFolderListener;
+import org.thunderdog.challegram.telegram.ChatFoldersListener;
import org.thunderdog.challegram.telegram.Tdlib;
import org.thunderdog.challegram.telegram.TdlibAccentColor;
+import org.thunderdog.challegram.telegram.TdlibUi;
import org.thunderdog.challegram.theme.ColorId;
import org.thunderdog.challegram.theme.Theme;
import org.thunderdog.challegram.tool.Drawables;
import org.thunderdog.challegram.tool.Screen;
import org.thunderdog.challegram.tool.UI;
import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.unsorted.Size;
import org.thunderdog.challegram.util.AdapterSubListUpdateCallback;
+import org.thunderdog.challegram.util.CharacterStyleFilter;
import org.thunderdog.challegram.util.ListItemDiffUtilCallback;
-import org.thunderdog.challegram.v.CustomRecyclerView;
+import org.thunderdog.challegram.util.PremiumLockModifier;
import org.thunderdog.challegram.widget.BetterChatView;
import org.thunderdog.challegram.widget.MaterialEditTextGroup;
@@ -65,13 +75,15 @@
import java.util.List;
import java.util.Set;
+import kotlin.Unit;
import me.vkryl.android.AnimatorUtils;
+import me.vkryl.android.text.CodePointCountFilter;
import me.vkryl.android.widget.FrameLayoutFix;
import me.vkryl.core.ArrayUtils;
import me.vkryl.core.StringUtils;
import me.vkryl.td.Td;
-public class EditChatFolderController extends RecyclerViewController implements View.OnClickListener, SettingsAdapter.TextChangeListener, SelectChatsController.Delegate {
+public class EditChatFolderController extends EditBaseController implements View.OnClickListener, View.OnLongClickListener, SettingsAdapter.TextChangeListener, SelectChatsController.Delegate, ChatFoldersListener, ChatFolderListener {
private static final int NO_CHAT_FOLDER_ID = 0;
private static final int COLLAPSED_CHAT_COUNT = 3;
@@ -129,24 +141,29 @@ public static EditChatFolderController newFolder (Context context, Tdlib tdlib,
private final @IdRes int excludedChatsPreviousItemId = R.id.btn_folderExcludeChats;
private final @IdRes int includedChatsNextItemId = ViewCompat.generateViewId();
private final @IdRes int excludedChatsNextItemId = ViewCompat.generateViewId();
+ private final @IdRes int inviteLinksPreviousItemId = R.id.btn_createInviteLink;
+ private final @IdRes int inviteLinksNextItemId = ViewCompat.generateViewId();
private boolean showAllIncludedChats;
private boolean showAllExcludedChats;
private SettingsAdapter adapter;
- private ListItem input;
+ private @Nullable ListItem input;
+ private @Nullable EditHeaderView headerCell;
- private int chatFolderId;
+ private volatile int chatFolderId;
private TdApi.ChatFolder originChatFolder;
private TdApi.ChatFolder editedChatFolder;
+ private @Nullable TdApi.ChatFolderInviteLink[] inviteLinks;
+
public EditChatFolderController (Context context, Tdlib tdlib) {
super(context, tdlib);
}
@Override
public boolean needAsynchronousAnimation () {
- return originChatFolder == null && chatFolderId != NO_CHAT_FOLDER_ID;
+ return chatFolderId != NO_CHAT_FOLDER_ID && (originChatFolder == null || originChatFolder.isShareable);
}
@Override
@@ -165,6 +182,22 @@ public CharSequence getName () {
return chatFolderId != NO_CHAT_FOLDER_ID ? arguments.chatFolderName : Lang.getString(R.string.NewFolder);
}
+ @Override
+ public View getCustomHeaderCell () {
+ return headerCell;
+ }
+
+ @Override
+ protected int getHeaderHeight () {
+ //noinspection deprecation
+ return headerCell != null ? Size.getHeaderBigPortraitSize(false) : super.getHeaderHeight();
+ }
+
+ @Override
+ protected int getRecyclerBackgroundColorId () {
+ return ColorId.background;
+ }
+
@Override
public void setArguments (Arguments args) {
super.setArguments(args);
@@ -174,46 +207,146 @@ public void setArguments (Arguments args) {
}
@Override
- protected void onCreateView (Context context, CustomRecyclerView recyclerView) {
+ protected void onCreateView (Context context, FrameLayoutFix contentView, RecyclerView recyclerView) {
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ headerCell = new EditHeaderView(context, this);
+ headerCell.setInput(editedChatFolder.title);
+ headerCell.setInputOptions(R.string.FolderNameHint, InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+ headerCell.setOnPhotoClickListener(this::showIconSelector);
+ headerCell.setImeOptions(EditorInfo.IME_ACTION_DONE);
+ headerCell.getInputView().setFilters(new InputFilter[] {
+ new CodePointCountFilter(MAX_CHAT_FOLDER_TITLE_LENGTH),
+ new CharacterStyleFilter()
+ });
+ TextViewKt.doAfterTextChanged(headerCell.getInputView(), (editable) -> {
+ onTitleChanged(editable != null ? editable.toString() : "");
+ return Unit.INSTANCE;
+ });
+ setLockFocusView(headerCell.getInputView(), /* showAlways */ StringUtils.isEmpty(editedChatFolder.title));
+ //noinspection deprecation
+ Views.setTopMargin(recyclerView, Size.getHeaderSizeDifference(false));
+ updateFolderIcon();
+ }
+
ArrayList items = new ArrayList<>();
- items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.FolderName));
- items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
- items.add(input = new ListItem(ListItem.TYPE_CUSTOM_SINGLE, R.id.input).setStringValue(editedChatFolder.title));
- items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
- items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.FolderIncludedChats));
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ if (chatFolderId != NO_CHAT_FOLDER_ID) {
+ items.add(new ListItem(ListItem.TYPE_RADIO_SETTING, R.id.btn_visible, 0, R.string.FolderVisible));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ } else {
+ items.add(new ListItem(ListItem.TYPE_EMPTY_OFFSET_SMALL));
+ }
+ } else {
+ items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.FolderName));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ items.add(input = new ListItem(ListItem.TYPE_CUSTOM_SINGLE, R.id.input).setStringValue(editedChatFolder.title));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ }
+
+ items.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.FolderIncludedChats));
items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_folderIncludeChats, R.drawable.baseline_add_24, R.string.FolderActionIncludeChats).setTextColorId(ColorId.inlineText));
fillIncludedChats(editedChatFolder, items);
items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, includedChatsNextItemId));
items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, Lang.getMarkdownString(this, R.string.FolderIncludedChatsInfo)));
- items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.FolderExcludedChats));
- items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
- items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_folderExcludeChats, R.drawable.baseline_add_24, R.string.FolderActionExcludeChats).setTextColorId(ColorId.inlineText));
- fillExcludedChats(editedChatFolder, items);
- items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, excludedChatsNextItemId));
- items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, Lang.getMarkdownString(this, R.string.FolderExcludedChatsInfo)));
+ if (!isShareable()) {
+ items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.FolderExcludedChats));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_folderExcludeChats, R.drawable.baseline_add_24, R.string.FolderActionExcludeChats).setTextColorId(ColorId.inlineText));
+ fillExcludedChats(editedChatFolder, items);
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, excludedChatsNextItemId));
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, Lang.getMarkdownString(this, R.string.FolderExcludedChatsInfo)));
+ }
if (chatFolderId != NO_CHAT_FOLDER_ID) {
+ items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.InviteLinks));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP, 0));
+ items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_createInviteLink, R.drawable.baseline_add_link_24, R.string.CreateANewLink)
+ .setTextColorId(ColorId.inlineText)
+ .setDrawModifier(new PremiumLockModifier()));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, inviteLinksNextItemId));
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.ChatFolderInviteLinksInfo));
items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
- items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_removeFolder, R.drawable.baseline_delete_forever_24, R.string.RemoveFolder).setTextColorId(ColorId.textNegative));
+ items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_removeFolder, R.drawable.baseline_delete_24, R.string.RemoveFolder).setTextColorId(ColorId.textNegative));
items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
items.add(new ListItem(ListItem.TYPE_PADDING).setHeight(Screen.dp(12f)));
}
+ items.add(new ListItem(ListItem.TYPE_ZERO_VIEW));
+
adapter = new Adapter(this);
- adapter.setLockFocusOn(this, /* showAlways */ StringUtils.isEmpty(editedChatFolder.title));
- adapter.setTextChangeListener(this);
+ if (input != null) {
+ adapter.setLockFocusOn(this, /* showAlways */ StringUtils.isEmpty(editedChatFolder.title));
+ adapter.setTextChangeListener(this);
+ }
adapter.setItems(items, false);
CustomItemAnimator itemAnimator = new CustomItemAnimator(AnimatorUtils.DECELERATE_INTERPOLATOR, 180l);
itemAnimator.setSupportsChangeAnimations(false);
recyclerView.setItemAnimator(itemAnimator);
+ recyclerView.addItemDecoration(new ItemDecoration());
recyclerView.setAdapter(adapter);
RemoveHelper.attach(recyclerView, new RemoveHelperCallback());
- if (originChatFolder == null && chatFolderId != NO_CHAT_FOLDER_ID) {
- loadChatFolder();
+ if (chatFolderId != NO_CHAT_FOLDER_ID) {
+ if (originChatFolder == null) {
+ loadChatFolder();
+ }
+ updateInviteLinks();
+ tdlib.listeners().subscribeToChatFoldersUpdates(this);
+ tdlib.listeners().addChatFolderListener(chatFolderId, this);
+ }
+ }
+
+ @Override
+ protected void onDoneVisibleChanged (boolean isVisible) {
+ if (recyclerView != null) {
+ recyclerView.invalidateItemDecorations();
+ adapter.notifyLastItemChanged();
+ }
+ }
+
+ @Override
+ public void destroy () {
+ super.destroy();
+ tdlib.listeners().unsubscribeFromChatFoldersUpdates(this);
+ tdlib.listeners().removeChatFolderListener(chatFolderId, this);
+ }
+
+ private boolean firstFocus;
+
+ @Override
+ public void onFocus () {
+ super.onFocus();
+ if (firstFocus) {
+ firstFocus = false;
+ } else {
+ updateInviteLinks();
+ if (chatFolderId != NO_CHAT_FOLDER_ID) {
+ checkFolderDeleted();
+ }
+ }
+ }
+
+ @Override
+ public void onChatFolderInviteLinkDeleted (int chatFolderId, String inviteLink) {
+ if (this.chatFolderId == chatFolderId) {
+ updateInviteLinks();
+ }
+ }
+
+ @Override
+ public void onChatFolderInviteLinkCreated (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+ if (this.chatFolderId == chatFolderId) {
+ updateInviteLinks();
+ }
+ }
+
+ @Override
+ public void onChatFolderInviteLinkChanged (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+ if (this.chatFolderId == chatFolderId) {
+ updateInviteLinks();
}
}
@@ -249,35 +382,18 @@ public boolean restoreInstanceState (Bundle in, String keyPrefix) {
return false;
}
- @Override
- protected int getMenuId () {
- return R.id.menu_done;
- }
-
- @Override
- public void fillMenuItems (int id, HeaderView header, LinearLayout menu) {
- if (id == R.id.menu_done) {
- header.addDoneButton(menu, this).setVisibility(canSaveChanges() ? View.VISIBLE : View.GONE);
- }
- }
-
- @Override
- public void onMenuItemPressed (int id, View view) {
- if (id == R.id.menu_btn_done) {
- saveChanges();
- }
- }
-
@Override
public void onClick (View v) {
int id = v.getId();
if (id == R.id.btn_folderIncludeChats) {
+ boolean showChatTypes = !isShareable();
SelectChatsController selectChats = new SelectChatsController(context, tdlib);
- selectChats.setArguments(SelectChatsController.Arguments.includedChats(this, chatFolderId, editedChatFolder));
+ selectChats.setArguments(SelectChatsController.Arguments.includedChats(this, chatFolderId, editedChatFolder, showChatTypes));
navigateTo(selectChats);
} else if (id == R.id.btn_folderExcludeChats) {
+ boolean showChatTypes = !isShareable();
SelectChatsController selectChats = new SelectChatsController(context, tdlib);
- selectChats.setArguments(SelectChatsController.Arguments.excludedChats(this, chatFolderId, editedChatFolder));
+ selectChats.setArguments(SelectChatsController.Arguments.excludedChats(this, chatFolderId, editedChatFolder, showChatTypes));
navigateTo(selectChats);
} else if (id == R.id.btn_showAdvanced) {
ListItem item = (ListItem) v.getTag();
@@ -292,8 +408,34 @@ public void onClick (View v) {
updateExcludedChats();
}
}
+ } else if (id == R.id.btn_visible) {
+ UI.forceVibrate(v, false);
+ boolean isEnabled = adapter.toggleView(v);
+ tdlib.settings().setChatFolderEnabled(chatFolderId, isEnabled);
} else if (id == R.id.btn_removeFolder) {
- showRemoveFolderConfirm();
+ if (originChatFolder.isShareable) {
+ tdlib.send(new TdApi.GetChatFolderChatsToLeave(chatFolderId), (result, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else if (result.totalCount > 0) {
+ ChatFolderInviteLinkController controller = new ChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(ChatFolderInviteLinkController.Arguments.deleteFolder(chatFolderId, originChatFolder.title, result.chatIds));
+ controller.show();
+ } else {
+ showRemoveFolderConfirm();
+ }
+ }));
+ } else {
+ showRemoveFolderConfirm();
+ }
+ } else if (id == R.id.btn_createInviteLink) {
+ onCreateInviteLinkClick(v);
+ } else if (id == R.id.btn_inviteLink) {
+ ListItem item = (ListItem) v.getTag();
+ TdApi.ChatFolderInviteLink inviteLink = (TdApi.ChatFolderInviteLink) item.getData();
+ EditChatFolderInviteLinkController controller = new EditChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(new EditChatFolderInviteLinkController.Arguments(chatFolderId, editedChatFolder, inviteLink));
+ navigateTo(controller);
} else if (id == R.id.chat || ArrayUtils.contains(TD.CHAT_TYPES, id)) {
int position = getRecyclerView().getChildAdapterPosition(v);
ListItem item = (ListItem) v.getTag();
@@ -301,15 +443,40 @@ public void onClick (View v) {
}
}
+ @Override
+ public boolean onLongClick (View v) {
+ int id = v.getId();
+ if (id == R.id.btn_inviteLink) {
+ ListItem item = (ListItem) v.getTag();
+ TdApi.ChatFolderInviteLink inviteLink = (TdApi.ChatFolderInviteLink) item.getData();
+ showInviteLinkOptions(inviteLink);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ protected boolean onDoneClick () {
+ if (!isInProgress()) {
+ saveChanges(this::closeSelf);
+ }
+ return true;
+ }
+
@Override
public boolean onBackPressed (boolean fromTop) {
- if (hasChanges()) {
+ if (hasUnsavedChanges()) {
showUnsavedChangesPromptBeforeLeaving(/* onConfirm */ null);
return true;
}
return super.onBackPressed(fromTop);
}
+ @Override
+ public boolean canSlideBackFrom (NavigationController navigationController, float x, float y) {
+ return !hasUnsavedChanges();
+ }
+
@Override
public void onBlur () {
super.onBlur();
@@ -320,13 +487,26 @@ public void onBlur () {
@Override
public void onPrepareToShow () {
super.onPrepareToShow();
- updateMenuButton();
+ updateDoneButton();
+ }
+
+ @Override
+ public void onChatFoldersChanged (TdApi.ChatFolderInfo[] chatFolders, int mainChatListPosition) {
+ if (chatFolderId != NO_CHAT_FOLDER_ID && isFocused()) {
+ checkFolderDeleted();
+ }
}
@Override
public void onTextChanged (int id, ListItem item, MaterialEditTextGroup v, String text) {
+ if (item == input) {
+ onTitleChanged(text);
+ }
+ }
+
+ private void onTitleChanged (String text) {
editedChatFolder.title = text;
- updateMenuButton();
+ updateDoneButton();
}
private void fillIncludedChats (TdApi.ChatFolder chatFolder, List outList) {
@@ -402,14 +582,21 @@ private void loadChatFolder () {
if (error != null) {
UI.showError(error);
} else {
+ boolean isFirstLoad = this.originChatFolder == null;
updateChatFolder(chatFolder);
+ if (isFirstLoad && (!chatFolder.isShareable || inviteLinks != null)) {
+ executeScheduledAnimation();
+ }
}
}));
}
private void updateChatFolder (TdApi.ChatFolder chatFolder) {
+ if (this.originChatFolder == null) {
+ this.originChatFolder = TD.copyOf(chatFolder);
+ }
this.editedChatFolder = chatFolder;
- updateMenuButton();
+ updateDoneButton();
updateIncludedChats();
updateExcludedChats();
}
@@ -455,28 +642,43 @@ private void updateExcludedChats () {
}
private void updateFolderName () {
- if (StringUtils.isEmpty(editedChatFolder.title) && editedChatFolder.pinnedChatIds.length == 0 && editedChatFolder.includedChatIds.length == 0) {
- int[] includedChatTypes = TD.includedChatTypes(editedChatFolder);
- if (includedChatTypes.length == 1) {
- int includedChatType = includedChatTypes[0];
- String chatTypeName = Lang.getString(TD.chatTypeName(includedChatType));
- boolean hasChanges = false;
- if (input.setStringValueIfChanged(chatTypeName)) {
- editedChatFolder.title = chatTypeName;
- hasChanges = true;
- }
- if (editedChatFolder.icon == null) {
- TdApi.ChatFolderIcon chatTypeIcon = TD.chatTypeIcon(includedChatType);
- if (chatTypeIcon != null) {
- editedChatFolder.icon = chatTypeIcon;
- hasChanges = true;
- }
- }
- if (hasChanges) {
- adapter.updateSimpleItemById(input.getId());
- }
+ if (!StringUtils.isEmpty(editedChatFolder.title)) {
+ return;
+ }
+ if (editedChatFolder.pinnedChatIds.length > 0 || editedChatFolder.includedChatIds.length > 0) {
+ return;
+ }
+ int[] includedChatTypes = TD.includedChatTypes(editedChatFolder);
+ if (includedChatTypes.length != 1) {
+ return;
+ }
+ int includedChatType = includedChatTypes[0];
+ String chatTypeName = Lang.getString(TD.chatTypeName(includedChatType));
+ boolean isNameChanged = false;
+ boolean isIconChanged = false;
+ if (!StringUtils.equalsOrBothEmpty(editedChatFolder.title, chatTypeName)) {
+ editedChatFolder.title = chatTypeName;
+ isNameChanged = true;
+ if (input != null) {
+ input.setStringValue(chatTypeName);
+ }
+ if (headerCell != null) {
+ headerCell.setInput(chatTypeName);
+ }
+ }
+ if (editedChatFolder.icon == null) {
+ TdApi.ChatFolderIcon chatTypeIcon = TD.chatTypeIcon(includedChatType);
+ if (chatTypeIcon != null) {
+ editedChatFolder.icon = chatTypeIcon;
+ isIconChanged = true;
}
}
+ if (input != null && (isNameChanged || isIconChanged)) {
+ adapter.updateSimpleItemById(input.getId());
+ }
+ if (headerCell != null && isIconChanged) {
+ updateFolderIcon();
+ }
}
@Override
@@ -545,17 +747,17 @@ private void showRemoveConditionConfirm (int position, ListItem item) {
editedChatFolder.excludeArchived = false;
}
updateFolderName();
- updateMenuButton();
+ updateDoneButton();
});
}
private void showRemoveFolderConfirm () {
- showConfirm(Lang.getString(R.string.RemoveFolderConfirm), Lang.getString(R.string.Remove), R.drawable.baseline_delete_24, OptionColor.RED, () -> {
+ tdlib.ui().showDeleteChatFolderConfirm(this, hasInviteLinks(), () -> {
deleteChatFolder(chatFolderId);
});
}
- private boolean hasChanges () {
+ private boolean hasUnsavedChanges () {
TdApi.ChatFolder originChatFolder = this.originChatFolder != null ? this.originChatFolder : EMPTY_CHAT_FOLDER;
TdApi.ChatFolder editedChatFolder = this.editedChatFolder != null ? this.editedChatFolder : EMPTY_CHAT_FOLDER;
return !TD.contentEquals(originChatFolder, editedChatFolder);
@@ -571,27 +773,40 @@ private boolean canSaveChanges () {
return false;
}
return (editedChatFolder.includeContacts || editedChatFolder.includeNonContacts || editedChatFolder.includeGroups || editedChatFolder.includeChannels || editedChatFolder.includeBots || editedChatFolder.pinnedChatIds.length > 0 || editedChatFolder.includedChatIds.length > 0) &&
- (chatFolderId == NO_CHAT_FOLDER_ID || hasChanges());
+ (chatFolderId == NO_CHAT_FOLDER_ID || hasUnsavedChanges());
}
- private void saveChanges () {
+ private void saveChanges (Runnable after) {
if (chatFolderId != NO_CHAT_FOLDER_ID) {
- editChatFolder(chatFolderId, TD.copyOf(editedChatFolder));
+ editChatFolder(chatFolderId, TD.copyOf(editedChatFolder), after);
} else {
- createChatFolder(TD.copyOf(editedChatFolder));
+ createChatFolder(TD.copyOf(editedChatFolder), after);
}
}
- private void createChatFolder (TdApi.ChatFolder chatFolder) {
- tdlib.send(new TdApi.CreateChatFolder(chatFolder), tdlib.successHandler(this::closeSelf));
+ private void createChatFolder (TdApi.ChatFolder chatFolder, Runnable after) {
+ executeWithProgress(new TdApi.CreateChatFolder(chatFolder), after);
}
- private void editChatFolder (int chatFolderId, TdApi.ChatFolder chatFolder) {
- tdlib.send(new TdApi.EditChatFolder(chatFolderId, chatFolder), tdlib.successHandler(this::closeSelf));
+ private void editChatFolder (int chatFolderId, TdApi.ChatFolder chatFolder, Runnable after) {
+ executeWithProgress(new TdApi.EditChatFolder(chatFolderId, chatFolder), after);
}
private void deleteChatFolder (int chatFolderId) {
- tdlib.send(new TdApi.DeleteChatFolder(chatFolderId, null), tdlib.typedOkHandler(this::closeSelf));
+ executeWithProgress(new TdApi.DeleteChatFolder(chatFolderId, null), this::closeSelf);
+ }
+
+ private void executeWithProgress (TdApi.Function request, Runnable onResult) {
+ setInProgress(true);
+ tdlib.send(request, (result, error) -> runOnUiThreadOptional(() -> {
+ setInProgress(false);
+ updateDoneButton();
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ onResult.run();
+ }
+ }));
}
private void closeSelf () {
@@ -600,16 +815,26 @@ private void closeSelf () {
}
}
- private void updateMenuButton () {
- if (headerView != null) {
- headerView.updateButton(getMenuId(), R.id.menu_btn_done, canSaveChanges() ? View.VISIBLE : View.GONE, 0);
+ private void updateFolderIcon () {
+ if (input != null) {
+ adapter.updateSimpleItemById(input.getId());
}
+ if (headerCell != null) {
+ int iconResource = TD.findFolderIcon(editedChatFolder.icon, R.drawable.baseline_folder_24);
+ headerCell.setIcon(iconResource, ColorId.white);
+ }
+ }
+
+ private void updateDoneButton () {
+ boolean isDoneVisible = isInProgress() || canSaveChanges();
+ setDoneVisible(isDoneVisible);
}
private class Adapter extends SettingsAdapter {
public Adapter (ViewController context) {
super(context);
}
+
@Override
protected void setChatData (ListItem item, int position, BetterChatView chatView) {
if (item.getId() == R.id.chat) {
@@ -628,7 +853,7 @@ protected void setChatData (ListItem item, int position, BetterChatView chatView
@Override
protected SettingHolder initCustom (ViewGroup parent) {
FrameLayoutFix frameLayout = new FrameLayoutFix(parent.getContext());
- frameLayout.setLayoutParams(new RecyclerView.LayoutParams(MATCH_PARENT, Screen.dp(57f)));
+ frameLayout.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(57f)));
ViewSupport.setThemedBackground(frameLayout, ColorId.filling, EditChatFolderController.this);
MaterialEditTextGroup editText = new MaterialEditTextGroup(parent.getContext(), false);
@@ -642,7 +867,7 @@ protected SettingHolder initCustom (ViewGroup parent) {
editText.getEditText().setLineDisabled(true);
editText.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
- FrameLayout.LayoutParams editTextParams = new FrameLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+ FrameLayout.LayoutParams editTextParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
editTextParams.leftMargin = Screen.dp(16f);
editTextParams.rightMargin = Screen.dp(57f);
editTextParams.bottomMargin = Screen.dp(8f);
@@ -681,8 +906,33 @@ protected void setCustom (ListItem item, SettingHolder holder, int position) {
@Override
protected void setValuedSetting (ListItem item, SettingView view, boolean isUpdate) {
+ view.setDrawModifier(item.getDrawModifier());
+
+ if (item.getId() == R.id.btn_createInviteLink) {
+ view.setName(hasInviteLinks() ? R.string.CreateANewLink : R.string.CreateAnInviteLink);
+ PremiumLockModifier modifier = (PremiumLockModifier) ObjectsCompat.requireNonNull(item.getDrawModifier());
+ boolean showLockIcon = !canCreateInviteLink() && !tdlib.hasPremium() && chatTypeCount() == 0;
+ modifier.setVisible(showLockIcon);
+ view.setTooltipLocationProvider(showLockIcon ? modifier : null);
+ } else if (item.getId() == R.id.btn_inviteLink) {
+ TdApi.ChatFolderInviteLink inviteLink = (TdApi.ChatFolderInviteLink) item.getData();
+ view.setData(Lang.plural(R.string.xChats, inviteLink.chatIds.length));
+ } else if (item.getId() == R.id.btn_visible) {
+ boolean isEnabled = tdlib.settings().isChatFolderEnabled(chatFolderId);
+ view.getToggler().setRadioEnabled(isEnabled, isUpdate);
+ }
+
+ if (item.getId() == R.id.btn_createInviteLink) {
+ view.setIgnoreEnabled(true);
+ view.setVisuallyEnabled(canCreateInviteLink(), isUpdate);
+ } else {
+ view.setIgnoreEnabled(false);
+ }
+
if (item.getId() == R.id.btn_folderIncludeChats || item.getId() == R.id.btn_folderExcludeChats) {
view.setIconColorId(ColorId.inlineIcon);
+ } else if (item.getId() == R.id.btn_createInviteLink) {
+ view.setIconColorId(canCreateInviteLink() ? ColorId.inlineIcon : ColorId.textLight);
} else if (item.getId() == R.id.btn_removeFolder) {
view.setIconColorId(ColorId.iconNegative);
} else {
@@ -703,8 +953,16 @@ public boolean areItemsTheSame (ListItem oldItem, ListItem newItem) {
if (oldItem.getId() == R.id.chat) {
return oldItem.getLongId() == newItem.getLongId();
}
- if (oldItem.getViewType() == ListItem.TYPE_SEPARATOR)
- return oldItem.getIntValue() == newItem.getIntValue() && oldItem.getLongValue() == newItem.getLongValue();
+ if (oldItem.getId() == R.id.btn_inviteLink) {
+ TdApi.ChatFolderInviteLink oldData = (TdApi.ChatFolderInviteLink) oldItem.getData();
+ TdApi.ChatFolderInviteLink newData = (TdApi.ChatFolderInviteLink) newItem.getData();
+ return ObjectsCompat.equals(oldData.inviteLink, newData.inviteLink);
+ }
+ if (oldItem.getViewType() == ListItem.TYPE_SEPARATOR) {
+ return oldItem.getIntValue() == newItem.getIntValue() &&
+ oldItem.getLongValue() == newItem.getLongValue() &&
+ ObjectsCompat.equals(oldItem.getStringValue(), newItem.getStringValue());
+ }
return true;
}
@@ -717,24 +975,257 @@ public boolean areContentsTheSame (ListItem oldItem, ListItem newItem) {
private class RemoveHelperCallback implements RemoveHelper.Callback {
@Override
public boolean canRemove (RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int position) {
+ Object tag = viewHolder.itemView.getTag();
+ if (tag instanceof ListItem) {
+ ListItem item = (ListItem) tag;
+ if (item.getId() == R.id.btn_inviteLink) {
+ return true;
+ }
+ }
return viewHolder.getItemViewType() == ListItem.TYPE_CHAT_BETTER;
}
@Override
public void onRemove (RecyclerView.ViewHolder viewHolder) {
ListItem item = (ListItem) viewHolder.itemView.getTag();
- int position = viewHolder.getAbsoluteAdapterPosition();
- showRemoveConditionConfirm(position, item);
+ if (item.getViewType() == ListItem.TYPE_CHAT_BETTER) {
+ int position = viewHolder.getAbsoluteAdapterPosition();
+ showRemoveConditionConfirm(position, item);
+ } else if (item.getId() == R.id.btn_inviteLink) {
+ TdApi.ChatFolderInviteLink data = (TdApi.ChatFolderInviteLink) item.getData();
+ showDeleteInviteLinkConfirm(data.inviteLink);
+ }
}
}
private void showIconSelector () {
- ChatFolderIconSelector.show(this, icon -> {
- if (!Td.equalsTo(editedChatFolder.icon, icon)) {
- editedChatFolder.icon = icon;
- adapter.updateSimpleItemById(input.getId());
- updateMenuButton();
+ ChatFolderIconSelector.show(this, TD.getIconName(editedChatFolder), selectedIcon -> {
+ if (!Td.equalsTo(editedChatFolder.icon, selectedIcon)) {
+ editedChatFolder.icon = selectedIcon;
+ updateFolderIcon();
+ updateDoneButton();
+ }
+ });
+ }
+
+ @AnyThread
+ private void updateInviteLinks () {
+ if (chatFolderId == NO_CHAT_FOLDER_ID) {
+ return;
+ }
+ tdlib.send(new TdApi.GetChatFolderInviteLinks(chatFolderId), (result, error) -> {
+ TdApi.ChatFolderInviteLink[] inviteLinks = result != null ? result.inviteLinks : new TdApi.ChatFolderInviteLink[0];
+ runOnUiThreadOptional(() -> {
+ boolean isFirstLoad = this.inviteLinks == null;
+ updateInviteLinks(inviteLinks);
+ if (isFirstLoad && originChatFolder != null) {
+ executeScheduledAnimation();
+ }
+ });
+ });
+ }
+
+ private void updateInviteLinks (TdApi.ChatFolderInviteLink[] inviteLinks) {
+ this.inviteLinks = inviteLinks;
+ int previousItemIndex = adapter.indexOfViewById(inviteLinksPreviousItemId);
+ if (previousItemIndex == -1) {
+ return;
+ }
+ int nextItemIndex = adapter.indexOfViewById(inviteLinksNextItemId);
+ int firstItemIndex = previousItemIndex + 1;
+ TEMP_ITEM_LIST.clear();
+ fillInviteLinks(inviteLinks, TEMP_ITEM_LIST);
+ if (firstItemIndex < nextItemIndex) {
+ List oldList = adapter.getItems().subList(firstItemIndex, nextItemIndex);
+ DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DiffUtilCallback(oldList, TEMP_ITEM_LIST));
+ oldList.clear();
+ oldList.addAll(TEMP_ITEM_LIST);
+ diffResult.dispatchUpdatesTo(new AdapterSubListUpdateCallback(adapter, firstItemIndex));
+ } else if (TEMP_ITEM_LIST.size() > 0) {
+ adapter.addItems(firstItemIndex, TEMP_ITEM_LIST.toArray(new ListItem[0]));
+ }
+ TEMP_ITEM_LIST.clear();
+ adapter.updateValuedSettingById(R.id.btn_createInviteLink);
+ }
+
+ /**
+ * @noinspection SameParameterValue
+ */
+ private void fillInviteLinks (TdApi.ChatFolderInviteLink[] inviteLinks, List outList) {
+ for (TdApi.ChatFolderInviteLink inviteLink : inviteLinks) {
+ outList.add(new ListItem(ListItem.TYPE_SEPARATOR).setStringValue(inviteLink.inviteLink));
+ outList.add(inviteLink(inviteLink));
+ }
+ }
+
+ private ListItem inviteLink (TdApi.ChatFolderInviteLink inviteLink) {
+ String name = getName(inviteLink);
+ return new ListItem(ListItem.TYPE_VALUED_SETTING_COMPACT, R.id.btn_inviteLink, R.drawable.baseline_link_24, name).setData(inviteLink);
+ }
+
+ private void onCreateInviteLinkClick (View view) {
+ if (chatTypeCount() > 0) {
+ UI.forceVibrateError(view);
+ showTooltip(view, R.string.ChatFolderInviteLinkChatTypesNotSupported);
+ return;
+ }
+ if (!isShareable() && !tdlib.canAddShareableFolder()) {
+ showShareableFoldersLimitReached(view);
+ return;
+ }
+ if (inviteLinkCount() >= tdlib.chatFolderInviteLinkCountMax()) {
+ showInviteLinksLimitReached(view);
+ return;
+ }
+ if (hasUnsavedChanges()) {
+ showConfirm(Lang.getString(R.string.ChatFolderSaveChangesBeforeCreatingANewInviteLink), Lang.getString(R.string.LocalizationEditConfirmSave), () -> {
+ saveChanges(this::createInviteLink);
+ });
+ } else {
+ createInviteLink();
+ }
+ }
+
+ private void showShareableFoldersLimitReached (View view) {
+ UI.forceVibrateError(view);
+ if (tdlib.hasPremium()) {
+ showTooltip(view, R.string.ShareableFoldersLimitReached, tdlib.addedShareableChatFolderCountMax());
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, view, TdlibUi.PremiumLimit.SHAREABLE_FOLDER_COUNT);
+ }
+ }
+
+ private void showInviteLinksLimitReached (View view) {
+ UI.forceVibrateError(view);
+ if (tdlib.hasPremium()) {
+ showTooltip(view, R.string.ChatFolderInviteLinksLimitReached, tdlib.chatFolderInviteLinkCountMax());
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, view, TdlibUi.PremiumLimit.CHAT_FOLDER_INVITE_LINK_COUNT);
+ }
+ }
+
+ private void showTooltip (View view, @StringRes int markdownStringRes, Object... formatArgs) {
+ context.tooltipManager().builder(view).controller(this).show(tdlib, Lang.getMarkdownString(this, markdownStringRes, formatArgs)).hideDelayed();
+ }
+
+ private void showInviteLinkOptions (TdApi.ChatFolderInviteLink inviteLink) {
+ Options.Builder builder = new Options.Builder();
+ builder.info(getName(inviteLink));
+ builder.item(new OptionItem(R.id.btn_copyLink, Lang.getString(R.string.InviteLinkCopy), OptionColor.NORMAL, R.drawable.baseline_content_copy_24));
+ builder.item(new OptionItem(R.id.btn_shareLink, Lang.getString(R.string.ShareLink), OptionColor.NORMAL, R.drawable.baseline_share_arrow_24));
+ builder.item(new OptionItem(R.id.btn_deleteLink, Lang.getString(R.string.InviteLinkDelete), OptionColor.RED, R.drawable.baseline_delete_24));
+ showOptions(builder.build(), (view, id) -> {
+ if (id == R.id.btn_copyLink) {
+ copyInviteLink(inviteLink);
+ } else if (id == R.id.btn_shareLink) {
+ shareInviteLink(inviteLink);
+ } else if (id == R.id.btn_deleteLink) {
+ showDeleteInviteLinkConfirm(inviteLink.inviteLink);
}
+ return true;
});
}
+
+ private void copyInviteLink (TdApi.ChatFolderInviteLink inviteLink) {
+ UI.copyText(inviteLink.inviteLink, R.string.CopiedLink);
+ }
+
+ private void shareInviteLink (TdApi.ChatFolderInviteLink inviteLink) {
+ tdlib.ui().shareUrl(this, inviteLink.inviteLink);
+ }
+
+ private void showDeleteInviteLinkConfirm (String inviteLink) {
+ showConfirm(Lang.getString(R.string.AreYouSureDeleteInviteLink), Lang.getString(R.string.InviteLinkDelete), R.drawable.baseline_delete_24, OptionColor.RED, () -> {
+ deleteInviteLink(inviteLink);
+ });
+ }
+
+ private void createInviteLink () {
+ tdlib.send(new TdApi.GetChatsForChatFolderInviteLink(chatFolderId), (result, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else if (result.totalCount == 0) {
+ EditChatFolderInviteLinkController controller = new EditChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(new EditChatFolderInviteLinkController.Arguments(chatFolderId, editedChatFolder));
+ navigateTo(controller);
+ } else {
+ createInviteLink(result.chatIds);
+ }
+ }));
+ }
+
+ private void createInviteLink (long[] shareableChatIds) {
+ tdlib.createChatFolderInviteLink(chatFolderId, /* name */ "", shareableChatIds, (inviteLink, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ View targetView = getRecyclerView().findViewById(R.id.btn_createInviteLink);
+ if (TD.ERROR_CHATLISTS_TOO_MUCH.equals(error.message) && targetView != null) {
+ showShareableFoldersLimitReached(targetView);
+ } else {
+ UI.showError(error);
+ }
+ } else {
+ EditChatFolderInviteLinkController controller = new EditChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(new EditChatFolderInviteLinkController.Arguments(chatFolderId, editedChatFolder, shareableChatIds, inviteLink));
+ navigateTo(controller);
+ }
+ }));
+ }
+
+ private void deleteInviteLink (String inviteLink) {
+ tdlib.deleteChatFolderInviteLink(chatFolderId, inviteLink, tdlib.typedOkHandler());
+ }
+
+ private String getName (TdApi.ChatFolderInviteLink inviteLink) {
+ if (StringUtils.isEmptyOrInvisible(inviteLink.name)) {
+ return StringUtils.urlWithoutProtocol(inviteLink.inviteLink);
+ }
+ return inviteLink.name;
+ }
+
+ private int inviteLinkCount () {
+ return inviteLinks != null ? inviteLinks.length : 0;
+ }
+
+ private int chatTypeCount () {
+ return TD.countIncludedChatTypes(editedChatFolder) + TD.countExcludedChatTypes(editedChatFolder);
+ }
+
+ private boolean hasInviteLinks () {
+ return inviteLinkCount() > 0;
+ }
+
+ private boolean canCreateInviteLink () {
+ int chatTypeCount = chatTypeCount();
+ if (chatTypeCount > 0) {
+ return false;
+ }
+ int inviteLinkCount = inviteLinkCount();
+ if (inviteLinkCount >= tdlib.chatFolderInviteLinkCountMax()) {
+ return false;
+ }
+ return isShareable() || tdlib.canAddShareableFolder();
+ }
+
+ private boolean isShareable () {
+ return editedChatFolder.isShareable || hasInviteLinks();
+ }
+
+ private void checkFolderDeleted () {
+ if (chatFolderId == NO_CHAT_FOLDER_ID) return;
+ boolean isFolderDeleted = tdlib.chatFolderInfo(chatFolderId) == null;
+ if (isFolderDeleted) {
+ closeSelf();
+ }
+ }
+
+ private class ItemDecoration extends RecyclerView.ItemDecoration {
+ @Override
+ public void getItemOffsets (@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+ outRect.setEmpty();
+ RecyclerView.ViewHolder viewHolder = parent.getChildViewHolder(view);
+ if (viewHolder.getItemViewType() == ListItem.TYPE_ZERO_VIEW && isDoneVisible()) {
+ outRect.bottom = Screen.dp(76);
+ }
+ }
+ }
}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderInviteLinkController.java b/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderInviteLinkController.java
new file mode 100644
index 0000000000..a14224fb1a
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/ui/EditChatFolderInviteLinkController.java
@@ -0,0 +1,555 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.ui;
+
+import android.content.Context;
+import android.text.InputType;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.util.ObjectsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.drinkless.tdlib.TdApi;
+import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.U;
+import org.thunderdog.challegram.charts.LayoutHelper;
+import org.thunderdog.challegram.component.base.SettingView;
+import org.thunderdog.challegram.core.Lang;
+import org.thunderdog.challegram.data.DoubleTextWrapper;
+import org.thunderdog.challegram.data.TD;
+import org.thunderdog.challegram.navigation.NavigationController;
+import org.thunderdog.challegram.navigation.ViewController;
+import org.thunderdog.challegram.telegram.Tdlib;
+import org.thunderdog.challegram.theme.ColorId;
+import org.thunderdog.challegram.theme.Theme;
+import org.thunderdog.challegram.tool.Screen;
+import org.thunderdog.challegram.tool.UI;
+import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.widget.CheckBoxView;
+import org.thunderdog.challegram.widget.MaterialEditText;
+import org.thunderdog.challegram.widget.MaterialEditTextGroup;
+import org.thunderdog.challegram.widget.SmallChatView;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import me.vkryl.android.widget.FrameLayoutFix;
+import me.vkryl.core.ArrayUtils;
+import me.vkryl.core.StringUtils;
+import me.vkryl.core.collection.LongSet;
+
+public class EditChatFolderInviteLinkController extends EditBaseController implements View.OnClickListener, View.OnLongClickListener, SettingsAdapter.TextChangeListener {
+
+ public static class Arguments {
+ private final int chatFolderId;
+ private final long[] chatIds;
+ private final long[] shareableChatIds;
+ private final String chatFolderName;
+ private final @Nullable TdApi.ChatFolderInviteLink inviteLink;
+
+ public Arguments (int chatFolderId, TdApi.ChatFolder chatFolder) {
+ this(chatFolderId, chatFolder, ArrayUtils.EMPTY_LONGS, /* inviteLink */ null);
+ }
+
+ public Arguments (int chatFolderId, TdApi.ChatFolder chatFolder, TdApi.ChatFolderInviteLink inviteLink) {
+ this(chatFolderId, chatFolder, inviteLink.chatIds, inviteLink);
+ }
+
+ public Arguments (int chatFolderId, TdApi.ChatFolder chatFolder, long[] shareableChatIds, @Nullable TdApi.ChatFolderInviteLink inviteLink) {
+ this.chatFolderId = chatFolderId;
+ this.chatFolderName = chatFolder.title;
+ this.chatIds = U.concat(chatFolder.pinnedChatIds, chatFolder.includedChatIds);
+ this.shareableChatIds = shareableChatIds;
+ this.inviteLink = inviteLink;
+ }
+ }
+
+ private final ChatIdSet selectedChatIds = new ChatIdSet();
+ private final ChatIdSet includedChatIds = new ChatIdSet();
+ private final ChatIdSet shareableChatIds = new ChatIdSet();
+ private final Adapter adapter = new Adapter(this);
+
+ private int chatFolderId;
+ private String chatFolderName;
+ private long[] chatIds;
+ private TdApi.ChatFolderInviteLink inviteLink;
+ private String inviteLinkName;
+
+ private final int headerId = ViewCompat.generateViewId();
+
+ public EditChatFolderInviteLinkController (Context context, Tdlib tdlib) {
+ super(context, tdlib);
+ }
+
+ @Override
+ public int getId () {
+ return R.id.controller_editChatFolderInviteLink;
+ }
+
+ @Override
+ public CharSequence getName () {
+ return Lang.getString(R.string.ShareFolder);
+ }
+
+ @Override
+ protected int getRecyclerBackgroundColorId () {
+ return ColorId.background;
+ }
+
+ @Override
+ public void setArguments (Arguments args) {
+ super.setArguments(args);
+ this.chatFolderId = args.chatFolderId;
+ this.chatFolderName = args.chatFolderName;
+ if (args.shareableChatIds.length > 0) {
+ this.chatIds = U.concat(args.shareableChatIds, ArrayUtils.removeAll(args.chatIds, args.shareableChatIds));
+ } else {
+ this.chatIds = args.chatIds;
+ }
+ updateInviteLink(args.inviteLink);
+ }
+
+ @Override
+ protected void onCreateView (Context context, FrameLayoutFix contentView, RecyclerView recyclerView) {
+ ArrayList items = new ArrayList<>();
+
+ if (isNoChatsToShare()) {
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION_CENTERED, 0, 0, R.string.ChatFolderInviteLinkNoChatsToShare));
+ } else {
+ items.add(new ListItem(ListItem.TYPE_EDITTEXT_CHANNEL_DESCRIPTION, R.id.btn_inviteLinkName, R.drawable.baseline_info_24, R.string.InviteLinkAdminName));
+ //noinspection ConstantValue
+ if (inviteLink != null) {
+ String link = StringUtils.urlWithoutProtocol(inviteLink.inviteLink);
+ items.add(new ListItem(ListItem.TYPE_VALUED_SETTING, R.id.btn_inviteLink, R.drawable.baseline_link_24, link));
+ }
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, R.id.edit_description));
+ }
+
+ // chats
+ if (chatIds != null && chatIds.length > 0) {
+ if (isNoChatsToShare()) {
+ items.add(new ListItem(ListItem.TYPE_HEADER_PADDED, 0, 0, R.string.ChatFolderInviteLinkNoChatsToShareHeader));
+ } else {
+ items.add(new ListItem(ListItem.TYPE_HEADER_WITH_CHECKBOX, headerId));
+ }
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ boolean addSeparator = false;
+ for (long chatId : chatIds) {
+ if (addSeparator) {
+ items.add(new ListItem(ListItem.TYPE_SEPARATOR));
+ } else {
+ addSeparator = true;
+ }
+ items.add(chatItem(chatId));
+ }
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+
+ // info
+ if (isNoChatsToShare()) {
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.ChatFolderInviteLinkNoChatsToShareInfo));
+ } else {
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, 0, 0, R.string.ChatFolderInviteLinkSelectGroupsAndChannelsInfo).setTextPaddingRight(Screen.dp(56f)));
+ }
+ }
+
+ adapter.setLockFocusOn(this, false);
+ adapter.setTextChangeListener(this);
+ adapter.setItems(items, false);
+ recyclerView.setLayoutManager(new LinearLayoutManager(context));
+ recyclerView.setAdapter(adapter);
+ updateDoneButton();
+
+ if (!isNoChatsToShare()) {
+ updateShareableChats();
+ }
+ }
+
+ @Override
+ public void onClick (View v) {
+ if (v.getId() == R.id.chat) {
+ ListItem item = (ListItem) v.getTag();
+ long chatId = item.getLongId();
+ if (shareableChatIds.has(chatId)) {
+ boolean isChecked = selectedChatIds.add(chatId) || !selectedChatIds.remove(chatId);
+ DoubleTextWrapper chat = (DoubleTextWrapper) item.getData();
+ chat.setIsChecked(isChecked, /* animated */ true);
+ updateItemsWithCounter();
+ updateDoneButton();
+ } else {
+ context.tooltipManager()
+ .builder(v)
+ .controller(this)
+ .locate((targetView, outRect) -> outRect.set(Screen.dp(48f), Screen.dp(5f), Screen.dp(58f), targetView.getHeight() - Screen.dp(5f)))
+ .show(tdlib, R.string.ThisChatCantBeShared)
+ .hideDelayed();
+ }
+ } else if (v.getId() == R.id.btn_inviteLink) {
+ showInviteLinkOptions();
+ } else if (v.getId() == headerId) {
+ if (selectedChatIds.size() < shareableChatIds.size()) {
+ selectedChatIds.addAll(shareableChatIds);
+ } else {
+ selectedChatIds.clear();
+ }
+ onSelectedChatsChanged();
+ }
+ }
+
+ @Override
+ public boolean onLongClick (View v) {
+ if (v.getId() == R.id.btn_inviteLink) {
+ copyInviteLink();
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ protected boolean onDoneClick () {
+ if (isInProgress()) {
+ return true;
+ }
+ if (hasUnsavedChanges()) {
+ saveChanges();
+ } else {
+ showInviteLinkOptions();
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onBackPressed (boolean fromTop) {
+ if (hasUnsavedChanges()) {
+ showUnsavedChangesPromptBeforeLeaving(/* onConfirm */ null);
+ return true;
+ }
+ return super.onBackPressed(fromTop);
+ }
+
+ @Override
+ public boolean canSlideBackFrom (NavigationController navigationController, float x, float y) {
+ return !hasUnsavedChanges();
+ }
+
+ private void updateInviteLink (@Nullable TdApi.ChatFolderInviteLink inviteLink) {
+ this.inviteLink = inviteLink;
+ if (inviteLinkName == null && inviteLink != null) {
+ inviteLinkName = inviteLink.name;
+ }
+ selectedChatIds.clear();
+ includedChatIds.clear();
+ if (inviteLink != null) {
+ selectedChatIds.addAll(inviteLink.chatIds);
+ includedChatIds.addAll(inviteLink.chatIds);
+ }
+ onSelectedChatsChanged();
+ }
+
+ private void updateShareableChats () {
+ tdlib.send(new TdApi.GetChatsForChatFolderInviteLink(chatFolderId), (result, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ updateShareableChats(result);
+ }
+ }));
+ }
+
+ private void updateShareableChats (TdApi.Chats chats) {
+ shareableChatIds.clear();
+ shareableChatIds.addAll(chats.chatIds);
+
+ Arguments arguments = getArgumentsStrict();
+ if (arguments.inviteLink != null) {
+ shareableChatIds.addAll(arguments.inviteLink.chatIds); // TODO(nikita-toropov) ???
+ }
+
+ updateItemsWithCounter();
+ updateChatItems();
+ }
+
+ private void onSelectedChatsChanged () {
+ if (getWrapUnchecked() == null) {
+ return;
+ }
+ updateItemsWithCounter();
+ updateChatItems();
+ updateDoneButton();
+ }
+
+ private void updateItemsWithCounter () {
+ adapter.updateValuedSettingById(R.id.edit_description);
+ adapter.updateValuedSettingById(headerId);
+ }
+
+ private void updateChatItems () {
+ adapter.updateAllValuedSettingsById(R.id.chat);
+ }
+
+ private boolean hasSelectedChats () {
+ return !selectedChatIds.isEmpty();
+ }
+
+ private boolean hasUnsavedChanges () {
+ if (inviteLink == null) {
+ return false;
+ }
+ return !ObjectsCompat.equals(inviteLink.name, inviteLinkName) || !includedChatIds.equals(selectedChatIds);
+ }
+
+ private void saveChanges () {
+ if (!hasUnsavedChanges()) return;
+ TdApi.ChatFolderInviteLink inviteLink = ObjectsCompat.requireNonNull(this.inviteLink);
+ long[] chatIds = selectedChatIds.toArray();
+ setInProgress(true);
+ tdlib.editChatFolderInviteLink(chatFolderId, inviteLink.inviteLink, inviteLinkName, chatIds, (result, error) -> runOnUiThreadOptional(() -> {
+ setInProgress(false);
+ CharSequence message;
+ if (error != null) {
+ message = TD.toErrorString(error);
+ updateDoneButton();
+ } else {
+ message = Lang.getString(R.string.Saved);
+ updateInviteLink(result);
+ }
+ context.tooltipManager()
+ .builder(getDoneButton())
+ .controller(this)
+ .show(tdlib, message)
+ .hideDelayed();
+ }));
+ }
+
+ private void showInviteLinkOptions () {
+ Options.Builder builder = new Options.Builder();
+ builder.item(new OptionItem(R.id.btn_copyLink, Lang.getString(R.string.InviteLinkCopy), OptionColor.NORMAL, R.drawable.baseline_content_copy_24));
+ builder.item(new OptionItem(R.id.btn_shareLink, Lang.getString(R.string.ShareLink), OptionColor.NORMAL, R.drawable.baseline_share_arrow_24));
+ builder.item(new OptionItem(R.id.btn_deleteLink, Lang.getString(R.string.InviteLinkDelete), OptionColor.RED, R.drawable.baseline_delete_24));
+ showOptions(builder.build(), (view, id) -> {
+ if (id == R.id.btn_copyLink) {
+ copyInviteLink();
+ } else if (id == R.id.btn_shareLink) {
+ shareInviteLink();
+ } else if (id == R.id.btn_deleteLink) {
+ showDeleteInviteLinkConfirm();
+ }
+ return true;
+ });
+ }
+
+ private void copyInviteLink () {
+ UI.copyText(inviteLink.inviteLink, R.string.CopiedLink);
+ }
+
+ private void shareInviteLink () {
+ tdlib.ui().shareUrl(this, inviteLink.inviteLink);
+ }
+
+ private void showDeleteInviteLinkConfirm () {
+ showConfirm(Lang.getString(R.string.AreYouSureDeleteInviteLink), Lang.getString(R.string.InviteLinkDelete), R.drawable.baseline_delete_24, OptionColor.RED, this::deleteInviteLink);
+ }
+
+ private void deleteInviteLink () {
+ tdlib.deleteChatFolderInviteLink(chatFolderId, inviteLink.inviteLink, (result, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ navigateBack();
+ }
+ }));
+ }
+
+ private ListItem chatItem (long chatId) {
+ TdApi.Chat chat = tdlib.chatStrict(chatId);
+ boolean isPublic = tdlib.chatPublic(chatId);
+ CharSequence subtitle;
+ if (tdlib.isChannel(chatId)) {
+ subtitle = Lang.getString(isPublic ? R.string.ChannelPublic : R.string.ChannelPrivate);
+ } else if (tdlib.isMultiChat(chat)) {
+ subtitle = Lang.getString(isPublic ? R.string.GroupPublic : R.string.GroupPrivate);
+ } else if (tdlib.isBotChat(chat)) {
+ subtitle = Lang.getString(R.string.Bot);
+ } else if (tdlib.isUserChat(chat)) {
+ subtitle = Lang.getString(R.string.PrivateChat);
+ } else {
+ subtitle = "";
+ }
+ DoubleTextWrapper data = new DoubleTextWrapper(tdlib, chat);
+ data.setAdminSignVisible(false, false);
+ data.setForcedSubtitle(subtitle);
+ return new ListItem(ListItem.TYPE_CHAT_SMALL, R.id.chat).setLongId(chatId).setData(data);
+ }
+
+ private @DrawableRes int doneIconRes = ResourcesCompat.ID_NULL;
+
+ private void updateDoneButton () {
+ if (inviteLink == null) {
+ return;
+ }
+ int iconRes = hasUnsavedChanges() ? R.drawable.baseline_check_24 : R.drawable.baseline_share_arrow_24;
+ if (doneIconRes != iconRes) {
+ doneIconRes = iconRes;
+ setDoneIcon(iconRes);
+ }
+ boolean isVisible = isInProgress() || hasSelectedChats();
+ if (isFocused()) {
+ setDoneVisible(isVisible);
+ } else {
+ setInstantDoneVisible(isVisible);
+ }
+ }
+
+ private class Adapter extends SettingsAdapter {
+ public Adapter (ViewController context) {
+ super(context);
+ }
+
+ @NonNull
+ @Override
+ public SettingHolder onCreateViewHolder (@NonNull ViewGroup parent, int viewType) {
+ SettingHolder holder = super.onCreateViewHolder(parent, viewType);
+ if (viewType == ListItem.TYPE_EDITTEXT_CHANNEL_DESCRIPTION) {
+ int verticalPadding = Screen.dp(13f);
+ FrameLayoutFix frameLayout = (FrameLayoutFix) holder.itemView;
+ frameLayout.setPadding(frameLayout.getPaddingLeft(), verticalPadding, frameLayout.getPaddingRight(), verticalPadding);
+ MaterialEditTextGroup editTextGroup = (MaterialEditTextGroup) frameLayout.getChildAt(0);
+ MaterialEditText editText = editTextGroup.getEditText();
+ editText.setLineDisabled(false);
+ editText.setPadding(0, editText.getPaddingTop(), 0, editText.getPaddingBottom());
+
+ int startMargin = Screen.dp(58f);
+ if (Lang.rtl()) {
+ Views.setRightMargin(editTextGroup, startMargin);
+ } else {
+ Views.setLeftMargin(editTextGroup, startMargin);
+ }
+ ImageView iconView = new ImageView(frameLayout.getContext());
+ iconView.setColorFilter(Theme.iconColor());
+ addThemeFilterListener(iconView, ColorId.icon);
+ iconView.setId(android.R.id.icon);
+ iconView.setPadding(Screen.dp(2f), 0, Screen.dp(2f), 0);
+ frameLayout.addView(iconView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Lang.gravity(Gravity.CENTER_VERTICAL)));
+ }
+ return holder;
+ }
+
+ @Override
+ protected void modifyEditText (ListItem item, ViewGroup parent, MaterialEditTextGroup editText) {
+ if (item.getId() == R.id.btn_inviteLinkName) {
+ editText.setEmptyHint(R.string.ChatFolderInviteLinkNameHint);
+ editText.setText(inviteLinkName);
+ editText.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+
+ ImageView iconView = parent.findViewById(android.R.id.icon);
+ iconView.setImageResource(item.getIconResource());
+ }
+ }
+
+ @Override
+ protected void modifyDescription (ListItem item, TextView textView) {
+ if (item.getId() == R.id.edit_description) {
+ int selectedChatCount = selectedChatIds.size();
+ if (selectedChatCount > 0) {
+ textView.setText(Lang.pluralBold(R.string.ChatFolderInviteLinkInfo, selectedChatCount, chatFolderName));
+ } else {
+ textView.setText(Lang.getStringBold(R.string.ChatFolderInviteLinkInfoNoCounter, chatFolderName));
+ }
+ }
+ }
+
+ @Override
+ protected void setValuedSetting (ListItem item, SettingView view, boolean isUpdate) {
+ if (item.getId() == R.id.btn_inviteLink) {
+ view.setCenterIcon(true);
+ view.setData(Lang.getString(R.string.FolderLink));
+ } else {
+ view.setCenterIcon(false);
+ }
+ }
+
+ @Override
+ protected void setHeaderText (ListItem item, TextView view, boolean isUpdate) {
+ if (item.getId() == headerId) {
+ if (chatIds != null && chatIds.length > 0) {
+ Views.setMediumText(view, Lang.getString(R.string.xOfYChatsSelected, selectedChatIds.size(), chatIds.length));
+ } else {
+ view.setText(null);
+ }
+ } else {
+ super.setHeaderText(item, view, isUpdate);
+ }
+ }
+
+ @Override
+ protected void setHeaderCheckBoxState (ListItem item, CheckBoxView checkBox, boolean isUpdate) {
+ if (item.getId() == headerId) {
+ checkBox.setChecked(!selectedChatIds.isEmpty(), isUpdate);
+ checkBox.setDisabled(shareableChatIds.isEmpty(), isUpdate);
+ checkBox.setPartially(selectedChatIds.size() < shareableChatIds.size(), isUpdate);
+ } else {
+ super.setHeaderCheckBoxState(item, checkBox, isUpdate);
+ }
+ }
+
+ @Override
+ protected void modifyChatView (ListItem item, SmallChatView chatView, @Nullable CheckBoxView checkBox, boolean isUpdate) {
+ if (item.getId() == R.id.chat) {
+ long chatId = item.getLongId();
+ DoubleTextWrapper chat = (DoubleTextWrapper) item.getData();
+ chat.setDrawCrossIcon(!shareableChatIds.has(chatId));
+ chat.setIsChecked(selectedChatIds.has(chatId), isUpdate);
+ }
+ }
+ }
+
+ @Override
+ public void onTextChanged (int id, ListItem item, MaterialEditTextGroup v, String text) {
+ if (id == R.id.btn_inviteLinkName) {
+ inviteLinkName = v.getText().toString();
+ updateDoneButton();
+ }
+ }
+
+ private boolean isNoChatsToShare () {
+ return inviteLink == null;
+ }
+
+ private static class ChatIdSet extends LongSet {
+ @Override
+ public boolean equals (@Nullable Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof ChatIdSet) {
+ return set.equals(((ChatIdSet) obj).set);
+ }
+ if (obj instanceof Set) {
+ return set.equals(obj);
+ }
+ return false;
+ }
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/FeatureToggles.java b/app/src/main/java/org/thunderdog/challegram/ui/FeatureToggles.java
index db136635fc..2c573ad30d 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/FeatureToggles.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/FeatureToggles.java
@@ -1,7 +1,5 @@
package org.thunderdog.challegram.ui;
-import static androidx.core.text.HtmlCompat.fromHtml;
-
import android.content.Context;
import android.view.View;
@@ -67,8 +65,8 @@ protected void setValuedSetting (ListItem item, SettingView view, boolean isUpda
header("Threads > First Open"),
shadowTop(),
toggle("Scroll to header message", () -> SCROLL_TO_HEADER_MESSAGE_ON_THREAD_FIRST_OPEN, (value) -> SCROLL_TO_HEADER_MESSAGE_ON_THREAD_FIRST_OPEN = value),
- descriptionSmall(fromHtml("On - Trying to show header message fully unless it takes more than half of the RecyclerView's height in which messages display, in which case it should scroll to the maximum position that fits that half", HtmlCompat.FROM_HTML_MODE_COMPACT)),
- descriptionSmall(fromHtml("Off - Showing with displayed header message preview showing and \"Discussion started\" aligned right below it", HtmlCompat.FROM_HTML_MODE_COMPACT)),
+ descriptionSmall(HtmlCompat.fromHtml("On - Trying to show header message fully unless it takes more than half of the RecyclerView's height in which messages display, in which case it should scroll to the maximum position that fits that half", HtmlCompat.FROM_HTML_MODE_COMPACT)),
+ descriptionSmall(HtmlCompat.fromHtml("Off - Showing with displayed header message preview showing and \"Discussion started\" aligned right below it", HtmlCompat.FROM_HTML_MODE_COMPACT)),
shadowBottom(),
header("Threads > Preview"),
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ListItem.java b/app/src/main/java/org/thunderdog/challegram/ui/ListItem.java
index afa2dfdf44..cb0baea3da 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/ListItem.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ListItem.java
@@ -162,6 +162,9 @@ public class ListItem {
public static final int TYPE_GIFT_HEADER = 142;
+ public static final int TYPE_HEADER_WITH_TEXT_BUTTON = 143;
+ public static final int TYPE_HEADER_WITH_CHECKBOX = 144;
+
private static final int FLAG_SELECTED = 1;
private static final int FLAG_BOOL_VALUE = 1 << 1;
private static final int FLAG_USE_SELECTION_INDEX = 1 << 2;
@@ -184,7 +187,7 @@ public class ListItem {
private String stringKey, stringValue;
private @PorterDuffColorId int textColorId;
private TdlibAccentColor accentColor;
- private int textPaddingLeft;
+ private int textPaddingLeft, textPaddingRight;
private int intValue;
private long longValue;
@@ -333,6 +336,11 @@ public ListItem setTextPaddingLeft (int paddingLeft) {
return this;
}
+ public ListItem setTextPaddingRight (int textPaddingRight) {
+ this.textPaddingRight = textPaddingRight;
+ return this;
+ }
+
public ListItem setData (Object data) {
this.data = data;
return this;
@@ -365,6 +373,10 @@ public int getTextPaddingLeft () {
return textPaddingLeft;
}
+ public int getTextPaddingRight () {
+ return textPaddingRight;
+ }
+
public ListItem setStringValue (String value) {
this.stringValue = value;
return this;
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/MainController.java b/app/src/main/java/org/thunderdog/challegram/ui/MainController.java
index 2adb7d3b60..1f5d3f2d96 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/MainController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/MainController.java
@@ -21,12 +21,16 @@
import android.content.pm.PackageManager;
import android.graphics.BitmapFactory;
import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.Build;
import android.os.Parcelable;
import android.os.SystemClock;
import android.provider.ContactsContract;
+import android.text.Spannable;
+import android.text.SpannableString;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.MotionEvent;
@@ -36,12 +40,16 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.AnyThread;
import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.annotation.StringRes;
+import androidx.collection.SparseArrayCompat;
+import androidx.core.util.ObjectsCompat;
+import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import org.drinkless.tdlib.TdApi;
@@ -67,6 +75,7 @@
import org.thunderdog.challegram.navigation.RecyclerViewProvider;
import org.thunderdog.challegram.navigation.SettingsWrap;
import org.thunderdog.challegram.navigation.SettingsWrapBuilder;
+import org.thunderdog.challegram.navigation.TooltipOverlayView;
import org.thunderdog.challegram.navigation.ViewController;
import org.thunderdog.challegram.navigation.ViewPagerController;
import org.thunderdog.challegram.navigation.ViewPagerHeaderViewCompact;
@@ -84,10 +93,13 @@
import org.thunderdog.challegram.telegram.TdlibManager;
import org.thunderdog.challegram.telegram.TdlibOptionListener;
import org.thunderdog.challegram.telegram.TdlibSettingsManager;
+import org.thunderdog.challegram.telegram.TdlibUi;
import org.thunderdog.challegram.theme.ColorId;
import org.thunderdog.challegram.theme.PropertyId;
import org.thunderdog.challegram.theme.Theme;
+import org.thunderdog.challegram.tool.Drawables;
import org.thunderdog.challegram.tool.Fonts;
+import org.thunderdog.challegram.tool.Paints;
import org.thunderdog.challegram.tool.Screen;
import org.thunderdog.challegram.tool.Strings;
import org.thunderdog.challegram.tool.TGMimeType;
@@ -99,6 +111,7 @@
import org.thunderdog.challegram.util.AppUpdater;
import org.thunderdog.challegram.util.StringList;
import org.thunderdog.challegram.util.text.Counter;
+import org.thunderdog.challegram.util.text.IconSpan;
import org.thunderdog.challegram.util.text.TextColorSet;
import org.thunderdog.challegram.widget.BubbleLayout;
import org.thunderdog.challegram.widget.NoScrollTextView;
@@ -422,7 +435,7 @@ private int applySection (int section, long pagerItemId, ChatsController chatsCo
if (filter == FILTER_NONE && !menuNeedArchive) {
item = getDefaultMainItem();
} else {
- String sectionName = getMenuSectionName(pagerItemId, pagerItemPosition, /* hasFolders */ false, ChatFolderStyle.LABEL_ONLY).toUpperCase();
+ CharSequence sectionName = getMenuSectionName(pagerItemId, pagerItemPosition, /* hasFolders */ false, ChatFolderStyle.LABEL_ONLY, /* upperCase */ true);
item = new ViewPagerTopView.Item(sectionName);
}
getDefaultSectionItems().set(0, item);
@@ -854,7 +867,9 @@ public void onPageSelected (int position, int actualPosition) {
composeWrap.show();
}
if (hasFolders()) {
- composeWrap.replaceMainButton(R.id.btn_float_compose, R.drawable.baseline_create_24);
+ if (composeWrap.getMainButtonId() != R.id.btn_float_compose) {
+ composeWrap.replaceMainButton(R.id.btn_float_compose, R.drawable.baseline_create_24);
+ }
return;
}
switch (position) {
@@ -1275,19 +1290,7 @@ private long getPagerItemId (TdApi.ChatList chatList) {
public boolean onPagerItemLongClick (int index) {
if (hasFolders()) {
TdApi.ChatList chatList = pagerChatLists.get(index);
- String title;
- if (TD.isChatListMain(chatList)) {
- title = Lang.getString(R.string.CategoryMain);
- } else if (TD.isChatListArchive(chatList)) {
- title = Lang.getString(R.string.CategoryArchive);
- } else if (TD.isChatListFolder(chatList)) {
- int chatFolderId = ((TdApi.ChatListFolder) chatList).chatFolderId;
- TdApi.ChatFolderInfo chatFolderInfo = tdlib.chatFolderInfo(chatFolderId);
- title = chatFolderInfo != null ? chatFolderInfo.title : null;
- } else {
- title = null;
- }
- showChatListOptions(title, chatList);
+ showChatListOptions(chatList);
return true;
}
return false;
@@ -1327,28 +1330,46 @@ private ChatsController newChatsController (TdApi.ChatList chatList, @Filter int
return chats;
}
- private String getMenuSectionName (long pagerItemId, int pagerItemPosition, boolean hasFolders, @ChatFolderStyle int chatFolderStyle) {
- return Lang.getString(getMenuSectionNameRes(pagerItemId, pagerItemPosition, hasFolders, chatFolderStyle));
- }
-
- private int getMenuSectionNameRes (long pagerItemId, int pagerItemPosition, boolean hasFolders, @ChatFolderStyle int chatFolderStyle) {
+ private CharSequence getMenuSectionName (long pagerItemId, int pagerItemPosition, boolean hasFolders, @ChatFolderStyle int chatFolderStyle, boolean upperCase) {
int selectedFilter = getSelectedFilter(pagerItemId);
boolean isMain = pagerItemId == MAIN_PAGER_ITEM_ID;
boolean isArchive = pagerItemId == ARCHIVE_PAGER_ITEM_ID;
if (!isMain && !isArchive) {
throw new UnsupportedOperationException();
}
+ if (hasFolders && Config.CHAT_FOLDERS_REDESIGN && selectedFilter != FILTER_NONE) {
+ String source;
+ if (chatFolderStyle == ChatFolderStyle.ICON_ONLY) {
+ source = "∇";
+ } else {
+ int sourceRes = isMain ? getMainSectionNameRes(FILTER_NONE, /* hasFolders */ true) : getArchiveSectionNameRes(FILTER_NONE, chatFolderStyle);
+ source = (upperCase ? Lang.getString(sourceRes).toUpperCase() : Lang.getString(sourceRes)) + " ∇";
+ }
+ SpannableString string = new SpannableString(source);
+ // TODO(nikita-toropov) icon color
+ string.setSpan(new IconSpan(R.drawable.baseline_filter_variant, ColorId.iconActive), string.length() - 1, string.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return string;
+ }
+ String sectionName;
//noinspection ConstantConditions
if (isArchive || (isMain && menuNeedArchive && (!hasFolders || pagerItemPosition > 0))) {
- return getArchiveSectionName(selectedFilter, chatFolderStyle);
+ sectionName = Lang.getString(getArchiveSectionNameRes(selectedFilter, chatFolderStyle));
+ } else {
+ sectionName = Lang.getString(getMainSectionNameRes(selectedFilter, hasFolders));
}
+ return upperCase ? sectionName.toUpperCase() : sectionName;
+ }
+
+ @StringRes
+ private int getMainSectionNameRes (int selectedFilter, boolean hasFolders) {
if (selectedFilter != FILTER_NONE) {
return getFilterName(selectedFilter);
}
return hasFolders ? R.string.CategoryMain : R.string.Chats;
}
- private int getArchiveSectionName (int selectedFilter, @ChatFolderStyle int chatFolderStyle) {
+ @StringRes
+ private int getArchiveSectionNameRes (int selectedFilter, @ChatFolderStyle int chatFolderStyle) {
if (chatFolderStyle == ChatFolderStyle.LABEL_ONLY) {
switch (selectedFilter) {
case FILTER_UNREAD:
@@ -1371,19 +1392,31 @@ private int getArchiveSectionName (int selectedFilter, @ChatFolderStyle int chat
return selectedFilter == FILTER_NONE ? R.string.CategoryArchive : getFilterName(selectedFilter);
}
- private String getMenuSectionName (long pagerItemId, String folderName, int chatFolderStyle) {
+ private CharSequence getFolderSectionName (long pagerItemId, String folderName, @ChatFolderStyle int chatFolderStyle) {
int selectedFilter = getSelectedFilter(pagerItemId);
+ CharSequence sectionName;
if (selectedFilter != FILTER_NONE) {
- String filterName = Lang.getString(getFilterName(selectedFilter));
- if (chatFolderStyle == ChatFolderStyle.LABEL_ONLY) {
- return Lang.getString(R.string.format_folderAndFilter, folderName, filterName);
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ String source = chatFolderStyle == ChatFolderStyle.ICON_ONLY ? "∇" : folderName + " ∇";
+ SpannableString string = new SpannableString(source);
+ // TODO(nikita-toropov) icon color
+ string.setSpan(new IconSpan(R.drawable.baseline_filter_variant, ColorId.iconActive), string.length() - 1, string.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ sectionName = string;
+ } else {
+ String filterName = Lang.getString(getFilterName(selectedFilter));
+ if (chatFolderStyle == ChatFolderStyle.LABEL_ONLY) {
+ sectionName = Lang.getString(R.string.format_folderAndFilter, folderName, filterName);
+ } else {
+ sectionName = filterName;
+ }
}
- return filterName;
+ } else {
+ sectionName = folderName;
}
- return folderName;
+ return Emoji.instance().replaceEmoji(sectionName);
}
- private @StringRes int getFilterName (int filter) {
+ private @StringRes int getFilterName (@Filter int filter) {
switch (filter) {
case FILTER_UNREAD:
return R.string.CategoryUnread;
@@ -1461,12 +1494,12 @@ private boolean hasFolders () {
}
@Override
- protected String[] getPagerSections () {
+ protected CharSequence[] getPagerSections () {
if (hasFolders()) {
throw new UnsupportedOperationException();
}
- return new String[] {
- getMenuSectionName(MAIN_PAGER_ITEM_ID, /* pagerItemPosition */ 0, /* hasFolders */ false, ChatFolderStyle.LABEL_ONLY).toUpperCase(),
+ return new CharSequence[] {
+ getMenuSectionName(MAIN_PAGER_ITEM_ID, /* pagerItemPosition */ 0, /* hasFolders */ false, ChatFolderStyle.LABEL_ONLY, /* upperCase */ true),
Lang.getString(R.string.Calls).toUpperCase()/*, UI.getString(R.string.Contacts).toUpperCase()*/
};
}
@@ -1477,7 +1510,7 @@ protected String[] getPagerSections () {
private ViewPagerTopView.Item getDefaultMainItem () {
if (defaultMainItem == null) {
- String mainItem = getMenuSectionName(MAIN_PAGER_ITEM_ID, 0, false, ChatFolderStyle.LABEL_ONLY).toUpperCase();
+ CharSequence mainItem = getMenuSectionName(MAIN_PAGER_ITEM_ID, 0, false, ChatFolderStyle.LABEL_ONLY, /* upperCase */ true);
UnreadCounterColorSet unreadCounterColorSet = new UnreadCounterColorSet();
Counter unreadCounter = new Counter.Builder()
.textSize(12f)
@@ -2037,22 +2070,43 @@ private void checkSyncAlert () {
// Chat folders
- private void showChatListOptions (@Nullable CharSequence title, TdApi.ChatList chatList) {
+ private void showChatListOptions (TdApi.ChatList chatList) {
boolean isMain = TD.isChatListMain(chatList);
boolean isFolder = TD.isChatListFolder(chatList);
boolean isArchive = TD.isChatListArchive(chatList);
int chatFolderId = isFolder ? ((TdApi.ChatListFolder) chatList).chatFolderId : 0;
+ TdApi.ChatFolderInfo chatFolderInfo;
+ String title;
+ if (isMain) {
+ title = Lang.getString(R.string.CategoryMain);
+ chatFolderInfo = null;
+ } else if (isArchive) {
+ title = Lang.getString(R.string.CategoryArchive);
+ chatFolderInfo = null;
+ } else if (isFolder) {
+ chatFolderInfo = tdlib.chatFolderInfo(chatFolderId);
+ title = chatFolderInfo != null ? chatFolderInfo.title : null;
+ } else {
+ title = null;
+ chatFolderInfo = null;
+ }
Options.Builder options = new Options.Builder();
if (!StringUtils.isEmptyOrBlank(title)) {
options.info(title);
}
+ if (tdlib.hasUnreadChats(chatList)) {
+ options.item(new OptionItem(R.id.btn_markFolderAsRead, Lang.getString(R.string.MarkFolderAsRead), OptionColor.NORMAL, R.drawable.baseline_done_all_24));
+ }
if (isFolder) {
options.item(new OptionItem(R.id.btn_editFolder, Lang.getString(R.string.EditFolder), OptionColor.NORMAL, R.drawable.baseline_edit_24));
int chatFolderStyle = tdlib.settings().chatFolderStyle();
- if (chatFolderStyle == ChatFolderStyle.ICON_ONLY || chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON) {
+ if (chatFolderStyle == ChatFolderStyle.ICON_ONLY || chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON || chatFolderStyle == ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE) {
options.item(new OptionItem(R.id.btn_changeFolderIcon, Lang.getString(R.string.ChatFolderChangeIcon), OptionColor.NORMAL, R.drawable.baseline_image_24));
}
options.item(new OptionItem(R.id.btn_folderIncludeChats, Lang.getString(R.string.ChatFolderAddChats), OptionColor.NORMAL, R.drawable.baseline_add_24));
+ if (chatFolderInfo != null) {
+ options.item(new OptionItem(R.id.btn_shareFolder, Lang.getString(R.string.ShareFolder), OptionColor.NORMAL, R.drawable.baseline_share_arrow_24));
+ }
}
if (isMain) {
if (!Config.RESTRICT_HIDING_MAIN_LIST) {
@@ -2095,20 +2149,21 @@ private void showChatListOptions (@Nullable CharSequence title, TdApi.ChatList c
if (error != null) {
UI.showError(error);
} else {
+ boolean showChatTypes = !chatFolder.isShareable;
SelectChatsController controller = new SelectChatsController(context, tdlib);
- controller.setArguments(SelectChatsController.Arguments.includedChats(chatFolderId, chatFolder));
+ controller.setArguments(SelectChatsController.Arguments.includedChats(chatFolderId, chatFolder, showChatTypes));
navigateTo(controller);
}
}));
} else if (id == R.id.btn_changeFolderIcon) {
- ChatFolderIconSelector.show(this, icon -> {
+ ChatFolderIconSelector.show(this, TD.getIconName(chatFolderInfo), selectedIcon -> {
tdlib.send(new TdApi.GetChatFolder(chatFolderId), (chatFolder, getError) -> {
if (getError != null) {
UI.showError(getError);
} else {
- if (!Td.equalsTo(chatFolder.icon, icon)) {
- chatFolder.icon = icon;
- tdlib.send(new TdApi.EditChatFolder(chatFolderId, chatFolder), (chatFolderInfo, editError) -> {
+ if (!Td.equalsTo(chatFolder.icon, selectedIcon)) {
+ chatFolder.icon = selectedIcon;
+ tdlib.send(new TdApi.EditChatFolder(chatFolderId, chatFolder), (info, editError) -> {
if (editError != null) {
UI.showError(editError);
}
@@ -2117,17 +2172,218 @@ private void showChatListOptions (@Nullable CharSequence title, TdApi.ChatList c
}
});
});
+ } else if (id == R.id.btn_shareFolder) {
+ TdApi.ChatFolderInfo info = ObjectsCompat.requireNonNull(chatFolderInfo);
+ if (info.hasMyInviteLinks) {
+ tdlib.send(new TdApi.GetChatFolderInviteLinks(chatFolderId), (result, error) -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ runOnUiThreadOptional(() -> showChatFolderInviteLinks(chatFolderId, title, result.inviteLinks));
+ }
+ });
+ } else {
+ return onCreateChatFolderInviteLinkClick(v, chatFolderId, info.isShareable, /* chatFolderInviteLinkCount */ 0L);
+ }
} else if (id == R.id.btn_removeFolder) {
- showConfirm(Lang.getString(R.string.RemoveFolderConfirm), Lang.getString(R.string.Remove), R.drawable.baseline_delete_24, OptionColor.RED, () -> {
- tdlib.send(new TdApi.DeleteChatFolder(chatFolderId, null), tdlib.typedOkHandler());
- });
+ TdApi.ChatFolderInfo info = ObjectsCompat.requireNonNull(chatFolderInfo);
+ if (info.isShareable) {
+ tdlib.send(new TdApi.GetChatFolderChatsToLeave(chatFolderId), (result, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else if (result.totalCount > 0) {
+ ChatFolderInviteLinkController controller = new ChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(ChatFolderInviteLinkController.Arguments.deleteFolder(info, result.chatIds));
+ controller.show();
+ } else {
+ showDeleteChatFolderConfirm(chatFolderId, info.hasMyInviteLinks);
+ }
+ }));
+ } else {
+ showDeleteChatFolderConfirm(chatFolderId, info.hasMyInviteLinks);
+ }
} else if (id == R.id.btn_chatFolders) {
navigateTo(new SettingsFoldersController(context, tdlib));
+ } else if (id == R.id.btn_markFolderAsRead) {
+ tdlib.readAllChats(chatList, /* after */ null);
+ }
+ return true;
+ });
+ }
+
+ private void showDeleteChatFolderConfirm (int chatFolderId, boolean hasMyInviteLinks) {
+ tdlib.ui().showDeleteChatFolderConfirm(this, hasMyInviteLinks, () -> {
+ tdlib.send(new TdApi.DeleteChatFolder(chatFolderId, null), tdlib.typedOkHandler());
+ });
+ }
+
+ private void showChatFolderInviteLinks (int chatFolderId, @Nullable CharSequence title, TdApi.ChatFolderInviteLink[] inviteLinks) {
+ Options.Builder options = new Options.Builder();
+ if (!StringUtils.isEmptyOrBlank(title)) {
+ options.info(title);
+ }
+ long chatFolderInviteLinkCount = inviteLinks.length;
+ long chatFolderInviteLinkCountMax = tdlib.chatFolderInviteLinkCountMax();
+ boolean canCreateInviteLink = chatFolderInviteLinkCount < chatFolderInviteLinkCountMax;
+ int createNewLinkOptionColor = canCreateInviteLink ? OptionColor.BLUE : OptionColor.INACTIVE;
+ SparseArrayCompat inviteLinkById = new SparseArrayCompat<>(inviteLinks.length);
+ for (TdApi.ChatFolderInviteLink inviteLink : inviteLinks) {
+ int id = ViewCompat.generateViewId();
+ inviteLinkById.append(id, inviteLink);
+ String name = StringUtils.isEmptyOrInvisible(inviteLink.name) ? StringUtils.urlWithoutProtocol(inviteLink.inviteLink) : inviteLink.name;
+ options.item(new OptionItem(id, name, OptionColor.NORMAL, R.drawable.baseline_link_24));
+ }
+ options.item(new OptionItem(R.id.btn_createInviteLink, Lang.getString(R.string.CreateANewLink), createNewLinkOptionColor, R.drawable.baseline_add_link_24));
+ PopupLayout popupLayout = showOptions(options.build(), (view, id) -> {
+ if (id == R.id.btn_createInviteLink) {
+ return onCreateChatFolderInviteLinkClick(view, chatFolderId, true, chatFolderInviteLinkCount);
+ }
+ TdApi.ChatFolderInviteLink inviteLink = ObjectsCompat.requireNonNull(inviteLinkById.get(id));
+ showChatFolderInviteLinkOptions(chatFolderId, inviteLink);
+ return true;
+ });
+ if (!canCreateInviteLink) {
+ View button = popupLayout.getBoundView().findViewById(R.id.btn_createInviteLink);
+ if (button instanceof TextView) {
+ TextView textView = (TextView) button;
+ Views.setMediumText(textView, textView.getText());
+ Drawable[] drawables = textView.getCompoundDrawables();
+ Drawable lock = Drawables.get(R.drawable.baseline_lock_16);
+ lock.setColorFilter(Paints.getColorFilter(Theme.textAccentColor()));
+ addThemeFilterListener(lock, ColorId.text);
+ button.setTag(R.id.tag_tooltip_location_provider, (TooltipOverlayView.LocationProvider) (targetView, outRect) -> {
+ outRect.set(lock.getBounds());
+ int top = (targetView.getHeight() - outRect.height()) / 2;
+ int left = Lang.rtl() ? targetView.getPaddingLeft() : targetView.getWidth() - targetView.getPaddingRight() - outRect.width();
+ outRect.offsetTo(left, top);
+ outRect.inset(0, -Screen.dp(10f));
+ });
+ if (Lang.rtl()) {
+ textView.setCompoundDrawablesWithIntrinsicBounds(lock, null, drawables[2], null);
+ } else {
+ textView.setCompoundDrawablesWithIntrinsicBounds(drawables[0], null, lock, null);
+ }
+ }
+ }
+ }
+
+ private boolean onCreateChatFolderInviteLinkClick (View view, int chatFolderId, boolean isChatFolderShareable, long chatFolderInviteLinkCount) {
+ if (chatFolderInviteLinkCount == 0 && !isChatFolderShareable && !tdlib.canAddShareableFolder()) {
+ showShareableFoldersLimitReached(view);
+ return false;
+ }
+ if (chatFolderInviteLinkCount >= tdlib.chatFolderInviteLinkCountMax()) {
+ showChatFolderInviteLinksLimitReached(view);
+ return false;
+ }
+ createChatFolderInviteLink(chatFolderId);
+ return true;
+ }
+
+ private void showShareableFoldersLimitReached (View view) {
+ UI.forceVibrateError(view);
+ PopupLayout popupLayout = PopupLayout.parentOf(view);
+ if (tdlib.hasPremium()) {
+ CharSequence message = Lang.getMarkdownString(this, R.string.ShareableFoldersLimitReached, tdlib.addedShareableChatFolderCountMax());
+ popupLayout.tooltipManager().builder(view).show(tdlib, message).hideDelayed();
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, popupLayout.tooltipManager(), view, TdlibUi.PremiumLimit.SHAREABLE_FOLDER_COUNT);
+ }
+ }
+
+ private void showChatFolderInviteLinksLimitReached (View view) {
+ UI.forceVibrateError(view);
+ PopupLayout popupLayout = PopupLayout.parentOf(view);
+ if (tdlib.hasPremium()) {
+ CharSequence message = Lang.getMarkdownString(this, R.string.ChatFolderInviteLinksLimitReached, tdlib.chatFolderInviteLinkCountMax());
+ popupLayout.tooltipManager().builder(view).show(tdlib, message).hideDelayed();
+ } else {
+ tdlib.ui().showPremiumLimitInfo(this, popupLayout.tooltipManager(), view, TdlibUi.PremiumLimit.CHAT_FOLDER_INVITE_LINK_COUNT);
+ }
+ }
+
+ private void showChatFolderInviteLinkOptions (int chatFolderId, TdApi.ChatFolderInviteLink inviteLink) {
+ String title = StringUtils.isEmptyOrInvisible(inviteLink.name) ? StringUtils.urlWithoutProtocol(inviteLink.inviteLink) : inviteLink.name;
+ Options.Builder options = new Options.Builder();
+ options.info(title);
+ options.item(new OptionItem(R.id.btn_shareLink, Lang.getString(R.string.ShareLink), OptionColor.NORMAL, R.drawable.baseline_share_arrow_24));
+ options.item(new OptionItem(R.id.btn_copyLink, Lang.getString(R.string.InviteLinkCopy), OptionColor.NORMAL, R.drawable.baseline_content_copy_24));
+ options.item(new OptionItem(R.id.btn_edit, Lang.getString(R.string.InviteLinkEdit), OptionColor.NORMAL, R.drawable.baseline_edit_24));
+ showOptions(options.build(), (view, id) -> {
+ if (id == R.id.btn_shareLink) {
+ tdlib.ui().shareUrl(this, inviteLink.inviteLink);
+ } else if (id == R.id.btn_copyLink) {
+ UI.copyText(inviteLink.inviteLink, R.string.CopiedLink);
+ } else if (id == R.id.btn_edit) {
+ tdlib.send(new TdApi.GetChatFolder(chatFolderId), (chatFolder, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ EditChatFolderInviteLinkController controller = new EditChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(new EditChatFolderInviteLinkController.Arguments(chatFolderId, chatFolder, inviteLink));
+ navigateTo(controller);
+ }
+ }));
+ } else {
+ throw new UnsupportedOperationException();
}
return true;
});
}
+ @AnyThread
+ private void createChatFolderInviteLink (int chatFolderId) {
+ tdlib.send(new TdApi.GetChatFolder(chatFolderId), (chatFolder, error) -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ createChatFolderInviteLink(chatFolderId, chatFolder);
+ }
+ });
+ }
+
+ @AnyThread
+ private void createChatFolderInviteLink (int chatFolderId, TdApi.ChatFolder chatFolder) {
+ if (TD.countIncludedChatTypes(chatFolder) > 0 || TD.countExcludedChatTypes(chatFolder) > 0) {
+ runOnUiThreadOptional(() -> {
+ CharSequence message = Lang.getMarkdownString(this, R.string.ChatFolderInviteLinkChatTypesNotSupported);
+ if (showFolderTooltip(chatFolderId, message)) {
+ View topView = headerCell != null ? headerCell.getTopView() : null;
+ if (topView != null) {
+ UI.forceVibrateError(topView);
+ }
+ } else {
+ UI.showCustomToast(message, Toast.LENGTH_LONG, 0);
+ }
+ });
+ return;
+ }
+ tdlib.send(new TdApi.GetChatsForChatFolderInviteLink(chatFolderId), (chats, error) -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ createChatFolderInviteLink(chatFolderId, chatFolder, chats.chatIds);
+ }
+ });
+ }
+
+ @AnyThread
+ private void createChatFolderInviteLink (int chatFolderId, TdApi.ChatFolder chatFolder, long[] shareableChatIds) {
+ if (shareableChatIds.length == 0) {
+ UI.showCustomToast(R.string.ChatFolderInviteLinkNoChatsToShare, Toast.LENGTH_SHORT, 0);
+ return;
+ }
+ tdlib.createChatFolderInviteLink(chatFolderId, /* name */ "", shareableChatIds, (inviteLink, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ } else {
+ EditChatFolderInviteLinkController controller = new EditChatFolderInviteLinkController(context, tdlib);
+ controller.setArguments(new EditChatFolderInviteLinkController.Arguments(chatFolderId, chatFolder, shareableChatIds, inviteLink));
+ navigateTo(controller);
+ }
+ }));
+ }
+
private @Nullable ViewGroup bottomBar;
private @Px float bottomBarOffsetByPlayer;
private @Px float bottomBarOffsetByScroll;
@@ -2167,12 +2423,57 @@ protected boolean applyPlayerOffset (float factor, float top) {
return result;
}
+ private boolean showFolderTooltip (int chatFolderId, CharSequence message) {
+ return showFolderTooltip(new TdApi.ChatListFolder(chatFolderId), message);
+ }
+
+ private boolean showFolderTooltip (TdApi.ChatList chatList, CharSequence message) {
+ if (headerCell == null) {
+ return false;
+ }
+ int index = indexOfChatList(chatList);
+ if (index == -1) {
+ return false;
+ }
+ ViewPagerTopView topView = headerCell.getTopView();
+ Rect itemRect = new Rect();
+ if (topView == null || !topView.getItemRect(index, itemRect)) {
+ return false;
+ }
+ int topViewX = Math.round(topView.getX());
+ int topViewParentWidth = ((View) topView.getParent()).getWidth();
+ int horizontalInset = Screen.dp(16f);
+ itemRect.left = Math.max(itemRect.left, horizontalInset - topViewX);
+ itemRect.right = Math.min(itemRect.right, topViewParentWidth - topViewX - horizontalInset);
+ if (itemRect.isEmpty()) {
+ return false;
+ }
+ context()
+ .tooltipManager()
+ .builder(topView)
+ .locate((targetView, outRect) -> outRect.set(itemRect))
+ .controller(this)
+ .show(tdlib, message)
+ .hideDelayed(3500, TimeUnit.MILLISECONDS);
+ return true;
+ }
+
+ private int indexOfChatList (TdApi.ChatList chatList) {
+ for (int i = 0; i < pagerChatLists.size(); i++) {
+ if (Td.equalsTo(chatList, pagerChatLists.get(i))) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
private void checkTabs () {
if (headerCell == null)
return;
ViewPagerHeaderViewCompact headerCellView = (ViewPagerHeaderViewCompact) headerCell.getView();
boolean hasFolders = hasFolders();
boolean displayTabsAtBottom = displayTabsAtBottom();
+ headerCell.getTopView().setShowLabelOnActiveOnly(hasFolders && tdlib.settings().chatFolderStyle() == ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE);
headerCell.getTopView().setUseDarkBackground(displayTabsAtBottom);
headerCell.getTopView().setDrawSelectionAtTop(displayTabsAtBottom);
headerCell.getTopView().setSlideOffDirection(displayTabsAtBottom ? ViewPagerTopView.SLIDE_OFF_DIRECTION_TOP : ViewPagerTopView.SLIDE_OFF_DIRECTION_BOTTOM);
@@ -2356,19 +2657,19 @@ private void updatePagerSections (TdApi.ChatFolderInfo[] chatFolders, int mainCh
}
private ViewPagerTopView.Item buildMainSectionItem (int pagerItemPosition, @ChatFolderStyle int chatFolderStyle) {
- CharSequence sectionName = getMenuSectionName(MAIN_PAGER_ITEM_ID, pagerItemPosition, /* hasFolders */ true, chatFolderStyle);
+ CharSequence sectionName = getMenuSectionName(MAIN_PAGER_ITEM_ID, pagerItemPosition, /* hasFolders */ true, chatFolderStyle, /* upperCase */ false);
int iconResource = menuNeedArchive ? R.drawable.baseline_archive_24 : R.drawable.baseline_forum_24;
return buildSectionItem(MAIN_PAGER_ITEM_ID, pagerItemPosition, ChatPosition.CHAT_LIST_MAIN, sectionName, iconResource, chatFolderStyle);
}
private ViewPagerTopView.Item buildArchiveSectionItem (int pagerItemPosition, @ChatFolderStyle int chatFolderStyle) {
- CharSequence sectionName = getMenuSectionName(ARCHIVE_PAGER_ITEM_ID, pagerItemPosition, /* hasFolders */ true, chatFolderStyle);
+ CharSequence sectionName = getMenuSectionName(ARCHIVE_PAGER_ITEM_ID, pagerItemPosition, /* hasFolders */ true, chatFolderStyle, /* upperCase */ false);
int iconResource = R.drawable.baseline_archive_24;
return buildSectionItem(ARCHIVE_PAGER_ITEM_ID, pagerItemPosition, ChatPosition.CHAT_LIST_ARCHIVE, sectionName, iconResource, chatFolderStyle);
}
private ViewPagerTopView.Item buildSectionItem (long pagerItemId, int pagerItemPosition, TdApi.ChatList chatList, TdApi.ChatFolderInfo chatFolderInfo, @ChatFolderStyle int chatFolderStyle) {
- CharSequence sectionName = Emoji.instance().replaceEmoji(getMenuSectionName(pagerItemId, chatFolderInfo.title, chatFolderStyle));
+ CharSequence sectionName = getFolderSectionName(pagerItemId, chatFolderInfo.title, chatFolderStyle);
int iconResource = TD.findFolderIcon(chatFolderInfo.icon, R.drawable.baseline_folder_24);
return buildSectionItem(pagerItemId, pagerItemPosition, chatList, sectionName, iconResource, chatFolderStyle);
}
@@ -2387,8 +2688,8 @@ private ViewPagerTopView.Item buildSectionItem (long pagerItemId, int pagerItemP
} else {
item = new ViewPagerTopView.Item(iconResource, unreadCounter);
}
- } else if (chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON ||
- chatFolderStyle == ChatFolderStyle.ICON_ONLY && selectedFilter != FILTER_NONE) {
+ } else if (chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON || chatFolderStyle == ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE ||
+ (chatFolderStyle == ChatFolderStyle.ICON_ONLY && selectedFilter != FILTER_NONE)) {
item = new ViewPagerTopView.Item(sectionName, iconResource, unreadCounter);
} else if (chatFolderStyle == ChatFolderStyle.ICON_ONLY) {
item = new ViewPagerTopView.Item(iconResource, unreadCounter);
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java b/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java
index cefde2dbd8..1403729459 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/MessageOptionsPagerController.java
@@ -114,7 +114,7 @@ public MessageOptionsPagerController (Context context, Tdlib tdlib, Options opti
.drawable(R.drawable.baseline_favorite_16, 16f, 6f, Gravity.LEFT)
.build(), this, Screen.dp(16));
counters[ALL_REACTED_POSITION].counter.setCount(message.getMessageReactions().getTotalCount(), false);
- state.headerAlwaysVisibleCountersWidth += counters[ALL_REACTED_POSITION].calculateWidth(null, Screen.dp(ViewPagerTopView.DEFAULT_ITEM_SPACING));
+ state.headerAlwaysVisibleCountersWidth += counters[ALL_REACTED_POSITION].calculateWidth(null, Screen.dp(ViewPagerTopView.DEFAULT_ITEM_SPACING), /* labelFactor */ 1f);
} else {
ALL_REACTED_POSITION = -1;
}
@@ -126,7 +126,7 @@ public MessageOptionsPagerController (Context context, Tdlib tdlib, Options opti
.drawable(R.drawable.baseline_visibility_16, 16f, 6f, Gravity.LEFT)
.build(), this, Screen.dp(16));
counters[SEEN_POSITION].counter.setCount(1, false);
- int itemWidth = counters[SEEN_POSITION].calculateWidth(null, Screen.dp(ViewPagerTopView.DEFAULT_ITEM_SPACING)); // - Screen.dp(16);
+ int itemWidth = counters[SEEN_POSITION].calculateWidth(null, Screen.dp(ViewPagerTopView.DEFAULT_ITEM_SPACING), /* labelFactor */ 1f); // - Screen.dp(16);
state.headerAlwaysVisibleCountersWidth += itemWidth;
counters[SEEN_POSITION].setStaticWidth(itemWidth - Screen.dp(16));
counters[SEEN_POSITION].counter.setCount(Tdlib.CHAT_LOADING, false);
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SelectChatsController.java b/app/src/main/java/org/thunderdog/challegram/ui/SelectChatsController.java
index e0cd33fdd6..3206f1d712 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/SelectChatsController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/SelectChatsController.java
@@ -51,6 +51,7 @@
import org.thunderdog.challegram.loader.ComplexReceiver;
import org.thunderdog.challegram.loader.ImageFile;
import org.thunderdog.challegram.loader.ImageReceiver;
+import org.thunderdog.challegram.navigation.NavigationController;
import org.thunderdog.challegram.navigation.ViewController;
import org.thunderdog.challegram.telegram.ChatListListener;
import org.thunderdog.challegram.telegram.Tdlib;
@@ -111,30 +112,32 @@ public static class Arguments {
private final @Nullable Delegate delegate;
private final Set selectedChatIds;
private final Set selectedChatTypes;
+ private final boolean showChatTypes;
- private Arguments (@Mode int mode, @Nullable Delegate delegate, int chatFolderId, @Nullable TdApi.ChatFolder chatFolder, Set selectedChatIds, Set selectedChatTypes) {
+ private Arguments (@Mode int mode, @Nullable Delegate delegate, int chatFolderId, @Nullable TdApi.ChatFolder chatFolder, Set selectedChatIds, Set selectedChatTypes, boolean showChatTypes) {
this.mode = mode;
this.delegate = delegate;
this.chatFolder = chatFolder;
this.chatFolderId = chatFolderId;
this.selectedChatIds = selectedChatIds;
this.selectedChatTypes = selectedChatTypes;
+ this.showChatTypes = showChatTypes;
}
- public static Arguments includedChats (int chatFolderId, TdApi.ChatFolder chatFolder) {
- return includedChats(null, chatFolderId, chatFolder);
+ public static Arguments includedChats (int chatFolderId, TdApi.ChatFolder chatFolder, boolean showChatTypes) {
+ return includedChats(null, chatFolderId, chatFolder, showChatTypes);
}
- public static Arguments includedChats (@Nullable Delegate delegate, int chatFolderId, TdApi.ChatFolder chatFolder) {
+ public static Arguments includedChats (@Nullable Delegate delegate, int chatFolderId, TdApi.ChatFolder chatFolder, boolean showChatTypes) {
Set selectedChatIds = unmodifiableLinkedHashSetOf(chatFolder.pinnedChatIds, chatFolder.includedChatIds);
Set selectedChatTypes = U.unmodifiableTreeSetOf(TD.includedChatTypes(chatFolder));
- return new Arguments(MODE_FOLDER_INCLUDE_CHATS, delegate, chatFolderId, chatFolder, selectedChatIds, selectedChatTypes);
+ return new Arguments(MODE_FOLDER_INCLUDE_CHATS, delegate, chatFolderId, chatFolder, selectedChatIds, selectedChatTypes, showChatTypes);
}
- public static Arguments excludedChats (@Nullable Delegate delegate, int chatFolderId, TdApi.ChatFolder chatFolder) {
+ public static Arguments excludedChats (@Nullable Delegate delegate, int chatFolderId, TdApi.ChatFolder chatFolder, boolean showChatTypes) {
Set selectedChatIds = unmodifiableLinkedHashSetOf(chatFolder.excludedChatIds);
Set selectedChatTypes = U.unmodifiableTreeSetOf(TD.excludedChatTypes(chatFolder));
- return new Arguments(MODE_FOLDER_EXCLUDE_CHATS, delegate, chatFolderId, chatFolder, selectedChatIds, selectedChatTypes);
+ return new Arguments(MODE_FOLDER_EXCLUDE_CHATS, delegate, chatFolderId, chatFolder, selectedChatIds, selectedChatTypes, showChatTypes);
}
private static Set unmodifiableLinkedHashSetOf (long[]... arrays) {
@@ -163,6 +166,7 @@ private static Set unmodifiableLinkedHashSetOf (long[]... arrays) {
private Set selectedChatIds = Collections.emptySet();
private Set selectedChatTypes = Collections.emptySet();
+ private boolean showChatTypes;
private int secretChatCount;
private int nonSecretChatCount;
@@ -184,6 +188,7 @@ public void setArguments (Arguments args) {
delegate = args.delegate;
selectedChatIds = new LinkedHashSet<>(args.selectedChatIds);
selectedChatTypes = new TreeSet<>(args.selectedChatTypes);
+ showChatTypes = args.showChatTypes;
secretChatCount = 0;
nonSecretChatCount = 0;
@@ -244,19 +249,21 @@ protected void onCreateView (Context context, CustomRecyclerView recyclerView) {
items.add(new ListItem(ListItem.TYPE_DESCRIPTION, R.id.description, 0, description));
}
- items.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.ChatTypes));
- items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
- if (arguments.mode == MODE_FOLDER_INCLUDE_CHATS) {
- for (int chatType : TD.CHAT_TYPES_TO_INCLUDE) {
- items.add(chatTypeItem(chatType));
+ if (showChatTypes) {
+ items.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.ChatTypes));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ if (arguments.mode == MODE_FOLDER_INCLUDE_CHATS) {
+ for (int chatType : TD.CHAT_TYPES_TO_INCLUDE) {
+ items.add(chatTypeItem(chatType));
+ }
}
- }
- if (arguments.mode == MODE_FOLDER_EXCLUDE_CHATS) {
- for (int chatType : TD.CHAT_TYPES_TO_EXCLUDE) {
- items.add(chatTypeItem(chatType));
+ if (arguments.mode == MODE_FOLDER_EXCLUDE_CHATS) {
+ for (int chatType : TD.CHAT_TYPES_TO_EXCLUDE) {
+ items.add(chatTypeItem(chatType));
+ }
}
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
}
- items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
items.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.Chats));
items.add(new ListItem(ListItem.TYPE_SHADOW_TOP, chatsHeaderId));
@@ -341,6 +348,11 @@ public boolean onBackPressed (boolean fromTop) {
return super.onBackPressed(fromTop);
}
+ @Override
+ public boolean canSlideBackFrom (NavigationController navigationController, float x, float y) {
+ return !hasChanges();
+ }
+
private void updateDoneButton () {
setDoneVisible(hasChanges(), true);
}
@@ -791,7 +803,7 @@ private static int getIntrinsicWidth (int labelWidth, boolean hasIcon) {
}
@Override
- public void draw (Canvas canvas) {
+ public void draw (@NonNull Canvas canvas) {
Rect bounds = getBounds();
if (bounds.isEmpty() || alpha == 0) {
return;
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SetSenderControllerPage.java b/app/src/main/java/org/thunderdog/challegram/ui/SetSenderControllerPage.java
index 0bbbe3eb03..c1c15201a7 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/SetSenderControllerPage.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/SetSenderControllerPage.java
@@ -207,14 +207,14 @@ private DoubleTextWrapper parseObject (TdApi.Object object) {
DoubleTextWrapper d = new DoubleTextWrapper(tdlib, Td.getSenderUserId(sender.sender), true);
d.setChatMessageSender(sender);
d.setForcedSubtitle(Lang.getString(R.string.YourAccount));
- d.setDrawFakeCheckbox(Td.getSenderId(currentSender) == Td.getSenderId(sender.sender));
+ d.setIsChecked(Td.getSenderId(currentSender) == Td.getSenderId(sender.sender), /* animated */ false);
return d;
} else {
TdApi.Chat chat = tdlib.chat(Td.getSenderId(sender.sender));
if (chat != null) {
DoubleTextWrapper d = new DoubleTextWrapper(tdlib, chat);
d.setChatMessageSender(sender);
- d.setDrawFakeCheckbox(Td.getSenderId(currentSender) == Td.getSenderId(sender.sender));
+ d.setIsChecked(Td.getSenderId(currentSender) == Td.getSenderId(sender.sender), /* animated */ false);
if (Td.getSenderId(sender.sender) == this.chat.id) {
d.setForcedSubtitle(Lang.getString(R.string.AnonymousAdmin));
} else {
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SettingHolder.java b/app/src/main/java/org/thunderdog/challegram/ui/SettingHolder.java
index 215524056d..c15ec8302b 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/SettingHolder.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/SettingHolder.java
@@ -35,12 +35,14 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.thunderdog.challegram.FillingDrawable;
import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.charts.LayoutHelper;
import org.thunderdog.challegram.charts.data.ChartDataUtil;
import org.thunderdog.challegram.charts.view_data.ChartHeaderView;
import org.thunderdog.challegram.component.RelativeSessionLayout;
@@ -206,7 +208,9 @@ public static int measureHeightForType (int viewType) {
return Screen.dp(32f) + Screen.dp(4f);
}
case ListItem.TYPE_HEADER:
- case ListItem.TYPE_HEADER_WITH_ACTION: {
+ case ListItem.TYPE_HEADER_WITH_ACTION:
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON:
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX: {
return Screen.dp(32f);
}
case ListItem.TYPE_SESSION:
@@ -484,6 +488,8 @@ public static boolean isValuedType (int viewType) {
case ListItem.TYPE_CHECKBOX_OPTION_DOUBLE_LINE:
case ListItem.TYPE_CHECKBOX_OPTION_MULTILINE:
case ListItem.TYPE_REACTION_CHECKBOX:
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON:
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX:
case ListItem.TYPE_RADIO_OPTION:
case ListItem.TYPE_RADIO_OPTION_LEFT:
case ListItem.TYPE_RADIO_OPTION_WITH_AVATAR:
@@ -1277,6 +1283,8 @@ public void getItemOffsets (Rect outRect, View view, RecyclerView parent, Recycl
case ListItem.TYPE_HEADER:
case ListItem.TYPE_HEADER_MULTILINE:
case ListItem.TYPE_HEADER_WITH_ACTION:
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON:
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX:
case ListItem.TYPE_HEADER_PADDED: {
final boolean isRtl = Lang.rtl();
@@ -1292,29 +1300,69 @@ public void getItemOffsets (Rect outRect, View view, RecyclerView parent, Recycl
}
textView.setTypeface(Fonts.getRobotoMedium());
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15f);
- if (viewType != ListItem.TYPE_HEADER_WITH_ACTION) {
- textView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, viewType == ListItem.TYPE_HEADER_MULTILINE ? ViewGroup.LayoutParams.WRAP_CONTENT : Screen.dp(32f) + paddingTop));
- adapter.modifyHeaderTextView(textView, Screen.dp(32f), paddingTop);
- return new SettingHolder(textView);
+
+ if (viewType == ListItem.TYPE_HEADER_WITH_ACTION) {
+ FrameLayoutFix wrapView = new FrameLayoutFix(context);
+ textView.setLayoutParams(FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ wrapView.addView(textView);
+
+ ImageView imageView = new ImageView(context);
+ imageView.setLayoutParams(FrameLayoutFix.newParams(Screen.dp(52f), ViewGroup.LayoutParams.MATCH_PARENT, isRtl ? Gravity.LEFT : Gravity.RIGHT));
+ imageView.setScaleType(ImageView.ScaleType.CENTER);
+ imageView.setColorFilter(Theme.getColor(ColorId.background_textLight));
+ if (themeProvider != null) {
+ themeProvider.addThemeFilterListener(imageView, ColorId.background_textLight);
+ }
+ imageView.setOnClickListener(onClickListener);
+ wrapView.addView(imageView);
+ wrapView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(32f)));
+ return new SettingHolder(wrapView);
}
- FrameLayoutFix wrapView = new FrameLayoutFix(context);
- textView.setLayoutParams(FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- wrapView.addView(textView);
+ if (viewType == ListItem.TYPE_HEADER_WITH_TEXT_BUTTON) {
+ textView.setId(android.R.id.text1);
+ LinearLayout wrapView = new LinearLayout(context);
+ wrapView.addView(textView, LayoutHelper.createLinear(0, ViewGroup.LayoutParams.MATCH_PARENT, 1f));
- ImageView imageView = new ImageView(context);
- imageView.setLayoutParams(FrameLayoutFix.newParams(Screen.dp(52f), ViewGroup.LayoutParams.MATCH_PARENT, isRtl ? Gravity.LEFT : Gravity.RIGHT));
- imageView.setScaleType(ImageView.ScaleType.CENTER);
- imageView.setColorFilter(Theme.getColor(ColorId.background_textLight));
- if (themeProvider != null) {
- themeProvider.addThemeFilterListener(imageView, ColorId.background_textLight);
+ ScalableTextView textButton = new ScalableTextView(context) {
+ @Override
+ protected void onReplaceText (@NonNull CharSequence replacement) {
+ setText(replacement);
+ }
+ };
+ textButton.setPadding(Screen.dp(16f), 0, Screen.dp(16f), 0);
+ textButton.setGravity(Gravity.CENTER_VERTICAL);
+ textButton.setSingleLine(true);
+ textButton.setTextColor(Theme.textAccent2Color());
+ if (themeProvider != null) {
+ themeProvider.addThemeTextColorListener(textButton, ColorId.background_text);
+ }
+ textButton.setTypeface(Fonts.getRobotoRegular());
+ textButton.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15f);
+ textButton.setOnClickListener(onClickListener);
+ wrapView.addView(textButton, isRtl ? 0 : 1, LayoutHelper.createLinear(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ wrapView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(32f)));
+ return new SettingHolder(wrapView);
}
- imageView.setOnClickListener(onClickListener);
- wrapView.addView(imageView);
- wrapView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(32f)));
+ if (viewType == ListItem.TYPE_HEADER_WITH_CHECKBOX) {
+ textView.setId(android.R.id.text1);
+ FrameLayoutFix wrapView = new FrameLayoutFix(context);
+ wrapView.addView(textView, FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- return new SettingHolder(wrapView);
+ CheckBoxView checkBox = CheckBoxView.simpleCheckBox(context, isRtl);
+ checkBox.setOnClickListener(onClickListener);
+ if (themeProvider != null) {
+ themeProvider.addThemeInvalidateListener(checkBox);
+ }
+ wrapView.addView(checkBox);
+ wrapView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Screen.dp(32f)));
+ return new SettingHolder(wrapView);
+ }
+
+ textView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, viewType == ListItem.TYPE_HEADER_MULTILINE ? ViewGroup.LayoutParams.WRAP_CONTENT : Screen.dp(32f) + paddingTop));
+ adapter.modifyHeaderTextView(textView, Screen.dp(32f), paddingTop);
+ return new SettingHolder(textView);
}
case ListItem.TYPE_DESCRIPTION:
case ListItem.TYPE_DESCRIPTION_CENTERED:
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SettingsAdapter.java b/app/src/main/java/org/thunderdog/challegram/ui/SettingsAdapter.java
index 4464540aa5..918e3f6d1b 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/SettingsAdapter.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/SettingsAdapter.java
@@ -339,6 +339,10 @@ protected void setHeaderText (ListItem item, TextView view, boolean isUpdate) {
Views.setMediumText(view, item.getString());
}
+ protected void setHeaderCheckBoxState (ListItem item, CheckBoxView checkBox, boolean isUpdate) {
+ checkBox.setChecked(item.isSelected(), isUpdate);
+ }
+
protected void setPlace (ListItem item, int position, MediaLocationPlaceView view, boolean isUpdate) {
// Override
}
@@ -703,6 +707,26 @@ public void updateValuedSettingByPosition (int position) {
break;
}
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON: {
+ TextView textView = view.findViewById(android.R.id.text1);
+ setHeaderText(item, textView, /* isUpdate */ true);
+
+ int buttonIndex = (((ViewGroup) view).indexOfChild(textView) + 1) % 2;
+ ScalableTextView textButton = (ScalableTextView) ((ViewGroup) view).getChildAt(buttonIndex);
+ setButtonText(item, textButton, /* isUpdate */ true);
+ break;
+ }
+
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX: {
+ ok = true;
+ TextView textView = (TextView) ((ViewGroup) view).getChildAt(0);
+ setHeaderText(item, textView, /* isUpdate */ true);
+
+ CheckBoxView checkBox = (CheckBoxView) ((ViewGroup) view).getChildAt(1);
+ setHeaderCheckBoxState(item, checkBox, /* isUpdate */ true);
+ break;
+ }
+
case ListItem.TYPE_BUTTON: {
if (ok = view instanceof ViewGroup && ((ViewGroup) view).getChildAt(0) instanceof ScalableTextView) {
setButtonText(item, (ScalableTextView) ((ViewGroup) view).getChildAt(0), true);
@@ -1269,7 +1293,9 @@ protected boolean needsBackground (ListItem item) {
case ListItem.TYPE_SHADOW_BOTTOM:
case ListItem.TYPE_HEADER:
case ListItem.TYPE_HEADER_PADDED:
- case ListItem.TYPE_HEADER_WITH_ACTION: {
+ case ListItem.TYPE_HEADER_WITH_ACTION:
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON:
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX: {
return true;
}
}
@@ -1770,6 +1796,32 @@ public void updateView (SettingHolder holder, int position, int viewType) {
Views.setGravity((FrameLayout.LayoutParams) imageView.getLayoutParams(), Lang.rtl() ? Gravity.LEFT : Gravity.RIGHT);
break;
}
+ case ListItem.TYPE_HEADER_WITH_TEXT_BUTTON: {
+ TextView textView = holder.itemView.findViewById(android.R.id.text1);
+ textView.setTextColor(Theme.getColor(item.getTextColorId(ColorId.background_textLight)));
+ textView.setGravity(Lang.gravity(Gravity.CENTER_VERTICAL));
+ setHeaderText(item, textView, false);
+
+ int buttonIndex = (((ViewGroup) holder.itemView).indexOfChild(textView) + 1) % 2;
+ ScalableTextView textButton = (ScalableTextView) ((ViewGroup) holder.itemView).getChildAt(buttonIndex);
+ textButton.setId(item.getId());
+ textButton.setTag(item);
+ setButtonText(item, textButton, false);
+ break;
+ }
+ case ListItem.TYPE_HEADER_WITH_CHECKBOX: {
+ TextView textView = (TextView) ((ViewGroup) holder.itemView).getChildAt(0);
+ textView.setGravity(Lang.gravity(Gravity.CENTER_VERTICAL));
+ textView.setTextColor(Theme.getColor(item.getTextColorId(ColorId.background_textLight)));
+ setHeaderText(item, textView, false);
+
+ CheckBoxView checkBox = (CheckBoxView) ((ViewGroup) holder.itemView).getChildAt(1);
+ checkBox.setId(item.getId());
+
+ setHeaderCheckBoxState(item, checkBox, false);
+ Views.setGravity(checkBox, Lang.reverseGravity(Gravity.CENTER_VERTICAL));
+ break;
+ }
case ListItem.TYPE_COUNTRY: {
ViewGroup group = (ViewGroup) holder.itemView;
((TextView) group.getChildAt(0)).setText(item.getString());
@@ -1781,10 +1833,11 @@ public void updateView (SettingHolder holder, int position, int viewType) {
case ListItem.TYPE_DESCRIPTION_CENTERED: {
TextView textView = (TextView) holder.itemView;
textView.setTextColor(Theme.getColor(item.getTextColorId(viewType == ListItem.TYPE_DESCRIPTION_CENTERED ? ColorId.textLight : ColorId.background_textLight)));
- int padding = Screen.dp(16f) + item.getTextPaddingLeft();
+ int paddingLeft = Screen.dp(16f) + item.getTextPaddingLeft();
+ int paddingRight = Screen.dp(16f) + item.getTextPaddingRight();
textView.setText(item.getString());
- if (holder.itemView.getPaddingLeft() != padding) {
- holder.itemView.setPadding(padding, holder.itemView.getPaddingTop(), holder.itemView.getPaddingRight(), holder.itemView.getPaddingBottom());
+ if (holder.itemView.getPaddingLeft() != paddingLeft || holder.itemView.getPaddingRight() != paddingRight) {
+ holder.itemView.setPadding(paddingLeft, holder.itemView.getPaddingTop(), paddingRight, holder.itemView.getPaddingBottom());
}
if (viewType != ListItem.TYPE_DESCRIPTION_CENTERED) {
textView.setGravity(Lang.gravity(Gravity.CENTER_VERTICAL));
@@ -2221,6 +2274,13 @@ public void updateAllValuedSettings (@NonNull Filter filter) {
}
}
+ public void notifyLastItemChanged () {
+ int itemCount = getItemCount();
+ if (itemCount > 0) {
+ notifyItemChanged(itemCount - 1);
+ }
+ }
+
public void notifyItemsChanged (@NonNull Filter filter) {
notifyItemsChangedImpl(item -> filter.accept(item) ? wouldUpdateItem(item) : CellFilterImpl.REJECTED);
}
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/SettingsFoldersController.java b/app/src/main/java/org/thunderdog/challegram/ui/SettingsFoldersController.java
index cabb696b83..47cd9d7fb5 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/SettingsFoldersController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/SettingsFoldersController.java
@@ -33,19 +33,23 @@
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
import org.drinkless.tdlib.TdApi;
-import org.thunderdog.challegram.BuildConfig;
import org.thunderdog.challegram.R;
import org.thunderdog.challegram.component.base.SettingView;
import org.thunderdog.challegram.component.user.RemoveHelper;
import org.thunderdog.challegram.config.Config;
import org.thunderdog.challegram.core.Lang;
+import org.thunderdog.challegram.data.TD;
import org.thunderdog.challegram.emoji.Emoji;
import org.thunderdog.challegram.navigation.SettingsWrapBuilder;
+import org.thunderdog.challegram.navigation.TooltipOverlayView;
import org.thunderdog.challegram.telegram.ChatFolderStyle;
import org.thunderdog.challegram.telegram.ChatFoldersListener;
import org.thunderdog.challegram.telegram.Tdlib;
+import org.thunderdog.challegram.telegram.TdlibSettingsManager;
+import org.thunderdog.challegram.telegram.TdlibUi;
import org.thunderdog.challegram.theme.ColorId;
import org.thunderdog.challegram.theme.Theme;
import org.thunderdog.challegram.tool.Paints;
@@ -55,7 +59,9 @@
import org.thunderdog.challegram.unsorted.Settings;
import org.thunderdog.challegram.util.AdapterSubListUpdateCallback;
import org.thunderdog.challegram.util.DrawModifier;
+import org.thunderdog.challegram.util.EndIconModifier;
import org.thunderdog.challegram.util.ListItemDiffUtilCallback;
+import org.thunderdog.challegram.util.PremiumLockModifier;
import org.thunderdog.challegram.util.text.Text;
import org.thunderdog.challegram.v.CustomRecyclerView;
import org.thunderdog.challegram.widget.NonMaterialButton;
@@ -75,8 +81,9 @@
import me.vkryl.core.collection.IntList;
import me.vkryl.core.lambda.RunnableBool;
import me.vkryl.td.ChatPosition;
+import me.vkryl.td.Td;
-public class SettingsFoldersController extends RecyclerViewController implements View.OnClickListener, View.OnLongClickListener, ChatFoldersListener {
+public class SettingsFoldersController extends RecyclerViewController implements View.OnClickListener, View.OnLongClickListener, ChatFoldersListener, TdlibSettingsManager.ChatListPositionListener {
private static final long MAIN_CHAT_FOLDER_ID = Long.MIN_VALUE;
private static final long ARCHIVE_CHAT_FOLDER_ID = Long.MIN_VALUE + 1;
@@ -86,6 +93,10 @@ public class SettingsFoldersController extends RecyclerViewController impl
private final @IdRes int chatFoldersPreviousItemId = ViewCompat.generateViewId();
private final @IdRes int recommendedChatFoldersPreviousItemId = ViewCompat.generateViewId();
+ private final PremiumLockModifier premiumLockModifier = new PremiumLockModifier();
+ private final DrawModifier hasInviteLinksModifier = new EndIconModifier(R.drawable.baseline_link_24, ColorId.icon);
+ private final DrawModifier disabledFolderModifier = new EndIconModifier(R.drawable.baseline_eye_off_24, ColorId.icon);
+
private int chatFolderGroupItemCount, recommendedChatFolderGroupItemCount;
private boolean recommendedChatFoldersInitialized;
@@ -120,6 +131,10 @@ public CharSequence getName () {
@Override
protected void onCreateView (Context context, CustomRecyclerView recyclerView) {
+ RecyclerView.ItemAnimator itemAnimator = recyclerView.getItemAnimator();
+ if (itemAnimator instanceof SimpleItemAnimator) {
+ ((SimpleItemAnimator) itemAnimator).setSupportsChangeAnimations(false);
+ }
itemTouchHelper = RemoveHelper.attach(recyclerView, new ItemTouchHelperCallback());
TdApi.ChatFolderInfo[] chatFolders = tdlib.chatFolders();
@@ -134,10 +149,22 @@ protected void onCreateView (Context context, CustomRecyclerView recyclerView) {
items.add(new ListItem(ListItem.TYPE_VALUED_SETTING_COMPACT, R.id.btn_chatFolderStyle, 0, R.string.ChatFoldersAppearance));
items.add(new ListItem(ListItem.TYPE_SEPARATOR_FULL));
items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_appBadge, 0, R.string.BadgeCounter));
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ items.add(new ListItem(ListItem.TYPE_SEPARATOR_FULL));
+ items.add(new ListItem(ListItem.TYPE_RADIO_SETTING, R.id.btn_archiveAsFolder, 0, R.string.ArchiveAsFolder));
+ }
// items.add(new ListItem(ListItem.TYPE_RADIO_SETTING, R.id.btn_countMutedChats, 0, R.string.CountMutedChats));
- items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, chatFoldersPreviousItemId));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ items.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.ChatFolders));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_TOP, chatFoldersPreviousItemId));
items.addAll(chatFolderItemList);
+ int newFolderIconRes = Config.CHAT_FOLDERS_REDESIGN ? R.drawable.baseline_add_24 : R.drawable.baseline_create_new_folder_24;
+ items.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_createNewFolder, newFolderIconRes, R.string.CreateNewFolder).setTextColorId(ColorId.inlineText));
+ items.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ int infoRes = Config.CHAT_FOLDERS_REDESIGN ? R.string.ChatFoldersReorderTip : R.string.ChatFoldersInfo;
+ items.add(new ListItem(ListItem.TYPE_DESCRIPTION, recommendedChatFoldersPreviousItemId, 0, infoRes));
+
items.add(new ListItem(ListItem.TYPE_PADDING).setHeight(Screen.dp(12f)));
adapter = new SettingsAdapter(this) {
@@ -147,24 +174,27 @@ protected SettingHolder initCustom (ViewGroup parent, int customViewType) {
switch (customViewType) {
case TYPE_CHAT_FOLDER: {
SettingView settingView = new SettingView(parent.getContext(), tdlib);
- settingView.setType(SettingView.TYPE_SETTING);
- settingView.addToggler();
- settingView.forcePadding(0, Screen.dp(66f));
- settingView.setOnTouchListener(new ChatFolderOnTouchListener());
+ settingView.setType(SettingView.TYPE_INFO_SUPERCOMPACT);
+ settingView.setSwapDataAndName();
settingView.setOnClickListener(SettingsFoldersController.this);
settingView.setOnLongClickListener(SettingsFoldersController.this);
- settingView.getToggler().setOnClickListener(v -> {
- ListItem item = (ListItem) settingView.getTag();
- TdApi.ChatList chatList = getChatList(item);
- if (Config.RESTRICT_HIDING_MAIN_LIST && isMainChatFolder(item) && settingView.getToggler().isEnabled()) {
- return;
- }
- UI.forceVibrate(v, false);
- boolean enabled = settingView.getToggler().toggle(true);
- settingView.setVisuallyEnabled(enabled, true);
- settingView.setIconColorId(enabled ? ColorId.icon : ColorId.iconLight);
- tdlib.settings().setChatListEnabled(chatList, enabled);
- });
+ if (!Config.CHAT_FOLDERS_REDESIGN) {
+ settingView.addToggler();
+ settingView.forcePadding(0, Screen.dp(66f));
+ settingView.setOnTouchListener(new ChatFolderOnTouchListener());
+ settingView.getToggler().setOnClickListener(v -> {
+ ListItem item = (ListItem) settingView.getTag();
+ if (Config.RESTRICT_HIDING_MAIN_LIST && isMainChatFolder(item) && settingView.getToggler().isEnabled()) {
+ return;
+ }
+ UI.forceVibrate(v, false);
+ boolean enabled = settingView.getToggler().toggle(true);
+ settingView.setVisuallyEnabled(enabled, true);
+ settingView.setIconColorId(enabled ? ColorId.icon : ColorId.iconLight);
+ TdApi.ChatList chatList = getChatList(item);
+ tdlib.settings().setChatListEnabled(chatList, enabled);
+ });
+ }
addThemeInvalidateListener(settingView);
return new SettingHolder(settingView);
}
@@ -175,7 +205,7 @@ protected SettingHolder initCustom (ViewGroup parent, int customViewType) {
settingView.setOnClickListener(SettingsFoldersController.this);
addThemeInvalidateListener(settingView);
- FrameLayout.LayoutParams params = FrameLayoutFix.newParams(Screen.dp(29f), Screen.dp(28f), (Lang.rtl() ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL);
+ FrameLayout.LayoutParams params = FrameLayoutFix.newParams(Screen.dp(29f), Screen.dp(28f), Lang.reverseGravity(Gravity.CENTER_VERTICAL));
params.leftMargin = params.rightMargin = Screen.dp(17f);
NonMaterialButton button = new NonMaterialButton(parent.getContext()) {
@Override
@@ -200,28 +230,47 @@ protected void modifyCustom (SettingHolder holder, int position, ListItem item,
SettingView settingView = (SettingView) holder.itemView;
settingView.setIcon(item.getIconResource());
settingView.setName(item.getString());
+ settingView.setData(item.getStringValue());
settingView.setTextColorId(item.getTextColorId(ColorId.NONE));
settingView.setIgnoreEnabled(true);
settingView.setEnabled(true);
- settingView.setDrawModifier(item.getDrawModifier());
boolean isEnabled;
if (isMainChatFolder(item) || isArchiveChatFolder(item)) {
isEnabled = tdlib.settings().isChatListEnabled(getChatList(item));
- settingView.setClickable(false);
- settingView.setLongClickable(false);
+ settingView.setClickable(Config.CHAT_FOLDERS_REDESIGN);
+ settingView.setLongClickable(Config.CHAT_FOLDERS_REDESIGN);
+ DrawModifier drawModifier = item.getDrawModifier();
+ settingView.setDrawModifier(drawModifier);
+ if (drawModifier instanceof PremiumLockModifier) {
+ settingView.setTooltipLocationProvider((PremiumLockModifier) drawModifier);
+ } else {
+ settingView.setTooltipLocationProvider(null);
+ }
} else if (isChatFolder(item)) {
isEnabled = tdlib.settings().isChatFolderEnabled(item.getIntValue());
settingView.setClickable(true);
settingView.setLongClickable(true);
+ DrawModifier drawModifier;
+ TdApi.ChatFolderInfo info = (TdApi.ChatFolderInfo) item.getData();
+ if (!isEnabled) {
+ drawModifier = disabledFolderModifier;
+ } else if (info.hasMyInviteLinks) {
+ drawModifier = hasInviteLinksModifier;
+ } else {
+ drawModifier = item.getDrawModifier();
+ }
+ settingView.setDrawModifier(drawModifier);
} else {
throw new IllegalArgumentException();
}
settingView.setVisuallyEnabled(isEnabled, false);
- settingView.getToggler().setRadioEnabled(isEnabled, false);
settingView.setIconColorId(isEnabled ? ColorId.icon : ColorId.iconLight);
- if (Config.RESTRICT_HIDING_MAIN_LIST) {
- settingView.getToggler().setVisibility(isMainChatFolder(item) ? View.GONE : View.VISIBLE);
+ if (!Config.CHAT_FOLDERS_REDESIGN) {
+ settingView.getToggler().setRadioEnabled(isEnabled, false);
+ if (Config.RESTRICT_HIDING_MAIN_LIST) {
+ settingView.getToggler().setVisibility(isMainChatFolder(item) ? View.GONE : View.VISIBLE);
+ }
}
} else if (customViewType == TYPE_RECOMMENDED_CHAT_FOLDER) {
SettingView settingView = (SettingView) holder.itemView;
@@ -242,14 +291,19 @@ protected void modifyCustom (SettingHolder holder, int position, ListItem item,
@Override
protected void setValuedSetting (ListItem item, SettingView view, boolean isUpdate) {
if (item.getId() == R.id.btn_createNewFolder) {
- boolean canCreateChatFolder = canCreateChatFolder();
+ boolean canCreateChatFolder = tdlib.canCreateChatFolder();
view.setIgnoreEnabled(true);
view.setVisuallyEnabled(canCreateChatFolder, isUpdate);
view.setIconColorId(canCreateChatFolder ? ColorId.inlineIcon : ColorId.iconLight);
+ PremiumLockModifier modifier = (canCreateChatFolder || tdlib.hasPremium()) ? null : premiumLockModifier;
+ view.setDrawModifier(modifier);
+ view.setTooltipLocationProvider(modifier);
} else {
view.setIgnoreEnabled(false);
view.setEnabledAnimated(true, isUpdate);
view.setIconColorId(ColorId.NONE);
+ view.setDrawModifier(item.getDrawModifier());
+ view.setTooltipLocationProvider(null);
}
if (item.getId() == R.id.btn_chatFolderStyle) {
int positionRes;
@@ -266,6 +320,9 @@ protected void setValuedSetting (ListItem item, SettingView view, boolean isUpda
case ChatFolderStyle.ICON_ONLY:
styleRes = R.string.IconOnly;
break;
+ case ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE:
+ styleRes = R.string.IconWithLabelOnActiveFolder;
+ break;
default:
case ChatFolderStyle.LABEL_ONLY:
styleRes = R.string.LabelOnly;
@@ -275,13 +332,18 @@ protected void setValuedSetting (ListItem item, SettingView view, boolean isUpda
} else if (item.getId() == R.id.btn_countMutedChats) {
boolean isEnabled = BitwiseUtils.hasFlag(tdlib.settings().getChatFolderBadgeFlags(), Settings.BADGE_FLAG_MUTED);
view.getToggler().setRadioEnabled(isEnabled, isUpdate);
+ } else if (item.getId() == R.id.btn_archiveAsFolder) {
+ boolean showArchiveAsFolder = tdlib.settings().isChatListEnabled(ChatPosition.CHAT_LIST_ARCHIVE);
+ view.getToggler().setRadioEnabled(showArchiveAsFolder, isUpdate);
}
}
};
adapter.setItems(items, false);
+ recyclerView.addItemDecoration(new ItemDecoration());
recyclerView.setAdapter(adapter);
tdlib.listeners().subscribeToChatFoldersUpdates(this);
+ tdlib.settings().addChatListPositionListener(this);
updateRecommendedChatFolders();
}
@@ -332,10 +394,22 @@ public void onChatFoldersChanged (TdApi.ChatFolderInfo[] chatFolders, int mainCh
});
}
+ @Override
+ public void onChatListStateChanged (Tdlib tdlib, TdApi.ChatList chatList, boolean isEnabled) {
+ runOnUiThreadOptional(() -> {
+ int startIndex = indexOfFirstChatFolder();
+ if (startIndex == RecyclerView.NO_POSITION) return;
+ int index = adapter.indexOfView((item) -> isChatFolder(item) && Td.equalsTo(chatList, getChatList(item)), startIndex, false);
+ if (index != RecyclerView.NO_POSITION) {
+ adapter.notifyItemChanged(index);
+ }
+ });
+ }
+
@Override
public void onClick (View v) {
if (v.getId() == R.id.btn_createNewFolder) {
- if (canCreateChatFolder()) {
+ if (tdlib.canCreateChatFolder()) {
navigateTo(EditChatFolderController.newFolder(context, tdlib));
} else {
showChatFolderLimitReached(v);
@@ -343,11 +417,14 @@ public void onClick (View v) {
} else if (v.getId() == R.id.chatFolder) {
ListItem item = (ListItem) v.getTag();
if (isMainChatFolder(item) || isArchiveChatFolder(item)) {
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ showTooltip(v, Lang.getString(R.string.HoldAndDragToReorder), View::getDrawingRect);
+ }
return;
}
editChatFolder((TdApi.ChatFolderInfo) item.getData());
} else if (v.getId() == R.id.recommendedChatFolder) {
- if (canCreateChatFolder()) {
+ if (tdlib.canCreateChatFolder()) {
ListItem item = (ListItem) v.getTag();
TdApi.ChatFolder chatFolder = (TdApi.ChatFolder) item.getData();
chatFolder.icon = tdlib.chatFolderIcon(chatFolder);
@@ -358,7 +435,7 @@ public void onClick (View v) {
} else if (v.getId() == R.id.btn_double) {
Object tag = v.getTag();
if (tag instanceof TdApi.ChatFolder) {
- if (canCreateChatFolder()) {
+ if (tdlib.canCreateChatFolder()) {
v.setEnabled(false);
TdApi.ChatFolder chatFolder = (TdApi.ChatFolder) tag;
WeakReference viewRef = new WeakReference<>(v);
@@ -384,9 +461,11 @@ public void onClick (View v) {
new ListItem(ListItem.TYPE_SHADOW_TOP).setTextColorId(ColorId.background),
new ListItem(ListItem.TYPE_RADIO_OPTION, R.id.btn_labelOnly, 0, R.string.LabelOnly, R.id.btn_chatFolderStyle, chatFolderStyle == ChatFolderStyle.LABEL_ONLY),
new ListItem(ListItem.TYPE_SEPARATOR_FULL),
+ new ListItem(ListItem.TYPE_RADIO_OPTION, R.id.btn_labelAndIcon, 0, R.string.LabelAndIcon, R.id.btn_chatFolderStyle, chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON),
+ new ListItem(ListItem.TYPE_SEPARATOR_FULL),
new ListItem(ListItem.TYPE_RADIO_OPTION, R.id.btn_iconOnly, 0, R.string.IconOnly, R.id.btn_chatFolderStyle, chatFolderStyle == ChatFolderStyle.ICON_ONLY),
new ListItem(ListItem.TYPE_SEPARATOR_FULL),
- new ListItem(ListItem.TYPE_RADIO_OPTION, R.id.btn_labelAndIcon, 0, R.string.LabelAndIcon, R.id.btn_chatFolderStyle, chatFolderStyle == ChatFolderStyle.LABEL_AND_ICON),
+ new ListItem(ListItem.TYPE_RADIO_OPTION, R.id.btn_iconWithLabelOnActiveFolder, 0, R.string.IconWithLabelOnActiveFolder, R.id.btn_chatFolderStyle, chatFolderStyle == ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE)
};
SettingsWrapBuilder settings = new SettingsWrapBuilder(R.id.btn_chatFolderStyle)
.setRawItems(items)
@@ -398,6 +477,8 @@ public void onClick (View v) {
style = ChatFolderStyle.ICON_ONLY;
} else if (selection == R.id.btn_labelAndIcon) {
style = ChatFolderStyle.LABEL_AND_ICON;
+ } else if (selection == R.id.btn_iconWithLabelOnActiveFolder) {
+ style = ChatFolderStyle.ICON_WITH_LABEL_ON_ACTIVE;
} else {
style = ChatFolderStyle.LABEL_ONLY;
}
@@ -415,12 +496,20 @@ public void onClick (View v) {
SettingsNotificationController c = new SettingsNotificationController(context, tdlib);
c.setArguments(new SettingsNotificationController.Args(SettingsNotificationController.Section.APP_BADGE, 0));
navigateTo(c);
+ } else if (v.getId() == R.id.btn_archiveAsFolder) {
+ boolean showArchiveAsFolder = adapter.toggleView(v);
+ tdlib.settings().setChatListEnabled(ChatPosition.CHAT_LIST_ARCHIVE, showArchiveAsFolder);
+ updateChatFolders();
}
}
@Override
public boolean onLongClick (View v) {
if (v.getId() == R.id.chatFolder) {
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ startDrag(getRecyclerView().getChildViewHolder(v));
+ return true;
+ }
ListItem item = (ListItem) v.getTag();
if (isMainChatFolder(item) || isArchiveChatFolder(item)) {
return false;
@@ -455,28 +544,20 @@ private void showChatFolderLimitReached (View view) {
if (tdlib.hasPremium()) {
showTooltip(view, Lang.getMarkdownString(this, R.string.ChatFolderLimitReached, tdlib.chatFolderCountMax()));
} else {
- Object viewTag = view.getTag();
- WeakReference viewRef = new WeakReference<>(view);
- tdlib.send(new TdApi.GetPremiumLimit(new TdApi.PremiumLimitTypeChatFolderCount()), (premiumLimit, error) -> runOnUiThreadOptional(() -> {
- View v = viewRef.get();
- if (v == null || !ViewCompat.isAttachedToWindow(v) || viewTag != v.getTag())
- return;
- CharSequence text;
- if (premiumLimit != null) {
- text = Lang.getMarkdownString(this, R.string.PremiumRequiredCreateFolder, premiumLimit.defaultValue, premiumLimit.premiumValue);
- } else {
- text = Lang.getMarkdownString(this, R.string.ChatFolderLimitReached, tdlib.chatFolderCountMax());
- }
- showTooltip(v, text);
- }));
+ tdlib.ui().showPremiumLimitInfo(this, view, TdlibUi.PremiumLimit.CHAT_FOLDER_COUNT);
}
}
private void showTooltip (View view, CharSequence text) {
+ showTooltip(view, text, null);
+ }
+
+ private void showTooltip (View view, CharSequence text, @Nullable TooltipOverlayView.LocationProvider locationProvider) {
context()
.tooltipManager()
.builder(view)
.controller(this)
+ .locate(locationProvider)
.show(tdlib, text)
.hideDelayed(3500, TimeUnit.MILLISECONDS);
}
@@ -491,15 +572,16 @@ private void showChatFolderOptions (TdApi.ChatFolderInfo chatFolderInfo) {
if (id == R.id.btn_edit) {
editChatFolder(chatFolderInfo);
} else if (id == R.id.btn_delete) {
- showRemoveFolderConfirm(chatFolderInfo.id);
+ showRemoveFolderConfirm(chatFolderInfo);
}
return true;
});
}
- private void showRemoveFolderConfirm (int chatFolderId) {
- showConfirm(Lang.getString(R.string.RemoveFolderConfirm), Lang.getString(R.string.Remove), R.drawable.baseline_delete_24, OptionColor.RED, () -> {
- deleteChatFolder(chatFolderId);
+ private void showRemoveFolderConfirm (TdApi.ChatFolderInfo info) {
+ tdlib.ui().showDeleteChatFolderConfirm(this, info.hasMyInviteLinks, () -> {
+ // TODO(nikita-toropov) leave chats suggestion
+ deleteChatFolder(info.id);
});
}
@@ -555,9 +637,9 @@ private void reorderChatFolders () {
int lastIndex = indexOfLastChatFolder();
if (firstIndex == RecyclerView.NO_POSITION || lastIndex == RecyclerView.NO_POSITION)
return;
- int mainChatListPosition = 0;
- int archiveChatListPosition = 0;
- IntList chatFoldersIds = new IntList(tdlib.chatFoldersCount());
+ int mainChatListPosition = tdlib.mainChatListPosition();
+ int archiveChatListPosition = tdlib.settings().archiveChatListPosition();
+ IntList chatFoldersIds = new IntList(tdlib.chatFolderCount());
int folderPosition = 0;
for (int index = firstIndex; index <= lastIndex; index++) {
ListItem item = adapter.getItem(index);
@@ -587,14 +669,15 @@ private void reorderChatFolders () {
return;
}
tdlib.settings().setArchiveChatListPosition(archiveChatListPosition);
- if (chatFoldersIds.size() > 0) {
- tdlib.send(new TdApi.ReorderChatFolders(chatFoldersIds.get(), mainChatListPosition), (ok, error) -> {
- if (error != null) {
- UI.showError(error);
- runOnUiThreadOptional(this::updateChatFolders);
- }
- });
+ if (chatFoldersIds.isEmpty()) {
+ return;
}
+ tdlib.send(new TdApi.ReorderChatFolders(chatFoldersIds.get(), mainChatListPosition), (ok, error) -> runOnUiThreadOptional(() -> {
+ if (error != null) {
+ UI.showError(error);
+ updateChatFolders();
+ }
+ }));
}
private boolean isChatFolder (ListItem item) {
@@ -626,13 +709,12 @@ private boolean canMoveChatFolder (ListItem item) {
}
private int indexOfFirstChatFolder () {
- int index = indexOfChatFolderGroup();
- return index == RecyclerView.NO_POSITION ? RecyclerView.NO_POSITION : index + 2 /* header, shadowTop */;
+ return indexOfChatFolderGroup();
}
private int indexOfLastChatFolder () {
int index = indexOfChatFolderGroup();
- return index == RecyclerView.NO_POSITION ? RecyclerView.NO_POSITION : index + chatFolderGroupItemCount - 2 /* shadowBottom, separator */;
+ return index == RecyclerView.NO_POSITION ? RecyclerView.NO_POSITION : index + chatFolderGroupItemCount - 1;
}
private int indexOfChatFolderGroup () {
@@ -646,16 +728,19 @@ private int indexOfRecommendedChatFolderGroup () {
}
private List buildChatFolderItemList (TdApi.ChatFolderInfo[] chatFolders, int mainChatListPosition, int archiveChatListPosition) {
- int chatFolderCount = chatFolders.length + 2; /* All Chats, Archived */
+ boolean showArchiveAsFolder = !Config.CHAT_FOLDERS_REDESIGN || tdlib.settings().isChatListEnabled(ChatPosition.CHAT_LIST_ARCHIVE);
+ int chatFolderCount = chatFolders.length + (showArchiveAsFolder ? 2 : 1); /* All Chats, Archived */
int chatFolderIndex = 0;
mainChatListPosition = MathUtils.clamp(mainChatListPosition, 0, chatFolders.length);
- archiveChatListPosition = MathUtils.clamp(archiveChatListPosition, 0, chatFolderCount - 1);
- if (mainChatListPosition >= archiveChatListPosition) {
- mainChatListPosition++;
+ if (showArchiveAsFolder) {
+ archiveChatListPosition = MathUtils.clamp(archiveChatListPosition, 0, chatFolderCount - 1);
+ if (mainChatListPosition >= archiveChatListPosition) {
+ mainChatListPosition++;
+ }
+ } else {
+ archiveChatListPosition = -1;
}
- List itemList = new ArrayList<>(chatFolderCount + 5);
- itemList.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.ChatFolders));
- itemList.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ List itemList = new ArrayList<>();
for (int position = 0; position < chatFolderCount; position++) {
if (position == mainChatListPosition) {
itemList.add(mainChatFolderItem());
@@ -664,30 +749,32 @@ private List buildChatFolderItemList (TdApi.ChatFolderInfo[] chatFolde
} else if (chatFolderIndex < chatFolders.length) {
TdApi.ChatFolderInfo chatFolder = chatFolders[chatFolderIndex++];
itemList.add(chatFolderItem(chatFolder));
- } else if (BuildConfig.DEBUG) {
- throw new RuntimeException();
+ } else {
+ throw new IllegalStateException(String.format("position=%d mainChatListPosition=%d archiveChatListPosition=%d chatFolderIndex=%d chatFolderCount=%d", position, mainChatListPosition, archiveChatListPosition, chatFolderIndex, chatFolderCount));
}
}
- itemList.add(new ListItem(ListItem.TYPE_SETTING, R.id.btn_createNewFolder, R.drawable.baseline_create_new_folder_24, R.string.CreateNewFolder).setTextColorId(ColorId.inlineText));
- itemList.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
- itemList.add(new ListItem(ListItem.TYPE_DESCRIPTION, recommendedChatFoldersPreviousItemId, 0, R.string.ChatFoldersInfo));
return itemList;
}
+ private static final int RECOMMENDED_FOLDERS_HEADER_ID = ViewCompat.generateViewId();
+ private static final int RECOMMENDED_FOLDERS_SHADOW_TOP_ID = ViewCompat.generateViewId();
+ private static final int RECOMMENDED_FOLDERS_SHADOW_BOTTOM_ID = ViewCompat.generateViewId();
+
private List buildRecommendedChatFolderItemList (TdApi.RecommendedChatFolder[] recommendedChatFolders) {
if (recommendedChatFolders.length == 0) {
return Collections.emptyList();
}
List itemList = new ArrayList<>(recommendedChatFolders.length * 2 - 1 + 3);
- itemList.add(new ListItem(ListItem.TYPE_HEADER, 0, 0, R.string.RecommendedFolders));
- itemList.add(new ListItem(ListItem.TYPE_SHADOW_TOP));
+ itemList.add(new ListItem(ListItem.TYPE_HEADER, RECOMMENDED_FOLDERS_HEADER_ID, 0, R.string.RecommendedFolders));
+ itemList.add(new ListItem(ListItem.TYPE_SHADOW_TOP, RECOMMENDED_FOLDERS_SHADOW_TOP_ID));
for (int index = 0; index < recommendedChatFolders.length; index++) {
+ TdApi.RecommendedChatFolder recommendedChatFolder = recommendedChatFolders[index];
if (index > 0) {
- itemList.add(new ListItem(ListItem.TYPE_SEPARATOR));
+ itemList.add(new ListItem(ListItem.TYPE_SEPARATOR).setStringValue(recommendedChatFolder.folder.title));
}
- itemList.add(recommendedChatFolderItem(recommendedChatFolders[index]));
+ itemList.add(recommendedChatFolderItem(recommendedChatFolder));
}
- itemList.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM));
+ itemList.add(new ListItem(ListItem.TYPE_SHADOW_BOTTOM, RECOMMENDED_FOLDERS_SHADOW_BOTTOM_ID));
return itemList;
}
@@ -695,8 +782,13 @@ private ListItem mainChatFolderItem () {
ListItem item = new ListItem(ListItem.TYPE_CUSTOM - TYPE_CHAT_FOLDER, R.id.chatFolder);
item.setString(R.string.CategoryMain);
item.setLongId(MAIN_CHAT_FOLDER_ID);
- item.setIconRes(tdlib.hasPremium() ? R.drawable.baseline_drag_handle_24 : R.drawable.deproko_baseline_lock_24);
- item.setDrawModifier(new FolderBadge(Lang.getString(R.string.MainListBadge)));
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ item.setIconRes(R.drawable.baseline_forum_24);
+ item.setDrawModifier(tdlib.hasPremium() ? null : premiumLockModifier);
+ } else {
+ item.setIconRes(tdlib.hasPremium() ? R.drawable.baseline_drag_handle_24 : R.drawable.deproko_baseline_lock_24);
+ item.setDrawModifier(new FolderBadge(Lang.getString(R.string.MainListBadge)));
+ }
return item;
}
@@ -704,13 +796,24 @@ private ListItem archiveChatFolderItem () {
ListItem item = new ListItem(ListItem.TYPE_CUSTOM - TYPE_CHAT_FOLDER, R.id.chatFolder);
item.setString(R.string.CategoryArchive);
item.setLongId(ARCHIVE_CHAT_FOLDER_ID);
- item.setIconRes(R.drawable.baseline_drag_handle_24);
- item.setDrawModifier(new FolderBadge(Lang.getString(R.string.LocalFolderBadge)));
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ item.setIconRes(R.drawable.baseline_archive_24);
+ item.setStringValue(Lang.getString(R.string.LocalFolder));
+ } else {
+ item.setIconRes(R.drawable.baseline_drag_handle_24);
+ item.setDrawModifier(new FolderBadge(Lang.getString(R.string.LocalFolderBadge)));
+ }
return item;
}
private ListItem chatFolderItem (TdApi.ChatFolderInfo chatFolderInfo) {
- ListItem item = new ListItem(ListItem.TYPE_CUSTOM - TYPE_CHAT_FOLDER, R.id.chatFolder, R.drawable.baseline_drag_handle_24, Emoji.instance().replaceEmoji(chatFolderInfo.title));
+ int iconRes;
+ if (Config.CHAT_FOLDERS_REDESIGN) {
+ iconRes = TD.findFolderIcon(chatFolderInfo.icon, R.drawable.baseline_folder_24);
+ } else {
+ iconRes = R.drawable.baseline_drag_handle_24;
+ }
+ ListItem item = new ListItem(ListItem.TYPE_CUSTOM - TYPE_CHAT_FOLDER, R.id.chatFolder, iconRes, Emoji.instance().replaceEmoji(chatFolderInfo.title));
item.setIntValue(chatFolderInfo.id);
item.setLongId(chatFolderInfo.id);
item.setData(chatFolderInfo);
@@ -726,10 +829,6 @@ private ListItem recommendedChatFolderItem (TdApi.RecommendedChatFolder recommen
return item;
}
- private boolean canCreateChatFolder () {
- return tdlib.chatFoldersCount() < tdlib.chatFolderCountMax();
- }
-
private void updateChatFolders () {
updateChatFolders(tdlib.chatFolders(), tdlib.mainChatListPosition(), tdlib.settings().archiveChatListPosition());
}
@@ -801,16 +900,23 @@ private static DiffUtil.Callback chatFoldersDiff (List oldList, List oldL
return new ListItemDiffUtilCallback(oldList, newList) {
@Override
public boolean areItemsTheSame (ListItem oldItem, ListItem newItem) {
- if (oldItem.getViewType() == newItem.getViewType() && oldItem.getId() == newItem.getId()) {
- if (oldItem.getId() == R.id.recommendedChatFolder) {
- CharSequence a = oldItem.getString();
- CharSequence b = newItem.getString();
- return ObjectUtils.equals(a, b);
- }
- return true;
+ if (oldItem.getViewType() != newItem.getViewType() || oldItem.getId() != newItem.getId()) {
+ return false;
}
- return false;
+ if (oldItem.getId() == R.id.recommendedChatFolder) {
+ CharSequence a = oldItem.getString();
+ CharSequence b = newItem.getString();
+ return ObjectUtils.equals(a, b);
+ }
+ if (oldItem.getViewType() == ListItem.TYPE_SEPARATOR) {
+ return ObjectUtils.equals(oldItem.getStringValue(), newItem.getStringValue());
+ }
+ return true;
}
@Override
@@ -841,9 +950,15 @@ public boolean areContentsTheSame (ListItem oldItem, ListItem newItem) {
String b = newItem.getStringValue();
return ObjectUtils.equals(a, b);
}
- CharSequence a = oldItem.getString();
- CharSequence b = newItem.getString();
- return ObjectUtils.equals(a, b);
+ if (oldItem.getViewType() == ListItem.TYPE_SEPARATOR) {
+ return true;
+ }
+ if (oldItem.getViewType() == ListItem.TYPE_HEADER) {
+ CharSequence a = oldItem.getString();
+ CharSequence b = newItem.getString();
+ return ObjectUtils.equals(a, b);
+ }
+ return true;
}
};
}
@@ -869,7 +984,7 @@ public boolean canRemove (RecyclerView recyclerView, RecyclerView.ViewHolder vie
@Override
public void onRemove (RecyclerView.ViewHolder viewHolder) {
ListItem item = (ListItem) viewHolder.itemView.getTag();
- showRemoveFolderConfirm(item.getIntValue());
+ showRemoveFolderConfirm((TdApi.ChatFolderInfo) item.getData());
}
@Override
@@ -895,7 +1010,7 @@ public boolean onMove (@NonNull RecyclerView recyclerView, @NonNull RecyclerView
public boolean canDropOver (@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder source, @NonNull RecyclerView.ViewHolder target) {
ListItem sourceItem = (ListItem) source.itemView.getTag();
ListItem targetItem = (ListItem) target.itemView.getTag();
- return isChatFolder(sourceItem) && isChatFolder(targetItem) && (canMoveChatFolder(targetItem) || BuildConfig.DEBUG && isArchiveChatFolder(sourceItem));
+ return isChatFolder(sourceItem) && isChatFolder(targetItem) && canMoveChatFolder(targetItem);
}
@Override
@@ -919,6 +1034,48 @@ public boolean onTouch (View view, MotionEvent event) {
}
}
+ private static class ItemDecoration extends RecyclerView.ItemDecoration {
+ @Override
+ public void onDrawOver (@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+ if (!Config.CHAT_FOLDERS_REDESIGN) return;
+ boolean isRtl = Lang.rtl();
+ int separatorColor = Theme.separatorColor();
+ int separatorHeight = Math.max(1, Screen.dp(.5f));
+ Paint sepratorPaint = Paints.fillingPaint(separatorColor);
+ int startOffset = Screen.dp(72f);
+ int childCount = parent.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ View child = parent.getChildAt(i);
+ if (!isChatFolder(child) || isDragging(child)) {
+ continue;
+ }
+ int layoutPosition = parent.getChildLayoutPosition(child);
+ if (layoutPosition == RecyclerView.NO_POSITION) {
+ continue;
+ }
+ RecyclerView.ViewHolder next = parent.findViewHolderForLayoutPosition(layoutPosition + 1);
+ if (next == null || isChatFolder(next.itemView) && isDragging(next.itemView)) {
+ continue;
+ }
+ int bottom = child.getBottom();
+ int top = bottom - separatorHeight;
+ if (isRtl) {
+ c.drawRect(0, top, child.getWidth() - startOffset, bottom, sepratorPaint);
+ } else {
+ c.drawRect(startOffset, top, child.getWidth(), bottom, sepratorPaint);
+ }
+ }
+ }
+
+ private boolean isChatFolder (View view) {
+ return view.getId() == R.id.chatFolder;
+ }
+
+ private boolean isDragging (View view) {
+ return view.getTranslationY() != 0f;
+ }
+ }
+
private static class FolderBadge implements DrawModifier {
private final Text text;
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java b/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java
index 2d2368d28a..f3a5e23a9f 100644
--- a/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java
+++ b/app/src/main/java/org/thunderdog/challegram/ui/ShareController.java
@@ -946,7 +946,7 @@ protected View onCreateView (Context context) {
headerCell.initWithMargin(Screen.dp(56f) * getMenuItemCount(), false);
headerCell.setThemedTextColor(ColorId.text, ColorId.textLight, this);
updateHeader();
- if (Settings.instance().chatFoldersEnabled() && TD.isChatListMain(displayingChatList) && tdlib.chatFoldersCount() > 0) {
+ if (Settings.instance().chatFoldersEnabled() && TD.isChatListMain(displayingChatList) && tdlib.chatFolderCount() > 0) {
headerCell.setTitle(R.string.CategoryMain);
headerCell.setTitleIcon(R.drawable.baseline_keyboard_arrow_down_20);
headerCell.setOnClickListener(v -> {
diff --git a/app/src/main/java/org/thunderdog/challegram/util/EndIconModifier.java b/app/src/main/java/org/thunderdog/challegram/util/EndIconModifier.java
new file mode 100644
index 0000000000..4733a6e5be
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/util/EndIconModifier.java
@@ -0,0 +1,78 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.util;
+
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import androidx.annotation.DrawableRes;
+
+import org.thunderdog.challegram.navigation.TooltipOverlayView;
+import org.thunderdog.challegram.theme.PorterDuffColorId;
+import org.thunderdog.challegram.tool.Drawables;
+import org.thunderdog.challegram.tool.PorterDuffPaint;
+import org.thunderdog.challegram.tool.Screen;
+
+public class EndIconModifier implements DrawModifier, TooltipOverlayView.LocationProvider {
+
+ private static final float HORIZONTAL_OFFSET_DP = 16f;
+
+ private final Drawable drawable;
+ private final @PorterDuffColorId int iconColorId;
+
+ private boolean isVisible = true;
+
+ public EndIconModifier (@DrawableRes int iconRes, @PorterDuffColorId int colorId) {
+ drawable = Drawables.get(iconRes);
+ iconColorId = colorId;
+ }
+
+ @Override
+ public void afterDraw (View view, Canvas c) {
+ if (!isVisible) return;
+ Drawables.draw(c, drawable, getX(view), getY(view), PorterDuffPaint.get(iconColorId));
+ }
+
+ @Override
+ public int getWidth () {
+ return isVisible ? Screen.dp(HORIZONTAL_OFFSET_DP) * 2 + drawable.getIntrinsicWidth() : 0;
+ }
+
+ public void setVisible (boolean isVisible) {
+ this.isVisible = isVisible;
+ }
+
+ @Override
+ public void getTargetBounds (View targetView, Rect outRect) {
+ if (isVisible) {
+ int x = getX(targetView);
+ int y = getY(targetView);
+ outRect.set(x, y, x + drawable.getIntrinsicWidth(), y + drawable.getIntrinsicHeight());
+ outRect.inset(0, -Screen.dp(10f));
+ } else {
+ targetView.getDrawingRect(outRect);
+ }
+ }
+
+ private int getX (View view) {
+ return view.getWidth() - drawable.getIntrinsicWidth() - Screen.dp(HORIZONTAL_OFFSET_DP);
+ }
+
+ private int getY (View view) {
+ return Math.round((view.getHeight() - drawable.getIntrinsicHeight()) / 2f);
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/util/Poller.java b/app/src/main/java/org/thunderdog/challegram/util/Poller.java
new file mode 100644
index 0000000000..f7945339b9
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/util/Poller.java
@@ -0,0 +1,102 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.util;
+
+import android.os.Handler;
+
+import androidx.annotation.Nullable;
+
+import org.drinkless.tdlib.TdApi;
+import org.thunderdog.challegram.telegram.Tdlib;
+import org.thunderdog.challegram.tool.UI;
+
+import me.vkryl.core.lambda.Future;
+import me.vkryl.core.lambda.FutureLong;
+
+public class Poller {
+
+ private static final long MIN_POLLING_DELAY_MILLIS = 1000;
+
+ private final Handler handler;
+ private final Tdlib tdlib;
+ private final Tdlib.ResultHandler resultHandler;
+ private final Future> requestFactory;
+ private final FutureLong pollingDelayMillis;
+
+ private @Nullable Runnable runnable;
+
+ public Poller (Tdlib tdlib, FutureLong pollingDelayMillis, Future> requestFactory, Tdlib.ResultHandler resultHandler) {
+ this(tdlib, UI.getAppHandler(), pollingDelayMillis, requestFactory, resultHandler);
+ }
+
+ public Poller (Tdlib tdlib, Handler handler, FutureLong pollingDelayMillis, Future> requestFactory, Tdlib.ResultHandler resultHandler) {
+ this.tdlib = tdlib;
+ this.handler = handler;
+ this.pollingDelayMillis = pollingDelayMillis;
+ this.resultHandler = resultHandler;
+ this.requestFactory = requestFactory;
+ }
+
+ public void start () {
+ checkCallingThread();
+ if (runnable == null) {
+ runnable = createRunnable();
+ handler.post(runnable);
+ }
+ }
+
+ public void stop () {
+ checkCallingThread();
+ if (runnable != null) {
+ handler.removeCallbacks(runnable);
+ runnable = null;
+ }
+ }
+
+ public void restart () {
+ stop();
+ start();
+ }
+
+ public boolean isStarted () {
+ checkCallingThread();
+ return runnable != null;
+ }
+
+ private void checkCallingThread () {
+ if (handler.getLooper().getThread() != Thread.currentThread()) {
+ throw new IllegalStateException();
+ }
+ }
+
+ private Runnable createRunnable() {
+ return new Runnable() {
+ @Override
+ public void run () {
+ TdApi.Function request = requestFactory.getValue();
+ tdlib.send(request, (result, error) -> handler.post(() -> {
+ if (runnable != this) {
+ return;
+ }
+ resultHandler.onResult(result, error);
+ if (runnable == this) {
+ long delayMillis = Math.max(MIN_POLLING_DELAY_MILLIS, pollingDelayMillis.getLongValue());
+ handler.postDelayed(runnable, delayMillis);
+ }
+ }));
+ }
+ };
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/util/PremiumLockModifier.java b/app/src/main/java/org/thunderdog/challegram/util/PremiumLockModifier.java
new file mode 100644
index 0000000000..1ac82646cd
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/util/PremiumLockModifier.java
@@ -0,0 +1,24 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.util;
+
+import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.theme.ColorId;
+
+public class PremiumLockModifier extends EndIconModifier {
+ public PremiumLockModifier () {
+ super(R.drawable.baseline_lock_16, ColorId.text);
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/util/text/FormattedCounterAnimator.java b/app/src/main/java/org/thunderdog/challegram/util/text/FormattedCounterAnimator.java
index 51aad8bed8..8a395c23e6 100644
--- a/app/src/main/java/org/thunderdog/challegram/util/text/FormattedCounterAnimator.java
+++ b/app/src/main/java/org/thunderdog/challegram/util/text/FormattedCounterAnimator.java
@@ -1,9 +1,5 @@
package org.thunderdog.challegram.util.text;
-import static me.vkryl.android.animator.CounterAnimator.Part.POSITION_BOTTOM;
-import static me.vkryl.android.animator.CounterAnimator.Part.POSITION_NORMAL;
-import static me.vkryl.android.animator.CounterAnimator.Part.POSITION_UP;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
@@ -145,23 +141,23 @@ private void setCounterImpl (long count, @Nullable List>
protected void onPartAdded (@NonNull Part part, long oldCount, long newCount, boolean isReturned) {
if (callback.shouldAnimatePartVerticalPosition(part, oldCount, newCount)) {
if (oldCount < newCount) {
- part.setVerticalPositionFrom(POSITION_UP);
+ part.setVerticalPositionFrom(CounterAnimator.Part.POSITION_UP);
} else if (oldCount > newCount) {
- part.setVerticalPositionFrom(POSITION_BOTTOM);
+ part.setVerticalPositionFrom(CounterAnimator.Part.POSITION_BOTTOM);
}
}
- part.setVerticalPositionTo(POSITION_NORMAL);
+ part.setVerticalPositionTo(CounterAnimator.Part.POSITION_NORMAL);
}
protected void onPartRemoved (@NonNull Part part, long oldCount, long newCount) {
if (callback.shouldAnimatePartVerticalPosition(part, oldCount, newCount)) {
if (oldCount < newCount) {
- part.setVerticalPositionTo(POSITION_BOTTOM);
+ part.setVerticalPositionTo(CounterAnimator.Part.POSITION_BOTTOM);
} else if (oldCount > newCount) {
- part.setVerticalPositionTo(POSITION_UP);
+ part.setVerticalPositionTo(CounterAnimator.Part.POSITION_UP);
}
} else {
- part.setVerticalPositionTo(POSITION_NORMAL);
+ part.setVerticalPositionTo(CounterAnimator.Part.POSITION_NORMAL);
}
}
}
diff --git a/app/src/main/java/org/thunderdog/challegram/util/text/IconSpan.java b/app/src/main/java/org/thunderdog/challegram/util/text/IconSpan.java
new file mode 100644
index 0000000000..a0120aea5d
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/util/text/IconSpan.java
@@ -0,0 +1,65 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.util.text;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.text.style.DynamicDrawableSpan;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thunderdog.challegram.theme.PorterDuffColorId;
+import org.thunderdog.challegram.tool.Drawables;
+import org.thunderdog.challegram.tool.PorterDuffPaint;
+
+public class IconSpan extends DynamicDrawableSpan implements TextReplacementSpan {
+
+ private final Drawable drawable;
+ private final @PorterDuffColorId int iconColorId;
+
+ public IconSpan (@DrawableRes int iconRes, @PorterDuffColorId int iconColorId) {
+ super(DynamicDrawableSpan.ALIGN_BOTTOM);
+ this.drawable = Drawables.get(iconRes);
+ this.drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ this.iconColorId = iconColorId;
+ }
+
+ @Override
+ public Drawable getDrawable () {
+ return drawable;
+ }
+
+ @Override
+ public void draw (@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
+ drawable.setColorFilter(PorterDuffPaint.get(iconColorId).getColorFilter());
+ super.draw(canvas, text, start, end, x, top, y, bottom, paint);
+ }
+
+ @Override
+ public int getSize (@NonNull Paint paint, CharSequence text, int start, int end, @Nullable Paint.FontMetricsInt fm) {
+ if (fm != null) {
+ paint.getFontMetricsInt(fm);
+ }
+ return getRawSize(paint);
+ }
+
+ @Override
+ public int getRawSize (Paint paint) {
+ return drawable.getIntrinsicWidth();
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/util/text/TextReplacementSpan.java b/app/src/main/java/org/thunderdog/challegram/util/text/TextReplacementSpan.java
new file mode 100644
index 0000000000..997a3d421c
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/util/text/TextReplacementSpan.java
@@ -0,0 +1,21 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.util.text;
+
+import android.graphics.Paint;
+
+public interface TextReplacementSpan {
+ int getRawSize (Paint paint);
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/v/ChatsRecyclerView.java b/app/src/main/java/org/thunderdog/challegram/v/ChatsRecyclerView.java
index b029f45f02..b28eb66ddb 100644
--- a/app/src/main/java/org/thunderdog/challegram/v/ChatsRecyclerView.java
+++ b/app/src/main/java/org/thunderdog/challegram/v/ChatsRecyclerView.java
@@ -227,13 +227,13 @@ public void updateUserStatus (long userId) {
if (updated == -1)
break;
View view = manager.findViewByPosition(updated);
- if (view instanceof ChatView && ((ChatView) view).getChatId() == adapter.getChatAt(updated).getChatId()) {
+ if (view instanceof ChatView && ((ChatView) view).getChatId() == adapter.getChatByItemPosition(updated).getChatId()) {
// ((ChatView) view).updateOnline();
view.invalidate();
} else {
adapter.notifyItemChanged(updated);
}
- startIndex = updated + 1;
+ startIndex = adapter.getChatIndexByItemPosition(updated) + 1;
}
}
@@ -280,7 +280,7 @@ public void updateArchive (int updateReason) {
}
public void updateChatSelectionState (long chatId, boolean isSelected) {
- int index = adapter.indexOfChat(chatId);
+ int index = adapter.findChatItemPosition(chatId);
if (index != -1) {
View view = getLayoutManager().findViewByPosition(index);
if (view instanceof ChatView && ((ChatView) view).getChatId() == chatId) {
@@ -293,7 +293,7 @@ public void updateChatSelectionState (long chatId, boolean isSelected) {
public void updateChatPosition (long chatId, TdApi.ChatPosition position, boolean orderChanged, boolean sourceChanged, boolean pinStateChanged) {
if (sourceChanged) {
- int i = adapter.indexOfChat(chatId);
+ int i = adapter.findChatItemPosition(chatId);
if (i != -1) {
invalidateViewAt(i);
}
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/BetterChatView.java b/app/src/main/java/org/thunderdog/challegram/widget/BetterChatView.java
index 79648cb0c0..0d178ed94c 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/BetterChatView.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/BetterChatView.java
@@ -147,7 +147,7 @@ public void performDestroy () {
public void setIsChecked (boolean isChecked, boolean animated) {
if (isChecked != (checkBoxHelper != null && checkBoxHelper.isChecked())) {
if (checkBoxHelper == null) {
- checkBoxHelper = new SimplestCheckBoxHelper(this, avatarReceiver);
+ checkBoxHelper = new SimplestCheckBoxHelper(this);
}
checkBoxHelper.setIsChecked(isChecked, animated);
}
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/ChartLayout.java b/app/src/main/java/org/thunderdog/challegram/widget/ChartLayout.java
index 46002d71da..668c09c948 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/ChartLayout.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/ChartLayout.java
@@ -12,11 +12,9 @@
*/
package org.thunderdog.challegram.widget;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
import android.content.Context;
import android.graphics.Canvas;
+import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
@@ -61,7 +59,7 @@ public ChartLayout (@NonNull Context context) {
this.progressReceiver.detach();
setWillNotDraw(false);
- setLayoutParams(new RecyclerView.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+ setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
}
private Tdlib tdlib;
@@ -247,7 +245,7 @@ public void initWithType (Tdlib tdlib, int type, Delegate delegate, @Nullable Vi
// zoomedChartView.sharedUiComponents = sharedUiComponents;
addView(chartView);
- addView(chartView.legendSignatureView, WRAP_CONTENT, WRAP_CONTENT);
+ addView(chartView.legendSignatureView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
/*addView(zoomedChartView);
addView(zoomedChartView.legendSignatureView, WRAP_CONTENT, WRAP_CONTENT);*/
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/PopupLayout.java b/app/src/main/java/org/thunderdog/challegram/widget/PopupLayout.java
index 07a8fca5c9..53c4aff027 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/PopupLayout.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/PopupLayout.java
@@ -26,6 +26,7 @@
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.WindowManager;
+import android.widget.FrameLayout;
import android.widget.PopupWindow;
import androidx.annotation.Nullable;
@@ -42,6 +43,7 @@
import org.thunderdog.challegram.navigation.MenuMoreWrap;
import org.thunderdog.challegram.navigation.OptionsLayout;
import org.thunderdog.challegram.navigation.RootDrawable;
+import org.thunderdog.challegram.navigation.TooltipOverlayView;
import org.thunderdog.challegram.navigation.ViewController;
import org.thunderdog.challegram.theme.Theme;
import org.thunderdog.challegram.tool.Keyboard;
@@ -911,6 +913,25 @@ public void addStatusBar () {
useStatusBar = true;
}
+ private @Nullable TooltipOverlayView tooltipOverlayView;
+
+ public TooltipOverlayView tooltipManager () {
+ if (tooltipOverlayView == null) {
+ tooltipOverlayView = new TooltipOverlayView(getContext());
+ tooltipOverlayView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ tooltipOverlayView.setAvailabilityListener((overlayView, hasChildren) -> {
+ if (hasChildren) {
+ if (tooltipOverlayView.getParent() != null)
+ return;
+ addView(tooltipOverlayView);
+ } else {
+ removeView(tooltipOverlayView);
+ }
+ });
+ }
+ return tooltipOverlayView;
+ }
+
public static PopupLayout parentOf (View view) {
ViewParent parent = view.getParent();
while (parent != null && !(parent instanceof PopupLayout)) {
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/ScalableTextView.java b/app/src/main/java/org/thunderdog/challegram/widget/ScalableTextView.java
index d3b1130fdf..e7d61c70c5 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/ScalableTextView.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/ScalableTextView.java
@@ -16,6 +16,8 @@
import android.content.Context;
+import androidx.annotation.NonNull;
+
import org.thunderdog.challegram.tool.Views;
import me.vkryl.android.AnimatorUtils;
@@ -56,7 +58,7 @@ private void setFactor (float factor) {
if (this.factor != factor) {
this.factor = factor;
if (factor >= .5f && futureReplacement != null) {
- Views.setMediumText(this, futureReplacement);
+ onReplaceText(futureReplacement);
futureReplacement = null;
}
float alpha = (factor <= .5f ? 1f - factor / .5f : (factor - .5f) / .5f);
@@ -76,4 +78,8 @@ public void onFactorChanged (int id, float factor, float fraction, FactorAnimato
public void onFactorChangeFinished (int id, float finalFactor, FactorAnimator callee) {
}
+
+ protected void onReplaceText (@NonNull CharSequence replacement) {
+ Views.setMediumText(this, replacement);
+ }
}
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/SimplestCheckBoxHelper.java b/app/src/main/java/org/thunderdog/challegram/widget/SimplestCheckBoxHelper.java
index 8e5f8aee55..ce44d33466 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/SimplestCheckBoxHelper.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/SimplestCheckBoxHelper.java
@@ -16,14 +16,16 @@
import android.view.View;
-import org.thunderdog.challegram.loader.Receiver;
+import androidx.annotation.Nullable;
import me.vkryl.android.AnimatorUtils;
import me.vkryl.android.animator.FactorAnimator;
+import me.vkryl.android.util.SingleViewProvider;
+import me.vkryl.android.util.ViewProvider;
public class SimplestCheckBoxHelper implements FactorAnimator.Target {
- private final View target;
- private final Receiver receiver;
+ private final ViewProvider viewProvider;
+ private final @Nullable Listener listener;
private float factor;
private FactorAnimator animator;
@@ -33,9 +35,17 @@ public interface Listener {
void onCheckFactorChanged (float factor);
}
- public SimplestCheckBoxHelper (View target, Receiver receiver) {
- this.target = target;
- this.receiver = receiver;
+ public SimplestCheckBoxHelper (View target) {
+ this(new SingleViewProvider(target), target instanceof Listener ? (Listener) target : null);
+ }
+
+ public SimplestCheckBoxHelper (ViewProvider viewProvider) {
+ this(viewProvider, null);
+ }
+
+ public SimplestCheckBoxHelper (ViewProvider viewProvider, @Nullable Listener listener) {
+ this.viewProvider = viewProvider;
+ this.listener = listener;
}
public boolean isChecked () {
@@ -67,9 +77,9 @@ public void setIsChecked (boolean isChecked, boolean isAnimated) {
private void setCheckFactor (float factor) {
if (this.factor != factor) {
this.factor = factor;
- target.invalidate();
- if (target instanceof Listener) {
- ((Listener) target).onCheckFactorChanged(factor);
+ viewProvider.invalidate();
+ if (listener != null) {
+ listener.onCheckFactorChanged(factor);
}
}
}
@@ -78,9 +88,4 @@ private void setCheckFactor (float factor) {
public void onFactorChanged (int id, float factor, float fraction, FactorAnimator callee) {
setCheckFactor(factor);
}
-
- @Override
- public void onFactorChangeFinished (int id, float finalFactor, FactorAnimator callee) {
-
- }
}
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/SuggestedChatsView.java b/app/src/main/java/org/thunderdog/challegram/widget/SuggestedChatsView.java
new file mode 100644
index 0000000000..133a13c865
--- /dev/null
+++ b/app/src/main/java/org/thunderdog/challegram/widget/SuggestedChatsView.java
@@ -0,0 +1,149 @@
+/*
+ * This file is a part of Telegram X
+ * Copyright © 2014 (tgx-android@pm.me)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * File created on 19/01/2024
+ */
+package org.thunderdog.challegram.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.View;
+
+import androidx.annotation.Dimension;
+import androidx.annotation.NonNull;
+
+import org.drinkless.tdlib.TdApi;
+import org.thunderdog.challegram.R;
+import org.thunderdog.challegram.core.Lang;
+import org.thunderdog.challegram.data.TD;
+import org.thunderdog.challegram.data.TGAvatars;
+import org.thunderdog.challegram.loader.ComplexReceiver;
+import org.thunderdog.challegram.support.RippleSupport;
+import org.thunderdog.challegram.telegram.Tdlib;
+import org.thunderdog.challegram.theme.Theme;
+import org.thunderdog.challegram.tool.Drawables;
+import org.thunderdog.challegram.tool.Paints;
+import org.thunderdog.challegram.tool.Screen;
+import org.thunderdog.challegram.tool.Views;
+import org.thunderdog.challegram.util.text.Text;
+import org.thunderdog.challegram.util.text.TextEntity;
+
+import java.util.Arrays;
+
+import me.vkryl.core.lambda.Destroyable;
+
+public final class SuggestedChatsView extends View implements TGAvatars.Callback, AttachDelegate, Destroyable {
+
+ @Dimension(unit = Dimension.DP)
+ public static final float DEFAULT_HEIGHT_DP = 36f;
+
+ private final Tdlib tdlib;
+ private final TGAvatars avatars;
+ private final ComplexReceiver complexReceiver;
+ private final Drawable icon;
+ private final Text text;
+
+ public SuggestedChatsView (Context context, Tdlib tdlib) {
+ super(context);
+ this.tdlib = tdlib;
+ this.complexReceiver = new ComplexReceiver(this);
+ this.avatars = new TGAvatars(tdlib, this, this);
+ this.icon = Drawables.get(context.getResources(), R.drawable.baseline_info_16);
+ this.text = new Text.Builder("", Integer.MAX_VALUE, Paints.robotoStyleProvider(15f), Theme::textAccent2Color)
+ .singleLine()
+ .build();
+
+ setMinimumHeight(Screen.dp(DEFAULT_HEIGHT_DP));
+ Views.setClickable(this);
+ RippleSupport.setTransparentSelector(this);
+ }
+
+ public void setChatIds (long[] chatIds, boolean animated) {
+ avatars.setChatIds(Arrays.copyOf(chatIds, Math.min(3, chatIds.length)), animated);
+
+ int chatCount = chatIds.length;
+ if (chatCount > 0) {
+ String in = Lang.plural(R.string.xNewChatsAvailableToJoin, chatCount);
+ TdApi.FormattedText formattedText = TD.toFormattedText(in, false);
+ if (TD.parseMarkdownWithEntities(formattedText) && formattedText.entities.length > 0) {
+ TextEntity[] entities = TextEntity.valueOf(tdlib, formattedText, null);
+ for (TextEntity entity : entities) {
+ if (entity.isBold()) {
+ entity.setCustomColorSet(Theme::textLinkColor);
+ }
+ }
+ text.set(getTextMaxWidth(), formattedText.text, entities);
+ } else {
+ text.set(getTextMaxWidth(), in, null);
+ }
+ }
+ }
+
+ @Override
+ protected void onDraw (@NonNull Canvas canvas) {
+ int cy = getHeight() / 2;
+ avatars.draw(canvas, complexReceiver, Screen.dp(7f), cy, Gravity.LEFT, 1f);
+
+ int textX = Math.round(avatars.getAnimatedWidth() + avatars.getAvatarsVisibility() * Screen.dp(7f)) + Screen.dp(7f);
+ int textY = cy - text.getLineCenterY();
+ text.draw(canvas, textX, textY);
+
+ Drawables.drawCentered(canvas, icon, getWidth() - Screen.dp(20f), cy, Paints.getBackgroundIconPorterDuffPaint());
+ }
+
+ @Override
+ public void onSizeChanged () {
+ if (isLaidOut()) {
+ text.changeMaxWidth(getTextMaxWidth());
+ }
+ invalidate();
+ }
+
+ @Override
+ protected void onSizeChanged (int width, int height, int oldWidth, int oldHeight) {
+ super.onSizeChanged(width, height, oldWidth, oldHeight);
+ if (width != oldWidth) {
+ text.changeMaxWidth(getTextMaxWidth());
+ invalidate();
+ }
+ }
+
+ @Override
+ public void onInvalidateMedia (TGAvatars avatars) {
+ avatars.requestFiles(complexReceiver, /* isUpdate */ true, /* neverClear */ false);
+ }
+
+ @Override
+ public void attach () {
+ complexReceiver.attach();
+ }
+
+ @Override
+ public void detach () {
+ complexReceiver.detach();
+ }
+
+ @Override
+ public void performDestroy () {
+ text.performDestroy();
+ complexReceiver.performDestroy();
+ }
+
+ private int getTextMaxWidth () {
+ if (!isLaidOut()) {
+ return Integer.MAX_VALUE;
+ }
+ return getWidth() - Math.round(avatars.getAnimatedWidth()) - Screen.dp(54);
+ }
+}
diff --git a/app/src/main/java/org/thunderdog/challegram/widget/VerticalChatView.java b/app/src/main/java/org/thunderdog/challegram/widget/VerticalChatView.java
index 2cd7916d4c..8d69d7626d 100644
--- a/app/src/main/java/org/thunderdog/challegram/widget/VerticalChatView.java
+++ b/app/src/main/java/org/thunderdog/challegram/widget/VerticalChatView.java
@@ -78,7 +78,7 @@ public VerticalChatView (@NonNull Context context, Tdlib tdlib) {
public void setIsChecked (boolean isChecked, boolean animated) {
if (isChecked != (checkBoxHelper != null && checkBoxHelper.isChecked())) {
if (checkBoxHelper == null) {
- checkBoxHelper = new SimplestCheckBoxHelper(this, avatarReceiver);
+ checkBoxHelper = new SimplestCheckBoxHelper(this);
}
checkBoxHelper.setIsChecked(isChecked, animated);
}
diff --git a/app/src/main/res/drawable/baseline_airplane_24.xml b/app/src/main/res/drawable/baseline_airplane_24.xml
new file mode 100644
index 0000000000..ec058e88e8
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_airplane_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/baseline_crown_24.xml b/app/src/main/res/drawable/baseline_crown_24.xml
new file mode 100644
index 0000000000..4c2c2784e1
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_crown_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/baseline_filter_variant.xml b/app/src/main/res/drawable/baseline_filter_variant.xml
new file mode 100644
index 0000000000..bf8e328aaa
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_filter_variant.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/baseline_folder_open_96.xml b/app/src/main/res/drawable/baseline_folder_open_96.xml
new file mode 100644
index 0000000000..1153298dca
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_folder_open_96.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/baseline_info_16.xml b/app/src/main/res/drawable/baseline_info_16.xml
new file mode 100755
index 0000000000..fbc6491352
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_info_16.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index f68f91940d..db098d89cc 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -245,6 +245,8 @@