Merge pull request #4651 from vector-im/element_4642

VoIP: Text & Icon Changes on Call Tiles

CHANGES.rst

@@ -7,6 +7,7 @@ Changes to be released in next version
 🙌 Improvements
  * Settings: The notifications toggle no longer detects the system's "Deliver Quietly" configuration as disabled (#2368).
  * Settings: Adds a link to open the Settings app to quickly configure app notifications.
+ * VoIP: Text & icon changes on call tiles (#4642).
 
 🐛 Bugfix
  * 

Riot/Assets/Images.xcassets/Call/call_missed_video.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Video.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Call/call_missed_voice.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Voice call.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Voice [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Voice [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Call/call_video_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "24.png",
+      "filename" : "Video.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "24@2x.png",
+      "filename" : "Video@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "24@3x.png",
+      "filename" : "Video@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/en.lproj/Vector.strings

@@ -846,14 +846,16 @@ Tap the + to start adding people.";
 "event_formatter_rerequest_keys_part1_link" = "Re-request encryption keys";
 "event_formatter_rerequest_keys_part2" = " from your other sessions.";
 "event_formatter_message_edited_mention" = "(edited)";
-"event_formatter_call_voice" = "Voice call";
-"event_formatter_call_video" = "Video call";
 "event_formatter_call_connecting" = "Connecting…";
 "event_formatter_call_ringing" = "Ringing…";
-"event_formatter_call_has_ended" = "Ended %@";
-"event_formatter_call_you_currently_in" = "Active call";
-"event_formatter_call_you_declined" = "You declined this call";
-"event_formatter_call_you_missed" = "You missed this call";
+"event_formatter_call_has_ended" = "Call ended %@";
+"event_formatter_call_incoming_voice" = "Incoming voice call";
+"event_formatter_call_incoming_video" = "Incoming video call";
+"event_formatter_call_active_voice" = "Active voice call";
+"event_formatter_call_active_video" = "Active video call";
+"event_formatter_call_you_declined" = "Call declined";
+"event_formatter_call_missed_voice" = "Missed voice call";
+"event_formatter_call_missed_video" = "Missed video call";
 "event_formatter_call_connection_failed" = "Connection failed";
 "event_formatter_call_back" = "Call back";
 "event_formatter_call_decline" = "Decline";

Riot/Generated/Images.swift

@@ -36,6 +36,8 @@ internal enum Asset {
     internal static let callDialpadCallIcon = ImageAsset(name: "call_dialpad_call_icon")
     internal static let callGoToChatIcon = ImageAsset(name: "call_go_to_chat_icon")
     internal static let callHangupLarge = ImageAsset(name: "call_hangup_large")
+    internal static let callMissedVideo = ImageAsset(name: "call_missed_video")
+    internal static let callMissedVoice = ImageAsset(name: "call_missed_voice")
     internal static let callMoreIcon = ImageAsset(name: "call_more_icon")
     internal static let callPausedIcon = ImageAsset(name: "call_paused_icon")
     internal static let callPausedWhiteIcon = ImageAsset(name: "call_paused_white_icon")

Riot/Generated/Strings.swift

@@ -1242,6 +1242,14 @@ internal enum VectorL10n {
   internal static var errorUserAlreadyLoggedIn: String { 
     return VectorL10n.tr("Vector", "error_user_already_logged_in") 
   }
+  /// Active video call
+  internal static var eventFormatterCallActiveVideo: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_active_video") 
+  }
+  /// Active voice call
+  internal static var eventFormatterCallActiveVoice: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_active_voice") 
+  }
   /// Answer
   internal static var eventFormatterCallAnswer: String { 
     return VectorL10n.tr("Vector", "event_formatter_call_answer") 
@@ -1266,10 +1274,26 @@ internal enum VectorL10n {
   internal static var eventFormatterCallEndCall: String { 
     return VectorL10n.tr("Vector", "event_formatter_call_end_call") 
   }
-  /// Ended %@
+  /// Call ended %@
   internal static func eventFormatterCallHasEnded(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "event_formatter_call_has_ended", p1)
   }
+  /// Incoming video call
+  internal static var eventFormatterCallIncomingVideo: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_incoming_video") 
+  }
+  /// Incoming voice call
+  internal static var eventFormatterCallIncomingVoice: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_incoming_voice") 
+  }
+  /// Missed video call
+  internal static var eventFormatterCallMissedVideo: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_missed_video") 
+  }
+  /// Missed voice call
+  internal static var eventFormatterCallMissedVoice: String { 
+    return VectorL10n.tr("Vector", "event_formatter_call_missed_voice") 
+  }
   /// Retry
   internal static var eventFormatterCallRetry: String { 
     return VectorL10n.tr("Vector", "event_formatter_call_retry") 
@@ -1278,26 +1302,10 @@ internal enum VectorL10n {
   internal static var eventFormatterCallRinging: String { 
     return VectorL10n.tr("Vector", "event_formatter_call_ringing") 
   }
-  /// Video call
-  internal static var eventFormatterCallVideo: String { 
-    return VectorL10n.tr("Vector", "event_formatter_call_video") 
-  }
-  /// Voice call
-  internal static var eventFormatterCallVoice: String { 
-    return VectorL10n.tr("Vector", "event_formatter_call_voice") 
-  }
-  /// Active call
-  internal static var eventFormatterCallYouCurrentlyIn: String { 
-    return VectorL10n.tr("Vector", "event_formatter_call_you_currently_in") 
-  }
-  /// You declined this call
+  /// Call declined
   internal static var eventFormatterCallYouDeclined: String { 
     return VectorL10n.tr("Vector", "event_formatter_call_you_declined") 
   }
-  /// You missed this call
-  internal static var eventFormatterCallYouMissed: String { 
-    return VectorL10n.tr("Vector", "event_formatter_call_you_missed") 
-  }
   /// Group call
   internal static var eventFormatterGroupCall: String { 
     return VectorL10n.tr("Vector", "event_formatter_group_call") 

Riot/Modules/Room/Views/BubbleCells/Call/CallBubbleCellBaseContentView.swift

@@ -32,8 +32,6 @@ class CallBubbleCellBaseContentView: UIView {
     @IBOutlet weak var avatarImageView: MXKImageView!
     @IBOutlet weak var callerNameLabel: UILabel!
     @IBOutlet weak var callIconView: UIImageView!
-    @IBOutlet weak var callTypeLabel: UILabel!
-    @IBOutlet weak var dotLabel: UILabel!
     @IBOutlet private weak var callStatusLabel: UILabel!
     @IBOutlet private weak var callSummaryHeightConstraint: NSLayoutConstraint!
 
@@ -51,7 +49,6 @@ class CallBubbleCellBaseContentView: UIView {
 
     var statusText: String? {
         didSet {
-            dotLabel.isHidden = statusText == nil
             callStatusLabel.text = statusText
         }
     }
@@ -105,9 +102,7 @@ extension CallBubbleCellBaseContentView: Themable {
 
         bgView.backgroundColor = theme.colors.tile
         callerNameLabel.textColor = theme.textPrimaryColor
-        callIconView.tintColor = theme.textTertiaryColor
-        callTypeLabel.textColor = theme.textSecondaryColor
-        dotLabel.textColor = theme.textSecondaryColor
+        callIconView.tintColor = theme.textSecondaryColor
         callStatusLabel.textColor = theme.textSecondaryColor
 
         if let bottomContainerView = bottomContainerView as? Themable {

Riot/Modules/Room/Views/BubbleCells/Call/CallBubbleCellBaseContentView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" 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="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -78,7 +78,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="kdm-vj-rsY">
-                                            <rect key="frame" x="92" y="98" width="160.5" height="20"/>
+                                            <rect key="frame" x="130" y="98" width="84" height="20"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="voice_call_hangon_icon" translatesAutoresizingMaskIntoConstraints="NO" id="iQL-Bn-D9b">
                                                     <rect key="frame" x="0.0" y="2" width="16" height="16"/>
@@ -87,20 +87,8 @@
                                                         <constraint firstAttribute="height" constant="16" id="OdD-1h-kkV"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Voice call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alq-3S-yHg">
-                                                    <rect key="frame" x="22" y="2" width="58" height="16"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6xJ-gU-ls1">
-                                                    <rect key="frame" x="86" y="2" width="6.5" height="16"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
-                                                    <rect key="frame" x="98.5" y="2" width="62" height="16"/>
+                                                    <rect key="frame" x="22" y="2" width="62" height="16"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -197,9 +185,7 @@
                 <outlet property="callIconView" destination="iQL-Bn-D9b" id="Cih-PG-EM2"/>
                 <outlet property="callStatusLabel" destination="A3h-4o-nXF" id="9Zf-aC-DAq"/>
                 <outlet property="callSummaryHeightConstraint" destination="xI1-oH-QU6" id="EnC-Bt-TkY"/>
-                <outlet property="callTypeLabel" destination="alq-3S-yHg" id="lgA-Dw-PH2"/>
                 <outlet property="callerNameLabel" destination="ONW-WU-t2g" id="0Vj-Xn-CLD"/>
-                <outlet property="dotLabel" destination="6xJ-gU-ls1" id="8ln-dF-l7V"/>
                 <outlet property="paginationLabel" destination="GQH-kh-LXA" id="Mww-Ps-yv1"/>
                 <outlet property="paginationSeparatorView" destination="YdR-PH-eGM" id="aK7-LF-awm"/>
                 <outlet property="paginationTitleView" destination="H6S-AE-DTm" id="yep-a0-QYq"/>