Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update call bar

Browse source
This commit is contained in:
ismailgulek 2021-04-01 23:56:51 +03:00
parent 8eb7f7a7e2
commit 3d7bf72a1a
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
3 changed files with 19 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Modules/Application/LegacyAppDelegate.m
View file

@ -4535,7 +4535,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
#pragma mark - CallBarDelegate
- (void)callBarDidTapReturnButton:(CallBar *)callBar
- (void)callBarDidTap:(CallBar *)callBar
{
[_callPresenter callStatusBarButtonTapped];
}

27
Riot/Modules/Call/Views/CallBar/CallBar.swift
View file

@ -18,24 +18,13 @@ import Foundation
import Reusable
@objc protocol CallBarDelegate: class {
func callBarDidTapReturnButton(_ callBar: CallBar)
func callBarDidTap(_ callBar: CallBar)
}
@objcMembers
class CallBar: UIView, NibLoadable {
@IBOutlet private weak var callIcon: UIImageView! {
didSet {
callIcon.image = Asset.Images.voiceCallHangonIcon.image.vc_tintedImage(usingColor: .white)
}
}
@IBOutlet private weak var titleLabel: UILabel!
@IBOutlet private weak var returnLabel: UILabel! {
didSet {
returnLabel.text = VectorL10n.callbarReturn
}
}
@IBOutlet private weak var returnButton: UIButton!
weak var delegate: CallBarDelegate?
@ -43,6 +32,13 @@ class CallBar: UIView, NibLoadable {
return CallBar.loadFromNib()
}
override func awakeFromNib() {
super.awakeFromNib()
let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapGestureRecognized(_:)))
addGestureRecognizer(tapRecognizer)
}
var title: String? {
get {
return titleLabel.text
@ -51,7 +47,8 @@ class CallBar: UIView, NibLoadable {
}
}
@IBAction private func returnButtonTapped(_ sender: UIButton) {
delegate?.callBarDidTapReturnButton(self)
@objc
private func tapGestureRecognized(_ sender: UITapGestureRecognizer) {
delegate?.callBarDidTap(self)
}
}

51
Riot/Modules/Call/Views/CallBar/CallBar.xib
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -17,53 +17,20 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eee-sW-qFO">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="voice_call_hangon_icon" translatesAutoresizingMaskIntoConstraints="NO" id="cuO-6F-uXq">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="cuO-6F-uXq" secondAttribute="height" multiplier="1:1" id="CgQ-jX-f2t"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4TV-K4-7lO">
<rect key="frame" x="44" y="4" width="311" height="36"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4TV-K4-7lO">
<rect key="frame" x="16" y="4" width="382" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Return" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YXg-I7-CI9">
<rect key="frame" x="363" y="8" width="43" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UUZ-sl-L6q">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<inset key="contentEdgeInsets" minX="8" minY="8" maxX="8" maxY="8"/>
<connections>
<action selector="returnButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="VJx-cV-NtX"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="cuO-6F-uXq" firstAttribute="leading" secondItem="eee-sW-qFO" secondAttribute="leading" id="1Md-B3-CA1"/>
<constraint firstItem="UUZ-sl-L6q" firstAttribute="leading" secondItem="eee-sW-qFO" secondAttribute="leading" id="7o1-9c-HSw"/>
<constraint firstAttribute="bottom" secondItem="cuO-6F-uXq" secondAttribute="bottom" id="Fe6-FC-Lkh"/>
<constraint firstItem="UUZ-sl-L6q" firstAttribute="top" secondItem="eee-sW-qFO" secondAttribute="top" id="HSs-7b-rXw"/>
<constraint firstAttribute="bottom" secondItem="UUZ-sl-L6q" secondAttribute="bottom" id="MgQ-Px-CRu"/>
<constraint firstItem="4TV-K4-7lO" firstAttribute="leading" secondItem="cuO-6F-uXq" secondAttribute="trailing" id="Pfy-hd-a8d"/>
<constraint firstAttribute="trailing" secondItem="UUZ-sl-L6q" secondAttribute="trailing" id="aqk-h6-34r"/>
<constraint firstAttribute="trailing" secondItem="4TV-K4-7lO" secondAttribute="trailing" constant="16" id="0K7-QJ-OZO"/>
<constraint firstAttribute="bottom" secondItem="4TV-K4-7lO" secondAttribute="bottom" constant="4" id="cij-lT-Nw6"/>
<constraint firstItem="YXg-I7-CI9" firstAttribute="top" secondItem="eee-sW-qFO" secondAttribute="top" constant="8" id="eeh-aD-h1f"/>
<constraint firstAttribute="height" constant="44" id="g8Q-T8-geN"/>
<constraint firstItem="YXg-I7-CI9" firstAttribute="leading" secondItem="4TV-K4-7lO" secondAttribute="trailing" constant="8" id="i0d-jI-AXQ"/>
<constraint firstItem="4TV-K4-7lO" firstAttribute="leading" secondItem="eee-sW-qFO" secondAttribute="leading" constant="16" id="ilZ-Fq-aZJ"/>
<constraint firstItem="4TV-K4-7lO" firstAttribute="top" secondItem="eee-sW-qFO" secondAttribute="top" constant="4" id="lfW-G9-DaP"/>
<constraint firstAttribute="trailing" secondItem="YXg-I7-CI9" secondAttribute="trailing" constant="8" id="nYT-hS-nah"/>
<constraint firstItem="cuO-6F-uXq" firstAttribute="top" secondItem="eee-sW-qFO" secondAttribute="top" id="v7k-1F-UR7"/>
<constraint firstAttribute="bottom" secondItem="YXg-I7-CI9" secondAttribute="bottom" constant="8" id="vMX-6A-4b2"/>
</constraints>
</view>
</subviews>
@ -76,15 +43,9 @@
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="callIcon" destination="cuO-6F-uXq" id="A3y-xa-XHu"/>
<outlet property="returnButton" destination="UUZ-sl-L6q" id="baV-ub-2f1"/>
<outlet property="returnLabel" destination="YXg-I7-CI9" id="KyV-MP-AbM"/>
<outlet property="titleLabel" destination="4TV-K4-7lO" id="ZkY-wt-1OH"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="-187.5"/>
</view>
</objects>
<resources>
<image name="voice_call_hangon_icon" width="24" height="24"/>
</resources>
</document>