fastlane 2.229.0 → 2.230.0

data/deliver/lib/deliver/app_screenshot.rb

@@ -7,81 +7,192 @@ module Deliver
   # AppScreenshot represents one screenshots for one specific locale and
   # device type.
   class AppScreenshot
-    #
-    module ScreenSize
-      # iPhone 4
-      IOS_35 = "iOS-3.5-in"
-      # iPhone 5
-      IOS_40 = "iOS-4-in"
-      # iPhone 6, 7, & 8
-      IOS_47 = "iOS-4.7-in"
-      # iPhone 6 Plus, 7 Plus, & 8 Plus
-      IOS_55 = "iOS-5.5-in"
-      # iPhone XS
-      IOS_58 = "iOS-5.8-in"
-      # iPhone 14 Pro
-      IOS_61 = "iOS-6.1-in"
-      # iPhone 14 Plus, iPhone 13 Pro Max, iPhone 12 Pro Max, iPhone 11 Pro Max, iPhone 11, iPhone XS Max, iPhone XR
-      IOS_65 = "iOS-6.5-in"
-      # iPhone 14 Pro Max
-      IOS_67 = "iOS-6.7-in"
+    # Shorthand for DisplayType constants
+    DisplayType = Spaceship::ConnectAPI::AppScreenshotSet::DisplayType
 
