Updated dependencies to support Flutter 3.22.

aloisdeniel · May 27, 2024 · 9cd7405 · 9cd7405
1 parent 307f096
commit 9cd7405
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/device_frame/CHANGELOG.md b/device_frame/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0
+
+* Updated dependencies to support Flutter 3.22.
+
 ## 1.1.0
 
 * Updated freezed dependency.

diff --git a/device_frame/lib/src/devices/android/devices.dart b/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'

diff --git a/device_frame/lib/src/info/identifier.dart b/device_frame/lib/src/info/identifier.dart
@@ -26,7 +26,7 @@ class DeviceIdentifier {
   );
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other is DeviceIdentifier &&
             other.name == name &&

diff --git a/device_frame/lib/src/keyboard/virtual_keyboard.dart b/device_frame/lib/src/keyboard/virtual_keyboard.dart
@@ -1,6 +1,5 @@
 import 'package:device_frame/device_frame.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 import 'button.dart';
 
@@ -85,16 +84,15 @@ class VirtualKeyboard extends StatelessWidget {
 class _VirtualKeyboard extends StatelessWidget {
   const _VirtualKeyboard({
     double? height,
-    this.spacing = 12,
   }) : height = height ?? minHeight;
 
   static const double minHeight = 214;
   final double height;
-  final double spacing;
+  static const double spacing = 22;
 
   Widget _row(List<Widget> children) {
     return Padding(
-      padding: EdgeInsets.only(
+      padding: const EdgeInsets.only(
         top: spacing,
         left: spacing,
       ),
@@ -113,7 +111,7 @@ class _VirtualKeyboard extends StatelessWidget {
         .map<Widget>(
           (x) => Expanded(
             child: Padding(
-              padding: EdgeInsets.only(
+              padding: const EdgeInsets.only(
                 right: spacing,
               ),
               child: VirtualKeyboardButton(
@@ -179,7 +177,7 @@ class _VirtualKeyboard extends StatelessWidget {
               theme.button1ForegroundColor,
             ),
             Padding(
-              padding: EdgeInsets.only(
+              padding: const EdgeInsets.only(
                 right: spacing,
               ),
               child: VirtualKeyboardButton(
@@ -195,7 +193,7 @@ class _VirtualKeyboard extends StatelessWidget {
           _row(
             [
               Padding(
-                padding: EdgeInsets.only(
+                padding: const EdgeInsets.only(
                   right: spacing,
                 ),
                 child: VirtualKeyboardButton(
@@ -210,7 +208,7 @@ class _VirtualKeyboard extends StatelessWidget {
                 ),
               ),
               Padding(
-                padding: EdgeInsets.only(
+                padding: const EdgeInsets.only(
                   right: spacing,
                 ),
                 child: VirtualKeyboardButton(
@@ -224,7 +222,7 @@ class _VirtualKeyboard extends StatelessWidget {
               ),
               Expanded(
                 child: Padding(
-                  padding: EdgeInsets.only(
+                  padding: const EdgeInsets.only(
                     right: spacing,
                   ),
                   child: VirtualKeyboardButton(
@@ -240,7 +238,7 @@ class _VirtualKeyboard extends StatelessWidget {
                 ),
               ),
               Padding(
-                padding: EdgeInsets.only(
+                padding: const EdgeInsets.only(
                   right: spacing,
                 ),
                 child: VirtualKeyboardButton(

diff --git a/device_frame/pubspec.yaml b/device_frame/pubspec.yaml
@@ -1,10 +1,11 @@
 name: device_frame
 description: Mockups for common devices.
-version: 1.1.0
+version: 1.2.0
 homepage: https://github.com/aloisdeniel/flutter_device_preview/device_frame
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.2.0'
 
 dependencies:
   freezed_annotation: ^2.0.3

diff --git a/device_preview/CHANGELOG.md b/device_preview/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0
+
+* Updated dependencies and adding support for Flutter 3.2.
+
 ## 1.1.0
 
 * Updated dependencies and adding support for Flutter 3.0.

diff --git a/device_preview/example/pubspec.yaml b/device_preview/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: ">=3.3.0 <4.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions

diff --git a/device_preview/pubspec.yaml b/device_preview/pubspec.yaml
@@ -1,17 +1,18 @@
 name: device_preview
-version: 1.1.0
+version: 1.2.0
 description: Approximate how your Flutter app looks and performs on another device.
 homepage: https://github.com/aloisdeniel/flutter_device_preview
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: '>=3.3.0-0 <4.0.0'
+  flutter: ">=3.22.0"
 dependencies:
   flutter:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
   provider: ^6.1.2
-  device_frame: ^1.1.0
+  device_frame: ^1.2.0
   freezed_annotation: ^2.4.1
   json_annotation: ^4.9.0
   shared_preferences: ^2.2.3
@@ -21,6 +22,6 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^4.0.0
-  build_runner: ^2.4.10
-  freezed: ^2.5.3
+  build_runner: ^2.4.0
+ # freezed: ^2.5.3
   json_serializable: ^6.8.0