Modernising the entire project

.vscode/launch.json

@@ -1,20 +1,20 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Device Frame Example",
-            "program": "device_frame/example/lib/main.dart",
-            "request": "launch",
-            "type": "dart"
-        },
-        {
-            "name": "Example",
-            "program": "device_preview/example/lib/main.dart",
-            "request": "launch",
-            "type": "dart"
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Device Frame Example",
+      "program": "device_frame/example/lib/main.dart",
+      "request": "launch",
+      "type": "dart"
+    },
+    {
+      "name": "Example",
+      "program": "device_preview/example/lib/main.dart",
+      "request": "launch",
+      "type": "dart"
+    }
+  ]
+}

device_frame/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1
+
+* Fixes iPhone 12 size and safe area issue
+* Adding Pixel 4
+
 ## 1.1.0
 
 * Updated freezed dependency.

device_frame/example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

device_frame/example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()

device_frame/example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

device_frame/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

device_frame/example/ios/Runner/Info.plist

@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

device_frame/example/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.19.6 <3.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -46,7 +46,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^1.0.0
+  flutter_lints: ^2.0.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

device_frame/lib/src/devices/android/devices.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:device_frame/src/info/info.dart';
 
 import 'package:device_frame/src/devices/android/samsung_galaxy_s20/device.dart'
@@ -32,6 +30,27 @@ class AndroidDevices {
 
   DeviceInfo get sonyXperia1II => i_sony_xperia_1_ii.info;
 
+  DeviceInfo get pixel4 => _pixel4;
+  static final _pixel4 = DeviceInfo.genericPhone(
+    platform: TargetPlatform.android,
+    id: 'pixel4',
+    name: 'Pixel 4',
+    pixelRatio: 3.5,
+    screenSize: const Size(412.0, 869.0),
+    safeAreas: const EdgeInsets.only(
+      left: 0.0,
+      top: 24.0,
+      right: 0.0,
+      bottom: 0.0,
+    ),
+    rotatedSafeAreas: const EdgeInsets.only(
+      left: 0.0,
+      top: 24.0,
+      right: 0.0,
+      bottom: 0.0,
+    ),
+  );
+
   DeviceInfo get smallPhone => _smallPhone;
   static final _smallPhone = DeviceInfo.genericPhone(
     platform: TargetPlatform.android,
@@ -159,6 +178,7 @@ class AndroidDevices {
         samsungGalaxyS20,
         samsungGalaxyNote20,
         samsungGalaxyNote20Ultra,
+        pixel4,
         onePlus8Pro,
         sonyXperia1II,
         smallPhone,

device_frame/lib/src/devices/ios/devices.dart

@@ -13,6 +13,10 @@ import 'package:device_frame/src/devices/ios/iphone_13/device.dart'
     as i_iphone_13;
 import 'package:device_frame/src/devices/ios/iphone_13_pro_max/device.dart'
     as i_iphone_13_pro_max;
+
+import 'package:device_frame/src/devices/ios/iphone_14_pro/device.dart'
+    as i_iphone_14_pro;
+
 import 'package:device_frame/src/devices/ios/iphone_se/device.dart'
     as i_iphone_se;
 import 'package:device_frame/src/devices/ios/ipad_air_4/device.dart'
@@ -35,6 +39,7 @@ class IosDevices {
   DeviceInfo get iPhone13Mini => i_iphone_13_mini.info;
   DeviceInfo get iPhone13 => i_iphone_13.info;
   DeviceInfo get iPhone13ProMax => i_iphone_13_pro_max.info;
+  DeviceInfo get iPhone14Pro => i_iphone_14_pro.info;
   DeviceInfo get iPhoneSE => i_iphone_se.info;
   DeviceInfo get iPadAir4 => i_ipad_air_4.info;
   DeviceInfo get iPad => i_ipad.info;
@@ -45,6 +50,7 @@ class IosDevices {
   /// All devices.
   List<DeviceInfo> get all => [
         // Phones
+        iPhone14Pro,
         iPhone12Mini,
         iPhone12,
         iPhone12ProMax,

device_frame/lib/src/devices/ios/iphone_12/device.dart

@@ -13,20 +13,20 @@ final info = DeviceInfo(
     'iphone-12',
   ),
   name: 'iPhone 12',
-  pixelRatio: 2.0,
+  pixelRatio: 3.0,
   frameSize: const Size(873.0, 1771.0),
-  screenSize: const Size(1024.0, 1366.0),
+  screenSize: const Size(390.0, 844.0),
   safeAreas: const EdgeInsets.only(
     left: 0.0,
-    top: 24.0,
+    top: 44.0,
     right: 0.0,
-    bottom: 20.0,
+    bottom: 34.0,
   ),
   rotatedSafeAreas: const EdgeInsets.only(
-    left: 0.0,
-    top: 24.0,
-    right: 0.0,
-    bottom: 20.0,
+    left: 44.0,
+    top: 0.0,
+    right: 44.0,
+    bottom: 21.0,
   ),
   framePainter: const _FramePainter(),
   screenPath: _screenPath,

device_frame/lib/src/devices/ios/iphone_14_pro/device.dart

@@ -0,0 +1,33 @@
+import 'package:device_frame/src/info/device_type.dart';
+import 'package:device_frame/src/info/identifier.dart';
+import 'package:device_frame/src/info/info.dart';
+import 'package:flutter/material.dart';
+
+part 'frame.g.dart';
+part 'screen.g.dart';
+
+final info = DeviceInfo(
+  identifier: const DeviceIdentifier(
+    TargetPlatform.iOS,
+    DeviceType.phone,
+    'iphone-14-pro',
+  ),
+  name: 'iPhone 14 Pro',
+  pixelRatio: 3.0,
+  frameSize: const Size(873.0, 1770.0),
+  screenSize: const Size(430, 932),
+  safeAreas: const EdgeInsets.only(
+    left: 0.0,
+    top: 47.0,
+    right: 0.0,
+    bottom: 34.0,
+  ),
+  rotatedSafeAreas: const EdgeInsets.only(
+    left: 23.0,
+    top: 0.0,
+    right: 47.0,
+    bottom: 21.0,
+  ),
+  framePainter: const _FramePainter(),
+  screenPath: _screenPath,
+);