lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature: allow hiding reactions in message menu, or displaying when double tap

This commit is contained in:
luvletter2333 2022-01-21 15:24:30 +08:00
parent e8e446f586
commit 8618ac484b
No known key found for this signature in database
GPG Key ID: A26A8880836E1978
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -1325,6 +1325,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (textSelectionHelper.isTryingSelect() || textSelectionHelper.isSelectionMode() || inPreviewMode) {
return false;
}
if((scrimPopupWindow != null && NekoConfig.reactions.Int() == 1))
return false;
wasManualScroll = true;
if (!actionBar.isActionModeShowed() && reportType < 0) {
createMenu(view, false, true, x, y);
@ -1474,11 +1476,15 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public boolean hasDoubleTap(View view, int position) {
if (view instanceof ChatMessageCell && NekoConfig.reactions.Int() == 1){
ChatMessageCell cell = (ChatMessageCell) view;
return !cell.getMessageObject().isSending() && !cell.getMessageObject().isEditing() && cell.getMessageObject().type != 16 && !actionBar.isActionModeShowed() && !isSecretChat() && !isInScheduleMode();
}
TLRPC.TL_availableReaction reaction = getMediaDataController().getReactionsMap().get(getMediaDataController().getDoubleTapReaction());
if (reaction == null) {
return false;
}
if (NekoConfig.disableDoubleTabReactions.Bool()) return false;
if (NekoConfig.reactions.Int() == 2) return false;
boolean available = dialog_id >= 0;
if (!available && chatInfo != null) {
for (String s : chatInfo.available_reactions) {
@ -1500,6 +1506,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!(view instanceof ChatMessageCell) || getParentActivity() == null || isSecretChat() || isInScheduleMode()) {
return;
}
if (NekoConfig.reactions.Int() == 2) return;
if (NekoConfig.reactions.Int() == 1) {
createMenu(view, true, false, x, y, true, true);
return;
}
ChatMessageCell cell = (ChatMessageCell) view;
MessageObject primaryMessage = cell.getPrimaryMessageObject();
ReactionsEffectOverlay.removeCurrent(false);
@ -1507,7 +1518,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (reaction == null) {
return;
}
if (NekoConfig.disableDoubleTabReactions.Bool()) return;
boolean available = dialog_id >= 0;
if (!available && chatInfo != null) {
for (String s : chatInfo.available_reactions) {
@ -20634,10 +20644,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
textSelectionHintWasShowed = false;
}
private void createMenu(View v, boolean single, boolean listView, float x, float y) {
createMenu(v, single, listView, x, y, true);
}
private CharSequence getMessageCaption(MessageObject messageObject, MessageObject.GroupedMessages group) {
String restrictionReason = MessagesController.getRestrictionReason(messageObject.messageOwner.restriction_reason);
if (!TextUtils.isEmpty(restrictionReason)) {
@ -20675,7 +20681,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
"[\u00A9\u00AE]\uFE0F?|[\u2122\u2139]\uFE0F?|\uD83C\uDC04\uFE0F?|\uD83C\uDCCF\uFE0F?|" +
"[\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA]\uFE0F?)+");
}
private void createMenu(View v, boolean single, boolean listView, float x, float y) {
createMenu(v, single, listView, x, y, true);
}
private void createMenu(View v, boolean single, boolean listView, float x, float y, boolean searchGroup) {
createMenu(v, single, listView, x, y, searchGroup, false);
}
private void createMenu(View v, boolean single, boolean listView, float x, float y, boolean searchGroup, boolean onDoubleTapped) {
if (actionBar.isActionModeShowed() || reportType >= 0) {
return;
}
@ -21523,7 +21538,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Rect rect = new Rect();
List<TLRPC.TL_availableReaction> availableReacts = getMediaDataController().getEnabledReactionsList();
boolean isReactionsViewAvailable = !isSecretChat() && !isInScheduleMode() && currentUser == null && message.hasReactions() && (!ChatObject.isChannel(currentChat) || currentChat.megagroup) && !availableReacts.isEmpty() && message.messageOwner.reactions.can_see_list;
boolean nekoXShowReactionsView = (NekoConfig.reactions.Int() == 0 || onDoubleTapped); // Show reactions and hide them from tap
boolean isReactionsViewAvailable = nekoXShowReactionsView && !isSecretChat() && !isInScheduleMode() && currentUser == null && message.hasReactions() && (!ChatObject.isChannel(currentChat) || currentChat.megagroup) && !availableReacts.isEmpty() && message.messageOwner.reactions.can_see_list;
boolean isReactionsAvailable;
boolean needLoadReactionsChat = false;
if (message.isForwardedChannelPost()) {
@ -21532,10 +21548,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
isReactionsAvailable = true;
needLoadReactionsChat = true;
} else {
isReactionsAvailable = !isSecretChat() && !isInScheduleMode() && message.isReactionsAvailable() && (chatInfo != null && !chatInfo.available_reactions.isEmpty()) && !availableReacts.isEmpty();
isReactionsAvailable = nekoXShowReactionsView && !isSecretChat() && !isInScheduleMode() && message.isReactionsAvailable() && (chatInfo != null && !chatInfo.available_reactions.isEmpty()) && !availableReacts.isEmpty();
}
} else {
isReactionsAvailable = !isSecretChat() && !isInScheduleMode() && message.isReactionsAvailable() && (chatInfo != null && !chatInfo.available_reactions.isEmpty() || (chatInfo == null && !ChatObject.isChannel(currentChat)) || currentUser != null) && !availableReacts.isEmpty();
isReactionsAvailable = nekoXShowReactionsView && !isSecretChat() && !isInScheduleMode() && message.isReactionsAvailable() && (chatInfo != null && !chatInfo.available_reactions.isEmpty() || (chatInfo == null && !ChatObject.isChannel(currentChat)) || currentUser != null) && !availableReacts.isEmpty();
}
boolean showMessageSeen = !isReactionsViewAvailable && !isInScheduleMode() && currentChat != null && message.isOutOwner() && message.isSent() && !message.isEditing() && !message.isSending() && !message.isSendError() && !message.isContentUnread() && !message.isUnread() && (ConnectionsManager.getInstance(currentAccount).getCurrentTime() - message.messageOwner.date < getMessagesController().chatReadMarkExpirePeriod) && (ChatObject.isMegagroup(currentChat) || !ChatObject.isChannel(currentChat)) && chatInfo != null && chatInfo.participants_count < getMessagesController().chatReadMarkSizeThreshold && !(message.messageOwner.action instanceof TLRPC.TL_messageActionChatJoinedByRequest) && (v instanceof ChatMessageCell);

2
TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java
View File

@ -166,7 +166,7 @@ public class NekoConfig {
public static ConfigItem rememberAllBackMessages = addConfig("rememberAllBackMessages", configTypeBool, false);
public static ConfigItem hideSendAsChannel = addConfig("hideSendAsChannel", configTypeBool, false);
public static ConfigItem showSpoilersDirectly = addConfig("showSpoilersDirectly", configTypeBool, false);
public static ConfigItem disableDoubleTabReactions = addConfig("disableDoubleTabReactions", configTypeBool, false);
public static ConfigItem reactions = addConfig("reactions", configTypeInt, 0);
public static ConfigItem disableAutoDownloadingWin32Executable = addConfig("Win32ExecutableFiles", configTypeBool, true);
public static ConfigItem disableAutoDownloadingArchive = addConfig("ArchiveFiles", configTypeBool, true);

7
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
View File

@ -100,11 +100,16 @@ public class NekoChatSettingsActivity extends BaseFragment implements Notificati
private final AbstractConfigCell messageMenuRow = cellGroup.appendCell(new ConfigCellSelectBox(LocaleController.getString("MessageMenu"), null, null, () -> {
showMessageMenuAlert();
}));
private final AbstractConfigCell reactionsRow = cellGroup.appendCell(new ConfigCellSelectBox(null, NekoConfig.reactions,
new String[]{
LocaleController.getString("doubleTapSendReactions", R.string.doubleTapSendReactions),
LocaleController.getString("doubleTapShowReactions", R.string.doubleTapShowReactions),
LocaleController.getString("ReactionsDisabled", R.string.ReactionsDisabled),
}, null));
private final AbstractConfigCell repeatConfirmRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.repeatConfirm));
private final AbstractConfigCell rememberAllBackMessagesRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.rememberAllBackMessages));
private final AbstractConfigCell hideSendAsChannelRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.hideSendAsChannel));
private final AbstractConfigCell showSpoilersDirectlyRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.showSpoilersDirectly));
private final AbstractConfigCell disableDoubleTabReactionsRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableDoubleTabReactions));
private final AbstractConfigCell divider1 = cellGroup.appendCell(new ConfigCellDivider());
private final AbstractConfigCell header2 = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString("AutoDownload")));
private final AbstractConfigCell win32Row = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableAutoDownloadingWin32Executable));

5
TMessagesProj/src/main/res/values/strings_neko.xml
View File

@ -126,7 +126,6 @@
<string name="autoUpdateSubInfo">Update proxies automatically</string>
<string name="hideSendAsChannel">Hide send as channel</string>
<string name="showSpoilersDirectly">Display Spoiler messages directly</string>
<string name="disableDoubleTabReactions">Disable double tap reactions</string>
<string name="SaveToDownloadCount_zero">Saving %1$d files to downloads</string>
<string name="SaveToDownloadCount_one">Saving %1$d file to downloads</string>
<string name="SaveToDownloadCount_two">Saving %1$d files to downloads</string>
@ -135,5 +134,9 @@
<string name="SaveToDownloadCount_other">Saving %1$d files to downloads</string>
<string name="NekoGeneralNotification">Notification</string>
<string name="disableNotificationBubbles">Disable Bubbles in notification</string>
<string name="reactions">Reactions in Menu</string>
<string name="doubleTapSendReactions">Send Reaction when double tap (Default)</string>
<string name="doubleTapShowReactions">Show reactions when double tap only</string>
<string name="ReactionsDisabled">Disable</string>
</resources>