1.8.9 (374)

nicegram · Nov 18, 2024 · 9776f20 · 9776f20
1 parent e68aa0a
commit 9776f20
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 14 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/Package.resolved b/Package.resolved
@@ -221,8 +221,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-http-types",
       "state" : {
-        "revision" : "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
-        "version" : "1.3.0"
+        "revision" : "ef18d829e8b92d731ad27bb81583edd2094d1ce3",
+        "version" : "1.3.1"
       }
     },
     {
@@ -338,8 +338,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/trustwallet/wallet-core.git",
       "state" : {
-        "revision" : "c4907d444673e7eb4c131b67ce2ced5b2d2cb09e",
-        "version" : "4.1.16"
+        "revision" : "3772536bd3de5cf3a8b412f598823fc6ea5285fe",
+        "version" : "4.1.17"
       }
     },
     {

diff --git a/Telegram/Telegram-iOS/ar.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ar.lproj/NiceLocalizable.strings
@@ -162,6 +162,8 @@
 "Premium.rememberFolderOnExit" = "تذكر المجلد الحالي عند الخروج";
 "NicegramSettings.HideStories" = "إخفاء الستوري";
 "NicegramSettings.HideBadgeCounters" = "إخفاء عدادات الشارات";
+"NicegramSettings.HideUnreadCounters" = "إخفاء عدادات الغير مقروءة";
+"NicegramSettings.HideMentionNotification" = "إخفاء إشعارات الإشارة";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "أقدم من";

diff --git a/Telegram/Telegram-iOS/de.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/de.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Aktuellen Ordner beim Beenden merken";
 "NicegramSettings.HideStories" = "Stories verbergen";
 "NicegramSettings.HideBadgeCounters" = "Ausblenden der Abzeichenzähler";
+"NicegramSettings.HideUnreadCounters" = "Ungelesene Zähler verbergen";
+"NicegramSettings.HideMentionNotification" = "Erwähnungsbenachrichtigungen verbergen";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Älter als";

diff --git a/Telegram/Telegram-iOS/es.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/es.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Recordar la carpeta actual a la salida";
 "NicegramSettings.HideStories" = "Ocultar Historias";
 "NicegramSettings.HideBadgeCounters" = "Ocultar contadores de insignias";
+"NicegramSettings.HideUnreadCounters" = "Ocultar contadores de no leídos";
+"NicegramSettings.HideMentionNotification" = "Ocultar notificación de mención";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Mayor que";

diff --git a/Telegram/Telegram-iOS/fr.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/fr.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Mémoriser le dossier actuel en quittant";
 "NicegramSettings.HideStories" = "Cacher les histoires";
 "NicegramSettings.HideBadgeCounters" = "Masquer les compteurs de badges";
+"NicegramSettings.HideUnreadCounters" = "Masquer les compteurs de non-lus";
+"NicegramSettings.HideMentionNotification" = "Masquer la notification de mention";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Plus vieux que";

diff --git a/Telegram/Telegram-iOS/it.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/it.lproj/NiceLocalizable.strings
@@ -162,6 +162,8 @@ Il browser selezionato deve essere installato.";
 "Premium.rememberFolderOnExit" = "Ricorda la cartella corrente all'uscita";
 "NicegramSettings.HideStories" = "Nascondi Storie";
 "NicegramSettings.HideBadgeCounters" = "Nascondi i contatori dei badge";
+"NicegramSettings.HideUnreadCounters" = "Nascondi contatori dei non letti";
+"NicegramSettings.HideMentionNotification" = "Nascondi notifiche di menzione";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Più vecchio di";

diff --git a/Telegram/Telegram-iOS/ko.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ko.lproj/NiceLocalizable.strings
@@ -163,6 +163,8 @@
 "Premium.rememberFolderOnExit" = "종료시 현재 폴더 기억하기";
 "NicegramSettings.HideStories" = "스토리 숨기기";
 "NicegramSettings.HideBadgeCounters" = "뱃지 카운터 숨기기";
+"NicegramSettings.HideUnreadCounters" = "읽지 않은 카운터 숨기기";
+"NicegramSettings.HideMentionNotification" = "언급 알림 숨기기";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "이전의";

diff --git a/Telegram/Telegram-iOS/pl.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/pl.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Zapamiętaj bieżący folder przy wyjściu";
 "NicegramSettings.HideStories" = "Ukryj Historie";
 "NicegramSettings.HideBadgeCounters" = "Ukryj liczniki odznak";
+"NicegramSettings.HideUnreadCounters" = "Ukryj liczniki nieprzeczytanych";
+"NicegramSettings.HideMentionNotification" = "Ukryj powiadomienia o wzmiankach";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Starsze niż";

diff --git a/Telegram/Telegram-iOS/pt.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/pt.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Lembrar pasta atual antes de sair";
 "NicegramSettings.HideStories" = "Ocultar Stories";
 "NicegramSettings.HideBadgeCounters" = "Ocultar contadores de distintivos";
+"NicegramSettings.HideUnreadCounters" = "Ocultar contadores de não lidos";
+"NicegramSettings.HideMentionNotification" = "Ocultar notificação de menção";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Mais antigo que";

diff --git a/Telegram/Telegram-iOS/ru.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ru.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "Запомнить текущую папку при выходе";
 "NicegramSettings.HideStories" = "Скрыть истории";
 "NicegramSettings.HideBadgeCounters" = "Скрыть счетчики значков";
+"NicegramSettings.HideUnreadCounters" = "Скрыть счетчики непрочитанных сообщений";
+"NicegramSettings.HideMentionNotification" = "Скрыть уведомления об упоминаниях";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Старше, чем";

diff --git a/Telegram/Telegram-iOS/tr.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/tr.lproj/NiceLocalizable.strings
@@ -162,6 +162,8 @@
 "Premium.rememberFolderOnExit" = "Çıkışta şu anki klasörü hatırla";
 "NicegramSettings.HideStories" = "Hikayeleri Gizle";
 "NicegramSettings.HideBadgeCounters" = "Rozet sayacını gizle";
+"NicegramSettings.HideUnreadCounters" = "Okunmamış sayacını gizle";
+"NicegramSettings.HideMentionNotification" = "Bahsetme bildirimlerini gizle";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Şundan daha eski:";

diff --git a/Telegram/Telegram-iOS/zh-hans.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/zh-hans.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "退出时记住当前分组";
 "NicegramSettings.HideStories" = "隐藏故事";
 "NicegramSettings.HideBadgeCounters" = "隐藏徽章计数器";
+"NicegramSettings.HideUnreadCounters" = "隐藏未读计数";
+"NicegramSettings.HideMentionNotification" = "隐藏提及通知";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "早于";

diff --git a/Telegram/Telegram-iOS/zh-hant.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/zh-hant.lproj/NiceLocalizable.strings
@@ -161,6 +161,8 @@
 "Premium.rememberFolderOnExit" = "記下應用程式關閉時所在的資料夾";
 "NicegramSettings.HideStories" = "隱藏故事";
 "NicegramSettings.HideBadgeCounters" = "隱藏徽章計數器";
+"NicegramSettings.HideUnreadCounters" = "隱藏未讀計數器";
+"NicegramSettings.HideMentionNotification" = "隱藏提及通知";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "早於";

diff --git a/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift b/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift
@@ -463,6 +463,11 @@ public struct ChatListFilterTabEntryUnreadCount: Equatable {
         self.value = value
         self.hasUnmuted = hasUnmuted
     }
+
+    public init(entry: ChatListFilterTabEntryUnreadCount, hideUnreadCounters: Bool) {
+        self.value = hideUnreadCounters ? 0 : entry.value
+        self.hasUnmuted = entry.hasUnmuted
+    }
 }
 
 public enum ChatListFilterTabEntry: Equatable {

diff --git a/submodules/Display/BUILD b/submodules/Display/BUILD
@@ -1,5 +1,7 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
+NGDEPS = ["//Nicegram/NGData:NGData"]
+
 swift_library(
     name = "Display",
     module_name = "Display",
@@ -9,7 +11,7 @@ swift_library(
     copts = [
         #"-warnings-as-errors",
     ],
-    deps = [
+    deps = NGDEPS + [
     	"//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
     	"//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
         "//submodules/AppBundle:AppBundle",

diff --git a/submodules/Display/Source/NavigationBar.swift b/submodules/Display/Source/NavigationBar.swift
@@ -1,7 +1,9 @@
 import UIKit
 import AsyncDisplayKit
 import SwiftSignalKit
-
+// MARK: Nicegram NCG-6652 Hide UI notifications
+import NGData
+//
 private var backArrowImageCache: [Int32: UIImage] = [:]
 
 open class SparseNode: ASDisplayNode {
@@ -809,6 +811,9 @@ open class NavigationBar: ASDisplayNode {
     }
 
     private func updateBadgeText(text: String?) {
+// MARK: Nicegram NCG-6652 Hide UI notifications
+        guard !NGSettings.hideUnreadCounters else { return }
+//
         let actualText = text ?? ""
         if self.badgeNode.text != actualText {
             self.badgeNode.text = actualText

diff --git a/...dules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift b/...dules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift
@@ -9,7 +9,9 @@ import ProgressNavigationButtonNode
 import AccountContext
 import SearchUI
 import ChatListUI
-
+// MARK: Nicegram NCG-6652 Hide UI notifications
+import NGData
+//
 public final class PeerSelectionControllerImpl: ViewController, PeerSelectionController {
     private let context: AccountContext
 
@@ -444,8 +446,23 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
                 }
             }
 
-            let resolvedItems = filterItems
-
+// MARK: Nicegram NCG-6652 Hide UI notifications
+            let resolvedItems = filterItems.map { filter -> ChatListFilterTabEntry in
+                switch filter {
+                case let .all(unreadCount):
+                    return .all(unreadCount: NGSettings.hideUnreadCounters ? 0 : unreadCount)
+                case let .filter(id, text, unread):
+                    return .filter(
+                        id: id,
+                        text: text,
+                        unread: .init(
+                            entry: unread,
+                            hideUnreadCounters: NGSettings.hideUnreadCounters
+                        )
+                    )
+                }
+            }
+//
             var wasEmpty = false
             if let tabContainerData = strongSelf.tabContainerData {
                 wasEmpty = tabContainerData.0.count <= 1 || tabContainerData.1