-      # iPad
-      IOS_IPAD = "iOS-iPad"
-      # iPad 10.5
-      IOS_IPAD_10_5 = "iOS-iPad-10.5"
-      # iPad 11
-      IOS_IPAD_11 = "iOS-iPad-11"
-      # iPad Pro
-      IOS_IPAD_PRO = "iOS-iPad-Pro"
-      # iPad Pro (12.9-inch) (3rd generation)
-      IOS_IPAD_PRO_12_9 = "iOS-iPad-Pro-12.9"
+    FORMATTED_NAMES = {
+      DisplayType::APP_IPHONE_35 => "iPhone 4",
+      DisplayType::APP_IPHONE_40 => "iPhone 5",
+      DisplayType::APP_IPHONE_47 => "iPhone 6",
+      DisplayType::APP_IPHONE_55 => "iPhone 6 Plus",
+      DisplayType::APP_IPHONE_58 => "iPhone XS",
+      DisplayType::APP_IPHONE_61 => "iPhone 14 Pro",
+      DisplayType::APP_IPHONE_65 => "iPhone XS Max",
+      DisplayType::APP_IPHONE_67 => "iPhone 14 Pro Max",
+      DisplayType::APP_IPAD_97 => "iPad",
+      DisplayType::APP_IPAD_105 => "iPad 10.5",
+      DisplayType::APP_IPAD_PRO_3GEN_11 => "iPad 11",
+      DisplayType::APP_IPAD_PRO_129 => "iPad Pro",
+      DisplayType::APP_IPAD_PRO_3GEN_129 => "iPad Pro (12.9-inch) (3rd generation)",
+      DisplayType::IMESSAGE_APP_IPHONE_40 => "iPhone 5 (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_47 => "iPhone 6 (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_55 => "iPhone 6 Plus (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_58 => "iPhone XS (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_61 => "iPhone 14 Pro (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_65 => "iPhone XS Max (iMessage)",
+      DisplayType::IMESSAGE_APP_IPHONE_67 => "iPhone 14 Pro Max (iMessage)",
+      DisplayType::IMESSAGE_APP_IPAD_97 => "iPad (iMessage)",
+      DisplayType::IMESSAGE_APP_IPAD_PRO_129 => "iPad Pro (iMessage)",
+      DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_129 => "iPad Pro (12.9-inch) (3rd generation) (iMessage)",
+      DisplayType::IMESSAGE_APP_IPAD_105 => "iPad 10.5 (iMessage)",
+      DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_11 => "iPad 11 (iMessage)",
+      DisplayType::APP_DESKTOP => "Mac",
+      DisplayType::APP_WATCH_SERIES_3 => "Watch",
+      DisplayType::APP_WATCH_SERIES_4 => "Watch Series4",
+      DisplayType::APP_WATCH_SERIES_7 => "Watch Series7",
+      DisplayType::APP_WATCH_SERIES_10 => "Watch Series10",
+      DisplayType::APP_WATCH_ULTRA => "Watch Ultra",
+      DisplayType::APP_APPLE_TV => "Apple TV",
+      DisplayType::APP_APPLE_VISION_PRO => "Vision Pro"
+    }.freeze
 
-      # iPhone 5 iMessage
-      IOS_40_MESSAGES = "iOS-4-in-messages"
-      # iPhone 6, 7, & 8 iMessage
-      IOS_47_MESSAGES = "iOS-4.7-in-messages"
-      # iPhone 6 Plus, 7 Plus, & 8 Plus iMessage
-      IOS_55_MESSAGES = "iOS-5.5-in-messages"
-      # iPhone XS iMessage
-      IOS_58_MESSAGES = "iOS-5.8-in-messages"
-      # iPhone 14 Pro iMessage
-      IOS_61_MESSAGES = "iOS-6.1-in-messages"
-      # iPhone 14 Plus, iPhone 13 Pro Max, iPhone 12 Pro Max, iPhone 11 Pro Max, iPhone 11, iPhone XS Max, iPhone XR iMessage
-      IOS_65_MESSAGES = "iOS-6.5-in-messages"
-      # iPhone 14 Pro Max iMessage
-      IOS_67_MESSAGES = "iOS-6.7-in-messages"
-
-      # iPad iMessage
-      IOS_IPAD_MESSAGES = "iOS-iPad-messages"
-      # iPad 10.5 iMessage
-      IOS_IPAD_10_5_MESSAGES = "iOS-iPad-10.5-messages"
-      # iPad 11 iMessage
-      IOS_IPAD_11_MESSAGES = "iOS-iPad-11-messages"
-      # iPad Pro iMessage
-      IOS_IPAD_PRO_MESSAGES = "iOS-iPad-Pro-messages"
-      # iPad Pro (12.9-inch) (3rd generation) iMessage
-      IOS_IPAD_PRO_12_9_MESSAGES = "iOS-iPad-Pro-12.9-messages"
-
-      # Apple Watch
-      IOS_APPLE_WATCH = "iOS-Apple-Watch"
-      # Apple Watch Series 4
-      IOS_APPLE_WATCH_SERIES4 = "iOS-Apple-Watch-Series4"
-      # Apple Watch Series 7
-      IOS_APPLE_WATCH_SERIES7 = "iOS-Apple-Watch-Series7"
-      # Apple Watch Ultra
-      IOS_APPLE_WATCH_ULTRA = "iOS-Apple-Watch-Ultra"
+    # reference: https://help.apple.com/app-store-connect/#/devd274dd925
+    # Returns a hash mapping DisplayType constants to their supported resolutions.
+    DEVICE_RESOLUTIONS = {
+      # These are actually 6.9" iPhones
+      DisplayType::APP_IPHONE_67 => [
+        [1260, 2736],
+        [2736, 1260],
+        [1290, 2796],
+        [2796, 1290],
+        [1320, 2868],
+        [2868, 1320]
+      ],
+      DisplayType::APP_IPHONE_65 => [
+        [1242, 2688],
+        [2688, 1242],
+        [1284, 2778],
+        [2778, 1284]
+      ],
+      # These are actually 6.3" iPhones
+      DisplayType::APP_IPHONE_61 => [
+        [1179, 2556],
+        [2556, 1179],
+        [1206, 2622],
+        [2622, 1206]
+      ],
+      # These are actually 6.1" iPhones
+      DisplayType::APP_IPHONE_58 => [
+        [1170, 2532],
+        [2532, 1170],
+        [1125, 2436],
+        [2436, 1125],
+        [1080, 2340],
+        [2340, 1080]
+      ],
+      DisplayType::APP_IPHONE_55 => [
+        [1242, 2208],
+        [2208, 1242]
+      ],
+      DisplayType::APP_IPHONE_47 => [
+        [750, 1334],
+        [1334, 750]
+      ],
+      DisplayType::APP_IPHONE_40 => [
+        [640, 1096],
+        [640, 1136],
+        [1136, 600],
+        [1136, 640]
+      ],
+      DisplayType::APP_IPHONE_35 => [
+        [640, 920],
+        [640, 960],
+        [960, 600],
+        [960, 640]
+      ],
+      DisplayType::APP_IPAD_97 => [
+        [1024, 748],
+        [1024, 768],
+        [2048, 1496],
+        [2048, 1536],
+        [768, 1004],
+        [768, 1024],
+        [1536, 2008],
+        [1536, 2048]
+      ],
+      DisplayType::APP_IPAD_105 => [
+        [1668, 2224],
+        [2224, 1668]
+      ],
+      DisplayType::APP_IPAD_PRO_3GEN_11 => [
+        [1488, 2266],
+        [2266, 1488],
+        [1668, 2420],
+        [2420, 1668],
+        [1668, 2388],
+        [2388, 1668],
+        [1640, 2360],
+        [2360, 1640]
+      ],
+      # These are 12.9" iPads
+      DisplayType::APP_IPAD_PRO_129 => [
+        [2048, 2732],
+        [2732, 2048]
+      ],
+      # These are actually 13" iPads
+      DisplayType::APP_IPAD_PRO_3GEN_129 => [
+        [2048, 2732],
+        [2732, 2048],
+        [2064, 2752],
+        [2752, 2064]
+      ],
+      DisplayType::APP_DESKTOP => [
+        [1280, 800],
+        [1440, 900],
+        [2560, 1600],
+        [2880, 1800]
+      ],
+      DisplayType::APP_WATCH_SERIES_3 => [
+        [312, 390]
+      ],
+      DisplayType::APP_WATCH_SERIES_4 => [
+        [368, 448]
+      ],
+      DisplayType::APP_WATCH_SERIES_7 => [
+        [396, 484]
+      ],
+      DisplayType::APP_WATCH_SERIES_10 => [
+        [416, 496]
+      ],
+      DisplayType::APP_WATCH_ULTRA => [
+        [410, 502],
+        [422, 514]
+      ],
+      DisplayType::APP_APPLE_TV => [
+        [1920, 1080],
+        [3840, 2160]
+      ],
+      DisplayType::APP_APPLE_VISION_PRO => [
+        [3840, 2160]
+      ]
+    }.freeze
 
-      # Apple TV
-      APPLE_TV = "Apple-TV"
+    DEVICE_RESOLUTIONS_MESSAGES = {
+      DisplayType::IMESSAGE_APP_IPHONE_40 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_40],
+      DisplayType::IMESSAGE_APP_IPHONE_47 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_47],
+      DisplayType::IMESSAGE_APP_IPHONE_55 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_55],
+      DisplayType::IMESSAGE_APP_IPHONE_58 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_58],
+      DisplayType::IMESSAGE_APP_IPHONE_61 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_61],
+      DisplayType::IMESSAGE_APP_IPHONE_65 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_65],
+      DisplayType::IMESSAGE_APP_IPHONE_67 => DEVICE_RESOLUTIONS[DisplayType::APP_IPHONE_67],
+      DisplayType::IMESSAGE_APP_IPAD_97 => DEVICE_RESOLUTIONS[DisplayType::APP_IPAD_97],
+      DisplayType::IMESSAGE_APP_IPAD_105 => DEVICE_RESOLUTIONS[DisplayType::APP_IPAD_105],
+      DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_11 => DEVICE_RESOLUTIONS[DisplayType::APP_IPAD_PRO_3GEN_11],
+      DisplayType::IMESSAGE_APP_IPAD_PRO_129 => DEVICE_RESOLUTIONS[DisplayType::APP_IPAD_PRO_129],
+      DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_129 => DEVICE_RESOLUTIONS[DisplayType::APP_IPAD_PRO_3GEN_129]
+    }.freeze
 
