Fix #5299 - Send Tab is missing the tablet icon (#5773)

mozilla-mobile · Nov 21, 2019 · ff96a7f · ff96a7f
1 parent 761a672
commit ff96a7f
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4 deletions.
diff --git a/Account/FxADeviceRegistration.swift b/Account/FxADeviceRegistration.swift
@@ -4,6 +4,7 @@
 
 import Foundation
 import Shared
+import UIKit
 import SwiftyJSON
 
 private let log = Logger.syncLogger
@@ -105,7 +106,7 @@ open class FxADeviceRegistrator {
             device = FxADevice.forUpdate(account.deviceName, id: registration.id, availableCommands: availableCommands, push: pushParams)
             registrationResult = .updated
         } else {
-            device = FxADevice.forRegister(account.deviceName, type: "mobile", availableCommands: availableCommands, push: pushParams)
+            device = FxADevice.forRegister(account.deviceName, type: UIDevice.current.model.lowercased().contains("ipad") ? "tablet" : "mobile", availableCommands: availableCommands, push: pushParams)
             registrationResult = .registered
         }
 

diff --git a/Client/Frontend/Extensions/DevicePickerViewController.swift b/Client/Frontend/Extensions/DevicePickerViewController.swift
@@ -135,10 +135,10 @@ class DevicePickerViewController: UITableViewController {
                 switch item {
                 case .client(let client):
                     clientCell.nameLabel.text = client.name
-                    clientCell.clientType = client.type == "mobile" ? .Mobile : .Desktop
+                    clientCell.clientType = ClientType.fromFxAType(client.type)
                 case .device(let device):
                     clientCell.nameLabel.text = device.name
-                    clientCell.clientType = device.type == "mobile" ? .Mobile : .Desktop
+                    clientCell.clientType = ClientType.fromFxAType(device.type)
                 }
 
                 if let id = item.identifier {
@@ -378,8 +378,28 @@ class DevicePickerTableViewHeaderCell: UITableViewCell {
 }
 
 public enum ClientType: String {
-    case Mobile = "deviceTypeMobile"
     case Desktop = "deviceTypeDesktop"
+    case Mobile = "deviceTypeMobile"
+    case Tablet = "deviceTypeTablet"
+    case VR = "deviceTypeVR"
+    case TV = "deviceTypeTV"
+
+    static func fromFxAType(_ type: String?) -> ClientType {
+        switch type {
+        case "desktop":
+            return ClientType.Desktop
+        case "mobile":
+            return ClientType.Mobile
+        case "tablet":
+            return ClientType.Tablet
+        case "vr":
+            return ClientType.VR
+        case "tv":
+            return ClientType.TV
+        default:
+            return ClientType.Mobile
+        }
+    }
 }
 
 class DevicePickerTableViewCell: UITableViewCell {

diff --git a/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/firefox.png b/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/firefox.png
diff --git a/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/[email protected] b/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/[email protected]
diff --git a/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/[email protected] b/Extensions/ShareTo/Images.xcassets/open-in-firefox.imageset/[email protected]
diff --git a/Extensions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/Contents.json b/Extensions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "deviceTypeTablet.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Extensions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/deviceTypeTablet.png b/Extensions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/deviceTypeTablet.png
diff --git a/...sions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/[email protected] b/...sions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/[email protected]
diff --git a/...sions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/[email protected] b/...sions/ShareTo/SendTo.xcassets/deviceTypeTablet.imageset/[email protected]