1.8.9 (371)

nicegram · Nov 13, 2024 · a91ebb9 · a91ebb9
1 parent f2b6b13
commit a91ebb9
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 255 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/Nicegram/NGData/Sources/NGSettings.swift b/Nicegram/NGData/Sources/NGSettings.swift
@@ -120,25 +120,6 @@ public struct NGSettings {
     public static var hideBadgeCounters: Bool
 }
 
-public extension NGSettings {
-    struct ChatDisplaySettings: Codable {
-        public var enableGrayscale: Bool = false
-    }
-
-    @NGStorage(key: "chatDisplaySettings", defaultValue: ChatDisplaySettings())
-    static var chatDisplaySettings
-}
-
-public extension NGSettings {
-    struct ChatListDisplaySettings: Codable {
-        public var disableAnimations: Bool = false
-        public var enableGrayscale: Bool = false
-    }
-
-    @NGStorage(key: "chatListDisplaySettings", defaultValue: ChatListDisplaySettings())
-    static var chatListDisplaySettings
-}
-
 public struct NGWebSettings {
     // MARK: Remote Settings
     @NGStorage(key: "syncPins", defaultValue: false)

diff --git a/Nicegram/NGUI/Sources/NicegramSettingsController.swift b/Nicegram/NGUI/Sources/NicegramSettingsController.swift
@@ -83,9 +83,6 @@ private enum EasyToggleType {
     case hideReactions
     case hideStories
     case hideBadgeCounters
-    case enableAnimationsInChatList
-    case enableGrayscaleInChatList
-    case enableGrayscaleInChat
 }
 
 
@@ -547,12 +544,6 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
                     }
                 case .hideBadgeCounters:
                     NGSettings.hideBadgeCounters = value
-                case .enableAnimationsInChatList:
-                    NGSettings.chatListDisplaySettings.disableAnimations = !value
-                case .enableGrayscaleInChatList:
-                    NGSettings.chatListDisplaySettings.enableGrayscale = value
-                case .enableGrayscaleInChat:
-                    NGSettings.chatDisplaySettings.enableGrayscale = value
                 }
             })
         case let .unblockHeader(text):
@@ -743,19 +734,10 @@ private func nicegramSettingsControllerEntries(presentationData: PresentationDat
 
     entries.append(.easyToggle(toggleIndex, .hideStories, l("NicegramSettings.HideStories"), NGSettings.hideStories))
     toggleIndex += 1
-    
+
     entries.append(.easyToggle(toggleIndex, .hideBadgeCounters, l("NicegramSettings.HideBadgeCounters"), NGSettings.hideBadgeCounters))
     toggleIndex += 1
-
-    entries.append(.easyToggle(toggleIndex, .enableAnimationsInChatList, l("NicegramSettings.EnableAnimationsInChatList"), !NGSettings.chatListDisplaySettings.disableAnimations))
-    toggleIndex += 1
-
-    entries.append(.easyToggle(toggleIndex, .enableGrayscaleInChatList, l("NicegramSettings.EnableGrayscaleInChatList"), NGSettings.chatListDisplaySettings.enableGrayscale))
-    toggleIndex += 1
-
-    entries.append(.easyToggle(toggleIndex, .enableGrayscaleInChat, l("NicegramSettings.EnableGrayscaleInChat"), NGSettings.chatDisplaySettings.enableGrayscale))
-    toggleIndex += 1
-
+
     if let sharingSettings {
         entries.append(
             .shareBotsData(

diff --git a/Nicegram/NGUtils/Sources/GrayscaleApplier.swift b/Nicegram/NGUtils/Sources/GrayscaleApplier.swift
diff --git a/Package.resolved b/Package.resolved
@@ -113,17 +113,17 @@
       "kind" : "remoteSourceControl",
       "location" : "[email protected]:mobyrix/nicegram-assistant-ios.git",
       "state" : {
-        "branch" : "develop",
-        "revision" : "0f8c6a99b60031394f19946fe6887d4e7a12f3b7"
+        "branch" : "fix/wallet-bugs",
+        "revision" : "52d1fb8ba76a4d4ddc2a90bbde8c497fe1cf3cac"
       }
     },
     {
       "identity" : "nicegram-wallet-ios",
       "kind" : "remoteSourceControl",
       "location" : "[email protected]:mobyrix/nicegram-wallet-ios.git",
       "state" : {
-        "branch" : "develop",
-        "revision" : "6417219110dae50a9dd129c61795dc469ceb12d0"
+        "branch" : "fix/wallet-bugs",
+        "revision" : "fbc76a10e90e1e5443e64bbac38bfd9aed12a4ba"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "nicegram-package",
     dependencies: [
-        .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "develop"),        
-        .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "develop")
+        .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "fix/wallet-bugs"),        
+        .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "fix/wallet-bugs")
     ]
 )