-      # Mac
-      MAC = "Mac"
-    end
+    # Resolutions that are shared by multiple device types
+    CONFLICTING_RESOLUTIONS = [
+      # iPad Pro 12.9" (2nd gen) and iPad Pro 13" (3rd+ gen)
+      [2048, 2732],
+      [2732, 2048],
+      # Apple TV and Apple Vision Pro
+      [3840, 2160]
+    ].freeze
 
-    # @return [Deliver::ScreenSize] the screen size (device type)
-    #  specified at {Deliver::ScreenSize}
-    attr_accessor :screen_size
+    # @return [Spaceship::ConnectAPI::AppScreenshotSet::DisplayType] the display type
+    attr_accessor :display_type
 
     attr_accessor :path
 
@@ -89,89 +200,15 @@ module Deliver
 
     # @param path (String) path to the screenshot file
     # @param language (String) Language of this screenshot (e.g. English)
-    # @param screen_size (Deliver::AppScreenshot::ScreenSize) the screen size, which
-    #  will automatically be calculated when you don't set it. (Deprecated)
-    def initialize(path, language, screen_size = nil)
-      UI.deprecated('`screen_size` for Deliver::AppScreenshot.new is deprecated in favor of the default behavior to calculate size automatically. Passed value is no longer validated.') if screen_size
+    def initialize(path, language)
       self.path = path
       self.language = language
