Add privacy settings premium stars

submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift

@@ -47,6 +47,7 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem {
     let title: String
     let titleColor: ItemListDisclosureItemTitleColor
     let titleFont: ItemListDisclosureItemTitleFont
+    let titleIcon: UIImage?
     let enabled: Bool
     let label: String
     let labelStyle: ItemListDisclosureLabelStyle
@@ -59,7 +60,7 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem {
     public let tag: ItemListItemTag?
     public let shimmeringIndex: Int?
     
-    public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, context: AccountContext? = nil, iconPeer: EnginePeer? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, titleFont: ItemListDisclosureItemTitleFont = .regular, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, additionalDetailLabel: String? = nil, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil, shimmeringIndex: Int? = nil) {
+    public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, context: AccountContext? = nil, iconPeer: EnginePeer? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, titleFont: ItemListDisclosureItemTitleFont = .regular, titleIcon: UIImage? = nil, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, additionalDetailLabel: String? = nil, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil, shimmeringIndex: Int? = nil) {
         self.presentationData = presentationData
         self.icon = icon
         self.context = context
@@ -67,6 +68,7 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem {
         self.title = title
         self.titleColor = titleColor
         self.titleFont = titleFont
+        self.titleIcon = titleIcon
         self.enabled = enabled
         self.labelStyle = labelStyle
         self.label = label
@@ -138,6 +140,7 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
     var avatarNode: AvatarNode?
     let iconNode: ASImageNode
     let titleNode: TextNode
+    let titleIconNode: ASImageNode
     public let labelNode: TextNode
     var additionalDetailLabelNode: TextNode?
     let arrowNode: ASImageNode
@@ -184,6 +187,10 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
         self.titleNode = TextNode()
         self.titleNode.isUserInteractionEnabled = false
         
+        self.titleIconNode = ASImageNode()
+        self.titleIconNode.displayWithoutProcessing = true
+        self.titleIconNode.displaysAsynchronously = false
+        
         self.labelNode = TextNode()
         self.labelNode.isUserInteractionEnabled = false
         
@@ -627,6 +634,19 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
                         additionalDetailLabelNode.removeFromSupernode()
                     }
                     
+                    if let titleIcon = item.titleIcon {
+                        if strongSelf.titleIconNode.supernode == nil {
+                            strongSelf.addSubnode(strongSelf.titleIconNode)
+                        }
+                        
+                        strongSelf.titleIconNode.image = titleIcon
+                        strongSelf.titleIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 5.0, y: floor((layout.contentSize.height - titleIcon.size.height) / 2.0) - 1.0), size: titleIcon.size)
+                    } else {
+                        if strongSelf.titleIconNode.supernode != nil {
+                            strongSelf.titleIconNode.removeFromSupernode()
+                        }
+                    }
+ 
                     if case .textWithIcon = item.labelStyle {
                         if let updatedLabelImage = updatedLabelImage {
                             strongSelf.labelImageNode.image = updatedLabelImage

submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift

@@ -97,7 +97,7 @@ private enum PrivacyAndSecurityEntry: ItemListNodeEntry {
     case forwardPrivacy(PresentationTheme, String, String)
     case groupPrivacy(PresentationTheme, String, String)
     case voiceMessagePrivacy(PresentationTheme, String, String, Bool)
-    case messagePrivacy(Bool)
+    case messagePrivacy(PresentationTheme, Bool, Bool)
     case bioPrivacy(PresentationTheme, String, String)
     case selectivePrivacyInfo(PresentationTheme, String)
     case passcode(PresentationTheme, String, Bool, String)
@@ -240,14 +240,14 @@ private enum PrivacyAndSecurityEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .voiceMessagePrivacy(lhsTheme, lhsText, lhsValue, lhsLocked):
+            case let .voiceMessagePrivacy(lhsTheme, lhsText, lhsValue, lhsHasPremium):
-                if case let .voiceMessagePrivacy(rhsTheme, rhsText, rhsValue, rhsLocked) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue, lhsLocked == rhsLocked {
+                if case let .voiceMessagePrivacy(rhsTheme, rhsText, rhsValue, rhsHasPremium) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue, lhsHasPremium == rhsHasPremium  {
                     return true
                 } else {
                     return false
                 }
-            case let .messagePrivacy(value):
+            case let .messagePrivacy(lhsTheme, lhsValue, lhsHasPremium):
-                if case .messagePrivacy(value) = rhs {
+                if case let .messagePrivacy(rhsTheme, rhsValue, rhsHasPremium) = rhs, lhsTheme === rhsTheme, lhsValue == rhsValue, lhsHasPremium == rhsHasPremium {
                     return true
                 } else {
                     return false
@@ -390,12 +390,12 @@ private enum PrivacyAndSecurityEntry: ItemListNodeEntry {
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, action: {
                     arguments.openGroupsPrivacy()
                 })
-            case let .voiceMessagePrivacy(_, text, value, locked):
+            case let .voiceMessagePrivacy(theme, text, value, hasPremium):
-                return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, labelStyle: locked ? .textWithIcon(UIImage(bundleImageName: "Chat/Input/Accessory Panels/TextLockIcon")!.precomposed()) : .text, sectionId: self.section, style: .blocks, action: {
+                return ItemListDisclosureItem(presentationData: presentationData, title: text, titleIcon: hasPremium ? PresentationResourcesItemList.premiumIcon(theme) : nil, label: value, labelStyle: !hasPremium ? .textWithIcon(UIImage(bundleImageName: "Chat/Input/Accessory Panels/TextLockIcon")!.precomposed()) : .text, sectionId: self.section, style: .blocks, action: {
                     arguments.openVoiceMessagePrivacy()
                 })
-            case let .messagePrivacy(value):
+            case let .messagePrivacy(theme, value, hasPremium):
-                return ItemListDisclosureItem(presentationData: presentationData, title: presentationData.strings.Settings_Privacy_Messages, label: !value ? presentationData.strings.Settings_Privacy_Messages_ValueEveryone : presentationData.strings.Settings_Privacy_Messages_ValueContactsAndPremium, sectionId: self.section, style: .blocks, action: {
+                return ItemListDisclosureItem(presentationData: presentationData, title: presentationData.strings.Settings_Privacy_Messages, titleIcon: hasPremium ? PresentationResourcesItemList.premiumIcon(theme) : nil, label: !value ? presentationData.strings.Settings_Privacy_Messages_ValueEveryone : presentationData.strings.Settings_Privacy_Messages_ValueContactsAndPremium, sectionId: self.section, style: .blocks, action: {
                     arguments.openMessagePrivacy()
                 })
             case let .bioPrivacy(_, text, value):
@@ -591,8 +591,8 @@ private func privacyAndSecurityControllerEntries(
         entries.append(.voiceCallPrivacy(presentationData.theme, presentationData.strings.Privacy_Calls, stringForSelectiveSettings(strings: presentationData.strings, settings: privacySettings.voiceCalls)))
         entries.append(.groupPrivacy(presentationData.theme, presentationData.strings.Privacy_GroupsAndChannels, stringForSelectiveSettings(strings: presentationData.strings, settings: privacySettings.groupInvitations)))
         if !isPremiumDisabled {
-            entries.append(.voiceMessagePrivacy(presentationData.theme, presentationData.strings.Privacy_VoiceMessages, stringForSelectiveSettings(strings: presentationData.strings, settings: privacySettings.voiceMessages), !isPremium))
+            entries.append(.voiceMessagePrivacy(presentationData.theme, presentationData.strings.Privacy_VoiceMessages, stringForSelectiveSettings(strings: presentationData.strings, settings: privacySettings.voiceMessages), isPremium))
-            entries.append(.messagePrivacy(privacySettings.globalSettings.nonContactChatsRequirePremium))
+            entries.append(.messagePrivacy(presentationData.theme, privacySettings.globalSettings.nonContactChatsRequirePremium, isPremium))
         }
     } else {
         entries.append(.phoneNumberPrivacy(presentationData.theme, presentationData.strings.PrivacySettings_PhoneNumber, presentationData.strings.Channel_NotificationLoading))
@@ -603,7 +603,7 @@ private func privacyAndSecurityControllerEntries(
         entries.append(.voiceCallPrivacy(presentationData.theme, presentationData.strings.Privacy_Calls, presentationData.strings.Channel_NotificationLoading))
         entries.append(.groupPrivacy(presentationData.theme, presentationData.strings.Privacy_GroupsAndChannels, presentationData.strings.Channel_NotificationLoading))
         if !isPremiumDisabled {
-            entries.append(.voiceMessagePrivacy(presentationData.theme, presentationData.strings.Privacy_VoiceMessages, presentationData.strings.Channel_NotificationLoading, !isPremium))
+            entries.append(.voiceMessagePrivacy(presentationData.theme, presentationData.strings.Privacy_VoiceMessages, presentationData.strings.Channel_NotificationLoading, isPremium))
         }
     
         //entries.append(.selectivePrivacyInfo(presentationData.theme, presentationData.strings.PrivacyLastSeenSettings_GroupsAndChannelsHelp))

submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift

@@ -71,6 +71,7 @@ public enum PresentationResourceKey: Int32 {
     case itemListCloudIcon
     case itemListTopicArrowIcon
     case itemListAddBoostsIcon
+    case itemListPremiumIcon
     
     case statsReactionsIcon
     case statsForwardsIcon

submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift

@@ -282,6 +282,30 @@ public struct PresentationResourcesItemList {
         })
     }
     
+    public static func premiumIcon(_ theme: PresentationTheme) -> UIImage? {
+        return theme.image(PresentationResourceKey.itemListPremiumIcon.rawValue, { theme in
+            return generateImage(CGSize(width: 16.0, height: 16.0), contextGenerator: { size, context in
+                let bounds = CGRect(origin: .zero, size: size)
+                context.clear(bounds)
+                
+                let image = UIImage(bundleImageName: "Item List/PremiumIcon")!
+                context.clip(to: bounds, mask: image.cgImage!)
+                
+                let colorsArray: [CGColor] = [
+                    UIColor(rgb: 0x6b93ff).cgColor,
+                    UIColor(rgb: 0x6b93ff).cgColor,
+                    UIColor(rgb: 0x8d77ff).cgColor,
+                    UIColor(rgb: 0xb56eec).cgColor,
+                    UIColor(rgb: 0xb56eec).cgColor
+                ]
+                var locations: [CGFloat] = [0.0, 0.3, 0.5, 0.7, 1.0]
+                let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray as CFArray, locations: &locations)!
+
+                context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: size.height), options: CGGradientDrawingOptions())
+            })
+        })
+    }
+    
     public static func cornersImage(_ theme: PresentationTheme, top: Bool, bottom: Bool) -> UIImage? {
         if !top && !bottom {
             return nil

submodules/TelegramUI/Images.xcassets/Item List/PremiumIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "premiumstar_16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Images.xcassets/Item List/PremiumIcon.imageset/premiumstar_16.pdf

@@ -0,0 +1,97 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.000000 0.494995 cm
+0.000000 0.000000 0.000000 scn
+7.573102 2.542415 m
+3.972436 0.336632 l
+3.598035 0.107271 3.108589 0.224851 2.879229 0.599252 c
+2.767209 0.782110 2.733811 1.002467 2.786615 1.210307 c
+3.343997 3.404178 l
+3.545203 4.196128 4.087134 4.858135 4.823744 5.211795 c
+8.751891 7.097767 l
+8.935022 7.185692 9.012203 7.405426 8.924278 7.588558 c
+8.853073 7.736866 8.692046 7.819856 8.529942 7.791792 c
+4.157411 7.034797 l
+3.268577 6.880917 2.357086 7.126360 1.665707 7.705756 c
+0.284388 8.863339 l
+-0.052136 9.145357 -0.096324 9.646784 0.185694 9.983309 c
+0.322857 10.146982 0.520100 10.248593 0.732998 10.265255 c
+4.953338 10.595538 l
+5.251494 10.618872 5.511330 10.807558 5.625789 11.083856 c
+7.253917 15.014055 l
+7.421958 15.419697 7.887019 15.612309 8.292661 15.444268 c
+8.487435 15.363581 8.642185 15.208831 8.722873 15.014055 c
+10.351001 11.083856 l
+10.465460 10.807558 10.725295 10.618872 11.023451 10.595538 c
+15.266980 10.263440 l
+15.704712 10.229183 16.031794 9.846561 15.997537 9.408829 c
+15.981057 9.198256 15.881458 9.002894 15.720723 8.865864 c
+12.484364 6.106792 l
+12.256535 5.912563 12.157140 5.606812 12.227205 5.315742 c
+13.222160 1.182478 l
+13.324918 0.755602 13.062167 0.326249 12.635291 0.223492 c
+12.430174 0.174116 12.213841 0.208297 12.033939 0.318506 c
+8.403688 2.542415 l
+8.148836 2.698538 7.827954 2.698538 7.573102 2.542415 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1440
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001530 00000 n
+0000001553 00000 n
+0000001726 00000 n
+0000001800 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1859
+%%EOF