forked from TelegramMessenger/Telegram-iOS
-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
42 changed files
with
508 additions
and
1,386 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,17 +113,17 @@ | |
| "kind" : "remoteSourceControl", | ||
| "location" : "[email protected]:mobyrix/nicegram-assistant-ios.git", | ||
| "state" : { | ||
| "branch" : "feat/NCG-7303_spy_on_friends", | ||
| "revision" : "2a7c71de73ca9dc7b14bc30d7dbdfd1b93fea928" | ||
| "branch" : "feat/att-action-subscribe", | ||
| "revision" : "9fdc3f375f2343b9692adaa982192a91fafbdce2" | ||
| } | ||
| }, | ||
| { | ||
| "identity" : "nicegram-wallet-ios", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "[email protected]:mobyrix/nicegram-wallet-ios.git", | ||
| "state" : { | ||
| "branch" : "feat/NCG-7303_spy_on_friends", | ||
| "revision" : "0d12be95114430db63569f04a08ec962733ed2d7" | ||
| "branch" : "develop", | ||
| "revision" : "564886b840d2331bb80663e1f21cb34796007804" | ||
| } | ||
| }, | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import PackageDescription | |
| let package = Package( | ||
| name: "nicegram-package", | ||
| dependencies: [ | ||
| .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "feat/NCG-7303_spy_on_friends"), | ||
| .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "feat/NCG-7303_spy_on_friends") | ||
| .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "feat/att-action-subscribe"), | ||
| .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "develop") | ||
| ] | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| prod | ||
| test |
79 changes: 79 additions & 0 deletions
79
submodules/ChatPresentationInterfaceState/Sources/NicegramUtils.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import AsyncDisplayKit | ||
| import Combine | ||
| import Factory | ||
| import FeatAttentionEconomy | ||
|
|
||
| public class SubscribeButtonClaimApplier { | ||
|
|
||
| // MARK: - Dependencies | ||
|
|
||
| @Injected(\AttCoreModule.getOngoingActionsUseCase) | ||
| private var getOngoingActionsUseCase | ||
|
|
||
| // MARK: - Logic | ||
|
|
||
| private let claimView = AttClaimAnimationView() | ||
|
|
||
| @Published private var apply = true | ||
| @Published private var username = "" | ||
|
|
||
| private var cancellables = Set<AnyCancellable>() | ||
|
|
||
| // MARK: - Lifecycle | ||
|
|
||
| public init() { | ||
| getOngoingActionsUseCase.publisher() | ||
| .combineLatestThreadSafe($apply, $username) | ||
| .map { actions, apply, username in | ||
| guard apply else { | ||
| return false | ||
| } | ||
|
|
||
| let hasOngoingAction = actions.contains { action in | ||
| if case let .subscribe(subscribe) = action.type, | ||
| subscribe.username == username { | ||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
| return hasOngoingAction | ||
| } | ||
| .receive(on: DispatchQueue.main) | ||
| .sink { [weak self] showClaim in | ||
| self?.claimView.isHidden = !showClaim | ||
| } | ||
| .store(in: &cancellables) | ||
| } | ||
| } | ||
|
|
||
| public extension SubscribeButtonClaimApplier { | ||
| func update( | ||
| buttonNode: ASDisplayNode, | ||
| titleNode: ASDisplayNode, | ||
| apply: Bool, | ||
| interfaceState: ChatPresentationInterfaceState | ||
| ) { | ||
| if claimView.superview == nil { | ||
| buttonNode.view.addSubview(claimView) | ||
| } | ||
|
|
||
| let size = CGSize(width: 20, height: 20) | ||
| buttonNode.layoutIfNeeded() | ||
| claimView.frame = CGRect( | ||
| x: titleNode.frame.maxX + 5, | ||
| y: titleNode.frame.midY - size.height / 2, | ||
| width: size.width, | ||
| height: size.height | ||
| ) | ||
|
|
||
| if self.apply != apply { | ||
| self.apply = apply | ||
| } | ||
|
|
||
| let username = interfaceState.renderedPeer?.peer?.addressName ?? "" | ||
| if self.username != username { | ||
| self.username = username | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.