-      self.screen_size = screen_size || self.class.calculate_screen_size(path)
-    end
-
-    # The iTC API requires a different notation for the device
-    def device_type
-      matching = {
-        ScreenSize::IOS_35 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_35,
-        ScreenSize::IOS_40 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_40,
-        ScreenSize::IOS_47 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_47, # also 7 & 8
-        ScreenSize::IOS_55 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_55, # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_58,
-        ScreenSize::IOS_61 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_61,
-        ScreenSize::IOS_65 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_65,
-        ScreenSize::IOS_67 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_67,
-        ScreenSize::IOS_IPAD => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_97,
-        ScreenSize::IOS_IPAD_10_5 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_105,
-        ScreenSize::IOS_IPAD_11 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_3GEN_11,
-        ScreenSize::IOS_IPAD_PRO => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_129,
-        ScreenSize::IOS_IPAD_PRO_12_9 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_3GEN_129,
-        ScreenSize::IOS_40_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_40,
-        ScreenSize::IOS_47_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_47, # also 7 & 8
-        ScreenSize::IOS_55_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_55, # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_58,
-        ScreenSize::IOS_61_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_61,
-        ScreenSize::IOS_65_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_65,
-        ScreenSize::IOS_67_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_67,
-        ScreenSize::IOS_IPAD_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_97,
-        ScreenSize::IOS_IPAD_PRO_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_129,
-        ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_129,
-        ScreenSize::IOS_IPAD_10_5_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_105,
-        ScreenSize::IOS_IPAD_11_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_11,
-        ScreenSize::MAC => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_DESKTOP,
-        ScreenSize::IOS_APPLE_WATCH => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_3,
-        ScreenSize::IOS_APPLE_WATCH_SERIES4 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_4,
-        ScreenSize::IOS_APPLE_WATCH_SERIES7 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_7,
-        ScreenSize::IOS_APPLE_WATCH_ULTRA => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_ULTRA,
-        ScreenSize::APPLE_TV => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_APPLE_TV
-      }
-      return matching[self.screen_size]
+      self.display_type = self.class.calculate_display_type(path)
     end
 
     # Nice name
     def formatted_name
