github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'b006c36c59'

Browse source
This commit is contained in:
Isaac 2024-07-25 13:59:29 +08:00
commit d8491d17bd
58 changed files with 4144 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

2
submodules/TelegramUIPreferences/Sources/InstantPagePresentationSettings.swift
View file

@ -11,6 +11,8 @@ public enum InstantPageThemeType: Int32 {
}
public enum InstantPagePresentationFontSize: Int32 {
case xxsmall = -2
case xsmall = -1
case small = 0
case standard = 1
case large = 2

2
submodules/TelegramUIPreferences/Sources/PostboxKeys.swift
View file

@ -104,6 +104,7 @@ private enum ApplicationSpecificOrderedItemListCollectionIdValues: Int32 {
case storyDrafts = 4
case storySources = 5
case hashtagSearchRecentQueries = 6
case browserRecentlyVisited = 7
}
public struct ApplicationSpecificOrderedItemListCollectionId {
@ -114,4 +115,5 @@ public struct ApplicationSpecificOrderedItemListCollectionId {
public static let storyDrafts = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.storyDrafts.rawValue)
public static let storySources = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.storySources.rawValue)
public static let hashtagSearchRecentQueries = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.hashtagSearchRecentQueries.rawValue)
public static let browserRecentlyVisited = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.browserRecentlyVisited.rawValue)
}

10
submodules/TelegramUIPreferences/Sources/WebBrowserSettings.swift
View file

@ -6,10 +6,12 @@ import SwiftSignalKit
public struct WebBrowserException: Codable, Equatable {
public let domain: String
public let title: String
public let icon: TelegramMediaImage?
public init(domain: String, title: String) {
public init(domain: String, title: String, icon: TelegramMediaImage?) {
self.domain = domain
self.title = title
self.icon = icon
}
public init(from decoder: Decoder) throws {
@ -17,6 +19,7 @@ public struct WebBrowserException: Codable, Equatable {
self.domain = try container.decode(String.self, forKey: "domain")
self.title = try container.decode(String.self, forKey: "title")
self.icon = try container.decodeIfPresent(TelegramMediaImage.self, forKey: "icon")
}
public func encode(to encoder: Encoder) throws {
@ -24,6 +27,11 @@ public struct WebBrowserException: Codable, Equatable {
try container.encode(self.domain, forKey: "domain")
try container.encode(self.title, forKey: "title")
if let icon = self.icon {
try container.encode(icon, forKey: "icon")
} else {
try container.encodeNil(forKey: "icon")
}
}
}