Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 318 update devices info #321

Merged
merged 8 commits into from
Sep 24, 2019
Merged

Issue 318 update devices info #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e525b3e
Add XS series
ascherbinin Sep 19, 2019
d929d69
Update ipod section
ascherbinin Sep 19, 2019
926b00e
Update iPad section
ascherbinin Sep 19, 2019
4e7b81c
Update Apple Watch Section
ascherbinin Sep 19, 2019
72c2094
Update Apple TV section
ascherbinin Sep 19, 2019
8c5a8d1
Add iPhone 11 series
ascherbinin Sep 23, 2019
5f59790
Update changelog.md
ascherbinin Sep 23, 2019
3067561
Merge branch 'develop' into issue-318-update_devices_info
ascherbinin Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog


## 7.0.3
* **improvement** Added new devices info [#321](https://github.com/matomo-org/matomo-sdk-ios/pull/321)

## 7.0.2
* **improvement** Added `timeout` property to URLSessionDispatcher initialization method

Expand Down
37 changes: 37 additions & 0 deletions MatomoTracker/Device.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ extension Device {
case "iPhone10,4": return "iPhone 8 (Global)"
case "iPhone10,5": return "iPhone 8 Plus (Global)"
case "iPhone10,6": return "iPhone X (Global)"
case "iPhone11,2": return "iPhone XS"
case "iPhone11,4": return "iPhone XS Max"
case "iPhone11,6": return "iPhone XS Max (Global)"
case "iPhone11,8": return "iPhone XR"
brototyp marked this conversation as resolved.
Show resolved Hide resolved
case "iPhone12,1": return "iPhone 11"
case "iPhone12,3": return "iPhone 11 Pro"
case "iPhone12,5": return "iPhone 11 Pro Max"

// iPod
case "iPod1,1": return "iPod Touch 1G"
Expand All @@ -96,6 +103,7 @@ extension Device {
case "iPod4,1": return "iPod Touch 4G"
case "iPod5,1": return "iPod Touch 5G"
case "iPod7,1": return "iPod Touch 6G"
case "iPod9,1": return "iPod Touch 7G"

// iPad
case "iPad1,1": return "iPad 1"
Expand Down Expand Up @@ -129,6 +137,26 @@ extension Device {
case "iPad6,4": return "iPad Pro 9.7 (Cellular)"
case "iPad6,7": return "iPad Pro 12.9 (WiFi)"
case "iPad6,8": return "iPad Pro 12.9 (Cellular)"
case "iPad6,11": return "iPad 5G (A1822)"
case "iPad6,12": return "iPad 5G (A1823)"
case "iPad7,1": return "iPad Pro 2G (WiFi)"
case "iPad7,2": return "iPad Pro 2G (Cellular)"
case "iPad7,3": return "iPad Pro 10.5 (A1701)"
case "iPad7,4": return "iPad Pro 10.5 (A1709)"
case "iPad7,5": return "iPad 6G (WiFi)"
case "iPad7,6": return "iPad 6G (Cellular)"
case "iPad8,1": return "iPad Pro 3G 11 (WiFi)"
case "iPad8,2": return "iPad Pro 3G 11 (1TB, WiFi)"
case "iPad8,3": return "iPad Pro 3G 11 (Cellular)"
case "iPad8,4": return "iPad Pro 3G (1TB, Cellular)"
case "iPad8,5": return "iPad Pro 3G 12.9 (WiFi)"
case "iPad8,6": return "iPad Pro 3G 12.9 (1TB, WiFi)"
case "iPad8,7": return "iPad Pro 3G 12.9 (Cellular)"
case "iPad8,8": return "iPad Pro 3G 12.9 (1TB, Cellular)"
case "iPad11,1": return "iPad mini 5G (WiFi)"
case "iPad11,2": return "iPad mini 5G"
case "iPad11,3": return "iPad Air 3G (WiFi)"
case "iPad11,4": return "iPad Air 3G"

// Apple Watch
case "Watch1,1": return "Apple Watch 38mm"
Expand All @@ -137,12 +165,21 @@ extension Device {
case "Watch2,4": return "Apple Watch 42mm (Series 2)"
case "Watch2,6": return "Apple Watch 38mm (Series 1)"
case "Watch2,7": return "Apple Watch 42mm (Series 1)"
case "Watch3,1": return "Apple Watch Series 38mm (Series 3, Cellular)"
case "Watch3,2": return "Apple Watch 42mm (Series 3, Cellular)"
case "Watch3,3": return "Apple Watch 38mm (Series 3, GPS)"
case "Watch3,4": return "Apple Watch 42mm (Series 3, GPS)"
case "Watch4,1": return "Apple Watch 40mm (Series 4, GPS)"
case "Watch4,2": return "Apple Watch 44mm (Series 4, GPS)"
case "Watch4,3": return "Apple Watch 40mm (Series 4, Cellular)"
case "Watch4,4": return "Apple Watch 44mm (Series 4, Cellular)"

// Apple TV
case "AppleTV2,1": return "Apple TV 2G"
case "AppleTV3,1": return "Apple TV 3G"
case "AppleTV3,2": return "Apple TV 3G (2013)"
case "AppleTV5,3": return "Apple TV 4G"
case "AppleTV6,2": return "Apple TV 4K"

case "i386": return "Simulator"
case "x86_64": return "Simulator"
Expand Down