Release 1.9.0 (384)

.bazelversion

@@ -1 +1 @@
-7.3.1
+7.3.1:981f82a470bad1349322b6f51c9c6ffa0aa291dab1014fac411543c12e661dff

.github/workflows/beta.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - uses: webfactory/[email protected]

.github/workflows/master.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - uses: webfactory/[email protected]

.gitmodules

@@ -27,9 +27,6 @@
 [submodule "third-party/webrtc/webrtc"]
 	path = third-party/webrtc/webrtc
 	url = https://github.com/nicegram/webrtc.git
-[submodule "third-party/libx264/x264"]
-	path = third-party/libx264/x264
-	url = https://github.com/mirror/x264.git
 [submodule "build-system/bazel-rules/rules_xcodeproj"]
 	path = build-system/bazel-rules/rules_xcodeproj
 	url = https://github.com/MobileNativeFoundation/rules_xcodeproj.git

Nicegram/NGData/BUILD

@@ -10,7 +10,8 @@ swift_library(
         "//Nicegram/NGRequests:NGRequests",
         "//Nicegram/NGLogging:NGLogging",
         "//Nicegram/NGEnv:NGEnv",
-        "//Nicegram/NGAppCache:NGAppCache"
+        "//Nicegram/NGAppCache:NGAppCache",
+        "@swiftpkg_nicegram_assistant_ios//:NGCore",
     ],
     visibility = [
         "//visibility:public",

Nicegram/NGData/Sources/Modern/Data/NicegramSettingsRepositoryImpl.swift

@@ -0,0 +1,50 @@
+import Combine
+import NGCore
+
+class NicegramSettingsRepositoryImpl {
+
+    private let repo = UDRepository<NicegramSettings, NicegramSettingsDto>(
+        key: "nicegramSettings",
+        defaultValue: NicegramSettings(
+            disableAnimationsInChatList: false,
+            grayscaleAll: false,
+            grayscaleInChat: false,
+            grayscaleInChatList: false,
+            trackDigitalFootprint: false
+        ),
+        toDomain: \.toDomain,
+        toDto: \.toDto
+    )
+}
+
+extension NicegramSettingsRepositoryImpl: NicegramSettingsRepository {
+    func settings() -> NicegramSettings {
+        repo.get()
+    }
+
+    func settingsPublisher() -> AnyPublisher<NicegramSettings, Never> {
+        repo.publisher()
+    }
+
+    func update(_ block: (NicegramSettings) -> (NicegramSettings)) async {
+        await repo.update(block)
+    }
+}
+
+private struct NicegramSettingsDto: Codable {
+    let disableAnimationsInChatList: Bool
+    let grayscaleAll: Bool
+    let grayscaleInChat: Bool
+    let grayscaleInChatList: Bool
+    let trackDigitalFootprint: Bool
+
+    var toDomain: NicegramSettings {
+        NicegramSettings(disableAnimationsInChatList: disableAnimationsInChatList, grayscaleAll: grayscaleAll, grayscaleInChat: grayscaleInChat, grayscaleInChatList: grayscaleInChatList, trackDigitalFootprint: trackDigitalFootprint)
+    }
+}
+
+private extension NicegramSettings {
+    var toDto: NicegramSettingsDto {
+        NicegramSettingsDto(disableAnimationsInChatList: disableAnimationsInChatList, grayscaleAll: grayscaleAll, grayscaleInChat: grayscaleInChat, grayscaleInChatList: grayscaleInChatList, trackDigitalFootprint: trackDigitalFootprint)
+    }
+}

Nicegram/NGData/Sources/Modern/Domain/GetGrayscaleSettingsUseCase.swift

@@ -0,0 +1,45 @@
+import Combine
+
+public class GetGrayscaleSettingsUseCase {
+
+    //  MARK: - Dependencies
+
+    private let nicegramSettingsRepository: NicegramSettingsRepository
+
+    //  MARK: - Lifecycle
+
+    init(nicegramSettingsRepository: NicegramSettingsRepository) {
+        self.nicegramSettingsRepository = nicegramSettingsRepository
+    }
+}
+
+public extension GetGrayscaleSettingsUseCase {
+    func grayscaleAllPublisher() -> AnyPublisher<Bool, Never> {
+        adjustedSetting(\.grayscaleAll)
+    }
+
+    func grayscaleInChatPublisher() -> AnyPublisher<Bool, Never> {
+        adjustedSetting(\.grayscaleInChat)
+    }
+
+    func grayscaleInChatListPublisher() -> AnyPublisher<Bool, Never> {
+        adjustedSetting(\.grayscaleInChatList)
+    }
+}
+
+private extension GetGrayscaleSettingsUseCase {
+    func adjustedSetting<T>(_ setting: @escaping (NicegramSettings) -> T) -> AnyPublisher<T, Never> {
+        nicegramSettingsRepository
+            .settingsPublisher()
+            .map { settings in
+                var result = settings
+                if result.grayscaleAll {
+                    result.grayscaleInChat = false
+                    result.grayscaleInChatList = false
+                }
+                return result
+            }
+            .map(setting)
+            .eraseToAnyPublisher()
+    }
+}

Nicegram/NGData/Sources/Modern/Domain/NicegramSettingsRepository.swift

@@ -0,0 +1,16 @@
+import Combine
+import NGCore
+
+public struct NicegramSettings: Withable {
+    public var disableAnimationsInChatList: Bool
+    public var grayscaleAll: Bool
+    public var grayscaleInChat: Bool
+    public var grayscaleInChatList: Bool
+    public var trackDigitalFootprint: Bool
+}
+
+public protocol NicegramSettingsRepository {
+    func settings() -> NicegramSettings
+    func settingsPublisher() -> AnyPublisher<NicegramSettings, Never>
+    func update(_: (NicegramSettings) -> (NicegramSettings)) async
+}

Nicegram/NGData/Sources/Modern/NicegramSettingsModule.swift

@@ -0,0 +1,24 @@
+import Factory
+
+public final class NicegramSettingsModule: SharedContainer {
+    public static var shared = NicegramSettingsModule()
+    public var manager = ContainerManager()
+}
+
+extension NicegramSettingsModule {
+    public var getGrayscaleSettingsUseCase: Factory<GetGrayscaleSettingsUseCase> {
+        self { [self] in
+            GetGrayscaleSettingsUseCase(
+                nicegramSettingsRepository: nicegramSettingsRepository()
+            )
+        }
+    }
+}
+
+extension NicegramSettingsModule {
+    public var nicegramSettingsRepository: Factory<NicegramSettingsRepository> {
+        self {
+            NicegramSettingsRepositoryImpl()
+        }.cached
+    }
+}

Nicegram/NGData/Sources/Modern/Presentation/GrayscaleLayer.swift

@@ -0,0 +1,32 @@
+import Combine
+import UIKit
+
+public class GrayscaleLayer: CALayer {
+    private var cancellables = Set<AnyCancellable>()
+
+    public init(
+        enablePublisher: AnyPublisher<Bool, Never>
+    ) {
+        super.init()
+
+        self.isHidden = true
+        self.backgroundColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1.0).cgColor
+        self.compositingFilter = "colorBlendMode"
+
+        enablePublisher
+            .removeDuplicates()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] enable in
+                self?.isHidden = !enable
+            }
+            .store(in: &cancellables)
+    }
+
+    public override init(layer: Any) {
+        super.init(layer: layer)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}