diff --git a/Telegram/Telegram-iOS/ar.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ar.lproj/NiceLocalizable.strings
@@ -162,9 +162,6 @@
 "Premium.rememberFolderOnExit" = "تذكر المجلد الحالي عند الخروج";
 "NicegramSettings.HideStories" = "إخفاء الستوري";
 "NicegramSettings.HideBadgeCounters" = "إخفاء عدادات الشارات";
-"NicegramSettings.EnableAnimationsInChatList" = "الرسوم المتحركة في قائمة الدردشة";
-"NicegramSettings.EnableGrayscaleInChatList" = "الرمادي في قائمة الدردشة";
-"NicegramSettings.EnableGrayscaleInChat" = "الرمادي في الدردشة";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "أقدم من";

diff --git a/Telegram/Telegram-iOS/de.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/de.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Aktuellen Ordner beim Beenden merken";
 "NicegramSettings.HideStories" = "Stories verbergen";
 "NicegramSettings.HideBadgeCounters" = "Ausblenden der Abzeichenzähler";
-"NicegramSettings.EnableAnimationsInChatList" = "Animationen in der Chatliste";
-"NicegramSettings.EnableGrayscaleInChatList" = "Graustufen in der Chatliste";
-"NicegramSettings.EnableGrayscaleInChat" = "Graustufen im Chat";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Älter als";

diff --git a/Telegram/Telegram-iOS/en.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/en.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Remember current folder on exit";
 "NicegramSettings.HideStories" = "Hide Stories";
 "NicegramSettings.HideBadgeCounters" = "Hide Badge counters";
-"NicegramSettings.EnableAnimationsInChatList" = "Animations in chat list";
-"NicegramSettings.EnableGrayscaleInChatList" = "Grayscale in chat list";
-"NicegramSettings.EnableGrayscaleInChat" = "Grayscale in chat";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Older than";

diff --git a/Telegram/Telegram-iOS/es.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/es.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Recordar la carpeta actual a la salida";
 "NicegramSettings.HideStories" = "Ocultar Historias";
 "NicegramSettings.HideBadgeCounters" = "Ocultar contadores de insignias";
