Skip to content

Commit 23ec667

Browse files
laktyushinlaktyushin
committed
Various Fixes
1 parent 0c9eb70 commit 23ec667

File tree

14 files changed

+95
-10
lines changed

14 files changed

+95
-10
lines changed

‎submodules/TelegramCallsUI/Sources/VoiceChatController.swift

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,8 @@ public final class VoiceChatController: ViewController {
858858

859859
private var currentLoadToken: String?
860860

861+
private var scrollAtTop = true
862+
861863
private var effectiveMuteState: GroupCallParticipantsContext.Participant.MuteState? {
862864
if self.pushingToTalk {
863865
return nil
@@ -2157,6 +2159,22 @@ public final class VoiceChatController: ViewController {
21572159
}
21582160
}
21592161

2162+
self.listNode.visibleContentOffsetChanged = { [weak self] offset in
2163+
guard let strongSelf = self else {
2164+
return
2165+
}
2166+
var scrollAtTop = false
2167+
if case let .known(value) = offset, value < 180.0 {
2168+
scrollAtTop = true
2169+
} else {
2170+
scrollAtTop = false
2171+
}
2172+
if scrollAtTop != strongSelf.scrollAtTop {
2173+
strongSelf.scrollAtTop = scrollAtTop
2174+
strongSelf.updateTitle(transition: .immediate)
2175+
}
2176+
}
2177+
21602178
self.listNode.visibleBottomContentOffsetChanged = { [weak self] offset in
21612179
guard let strongSelf = self else {
21622180
return
@@ -3939,8 +3957,15 @@ public final class VoiceChatController: ViewController {
39393957
}
39403958
}
39413959

3942-
var subtitle = self.currentSpeakingSubtitle ?? self.currentSubtitle
3943-
var speaking = self.currentSpeakingSubtitle != nil
3960+
var subtitle = ""
3961+
var speaking = false
3962+
if self.scrollAtTop {
3963+
subtitle = self.currentSubtitle
3964+
speaking = false
3965+
} else {
3966+
subtitle = self.currentSpeakingSubtitle ?? self.currentSubtitle
3967+
speaking = self.currentSpeakingSubtitle != nil
3968+
}
39443969
if self.isScheduling {
39453970
subtitle = ""
39463971
speaking = false

‎submodules/TelegramCallsUI/Sources/VoiceChatRecordingSetupController.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,23 +565,35 @@ private class PreviewIconNode: ASDisplayNode {
565565
override init() {
566566
self.avatar1Node = ASImageNode()
567567
self.avatar1Node.cornerRadius = 4.0
568+
self.avatar1Node.clipsToBounds = true
568569
self.avatar1Node.displaysAsynchronously = false
569570
self.avatar1Node.backgroundColor = UIColor(rgb: 0x834fff)
571+
self.avatar1Node.image = UIImage(bundleImageName: "Call/Avatar1")
572+
self.avatar1Node.contentMode = .bottom
570573

571574
self.avatar2Node = ASImageNode()
572575
self.avatar2Node.cornerRadius = 4.0
576+
self.avatar2Node.clipsToBounds = true
573577
self.avatar2Node.displaysAsynchronously = false
574578
self.avatar2Node.backgroundColor = UIColor(rgb: 0x63d5c9)
579+
self.avatar2Node.image = UIImage(bundleImageName: "Call/Avatar2")
580+
self.avatar2Node.contentMode = .scaleAspectFit
575581

576582
self.avatar3Node = ASImageNode()
577583
self.avatar3Node.cornerRadius = 4.0
584+
self.avatar3Node.clipsToBounds = true
578585
self.avatar3Node.displaysAsynchronously = false
579586
self.avatar3Node.backgroundColor = UIColor(rgb: 0xccff60)
587+
self.avatar3Node.image = UIImage(bundleImageName: "Call/Avatar3")
588+
self.avatar3Node.contentMode = .scaleAspectFit
580589

581590
self.avatar4Node = ASImageNode()
582591
self.avatar4Node.cornerRadius = 4.0
592+
self.avatar4Node.clipsToBounds = true
583593
self.avatar4Node.displaysAsynchronously = false
584594
self.avatar4Node.backgroundColor = UIColor(rgb: 0xf5512a)
595+
self.avatar4Node.image = UIImage(bundleImageName: "Call/Avatar4")
596+
self.avatar4Node.contentMode = .scaleAspectFit
585597

586598
super.init()
587599

‎submodules/TelegramUI/Images.xcassets/Call/Avatar1.imageset/Avatar1.pdf

4.93 KB
Binary file not shown.

‎submodules/TelegramUI/Images.xcassets/Call/Avatar1.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Avatar1.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎submodules/TelegramUI/Images.xcassets/Call/Avatar2.imageset/Avatar3.pdf

5.55 KB
Binary file not shown.

‎submodules/TelegramUI/Images.xcassets/Call/Avatar2.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Avatar3.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎submodules/TelegramUI/Images.xcassets/Call/Avatar3.imageset/Avatar2.pdf

5.97 KB
Binary file not shown.

‎submodules/TelegramUI/Images.xcassets/Call/Avatar3.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Avatar2.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎submodules/TelegramUI/Images.xcassets/Call/Avatar4.imageset/Avatar4.pdf

5.97 KB
Binary file not shown.

‎submodules/TelegramUI/Images.xcassets/Call/Avatar4.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Avatar4.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

0 commit comments

Comments
 (0)