Nicegram/NGData/Sources/Modern/Presentation/NicegramSettings+PresentationHelpers.swift

@@ -0,0 +1,15 @@
+private let nicegramSettingsRepository = NicegramSettingsModule.shared.nicegramSettingsRepository()
+
+public func getNicegramSettings() -> NicegramSettings {
+    nicegramSettingsRepository.settings()
+}
+
+public func updateNicegramSettings(_ modifier: @escaping (inout NicegramSettings) -> Void) {
+    Task {
+        await nicegramSettingsRepository.update {
+            var result = $0
+            modifier(&result)
+            return result
+        }
+    }
+}

Nicegram/NGData/Sources/NGSettings.swift

@@ -115,6 +115,15 @@ public struct NGSettings {
 
     @NGStorage(key: "feedPeer", defaultValue: [:])
     public static var feedPeer: [Int64: PeerId]
+
+    @NGStorage(key: "hideBadgeCounters", defaultValue: false)
+    public static var hideBadgeCounters: Bool
+
+    @NGStorage(key: "hideUnreadCounters", defaultValue: false)
+    public static var hideUnreadCounters: Bool
+
+    @NGStorage(key: "hideMentionNotification", defaultValue: false)
+    public static var hideMentionNotification: Bool
 }
 
 public struct NGWebSettings {