diff --git a/device_preview/example/macos/Flutter/GeneratedPluginRegistrant.swift b/device_preview/example/macos/Flutter/GeneratedPluginRegistrant.swift index 287b6a9d..724bb2ac 100644 --- a/device_preview/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/device_preview/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,7 @@ import FlutterMacOS import Foundation -import shared_preferences_macos +import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/device_preview/lib/src/views/theme.dart b/device_preview/lib/src/views/theme.dart index 837d0121..384bb5b8 100644 --- a/device_preview/lib/src/views/theme.dart +++ b/device_preview/lib/src/views/theme.dart @@ -28,7 +28,7 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData { primaryColor: accentColor, primaryColorDark: accentColor, indicatorColor: accentColor, - toggleableActiveColor: accentColor, + toggleButtonsTheme: const ToggleButtonsThemeData(color: accentColor), highlightColor: accentColor.withOpacity(0.1), sliderTheme: base.sliderTheme.copyWith( thumbColor: accentColor, @@ -51,7 +51,7 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData { primaryColor: accentColor, primaryColorDark: accentColor, indicatorColor: accentColor, - toggleableActiveColor: accentColor, + toggleButtonsTheme: const ToggleButtonsThemeData(color: accentColor), highlightColor: accentColor, appBarTheme: base.appBarTheme.copyWith( color: barColor, diff --git a/device_preview/lib/src/views/tool_panel/sections/section.dart b/device_preview/lib/src/views/tool_panel/sections/section.dart index 059ef69a..65167491 100644 --- a/device_preview/lib/src/views/tool_panel/sections/section.dart +++ b/device_preview/lib/src/views/tool_panel/sections/section.dart @@ -36,7 +36,7 @@ class ToolPanelSection extends StatelessWidget { ), child: Text( title.toUpperCase(), - style: theme.textTheme.subtitle2?.copyWith( + style: theme.textTheme.titleMedium?.copyWith( color: theme.hintColor, ), ), diff --git a/device_preview/lib/src/views/tool_panel/sections/settings.dart b/device_preview/lib/src/views/tool_panel/sections/settings.dart index eaf9f279..195bd6f4 100644 --- a/device_preview/lib/src/views/tool_panel/sections/settings.dart +++ b/device_preview/lib/src/views/tool_panel/sections/settings.dart @@ -53,7 +53,7 @@ class SettingsSection extends StatelessWidget { shape: BoxShape.circle, color: background.scaffoldBackgroundColor, border: Border.all( - color: toolbar.backgroundColor, + color: toolbar.scaffoldBackgroundColor, width: 1, ), ), @@ -84,7 +84,7 @@ class SettingsSection extends StatelessWidget { shape: BoxShape.circle, color: toolbar.scaffoldBackgroundColor, border: Border.all( - color: toolbar.backgroundColor, + color: toolbar.scaffoldBackgroundColor, width: 1, ), ), diff --git a/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart b/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart index 8199e8ff..5ccd5884 100644 --- a/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart +++ b/device_preview/lib/src/views/tool_panel/sections/subsections/device_model.dart @@ -172,7 +172,7 @@ class _TypeSectionHeader extends StatelessWidget { } }() .toUpperCase(), - style: theme.textTheme.subtitle2?.copyWith( + style: theme.textTheme.titleMedium?.copyWith( color: theme.hintColor, ), ), diff --git a/device_preview/lib/src/views/tool_panel/tool_panel.dart b/device_preview/lib/src/views/tool_panel/tool_panel.dart index 9c2ee146..d9d7b5f4 100644 --- a/device_preview/lib/src/views/tool_panel/tool_panel.dart +++ b/device_preview/lib/src/views/tool_panel/tool_panel.dart @@ -80,7 +80,7 @@ class _ToolPanel extends StatelessWidget { appBar: AppBar( title: Text( 'Device preview', - style: theme.textTheme.headline6?.copyWith( + style: theme.textTheme.titleLarge?.copyWith( fontSize: 14, fontWeight: FontWeight.bold, color: (theme.colorScheme.brightness == Brightness.dark diff --git a/devtools_device_preview/pubspec.yaml b/devtools_device_preview/pubspec.yaml index 27831ddc..0f233f6d 100644 --- a/devtools_device_preview/pubspec.yaml +++ b/devtools_device_preview/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: ">=1.17.0" dependencies: - device_frame: ^1.0.0-alpha.1 + device_frame: ^1.1.0 flutter: sdk: flutter diff --git a/plugins/device_preview_screenshot/example/lib/main.dart b/plugins/device_preview_screenshot/example/lib/main.dart index 1b8012d6..3867531c 100644 --- a/plugins/device_preview_screenshot/example/lib/main.dart +++ b/plugins/device_preview_screenshot/example/lib/main.dart @@ -103,7 +103,7 @@ class _MyHomePageState extends State { ), Text( '$_counter', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), ], ), diff --git a/plugins/device_preview_screenshot/example/macos/Flutter/GeneratedPluginRegistrant.swift b/plugins/device_preview_screenshot/example/macos/Flutter/GeneratedPluginRegistrant.swift index 287b6a9d..724bb2ac 100644 --- a/plugins/device_preview_screenshot/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/plugins/device_preview_screenshot/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,7 @@ import FlutterMacOS import Foundation -import shared_preferences_macos +import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))