TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into m_10.13.0

Browse Source
This commit is contained in:
xtaodada 2024-06-04 21:27:58 +08:00
commit b32a8de2be
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
View File

@ -4423,7 +4423,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
private boolean checkTextSelection(MotionEvent event) {
TextSelectionHelper.ChatListTextSelectionHelper textSelectionHelper = delegate.getTextSelectionHelper();
if (textSelectionHelper == null/* || MessagesController.getInstance(currentAccount).isChatNoForwards(currentMessageObject.getChatId()) || (currentMessageObject.messageOwner != null && currentMessageObject.messageOwner.noforwards)*/ || NekoXConfig.disableFlagSecure) {
if (textSelectionHelper == null/* || MessagesController.getInstance(currentAccount).isChatNoForwards(currentMessageObject.getChatId()) || (currentMessageObject.messageOwner != null && currentMessageObject.messageOwner.noforwards)*/) {
return false;
}
boolean hasTextBlocks = currentMessageObject.textLayoutBlocks != null && !currentMessageObject.textLayoutBlocks.isEmpty();

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

@ -36409,7 +36409,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public void didPressTime(ChatMessageCell cell) {
if (!cell.getMessageObject().isImportedForward()) {
showTimeHint(cell);
if (NaConfig.INSTANCE.getShowTimeHint().Bool()) {
showTimeHint(cell);
}
return;
}
createUndoView();

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

@ -157,6 +157,7 @@ public class NekoChatSettingsActivity extends BaseNekoXSettingsActivity implemen
private final AbstractConfigCell disableClickCommandToSendRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableClickCommandToSend(), LocaleController.getString(R.string.DisableClickCommandToSendHint)));
private final AbstractConfigCell showQuickReplyInBotCommandsRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getShowQuickReplyInBotCommands()));
private final AbstractConfigCell disablePreviewVideoSoundShortcutRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisablePreviewVideoSoundShortcut(), LocaleController.getString(R.string.DisablePreviewVideoSoundShortcutNotice)));
private final AbstractConfigCell showTimeHintRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getShowTimeHint()));
private final AbstractConfigCell dividerInteractions = cellGroup.appendCell(new ConfigCellDivider());
// Sticker

6
TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
View File

@ -614,6 +614,12 @@ object NaConfig {
ConfigItem.configTypeBool,
true
)
val showTimeHint =
addConfig(
"ShowTimeHint",
ConfigItem.configTypeBool,
true
)
private fun addConfig(
k: String,

1
TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
View File

@ -155,4 +155,5 @@
<string name="RegexFiltersAddDescription">您可以使用网站 <![CDATA[<a href="https://regex101.com">regex101.com</a>]]> 来测试您的正则表达式。
您也可以使用纯文本，但请不要忘记使用转义符号。</string>
<string name="RegexFiltersAddError">正则表达式语法错误</string>
<string name="ShowTimeHint">点击消息时间显示详细信息</string>
</resources>

1
TMessagesProj/src/main/res/values/strings_na.xml
View File

@ -155,4 +155,5 @@
<string name="RegexFiltersAddDescription">You can use site <![CDATA[<a href="https://regex101.com">regex101.com</a>]]> to fully test your regular expression.
You can also use plain text, but don\'t forget to escape brackets.</string>
<string name="RegexFiltersAddError">Regex syntax error</string>
<string name="ShowTimeHint">Click message time to display details</string>
</resources>