-      matching = {
-        ScreenSize::IOS_35 => "iPhone 4",
-        ScreenSize::IOS_40 => "iPhone 5",
-        ScreenSize::IOS_47 => "iPhone 6", # also 7 & 8
-        ScreenSize::IOS_55 => "iPhone 6 Plus", # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58 => "iPhone XS",
-        ScreenSize::IOS_61 => "iPhone 14 Pro",
-        ScreenSize::IOS_65 => "iPhone XS Max",
-        ScreenSize::IOS_67 => "iPhone 14 Pro Max",
-        ScreenSize::IOS_IPAD => "iPad",
-        ScreenSize::IOS_IPAD_10_5 => "iPad 10.5",
-        ScreenSize::IOS_IPAD_11 => "iPad 11",
-        ScreenSize::IOS_IPAD_PRO => "iPad Pro",
-        ScreenSize::IOS_IPAD_PRO_12_9 => "iPad Pro (12.9-inch) (3rd generation)",
-        ScreenSize::IOS_40_MESSAGES => "iPhone 5 (iMessage)",
-        ScreenSize::IOS_47_MESSAGES => "iPhone 6 (iMessage)", # also 7 & 8
-        ScreenSize::IOS_55_MESSAGES => "iPhone 6 Plus (iMessage)", # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58_MESSAGES => "iPhone XS (iMessage)",
-        ScreenSize::IOS_61_MESSAGES => "iPhone 14 Pro (iMessage)",
-        ScreenSize::IOS_65_MESSAGES => "iPhone XS Max (iMessage)",
-        ScreenSize::IOS_67_MESSAGES => "iPhone 14 Pro Max (iMessage)",
-        ScreenSize::IOS_IPAD_MESSAGES => "iPad (iMessage)",
-        ScreenSize::IOS_IPAD_PRO_MESSAGES => "iPad Pro (iMessage)",
-        ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => "iPad Pro (12.9-inch) (3rd generation) (iMessage)",
-        ScreenSize::IOS_IPAD_10_5_MESSAGES => "iPad 10.5 (iMessage)",
-        ScreenSize::IOS_IPAD_11_MESSAGES => "iPad 11 (iMessage)",
-        ScreenSize::MAC => "Mac",
-        ScreenSize::IOS_APPLE_WATCH => "Watch",
-        ScreenSize::IOS_APPLE_WATCH_SERIES4 => "Watch Series4",
-        ScreenSize::IOS_APPLE_WATCH_SERIES7 => "Watch Series7",
-        ScreenSize::IOS_APPLE_WATCH_ULTRA => "Watch Ultra",
-        ScreenSize::APPLE_TV => "Apple TV"
-      }
-      return matching[self.screen_size]
+      return FORMATTED_NAMES[self.display_type]
     end
 
     # Validates the given screenshots (size and format)
@@ -179,219 +216,50 @@ module Deliver
       UI.deprecated('Deliver::AppScreenshot#is_valid? is deprecated in favor of Deliver::AppScreenshotValidator')
       return false unless ["png", "PNG", "jpg", "JPG", "jpeg", "JPEG"].include?(self.path.split(".").last)
 
-      return self.screen_size == self.class.calculate_screen_size(self.path)
+      return self.display_type == self.class.calculate_display_type(self.path)
     end
 
     def is_messages?
-      return [
-        ScreenSize::IOS_40_MESSAGES,
-        ScreenSize::IOS_47_MESSAGES,
-        ScreenSize::IOS_55_MESSAGES,
-        ScreenSize::IOS_58_MESSAGES,
-        ScreenSize::IOS_61_MESSAGES,
-        ScreenSize::IOS_65_MESSAGES,
-        ScreenSize::IOS_67_MESSAGES,
-        ScreenSize::IOS_IPAD_MESSAGES,
-        ScreenSize::IOS_IPAD_PRO_MESSAGES,
-        ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES,
-        ScreenSize::IOS_IPAD_10_5_MESSAGES,
-        ScreenSize::IOS_IPAD_11_MESSAGES
-      ].include?(self.screen_size)
+      # rubocop:disable Require/MissingRequireStatement
+      return DisplayType::ALL_IMESSAGE.include?(self.display_type)
+      # rubocop:enable Require/MissingRequireStatement
     end
 
