Merge remote-tracking branch 'upstream/dev' into dev

LiuYi0526 · Apr 13, 2024 · 0e0877e · 0e0877e
2 parents f6361f3 + ab03cac
commit 0e0877e
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 1 deletion.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -24904,6 +24904,11 @@ private void updateBottomOverlay() {
                         bottomOverlayChatText.setText(LocaleController.getString("ChannelUnmute", R.string.ChannelUnmute), true);
                         bottomOverlayChatText.setEnabled(true);
                     }
+                    // na: DisableChannelMuteButton
+                    if (NaConfig.INSTANCE.getDisableChannelMuteButton().Bool()) {
+                        bottomOverlayChatText.setText("", false);
+                        bottomOverlayChatText.setEnabled(false);
+                    }
                     showBottomOverlayProgress(false, bottomOverlayProgress.getTag() != null);
                 } else if (forumTopic != null && forumTopic.closed) {
                     if (!ChatObject.canManageTopic(currentAccount, currentChat, forumTopic)) {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
@@ -6510,7 +6510,7 @@ public void onItemClick(int id) {
                                 return;
                             }
                         }
-                    CameraScanActivity.showAsSheet(DialogsActivity.this, false, CameraScanActivity.TYPE_QR, new CameraScanActivity.CameraScanActivityDelegate() {
+                    CameraScanActivity.showAsSheet(DialogsActivity.this, true, CameraScanActivity.TYPE_QR, new CameraScanActivity.CameraScanActivityDelegate() {
 
                         @Override
                         public void didFindQr(String text) {

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
@@ -136,6 +136,7 @@ public class NekoChatSettingsActivity extends BaseNekoXSettingsActivity implemen
     private final AbstractConfigCell disableProximityEventsRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableProximityEvents));
     private final AbstractConfigCell disableTrendingRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableTrending));
     private final AbstractConfigCell disableSwipeToNextRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableSwipeToNext));
+    private final AbstractConfigCell disableChannelMuteButtonRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableChannelMuteButton()));
     private final AbstractConfigCell disablePhotoSideActionRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disablePhotoSideAction));
     private final AbstractConfigCell disableClickProfileGalleryViewRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableClickProfileGalleryView()));
     private final AbstractConfigCell disableRemoteEmojiInteractionsRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableRemoteEmojiInteractions));

diff --git a/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt b/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
@@ -572,6 +572,12 @@ object NaConfig {
             ConfigItem.configTypeBool,
             false
         )
