Merge branch 'release/0.14.0/master'

CHANGES.rst

@@ -1,3 +1,31 @@
+Changes in 0.14.0 (2021-02-11)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * Pre-share session keys when opening a room (vector-im/element-ios/issues/3934)
+ * VoIP: DTMF support in calls (vector-im/element-ios/issues/3929).
+
+🐛 Bugfix
+ * 
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixSDK version ([v0.18.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.18.0)).
+
 Changes in 0.13.9 (2021-02-03)
 =================================================
 

MatrixKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.13.9"
+  s.version      = "0.14.0"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.17.11"
+  s.dependency 'MatrixSDK', "= 0.18.0"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.23'

MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings

@@ -94,6 +94,7 @@
 "answer_call" = "Answer Call";
 "reject_call" = "Reject Call";
 "end_call" = "End Call";
+"resume_call" = "Resume";
 "ignore" = "Ignore";
 "unignore" = "Unignore";
 
@@ -369,6 +370,7 @@
 "notice_placed_video_call" = "%@ placed a video call";
 "notice_answered_video_call" = "%@ answered the call";
 "notice_ended_video_call" = "%@ ended the call";
+"notice_declined_video_call" = "%@ declined the call";
 "notice_conference_call_request" = "%@ requested a VoIP conference";
 "notice_conference_call_started" = "VoIP conference started";
 "notice_conference_call_finished" = "VoIP conference finished";
@@ -399,6 +401,7 @@
 "notice_placed_video_call_by_you" = "You placed a video call";
 "notice_answered_video_call_by_you" = "You answered the call";
 "notice_ended_video_call_by_you" = "You ended the call";
+"notice_declined_video_call_by_you" = "You declined the call";
 "notice_conference_call_request_by_you" = "You requested a VoIP conference";
 "notice_room_name_removed_by_you" = "You removed the room name";
 "notice_room_name_removed_by_you_for_dm" = "You removed the name";
@@ -535,6 +538,15 @@
 "incoming_video_call" = "Incoming Video Call";
 "incoming_voice_call" = "Incoming Voice Call";
 "call_invite_expired" = "Call Invite Expired";
+"call_remote_holded" = "%@ held the call";
+"call_holded" = "You held the call";
+"call_more_actions_hold" = "Hold";
+"call_more_actions_unhold" = "Resume";
+"call_more_actions_change_audio_device" = "Change Audio Device";
+"call_more_actions_audio_use_headset" = "Use Headset Audio";
+"call_more_actions_audio_use_device" = "Use Device Audio";
+"call_more_actions_transfer" = "Transfer";
+"call_more_actions_dialpad" = "Dial pad";
 
 // unrecognized SSL certificate
 "ssl_trust" = "Trust";

MatrixKit/Controllers/MXKCallViewController.h

@@ -40,6 +40,18 @@
  */
 - (void)dismissCallViewController:(MXKCallViewController *)callViewController completion:(void (^)(void))completion;
 
+/**
+ Tells the delegate that user tapped on hold call.
+ @param callViewController the call view controller.
+ */
+- (void)callViewControllerDidTapOnHoldCall:(MXKCallViewController *)callViewController;
+
+/**
+ Tells the delegate that user tapped PiP button.
+ @param callViewController the call view controller.
+ */
+- (void)callViewControllerDidTapPiPButton:(MXKCallViewController *)callViewController;
+
 @end
 
 extern NSString *const kMXKCallViewControllerWillAppearNotification;
@@ -58,23 +70,30 @@ extern NSString *const kMXKCallViewControllerBackToAppNotification;
 @property (weak, nonatomic, readonly) IBOutlet UIView *localPreviewContainerView;
 @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *localPreviewActivityView;
 
+@property (weak, nonatomic, readonly) IBOutlet UIView *onHoldCallContainerView;
+@property (weak, nonatomic) IBOutlet MXKImageView *onHoldCallerImageView;
+
 @property (weak, nonatomic, readonly) IBOutlet UIView *remotePreviewContainerView;
 
 @property (weak, nonatomic) IBOutlet UIView *overlayContainerView;
 @property (weak, nonatomic) IBOutlet UIView *callContainerView;
 @property (weak, nonatomic) IBOutlet MXKImageView *callerImageView;
+@property (weak, nonatomic) IBOutlet UIImageView *pausedIcon;
 @property (weak, nonatomic) IBOutlet UILabel *callerNameLabel;
 @property (weak, nonatomic) IBOutlet UILabel *callStatusLabel;
+@property (weak, nonatomic) IBOutlet UIButton *resumeButton;
 
 @property (weak, nonatomic) IBOutlet UIView *callToolBar;
 @property (weak, nonatomic) IBOutlet UIButton *rejectCallButton;
 @property (weak, nonatomic) IBOutlet UIButton *answerCallButton;
 @property (weak, nonatomic) IBOutlet UIButton *endCallButton;
 
 @property (weak, nonatomic) IBOutlet UIView *callControlContainerView;
+@property (weak, nonatomic) IBOutlet UIButton *pipButton;
 @property (weak, nonatomic) IBOutlet UIButton *speakerButton;
 @property (weak, nonatomic) IBOutlet UIButton *audioMuteButton;
 @property (weak, nonatomic) IBOutlet UIButton *videoMuteButton;
+@property (weak, nonatomic) IBOutlet UIButton *moreButton;
 
 @property (weak, nonatomic) IBOutlet UIButton *backToAppButton;
 @property (weak, nonatomic) IBOutlet UIButton *cameraSwitchButton;
@@ -99,11 +118,21 @@ extern NSString *const kMXKCallViewControllerBackToAppNotification;
  */
 @property (nonatomic) MXCall *mxCall;
 
+/**
+ The current call on hold
+ */
+@property (nonatomic) MXCall *mxCallOnHold;
+
 /**
  The current peer
  */
 @property (nonatomic, readonly) MXUser *peer;
 
+/**
+ The current peer of the call on hold
+ */
+@property (nonatomic, readonly) MXUser *peerOnHold;
+
 /**
  The delegate.
  */
@@ -185,4 +214,18 @@ extern NSString *const kMXKCallViewControllerBackToAppNotification;
  */
 - (IBAction)onButtonPressed:(id)sender;
 
+#pragma mark - DTMF
+
+/**
+ Default implementation does nothing. Override to show a dial pad and then use MXCall methods to send DTMF tones.
+ */
+- (void)openDialpad;
+
+#pragma mark - Call Transfer
+
+/**
+ Default implementation does nothing. Override to show a contact selection screen and then use MXCallManager methods to start the transfer.
+ */
+- (void)openCallTransfer;
+
 @end