oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Delete tooltip

This commit is contained in:
Niels Andriesse 2021-08-02 16:11:11 +10:00
parent 9dd1ab023b
commit 6f7d7228e7
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Session.xcodeproj/project.pbxproj
View File

@ -185,7 +185,6 @@
B82A0C2126B7B45200C1BCE3 /* GroupCallVideoGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0A26B7B45200C1BCE3 /* GroupCallVideoGrid.swift */; };
B82A0C2226B7B45200C1BCE3 /* GroupCallSwipeToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0B26B7B45200C1BCE3 /* GroupCallSwipeToastView.swift */; };
B82A0C2326B7B45200C1BCE3 /* GroupCallErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0C26B7B45200C1BCE3 /* GroupCallErrorView.swift */; };
B82A0C2426B7B45200C1BCE3 /* GroupCallTooltip.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0D26B7B45200C1BCE3 /* GroupCallTooltip.swift */; };
B82A0C2526B7B45200C1BCE3 /* GroupCallMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0E26B7B45200C1BCE3 /* GroupCallMemberView.swift */; };
B82A0C2626B7B45200C1BCE3 /* RemoteVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C0F26B7B45200C1BCE3 /* RemoteVideoView.m */; };
B82A0C2726B7B45200C1BCE3 /* LocalVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82A0C1026B7B45200C1BCE3 /* LocalVideoView.swift */; };
@ -1213,7 +1212,6 @@
B82A0C0A26B7B45200C1BCE3 /* GroupCallVideoGrid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallVideoGrid.swift; sourceTree = "<group>"; };
B82A0C0B26B7B45200C1BCE3 /* GroupCallSwipeToastView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallSwipeToastView.swift; sourceTree = "<group>"; };
B82A0C0C26B7B45200C1BCE3 /* GroupCallErrorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallErrorView.swift; sourceTree = "<group>"; };
B82A0C0D26B7B45200C1BCE3 /* GroupCallTooltip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallTooltip.swift; sourceTree = "<group>"; };
B82A0C0E26B7B45200C1BCE3 /* GroupCallMemberView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallMemberView.swift; sourceTree = "<group>"; };
B82A0C0F26B7B45200C1BCE3 /* RemoteVideoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteVideoView.m; sourceTree = "<group>"; };
B82A0C1026B7B45200C1BCE3 /* LocalVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalVideoView.swift; sourceTree = "<group>"; };
@ -2248,7 +2246,6 @@
B82A0C0A26B7B45200C1BCE3 /* GroupCallVideoGrid.swift */,
B82A0C0B26B7B45200C1BCE3 /* GroupCallSwipeToastView.swift */,
B82A0C0C26B7B45200C1BCE3 /* GroupCallErrorView.swift */,
B82A0C0D26B7B45200C1BCE3 /* GroupCallTooltip.swift */,
B82A0C0E26B7B45200C1BCE3 /* GroupCallMemberView.swift */,
);
path = Group;
@ -5124,7 +5121,6 @@
B82A0C2D26B7B45200C1BCE3 /* CallKitCallManager.swift in Sources */,
C328253025CA55370062D0A7 /* ContextMenuWindow.swift in Sources */,
B82A0C3126B7BFF800C1BCE3 /* TSConstants.swift in Sources */,
B82A0C2426B7B45200C1BCE3 /* GroupCallTooltip.swift in Sources */,
B82A0C1E26B7B45200C1BCE3 /* GroupCallMemberSheet.swift in Sources */,
340FC8B7204DAC8D007AEB0F /* OWSConversationSettingsViewController.m in Sources */,
34BECE2E1F7ABCE000D7438D /* GifPickerViewController.swift in Sources */,

2
Session/Calls/CallService.swift
View File

@ -570,7 +570,7 @@ public final class CallService: NSObject {
AssertIsOnMainThread()
// Make sure we're working with the latest group state.
databaseStorage.read { thread.anyReload(transaction: $0) }
thread.reload()
guard let groupModel = thread.groupModel as? TSGroupModelV2,
let groupV2Params = try? groupModel.groupV2Params() else {

32
Session/Calls/UserInterface/Group/GroupCallTooltip.swift
View File

@ -1,32 +0,0 @@
//
// Copyright (c) 2020 Open Whisper Systems. All rights reserved.
//
import Foundation
@objc
public class GroupCallTooltip: TooltipView {
@objc
public class func present(fromView: UIView,
widthReferenceView: UIView,
tailReferenceView: UIView,
wasTappedBlock: (() -> Void)?) -> GroupCallTooltip {
return GroupCallTooltip(fromView: fromView, widthReferenceView: widthReferenceView, tailReferenceView: tailReferenceView, wasTappedBlock: wasTappedBlock)
}
public override func bubbleContentView() -> UIView {
let label = UILabel()
label.text = NSLocalizedString(
"GROUP_CALL_START_TOOLTIP",
comment: "Tooltip highlighting group calls."
)
label.font = UIFont.ows_dynamicTypeSubheadline
label.textColor = UIColor.ows_white
return horizontalStack(forSubviews: [label])
}
public override var bubbleColor: UIColor { .ows_accentGreen }
public override var tailDirection: TooltipView.TailDirection { .up }
}

6
Session/Calls/UserInterface/Group/GroupCallViewController.swift
View File

@ -118,12 +118,6 @@ class GroupCallViewController: UIViewController {
return owsFailDebug("Failed to build group call")
}
// Dismiss the group calling megaphone once someone opens the lobby.
ExperienceUpgradeManager.clearExperienceUpgradeWithSneakyTransaction(.groupCallsMegaphone)
// Dismiss the group call tooltip
self.preferences.setWasGroupCallTooltipShown()
let vc = GroupCallViewController(call: groupCall)
vc.modalTransitionStyle = .crossDissolve