+    val disableChannelMuteButton =
+        addConfig(
+            "DisableChannelMuteButton",
+            ConfigItem.configTypeBool,
+            false
+        )
 
     private fun addConfig(
         k: String,

diff --git a/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml b/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">إظهار الإشعارات المقيمة</string>
     <string name="PushServiceTypeUnifiedGateway">بوابة دفع موحدة</string>
     <string name="SendMp4DocumentAsVideo">إرسال مستند mp4 كفيديو</string>
+    <string name="StickersChooseShortNameForStickerPack">اختر اسما قصيرا لحزمتك.</string>
+    <string name="StickersCopyStickerSet">نسخ مجموعة الملصقات</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml b/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Zobrazit rezidentní oznámení</string>
     <string name="PushServiceTypeUnifiedGateway">Sjednocená posuvná brána</string>
     <string name="SendMp4DocumentAsVideo">Poslat dokument mp4 jako video</string>
+    <string name="StickersChooseShortNameForStickerPack">Choose a short name for your pack.</string>
+    <string name="StickersCopyStickerSet">Copy Sticker Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml b/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Vis residente notifikationer</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Send mp4-dokument som video</string>
+    <string name="StickersChooseShortNameForStickerPack">Vælg et kort navn til din pakke.</string>
+    <string name="StickersCopyStickerSet">Kopiér Klistermærke Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml b/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Resident-Benachrichtigungen anzeigen</string>
     <string name="PushServiceTypeUnifiedGateway">Einheitliches Push-Gateway</string>
     <string name="SendMp4DocumentAsVideo">mp4 Dokument als Video senden</string>
+    <string name="StickersChooseShortNameForStickerPack">Wähle einen kurzen Namen für dein Paket.</string>
+    <string name="StickersCopyStickerSet">Sticker-Set kopieren</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml b/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Εμφάνιση ειδοποιήσεων κατοίκων</string>
     <string name="PushServiceTypeUnifiedGateway">Ενοποιημένη Πύλη Ώθησης</string>
     <string name="SendMp4DocumentAsVideo">Αποστολή εγγράφου mp4 ως βίντεο</string>
+    <string name="StickersChooseShortNameForStickerPack">Επιλέξτε ένα σύντομο όνομα για το πακέτο σας.</string>
+    <string name="StickersCopyStickerSet">Αντιγραφή Σετ Αυτοκόλλητων</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-es-rES/strings_na.xml b/TMessagesProj/src/main/res/values-es-rES/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Mostrar notificación permanente</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway de Unified Push</string>
     <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
+    <string name="StickersChooseShortNameForStickerPack">Elige un nombre corto para tu paquete.</string>
+    <string name="StickersCopyStickerSet">Copiar Set de Sticker</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml b/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Näytä kotimaiset ilmoitukset</string>
     <string name="PushServiceTypeUnifiedGateway">Yhdistetty Push-Yhdyskäytävä</string>
     <string name="SendMp4DocumentAsVideo">Lähetä mp4-asiakirja videona</string>
+    <string name="StickersChooseShortNameForStickerPack">Choose a short name for your pack.</string>
+    <string name="StickersCopyStickerSet">Copy Sticker Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml b/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Afficher les notifications des résidents</string>
     <string name="PushServiceTypeUnifiedGateway">Passerelle Push unifiée</string>
     <string name="SendMp4DocumentAsVideo">Envoyer le document mp4 en tant que vidéo</string>
+    <string name="StickersChooseShortNameForStickerPack">Choisissez un nom court pour votre pack.</string>
+    <string name="StickersCopyStickerSet">Copier le jeu d\'autocollants</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml b/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Mostra notifiche residenti</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Invia il documento mp4 come video</string>
+    <string name="StickersChooseShortNameForStickerPack">Scegli un nome breve per il tuo pacchetto.</string>
+    <string name="StickersCopyStickerSet">Copia Set Adesivo</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml b/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">常駐通知を表示</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">mp4ドキュメントを動画として送信</string>
+    <string name="StickersChooseShortNameForStickerPack">あなたのパックの短い名前を選択してください。</string>
+    <string name="StickersCopyStickerSet">ステッカーセットをコピー</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml b/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Toon inactieve meldingen</string>
     <string name="PushServiceTypeUnifiedGateway">Gecombineerde Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Stuur mp4-document als video</string>
+    <string name="StickersChooseShortNameForStickerPack">Kies een korte naam voor je pakket.</string>
+    <string name="StickersCopyStickerSet">Kopieer Sticker Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml b/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Vis varsling fra kunder</string>
     <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Send mp4-dokument som video</string>
+    <string name="StickersChooseShortNameForStickerPack">Choose a short name for your pack.</string>
+    <string name="StickersCopyStickerSet">Copy Sticker Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml b/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Pokaż powiadomienia mieszkańców</string>
     <string name="PushServiceTypeUnifiedGateway">Zunifikowana brama popychająca</string>
     <string name="SendMp4DocumentAsVideo">Wyślij dokument mp4 jako film</string>
+    <string name="StickersChooseShortNameForStickerPack">Wybierz krótką nazwę dla paczki.</string>
+    <string name="StickersCopyStickerSet">Kopiuj zestaw naklejek</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
     <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
+    <string name="StickersChooseShortNameForStickerPack">Escolha um nome curto para o seu pacote.</string>
+    <string name="StickersCopyStickerSet">Copiar Conjunto de Sticker</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
     <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
+    <string name="StickersChooseShortNameForStickerPack">Escolha um nome curto para o seu pacote.</string>
+    <string name="StickersCopyStickerSet">Copiar Conjunto de Sticker</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml b/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Arată notificările rezidenților</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Push Unificat</string>
     <string name="SendMp4DocumentAsVideo">Trimite documentul mp4 ca video</string>
+    <string name="StickersChooseShortNameForStickerPack">Alege un nume scurt pentru pachet.</string>
+    <string name="StickersCopyStickerSet">Copiază Setul de Sticker</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml b/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Показывать уведомления жителя</string>
     <string name="PushServiceTypeUnifiedGateway">Единый Push шлюз</string>
     <string name="SendMp4DocumentAsVideo">Отправить mp4 документ как видео</string>
+    <string name="StickersChooseShortNameForStickerPack">Выберите короткое имя для вашего набора.</string>
+    <string name="StickersCopyStickerSet">Копировать набор стикеров</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml b/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Visa inhemska aviseringar</string>
     <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Skicka mp4-dokument som video</string>
+    <string name="StickersChooseShortNameForStickerPack">Välj ett kort namn för ditt paket.</string>
+    <string name="StickersCopyStickerSet">Kopiera klistermärke set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml b/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
@@ -133,4 +133,6 @@
     <string name="PushServiceTypeInAppDialog">Показувати сповіщення резидента</string>
     <string name="PushServiceTypeUnifiedGateway">Уніфікований Push-шлюз</string>
     <string name="SendMp4DocumentAsVideo">Відправити mp4 документ як відео</string>
+    <string name="StickersChooseShortNameForStickerPack">Виберіть коротке ім\'я для свого набору.</string>
+    <string name="StickersCopyStickerSet">Копіювати набір наклейок</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml b/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
@@ -134,5 +134,7 @@
     <string name="PushServiceTypeInAppDialog">显示常驻通知</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">MP4 视频作为文件发送时可预览</string>
+    <string name="StickersChooseShortNameForStickerPack">为您的包选择一个简短的名称。</string>
     <string name="StickersCopyStickerSet">复制整个贴纸包</string>
+    <string name="DisableChannelMuteButton">禁用频道聊天页面的静音按钮</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml b/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
@@ -134,4 +134,6 @@
     <string name="PushServiceTypeInAppDialog">Show resident notifications</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
     <string name="SendMp4DocumentAsVideo">Send mp4 document as video</string>
+    <string name="StickersChooseShortNameForStickerPack">Choose a short name for your pack.</string>
+    <string name="StickersCopyStickerSet">Copy Sticker Set</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values/strings_na.xml b/TMessagesProj/src/main/res/values/strings_na.xml
@@ -136,4 +136,5 @@
     <string name="SendMp4DocumentAsVideo">Send mp4 document as video</string>
     <string name="StickersChooseShortNameForStickerPack">Choose a short name for your pack.</string>
     <string name="StickersCopyStickerSet">Copy Sticker Set</string>
+    <string name="DisableChannelMuteButton">Disable channel mute button</string>
 </resources>