-    def self.device_messages
-      # This list does not include iPad Pro 12.9-inch (3rd generation)
-      # because it has same resolution as IOS_IPAD_PRO and will clobber
-      return {
-        ScreenSize::IOS_67_MESSAGES => [
-          [1290, 2796],
-          [2796, 1290]
-        ],
-        ScreenSize::IOS_65_MESSAGES => [
-          [1242, 2688],
-          [2688, 1242],
-          [1284, 2778],
-          [2778, 1284]
-        ],
-        ScreenSize::IOS_61_MESSAGES => [
-          [1179, 2556],
-          [2556, 1179]
-        ],
-        ScreenSize::IOS_58_MESSAGES => [
-          [1125, 2436],
-          [2436, 1125],
-          [1170, 2532],
-          [2532, 1170]
-        ],
-        ScreenSize::IOS_55_MESSAGES => [
-          [1242, 2208],
-          [2208, 1242]
-        ],
-        ScreenSize::IOS_47_MESSAGES => [
-          [750, 1334],
-          [1334, 750]
-        ],
-        ScreenSize::IOS_40_MESSAGES => [
-          [640, 1096],
-          [640, 1136],
-          [1136, 600],
-          [1136, 640]
-        ],
-        ScreenSize::IOS_IPAD_MESSAGES => [
-          [1024, 748],
-          [1024, 768],
-          [2048, 1496],
-          [2048, 1536],
-          [768, 1004],
-          [768, 1024],
-          [1536, 2008],
-          [1536, 2048]
-        ],
-        ScreenSize::IOS_IPAD_10_5_MESSAGES => [
-          [1668, 2224],
-          [2224, 1668]
-        ],
-        ScreenSize::IOS_IPAD_11_MESSAGES => [
-          [1668, 2388],
-          [2388, 1668]
-        ],
-        ScreenSize::IOS_IPAD_PRO_MESSAGES => [
-          [2732, 2048],
-          [2048, 2732]
-        ]
-      }
-    end
+    def self.calculate_display_type(path)
+      size = FastImage.size(path)
+      UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? || size.count == 0
 
-    # reference: https://help.apple.com/app-store-connect/#/devd274dd925
-    def self.devices
-      # This list does not include iPad Pro 12.9-inch (3rd generation)
-      # because it has same resolution as IOS_IPAD_PRO and will clobber
-      return {
-        ScreenSize::IOS_67 => [
-          [1290, 2796],
-          [2796, 1290]
-        ],
-        ScreenSize::IOS_65 => [
-          [1242, 2688],
-          [2688, 1242],
-          [1284, 2778],
-          [2778, 1284]
-        ],
-        ScreenSize::IOS_61 => [
-          [1179, 2556],
-          [2556, 1179]
-        ],
-        ScreenSize::IOS_58 => [
-          [1125, 2436],
-          [2436, 1125],
-          [1170, 2532],
-          [2532, 1170]
-        ],
-        ScreenSize::IOS_55 => [
-          [1242, 2208],
-          [2208, 1242]
-        ],
-        ScreenSize::IOS_47 => [
-          [750, 1334],
-          [1334, 750]
-        ],
-        ScreenSize::IOS_40 => [
-          [640, 1096],
-          [640, 1136],
-          [1136, 600],
-          [1136, 640]
-        ],
-        ScreenSize::IOS_35 => [
-          [640, 920],
-          [640, 960],
-          [960, 600],
-          [960, 640]
-        ],
-        ScreenSize::IOS_IPAD => [ # 9.7 inch
-          [1024, 748],
-          [1024, 768],
-          [2048, 1496],
-          [2048, 1536],
-          [768, 1004], # portrait without status bar
-          [768, 1024],
-          [1536, 2008], # portrait without status bar
-          [1536, 2048]
-        ],
-        ScreenSize::IOS_IPAD_10_5 => [
-          [1668, 2224],
-          [2224, 1668]
-        ],
-        ScreenSize::IOS_IPAD_11 => [
-          [1668, 2388],
-          [2388, 1668]
-        ],
-        ScreenSize::IOS_IPAD_PRO => [
-          [2732, 2048],
-          [2048, 2732]
-        ],
-        ScreenSize::MAC => [
-          [1280, 800],
-          [1440, 900],
-          [2560, 1600],
-          [2880, 1800]
-        ],
-        ScreenSize::IOS_APPLE_WATCH => [
-          [312, 390]
-        ],
-        ScreenSize::IOS_APPLE_WATCH_SERIES4 => [
-          [368, 448]
-        ],
-        ScreenSize::IOS_APPLE_WATCH_SERIES7 => [
-          [396, 484]
-        ],
-        ScreenSize::IOS_APPLE_WATCH_ULTRA => [
-          [410, 502]
-        ],
-        ScreenSize::APPLE_TV => [
-          [1920, 1080],
-          [3840, 2160]
-        ]
-      }
-    end
+      path_component = Pathname.new(path).each_filename.to_a[-3]
+      is_imessage = path_component.eql?("iMessage")
+      devices = is_imessage ? DEVICE_RESOLUTIONS_MESSAGES : DEVICE_RESOLUTIONS
 
