Skip to content

Commit

Permalink
Merge pull request #1405 from nextcloud/fix-titleview-animation
Browse files Browse the repository at this point in the history
Fix titleview animation
  • Loading branch information
Ivansss committed Nov 3, 2023
2 parents e186840 + 9107b3b commit 24ac5c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions NextcloudTalk/ChatViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import UIKit
let symbolConfiguration = UIImage.SymbolConfiguration(pointSize: 20)
let buttonImage = UIImage(systemName: video ? "video" : "phone", withConfiguration: symbolConfiguration)

let button = BarButtonItemWithActivity(width: 44, with: buttonImage)
let button = BarButtonItemWithActivity(width: 50, with: buttonImage)
button.innerButton.addAction { [unowned self] in
button.showIndicator()
CallKitManager.sharedInstance().startCall(self.room.token, withVideoEnabled: video, andDisplayName: self.room.displayName, silently: false, withAccountId: self.room.accountId)
Expand Down Expand Up @@ -150,9 +150,7 @@ import UIKit

if NCSettingsController.sharedInstance().callsEnabledCapability() &&
room.type != kNCRoomTypeChangelog && room.type != kNCRoomTypeNoteToSelf {
let fixedSpace = UIBarButtonItem(systemItem: .fixedSpace)
fixedSpace.width = 16
self.navigationItem.rightBarButtonItems = [videoCallButton, fixedSpace, voiceCallButton]
self.navigationItem.rightBarButtonItems = [videoCallButton, voiceCallButton]
}

// Disable room info, input bar and call buttons until joining room
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end
target "NextcloudTalk" do
common_dependencies_ext
pod 'DateTools'
pod 'JDStatusBarNotification'
pod 'JDStatusBarNotification', '~> 2.0.0'
pod 'MaterialComponents/ActivityIndicator'
pod 'Toast', '~> 4.0.0'
pod 'libPhoneNumber-iOS'
Expand Down

0 comments on commit 24ac5c8

Please sign in to comment.