-"NicegramSettings.EnableAnimationsInChatList" = "Animaciones en la lista de chat";
-"NicegramSettings.EnableGrayscaleInChatList" = "Escala de grises en la lista de chat";
-"NicegramSettings.EnableGrayscaleInChat" = "Escala de grises en el chat";
 
 /*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,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Mémoriser le dossier actuel en quittant";
 "NicegramSettings.HideStories" = "Cacher les histoires";
 "NicegramSettings.HideBadgeCounters" = "Masquer les compteurs de badges";
-"NicegramSettings.EnableAnimationsInChatList" = "Animations dans la liste de chat";
-"NicegramSettings.EnableGrayscaleInChatList" = "Niveaux de gris dans la liste de chat";
-"NicegramSettings.EnableGrayscaleInChat" = "Gris dans le chat";
 
 /*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,9 +162,6 @@ 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.EnableAnimationsInChatList" = "Animazioni nella lista chat";
-"NicegramSettings.EnableGrayscaleInChatList" = "Scala di grigi nella lista chat";
-"NicegramSettings.EnableGrayscaleInChat" = "In scala di grigi nella chat";
 
 /*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,9 +163,6 @@
 "Premium.rememberFolderOnExit" = "종료시 현재 폴더 기억하기";
 "NicegramSettings.HideStories" = "스토리 숨기기";
 "NicegramSettings.HideBadgeCounters" = "뱃지 카운터 숨기기";
-"NicegramSettings.EnableAnimationsInChatList" = "채팅 목록의 애니메이션";
-"NicegramSettings.EnableGrayscaleInChatList" = "채팅 목록의 그레이스케일";
-"NicegramSettings.EnableGrayscaleInChat" = "채팅에서의 그레이스케일";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "이전의";

diff --git a/Telegram/Telegram-iOS/pl.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/pl.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Zapamiętaj bieżący folder przy wyjściu";
 "NicegramSettings.HideStories" = "Ukryj Historie";
 "NicegramSettings.HideBadgeCounters" = "Ukryj liczniki odznak";
-"NicegramSettings.EnableAnimationsInChatList" = "Animacje na liście czatów";
-"NicegramSettings.EnableGrayscaleInChatList" = "Skala szarości na liście czatów";
-"NicegramSettings.EnableGrayscaleInChat" = "Skala szarości w czacie";
 
 /*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,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Lembrar pasta atual antes de sair";
 "NicegramSettings.HideStories" = "Ocultar Stories";
 "NicegramSettings.HideBadgeCounters" = "Ocultar contadores de distintivos";
-"NicegramSettings.EnableAnimationsInChatList" = "Animações na lista de chat";
-"NicegramSettings.EnableGrayscaleInChatList" = "Escala de cinza na lista de chat";
-"NicegramSettings.EnableGrayscaleInChat" = "Escala de cinza no chat";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Mais antigo que";

diff --git a/Telegram/Telegram-iOS/ro.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ro.lproj/NiceLocalizable.strings
@@ -160,9 +160,6 @@
 "Premium.rememberFolderOnExit" = "Ține minte folderul curent la ieșire";
 "NicegramSettings.HideStories" = "Ascunde Poveștile";
 "NicegramSettings.HideBadgeCounters" = "Ascunde contoarele de insigne";
-"NicegramSettings.EnableAnimationsInChatList" = "Animații în lista de chat";
-"NicegramSettings.EnableGrayscaleInChatList" = "Scala de gri în lista de chat";
-"NicegramSettings.EnableGrayscaleInChat" = "Gri în chat";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Mai vechi de";

diff --git a/Telegram/Telegram-iOS/ru.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/ru.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "Запомнить текущую папку при выходе";
 "NicegramSettings.HideStories" = "Скрыть истории";
 "NicegramSettings.HideBadgeCounters" = "Скрыть счетчики значков";
-"NicegramSettings.EnableAnimationsInChatList" = "Анимации в списке чата";
-"NicegramSettings.EnableGrayscaleInChatList" = "Оттенки серого в списке чата";
-"NicegramSettings.EnableGrayscaleInChat" = "Оттенки серого в чате";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Старше, чем";

diff --git a/Telegram/Telegram-iOS/tr.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/tr.lproj/NiceLocalizable.strings
@@ -162,9 +162,6 @@
 "Premium.rememberFolderOnExit" = "Çıkışta şu anki klasörü hatırla";
 "NicegramSettings.HideStories" = "Hikayeleri Gizle";
 "NicegramSettings.HideBadgeCounters" = "Rozet sayacını gizle";
-"NicegramSettings.EnableAnimationsInChatList" = "Sohbet listesinde animasyonlar";
-"NicegramSettings.EnableGrayscaleInChatList" = "Sohbet listesinde gri tonlama";
-"NicegramSettings.EnableGrayscaleInChat" = "Sohbette gri tonlama";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "Şundan daha eski:";

diff --git a/Telegram/Telegram-iOS/uz.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/uz.lproj/NiceLocalizable.strings
@@ -160,9 +160,6 @@
 "Premium.rememberFolderOnExit" = "dan Kattaroq";
 "NicegramSettings.HideStories" = "Hikoyalarni yashirish";
 "NicegramSettings.HideBadgeCounters" = "Belgilar sonini yashirish";
-"NicegramSettings.EnableAnimationsInChatList" = "Суҳбат рўйхатидаги анимациялар";
-"NicegramSettings.EnableGrayscaleInChatList" = "Чат рўйхатидаги кулранглар";
-"NicegramSettings.EnableGrayscaleInChat" = "Чатда кулранглар";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "dan kattaroq";

diff --git a/Telegram/Telegram-iOS/zh-hans.lproj/NiceLocalizable.strings b/Telegram/Telegram-iOS/zh-hans.lproj/NiceLocalizable.strings
@@ -161,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "退出时记住当前分组";
 "NicegramSettings.HideStories" = "隐藏故事";
 "NicegramSettings.HideBadgeCounters" = "隐藏徽章计数器";
-"NicegramSettings.EnableAnimationsInChatList" = "聊天列表中的动画";
-"NicegramSettings.EnableGrayscaleInChatList" = "聊天列表中的灰度";
-"NicegramSettings.EnableGrayscaleInChat" = "灰度在聊天中";
 
 /*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,9 +161,6 @@
 "Premium.rememberFolderOnExit" = "記下應用程式關閉時所在的資料夾";
 "NicegramSettings.HideStories" = "隱藏故事";
 "NicegramSettings.HideBadgeCounters" = "隱藏徽章計數器";
-"NicegramSettings.EnableAnimationsInChatList" = "聊天列表中的動畫";
-"NicegramSettings.EnableGrayscaleInChatList" = "聊天列表中的灰階";
-"NicegramSettings.EnableGrayscaleInChat" = "灰階在聊天中";
 
 /*Registration Date*/
 "NiceFeatures.RegDate.OlderThan" = "早於";

diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift
@@ -1,9 +1,6 @@
 // MARK: Nicegram HideStories
 import NGData
 //
-// MARK: Nicegram ColorAlign
-import NGUtils
-//
 import Foundation
 import UIKit
 import AsyncDisplayKit
@@ -1059,10 +1056,6 @@ final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate {
         }
     }
 
-    // MARK: Nicegram ColorAlign
-    private let grayscaleApplier = GrayscaleApplier()
-    //
-
     private(set) var inlineStackContainerTransitionFraction: CGFloat = 0.0
     private(set) var inlineStackContainerNode: ChatListContainerNode?
     private var inlineContentPanRecognizer: InteractiveTransitionGestureRecognizer?
@@ -1665,17 +1658,6 @@ final class ChatListControllerNode: ASDisplayNode, ASGestureRecognizerDelegate {
             navigationBarComponentView.deferScrollApplication = false
             navigationBarComponentView.applyCurrentScroll(transition: ComponentTransition(transition))
         }
-
-        // MARK: Nicegram ColorAlign
-        self.grayscaleApplier.onLayoutUpdated(
-            apply: NGSettings.chatListDisplaySettings.enableGrayscale,
-            frame: CGRect(
-                origin: .zero,
-                size: layout.size
-            ),
-            superlayer: self.layer
-        )
-        //
     }
 
     func activateSearch(placeholderNode: SearchBarPlaceholderNode, displaySearchFilters: Bool, hasDownloads: Bool, initialFilter: ChatListSearchFilter, navigationController: NavigationController?) -> (ASDisplayNode, (Bool) -> Void)? {