Various improvements

Author: laktyushin

submodules/SettingsUI/Sources/Data and Storage/IntentsSettingsController.swift

@@ -47,7 +47,7 @@ private enum IntentsSettingsSection: Int32 {
 
 private enum IntentsSettingsControllerEntry: ItemListNodeEntry {
     case accountHeader(PresentationTheme, String)
-    case account(PresentationTheme, EnginePeer, Bool, Int32)
+    case account(PresentationTheme, Account, EnginePeer, Bool, Int32)
     case accountInfo(PresentationTheme, String)
 
     case chatsHeader(PresentationTheme, String)
@@ -80,7 +80,7 @@ private enum IntentsSettingsControllerEntry: ItemListNodeEntry {
         switch self {
             case .accountHeader:
                 return 0
-            case let .account(_, _, _, index):
+            case let .account(_, _, _, _, index):
                 return 1 + index
             case .accountInfo:
                 return 1000
@@ -115,8 +115,8 @@ private enum IntentsSettingsControllerEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .account(lhsTheme, lhsPeer, lhsSelected, lhsIndex):
-                if case let .account(rhsTheme, rhsPeer, rhsSelected, rhsIndex) = rhs, lhsTheme === rhsTheme, lhsPeer == rhsPeer, lhsSelected == rhsSelected, lhsIndex == rhsIndex {
+            case let .account(lhsTheme, lhsAccount, lhsPeer, lhsSelected, lhsIndex):
+                if case let .account(rhsTheme, rhsAccount, rhsPeer, rhsSelected, rhsIndex) = rhs, lhsTheme === rhsTheme, lhsAccount === rhsAccount, lhsPeer == rhsPeer, lhsSelected == rhsSelected, lhsIndex == rhsIndex {
                     return true
                 } else {
                     return false
@@ -200,8 +200,8 @@ private enum IntentsSettingsControllerEntry: ItemListNodeEntry {
         switch self {
             case let .accountHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .account(_, peer, selected, _):
-                return ItemListPeerItem(presentationData: presentationData, systemStyle: .glass, dateTimeFormat: PresentationDateTimeFormat(), nameDisplayOrder: .firstLast, context: arguments.context.sharedContext.makeTempAccountContext(account: arguments.context.account), peer: peer, height: .generic, aliasHandling: .standard, nameStyle: .plain, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: false), revealOptions: nil, switchValue: ItemListPeerItemSwitch(value: selected, style: .check), enabled: true, selectable: true, sectionId: self.section, action: {
+            case let .account(_, account, peer, selected, _):
+                return ItemListPeerItem(presentationData: presentationData, systemStyle: .glass, dateTimeFormat: PresentationDateTimeFormat(), nameDisplayOrder: .firstLast, context: arguments.context.sharedContext.makeTempAccountContext(account: account), peer: peer, height: .generic, aliasHandling: .standard, nameStyle: .plain, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: false), revealOptions: nil, switchValue: ItemListPeerItemSwitch(value: selected, style: .check), enabled: true, selectable: true, sectionId: self.section, action: {
                     arguments.updateSettings { $0.withUpdatedAccount(peer.id) }
                 }, setPeerIdWithRevealedOptions: { _, _ in}, removePeer: { _ in })
             case let .accountInfo(_, text):
@@ -251,8 +251,8 @@ private func intentsSettingsControllerEntries(context: AccountContext, presentat
     if accounts.count > 1 {
         entries.append(.accountHeader(presentationData.theme, presentationData.strings.IntentsSettings_MainAccount.uppercased()))
         var index: Int32 = 0
-        for (_, peer) in accounts {
-            entries.append(.account(presentationData.theme, peer, peer.id == settings.account, index))
+        for (account, peer) in accounts {
+            entries.append(.account(presentationData.theme, account, peer, peer.id == settings.account, index))
             index += 1
         }
         entries.append(.accountInfo(presentationData.theme, presentationData.strings.IntentsSettings_MainAccountInfo))

submodules/TelegramUI/Components/Gifts/GiftCraftScreen/Sources/CraftTableComponent.swift

@@ -98,6 +98,10 @@ final class CraftTableComponent: Component {
             super.init(frame: frame)
 
             self.addSubview(self.animationView)
+            
+            self.animationView.onStickerLaunch = {
+                HapticFeedback().impact(.soft)
+            }
         }
 
         required init?(coder: NSCoder) {
@@ -139,7 +143,9 @@ final class CraftTableComponent: Component {
                     self.failWillFinish = true
                     self.component?.willFinish(false)
 
-                    self.craftFailPlayOnce.invoke(Void())
+                    Queue.mainQueue().after(0.1) {
+                        self.craftFailPlayOnce.invoke(Void())
+                    }
                 })
 
                 Queue.mainQueue().after(0.5, {
@@ -408,8 +414,13 @@ final class CraftTableComponent: Component {
                 for index in component.gifts.keys.sorted() {
                     indices.append(Int(index))
                 }
+                
+                Queue.mainQueue().after(0.55) {
+                    HapticFeedback().impact(.light)
+                }
+                
                 self.anvilPlayOnce.invoke(Void())
-                Queue.mainQueue().after(0.6, {
+                Queue.mainQueue().after(0.75, {
                     self.animationView.startStickerSequence(indices: indices)
 
                     switch component.result {

submodules/TelegramUI/Components/Gifts/GiftCraftScreen/Sources/CubeAnimationView.swift

@@ -82,6 +82,7 @@ final class CubeAnimationView: UIView {
 
     var isSuccess = false
 
+    var onStickerLaunch: (() -> Void)?
     var onFinishApproach: ((Bool) -> Void)?
 
     private let defaultStickOrder: [Int] = [0, 5, 4, 3]
@@ -520,6 +521,8 @@ final class CubeAnimationView: UIView {
                 return
             }
 
+            self.onStickerLaunch?()
+            
             if let animationView, animationView !== sticker {
                 animationView.removeFromSuperview()
                 self.warpSnapshot = nil

submodules/TelegramUI/Components/Gifts/GiftCraftScreen/Sources/GiftCraftScreen.swift

@@ -1215,7 +1215,9 @@ private final class CraftGiftPageContent: Component {
 
                                 HapticFeedback().success()
                             } else {
-                                HapticFeedback().error()
+                                Queue.mainQueue().after(0.15) {
+                                    HapticFeedback().error()
+                                }
                             }
                         }
                     )

submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift

@@ -689,6 +689,10 @@ public final class GlassBackgroundContainerView: UIView {
             return nil
         }
 
+        if result === self.contentView {
+            return nil
+        }
+        
         return result
     }