-    def self.resolve_ipadpro_conflict_if_needed(screen_size, filename)
-      is_3rd_gen = [
-        "iPad Pro (12.9-inch) (3rd generation)", # Default simulator has this name
-        "iPad Pro (12.9-inch) (4th generation)", # Default simulator has this name
-        "iPad Pro (12.9-inch) (5th generation)", # Default simulator has this name
-        "iPad Pro (12.9-inch) (6th generation)", # Default simulator has this name
-        "IPAD_PRO_3GEN_129", # Screenshots downloaded from App Store Connect has this name
-        "ipadPro129" # Legacy: screenshots downloaded from iTunes Connect used to have this name
-      ].any? { |key| filename.include?(key) }
-      if is_3rd_gen
-        if screen_size == ScreenSize::IOS_IPAD_PRO
-          return ScreenSize::IOS_IPAD_PRO_12_9
-        elsif screen_size == ScreenSize::IOS_IPAD_PRO_MESSAGES
-          return ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES
-        end
-      end
-      screen_size
-    end
+      matching_display_type = devices.find { |_display_type, resolutions| resolutions.include?(size) }&.first
 
-    def self.calculate_screen_size(path)
-      size = FastImage.size(path)
+      return nil unless matching_display_type
 
-      UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? || size.count == 0
+      return matching_display_type unless CONFLICTING_RESOLUTIONS.include?(size)
 
-      # iMessage screenshots have same resolution as app screenshots so we need to distinguish them
-      path_component = Pathname.new(path).each_filename.to_a[-3]
-      devices = path_component.eql?("iMessage") ? self.device_messages : self.devices
+      path_lower = path.downcase
+
+      case size
+      # iPad Pro conflict
+      when [2048, 2732], [2732, 2048]
+        is_2gen = path_lower.include?("app_ipad_pro_129") ||
+                  (path_lower.include?("12.9") && path_lower.include?("2nd generation")) # e.g. iPad Pro (12.9-inch) (2nd generation)
 
-      devices.each do |screen_size, resolutions|
-        if resolutions.include?(size)
-          filename = Pathname.new(path).basename.to_s
-          return resolve_ipadpro_conflict_if_needed(screen_size, filename)
+        # rubocop:disable Require/MissingRequireStatement
+        if is_2gen
+          return is_imessage ? DisplayType::IMESSAGE_APP_IPAD_PRO_129 : DisplayType::APP_IPAD_PRO_129
+        else
+          return is_imessage ? DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_129 : DisplayType::APP_IPAD_PRO_3GEN_129
         end
+      # Apple TV vs Vision Pro conflict
+      when [3840, 2160]
+        return path_lower.include?("vision") ? DisplayType::APP_APPLE_VISION_PRO : DisplayType::APP_APPLE_TV
+        # rubocop:enable Require/MissingRequireStatement
+      else
+        matching_display_type
       end
-
-      nil
     end
   end
-
-  ScreenSize = AppScreenshot::ScreenSize
 end

data/deliver/lib/deliver/app_screenshot_iterator.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Deliver
   # This is a convenient class that enumerates app store connect's screenshots in various degrees.
   class AppScreenshotIterator
@@ -77,10 +79,11 @@ module Deliver
       # iterate over screenshots per localization
       screenshots_per_language.each do |language, screenshots_for_language|
         localization = supported_localizations.find { |l| l.locale == language }
-        screenshots_per_display_type = screenshots_for_language.reject { |screenshot| screenshot.device_type.nil? }.group_by(&:device_type)
+        screenshots_per_display_type = screenshots_for_language.reject { |screenshot| screenshot.display_type.nil? }.group_by(&:display_type)
 
         screenshots_per_display_type.each do |display_type, screenshots|
           # create AppScreenshotSet for given display_type if it doesn't exist
+          UI.verbose("Setting up screenshot set for #{language}, #{display_type}")
           app_screenshot_set = (app_screenshot_set_per_locale_and_display_type[language] || {})[display_type]
           app_screenshot_set ||= localization.create_app_screenshot_set(attributes: { screenshotDisplayType: display_type })