diff --git a/device_frame/assets/android_phone_android-16-9-aspect-ratio.svg b/device_frame/assets/android_phone_android-16-9-aspect-ratio.svg new file mode 100644 index 00000000..84535d6b --- /dev/null +++ b/device_frame/assets/android_phone_android-16-9-aspect-ratio.svg @@ -0,0 +1,19 @@ + + + + + + + name: Android Phone 16_9 + + + density: 3 + + + screen_size: 414x736 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/assets/android_tablet_android-10-inch.svg b/device_frame/assets/android_tablet_android-10-inch.svg new file mode 100644 index 00000000..1de0f3ae --- /dev/null +++ b/device_frame/assets/android_tablet_android-10-inch.svg @@ -0,0 +1,19 @@ + + + + + + + name: Android Tablet 10" + + + density: 3 + + + screen_size: 720x1280 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/assets/android_tablet_android-7-inch.svg b/device_frame/assets/android_tablet_android-7-inch.svg new file mode 100644 index 00000000..57c7961f --- /dev/null +++ b/device_frame/assets/android_tablet_android-7-inch.svg @@ -0,0 +1,19 @@ + + + + + + + name: Android Tablet 7" + + + density: 3 + + + screen_size: 576x1024 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/assets/ios_phone_iphone-5-5-inch.svg b/device_frame/assets/ios_phone_iphone-5-5-inch.svg new file mode 100644 index 00000000..9ed2074d --- /dev/null +++ b/device_frame/assets/ios_phone_iphone-5-5-inch.svg @@ -0,0 +1,19 @@ + + + + + + + name: iPhone 5.5" + + + density: 3 + + + screen_size: 414x736 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/assets/ios_phone_iphone-6-5-inch.svg b/device_frame/assets/ios_phone_iphone-6-5-inch.svg new file mode 100644 index 00000000..35076b53 --- /dev/null +++ b/device_frame/assets/ios_phone_iphone-6-5-inch.svg @@ -0,0 +1,19 @@ + + + + + + + name: iPhone 6.5" + + + density: 3 + + + screen_size: 414x896 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/assets/ios_tablet_ipad-12-9-inch.svg b/device_frame/assets/ios_tablet_ipad-12-9-inch.svg new file mode 100644 index 00000000..66939e85 --- /dev/null +++ b/device_frame/assets/ios_tablet_ipad-12-9-inch.svg @@ -0,0 +1,19 @@ + + + + + + + name: iPad 12.9" + + + density: 2 + + + screen_size: 1024x1366 + + + safe_areas: 0,0,0,0|0,0,0,0 + + + diff --git a/device_frame/lib/src/devices.dart b/device_frame/lib/src/devices.dart index 2e73ed07..bcc69bc1 100644 --- a/device_frame/lib/src/devices.dart +++ b/device_frame/lib/src/devices.dart @@ -142,6 +142,24 @@ class IosDevices { 'ipad', ); + final iPhone5_5Inch = _find( + TargetPlatform.iOS, + DeviceType.phone, + 'iphone-5-5-inch', + ); + + final iPhone6_5Inch = _find( + TargetPlatform.iOS, + DeviceType.phone, + 'iphone-6-5-inch', + ); + + final iPad12_9Inch = _find( + TargetPlatform.iOS, + DeviceType.tablet, + 'ipad-12-9-inch', + ); + List get all => [ iPadMini, iPadPro129, @@ -150,6 +168,9 @@ class IosDevices { iPhone11, iPhone11Pro, iPhone11ProMax, + iPhone5_5Inch, + iPhone6_5Inch, + iPad12_9Inch ]; } @@ -205,6 +226,24 @@ class AndroidDevices { 'nexus9', ); + final android16_9AspectRatio = _find( + TargetPlatform.android, + DeviceType.phone, + 'android-16-9-aspect-ratio', + ); + + final android7Inch = _find( + TargetPlatform.android, + DeviceType.tablet, + 'android-7-inch', + ); + + final android10Inch = _find( + TargetPlatform.android, + DeviceType.tablet, + 'android-10-inch', + ); + List get all => [ small, medium, @@ -214,6 +253,9 @@ class AndroidDevices { samsungS20, samsungNote10Plus, nexus9, + android16_9AspectRatio, + android7Inch, + android10Inch ]; } diff --git a/device_frame/lib/src/devices.g.dart b/device_frame/lib/src/devices.g.dart index 6daef6a3..342e9f9c 100644 --- a/device_frame/lib/src/devices.g.dart +++ b/device_frame/lib/src/devices.g.dart @@ -2833,6 +2833,46 @@ final _allDevices = [ frameSize: Size(892.0, 1526.0), screenSize: Size(800.0, 1280.0), ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.android, + DeviceType.tablet, + 'android-10-inch', + ), + name: 'Android Tablet 10"', + pixelRatio: 3.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 720.0, + 1280.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(720.0, 1280.0), + screenSize: Size(720.0, 1280.0), + ), DeviceInfo( identifier: const DeviceIdentifier._( TargetPlatform.android, @@ -3714,6 +3754,126 @@ final _allDevices = [ frameSize: Size(1854.0, 2722.0), screenSize: Size(768.0, 1024.0), ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.android, + DeviceType.phone, + 'android-16-9-aspect-ratio', + ), + name: 'Android Phone 16_9', + pixelRatio: 3.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 414.0, + 736.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(414.0, 736.0), + screenSize: Size(414.0, 736.0), + ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.android, + DeviceType.tablet, + 'android-7-inch', + ), + name: 'Android Tablet 7"', + pixelRatio: 3.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 576.0, + 1024.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(576.0, 1024.0), + screenSize: Size(576.0, 1024.0), + ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.iOS, + DeviceType.phone, + 'iphone-5-5-inch', + ), + name: 'iPhone 5.5"', + pixelRatio: 3.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 414.0, + 736.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(414.0, 736.0), + screenSize: Size(414.0, 736.0), + ), DeviceInfo( identifier: const DeviceIdentifier._( TargetPlatform.iOS, @@ -6044,6 +6204,46 @@ final _allDevices = [ frameSize: Size(2881.0, 2032.0), screenSize: Size(1690.0, 1020.0), ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.iOS, + DeviceType.phone, + 'iphone-6-5-inch', + ), + name: 'iPhone 6.5"', + pixelRatio: 3.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 414.0, + 896.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(414.0, 896.0), + screenSize: Size(414.0, 896.0), + ), DeviceInfo( identifier: const DeviceIdentifier._( TargetPlatform.iOS, @@ -6644,6 +6844,46 @@ final _allDevices = [ frameSize: Size(918.0, 1848.0), screenSize: Size(414.0, 896.0), ), + DeviceInfo( + identifier: const DeviceIdentifier._( + TargetPlatform.iOS, + DeviceType.tablet, + 'ipad-12-9-inch', + ), + name: 'iPad 12.9"', + pixelRatio: 2.0, + safeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + rotatedSafeAreas: EdgeInsets.only( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, + ), + screenPath: Path() + ..addRect( + Rect.fromLTWH( + 0.0, + 0.0, + 1024.0, + 1366.0, + ), + ), + svgFrame: + ''' + + + + + +''', + frameSize: Size(1024.0, 1366.0), + screenSize: Size(1024.0, 1366.0), + ), DeviceInfo( identifier: const DeviceIdentifier._( TargetPlatform.macOS, diff --git a/docs/content/usage/devices.md b/docs/content/usage/devices.md index 44f4f444..2c21e963 100644 --- a/docs/content/usage/devices.md +++ b/docs/content/usage/devices.md @@ -34,6 +34,21 @@ This section lists all simulated devices included with Device Preview. Safe Area (Landscape)left: 44.0, top: 0.0, right: 44.0, bottom: 21.0 +#### iPhone 5.5" + + + + + + + + + + +
+ +
PlatformiOS
Typephone
Pixel Ratio3.0
Screen size414.0 x 736.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ #### iPhone 11 @@ -49,6 +64,21 @@ This section lists all simulated devices included with Device Preview. Safe Area (Landscape)left: 44.0, top: 0.0, right: 44.0, bottom: 21.0 +#### iPhone 6.5" + + + + + + + + + + +
+ +
PlatformiOS
Typephone
Pixel Ratio3.0
Screen size414.0 x 896.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ #### iPhone 11 Pro Max @@ -109,6 +139,21 @@ This section lists all simulated devices included with Device Preview. Safe Area (Landscape)left: 0.0, top: 24.0, right: 0.0, bottom: 20.0 +#### iPad 12.9" + + + + + + + + + + +
+ +
PlatformiOS
Typetablet
Pixel Ratio2.0
Screen size1024.0 x 1366.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ ## Android #### Small Phone @@ -171,6 +216,21 @@ This section lists all simulated devices included with Device Preview. Safe Area (Landscape)left: 0.0, top: 24.0, right: 0.0, bottom: 0.0 +#### Android Phone 16_9 + + + + + + + + + + +
+ +
Platformandroid
Typephone
Pixel Ratio3.0
Screen size414.0 x 736.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ #### Samsung Galaxy Note 10 Plus @@ -201,6 +261,36 @@ This section lists all simulated devices included with Device Preview. Safe Area (Landscape)left: 0.0, top: 24.0, right: 0.0, bottom: 0.0 +#### Android Tablet 7" + + + + + + + + + + +
+ +
Platformandroid
Typetablet
Pixel Ratio3.0
Screen size576.0 x 1024.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ +#### Android Tablet 10" + + + + + + + + + + +
+ +
Platformandroid
Typetablet
Pixel Ratio3.0
Screen size720.0 x 1280.0
Safe Area (portrait)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
Safe Area (Landscape)left: 0.0, top: 0.0, right: 0.0, bottom: 0.0
+ #### Nexus 9 diff --git a/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio copy.svg b/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio copy.svg new file mode 100644 index 00000000..775a1771 --- /dev/null +++ b/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio copy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio.svg b/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio.svg new file mode 100644 index 00000000..775a1771 --- /dev/null +++ b/docs/content/usage/devices/android_phone_android-16-9-aspect-ratio.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/android_tablet_android-10-inch.svg b/docs/content/usage/devices/android_tablet_android-10-inch.svg new file mode 100644 index 00000000..f96ccf6f --- /dev/null +++ b/docs/content/usage/devices/android_tablet_android-10-inch.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/android_tablet_android-7-inch.svg b/docs/content/usage/devices/android_tablet_android-7-inch.svg new file mode 100644 index 00000000..a2484221 --- /dev/null +++ b/docs/content/usage/devices/android_tablet_android-7-inch.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/ios_phone_iphone-5-5-inch.svg b/docs/content/usage/devices/ios_phone_iphone-5-5-inch.svg new file mode 100644 index 00000000..775a1771 --- /dev/null +++ b/docs/content/usage/devices/ios_phone_iphone-5-5-inch.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/ios_phone_iphone-6-5-inch.svg b/docs/content/usage/devices/ios_phone_iphone-6-5-inch.svg new file mode 100644 index 00000000..8057fcf4 --- /dev/null +++ b/docs/content/usage/devices/ios_phone_iphone-6-5-inch.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/content/usage/devices/ios_tablet_ipad-12-9-inch.svg b/docs/content/usage/devices/ios_tablet_ipad-12-9-inch.svg new file mode 100644 index 00000000..d2768159 --- /dev/null +++ b/docs/content/usage/devices/ios_tablet_ipad-12-9-inch.svg @@ -0,0 +1,6 @@ + + + + + +