From 947adac70e0aed7ea711033ca57012645dfa0fb1 Mon Sep 17 00:00:00 2001 From: Paul Kepinski Date: Fri, 17 Feb 2023 11:18:01 +0100 Subject: [PATCH] Example: update deps (#129) --- example/lib/src/common/icon_dialog.dart | 4 ++-- example/lib/src/common/icon_usage.dart | 2 +- example/lib/src/common/search_entry.dart | 8 +++++++- example/lib/src/example.dart | 20 +++++++++---------- .../flutter/generated_plugin_registrant.cc | 16 +++++++++++---- example/linux/flutter/generated_plugins.cmake | 4 +++- example/pubspec.yaml | 6 +++--- 7 files changed, 38 insertions(+), 22 deletions(-) diff --git a/example/lib/src/common/icon_dialog.dart b/example/lib/src/common/icon_dialog.dart index 03ad2e9cf..db74385aa 100644 --- a/example/lib/src/common/icon_dialog.dart +++ b/example/lib/src/common/icon_dialog.dart @@ -29,7 +29,7 @@ class IconDialog extends StatelessWidget { titlePadding: EdgeInsets.zero, contentPadding: const EdgeInsets.symmetric(vertical: _dialogContentPaddingValue), - title: YaruTitleBar( + title: YaruDialogTitleBar( title: Text(beautifyIconName(iconItem.name)), ), children: [ @@ -60,7 +60,7 @@ class IconDialog extends StatelessWidget { ), Text( '${size.toInt().toString()}px', - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, ), ], ), diff --git a/example/lib/src/common/icon_usage.dart b/example/lib/src/common/icon_usage.dart index b6cfe5a9f..0e52cfe27 100644 --- a/example/lib/src/common/icon_usage.dart +++ b/example/lib/src/common/icon_usage.dart @@ -14,7 +14,7 @@ class IconUsage extends StatelessWidget { @override Widget build(BuildContext context) { - final usageTextStyle = Theme.of(context).textTheme.bodyText1!.copyWith( + final usageTextStyle = Theme.of(context).textTheme.bodyLarge!.copyWith( fontFamily: 'Monospace', ); diff --git a/example/lib/src/common/search_entry.dart b/example/lib/src/common/search_entry.dart index c64e2922d..bce62256b 100644 --- a/example/lib/src/common/search_entry.dart +++ b/example/lib/src/common/search_entry.dart @@ -30,7 +30,13 @@ class SearchEntry extends StatelessWidget implements PreferredSizeWidget { }, child: TextField( decoration: InputDecoration( - border: const UnderlineInputBorder(), + enabledBorder: InputBorder.none, + focusedBorder: UnderlineInputBorder( + borderSide: BorderSide( + color: Theme.of(context).colorScheme.primary, + ), + borderRadius: BorderRadius.zero, + ), prefixIcon: const Icon( YaruIcons.magnifying_glass, size: 24, diff --git a/example/lib/src/example.dart b/example/lib/src/example.dart index fe872c7bc..b0a30617d 100644 --- a/example/lib/src/example.dart +++ b/example/lib/src/example.dart @@ -78,30 +78,30 @@ class Example extends StatelessWidget { ) : null, ), - body: YaruCompactLayout( + body: YaruNavigationPage( length: 3, itemBuilder: (context, index, selected) { const style = YaruNavigationRailStyle.labelled; switch (index) { case 0: - return const YaruNavigationRailItem( - icon: Icon(YaruIcons.image), - label: Text('Static icons'), + return YaruNavigationRailItem( + icon: const Icon(YaruIcons.image), + label: const Text('Static icons'), tooltip: 'Static icons', style: style, ); case 1: - return const YaruNavigationRailItem( - icon: Icon(YaruIcons.video), - label: Text('Animated icons'), + return YaruNavigationRailItem( + icon: const Icon(YaruIcons.video), + label: const Text('Animated icons'), tooltip: 'Animated icons', style: style, ); case 2: - return const YaruNavigationRailItem( - icon: Icon(YaruIcons.rule_and_pen), - label: Text('Widget icons'), + return YaruNavigationRailItem( + icon: const Icon(YaruIcons.rule_and_pen), + label: const Text('Widget icons'), tooltip: 'Widget icons', style: style, ); diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index 6cdf9ac90..6ef9dd5ea 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,18 @@ #include "generated_plugin_registrant.h" -#include +#include +#include +#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) yaru_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "YaruPlugin"); - yaru_plugin_register_with_registrar(yaru_registrar); + g_autoptr(FlPluginRegistrar) gtk_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); + gtk_plugin_register_with_registrar(gtk_registrar); + g_autoptr(FlPluginRegistrar) screen_retriever_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); + screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); + g_autoptr(FlPluginRegistrar) window_manager_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); + window_manager_plugin_register_with_registrar(window_manager_registrar); } diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 4710751e9..7b6f37ac1 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -3,7 +3,9 @@ # list(APPEND FLUTTER_PLUGIN_LIST - yaru + gtk + screen_retriever + window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 73b134bd5..d205b6b73 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,11 +12,11 @@ dependencies: flutter: sdk: flutter provider: ^6.0.3 - yaru: ^0.4.4 - yaru_colors: ^0.1.0 + yaru: ^0.5.2 + yaru_colors: ^0.1.3 yaru_icons: path: ../ - yaru_widgets: 2.0.0-beta-2 + yaru_widgets: ^2.0.1 dependency_overrides: yaru_icons: