Remove yaru dep

lib/helpers/extension_helper.dart

@@ -20,3 +20,15 @@ extension Capitalize on String {
   String toCapitalized() =>
       length > 0 ? "${this[0].toUpperCase()}${substring(1).toLowerCase()}" : "";
 }
+
+extension GetTheme on ThemeData {
+  ThemeData tweaked() => copyWith(
+        textTheme: (brightness == Brightness.light
+                ? ThemeData.light()
+                : ThemeData.dark())
+            .textTheme,
+        navigationRailTheme: NavigationRailThemeData(
+          backgroundColor: Colors.transparent,
+        ),
+      );
+}

lib/main.dart

@@ -1,14 +1,16 @@
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:brook/widgets/app.dart';
-import 'package:window_size/window_size.dart';
+import 'package:window_manager/window_manager.dart';
-import 'package:yaru/yaru.dart';
 
 void main() async {
-  await YaruWindowTitleBar.ensureInitialized();
   WidgetsFlutterBinding.ensureInitialized();
 
-  setWindowMinSize(const Size.square(500));
+  await windowManager.ensureInitialized();
+  windowManager.waitUntilReadyToShow(WindowOptions(
+    minimumSize: Size.square(500),
+    titleBarStyle: TitleBarStyle.hidden,
+  ));
 
   runApp(const ProviderScope(child: App()));
 }

lib/models/decoration_type.dart

@@ -0,0 +1,6 @@
+enum DecorationType {
+  close,
+  maximize,
+  restore,
+  minimize,
+}

lib/models/decorations.dart

@@ -1,11 +1,11 @@
+import 'package:brook/models/decoration_type.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:yaru/yaru.dart';
 part "decorations.freezed.dart";
 
 @freezed
 class Decorations with _$Decorations {
   const factory Decorations({
-    required List<YaruWindowControlType> leading,
+    required List<DecorationType> leading,
-    required List<YaruWindowControlType> trailing,
+    required List<DecorationType> trailing,
   }) = _Decorations;
 }

lib/providers/decorations_provider.dart

@@ -1,16 +1,16 @@
+import 'package:brook/models/decoration_type.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import "package:riverpod_annotation/riverpod_annotation.dart";
 import 'package:brook/models/decorations.dart';
 import 'package:brook/providers/button_layout_provider.dart';
-import 'package:yaru/yaru.dart';
 import "package:collection/collection.dart";
 part 'decorations_provider.g.dart';
 
 @riverpod
 Decorations decorations(Ref ref) {
-  List<YaruWindowControlType> parse(String section) => section
+  List<DecorationType> parse(String section) => section
       .split(",")
-      .map((button) => YaruWindowControlType.values.firstWhereOrNull(
+      .map((button) => DecorationType.values.firstWhereOrNull(
             (element) => element.name == button,
           ))
       .nonNulls

lib/providers/search_provider.dart

@@ -20,7 +20,7 @@ Future<IList<SearchResult>> searchProvider(
       SearchType.songs => await yt.searchSongs(search),
       SearchType.albums => await yt.searchAlbums(search),
       SearchType.videos => await yt.searchVideos(search),
-      SearchType.artists => await yt.searchAlbums(search),
+      SearchType.artists => await yt.searchArtists(search),
       SearchType.playlists => await yt.searchPlaylists(search),
     },
   );

lib/screens/tabs/home.dart

@@ -1,13 +1,12 @@
 import 'package:brook/helpers/extension_helper.dart';
 import 'package:brook/providers/home_sections_provider.dart';
-import 'package:brook/screens/album_page.dart';
+import 'package:brook/screens/album.dart';
-import 'package:brook/screens/playlist_page.dart';
+import 'package:brook/screens/playlist.dart';
 import 'package:brook/widgets/thumbnail.dart';
 import 'package:dart_ytmusic_api/dart_ytmusic_api.dart';
 import 'package:flutter/material.dart';
 import 'package:brook/models/tab.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:yaru/yaru.dart';
 
 class HomeTab extends ConsumerWidget implements TabPage {
   const HomeTab({super.key});
@@ -19,46 +18,56 @@ class HomeTab extends ConsumerWidget implements TabPage {
   String get title => "Home";
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) => ref
+  Widget build(BuildContext context, WidgetRef ref) =>
-      .watch(homeSectionsProvider)
+      ref.watch(homeSectionsProvider).betterWhen(
-      .betterWhen(
+            data: (sections) => ListView(
-        data: (sections) => ListView(
+              padding: EdgeInsets.symmetric(vertical: 4),
-          padding: EdgeInsets.symmetric(vertical: 4),
+              children: sections
-          children: sections
+                  .where((element) => element.contents.isNotEmpty)
-              .where(
+                  .map(
-                (element) => element.contents.isNotEmpty,
+                    (section) => Column(
-              )
+                      children: [
-              .map(
+                        ListTile(
-                (section) => YaruSection(
+                          title: Text(
-                  margin: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                            section.title,
-                  padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                            style: Theme.of(context).textTheme.displayMedium,
-                  headline: Text(section.title),
+                          ),
-                  child: SizedBox(
+                          subtitle: SizedBox(
-                    height: 262,
+                            height: 266,
-                    child: ListView(
+                            child: ListView(
-                      itemExtent: 268,
+                              padding: EdgeInsets.only(top: 6),
-                      scrollDirection: Axis.horizontal,
+                              itemExtent: 268,
-                      children: section.contents
+                              scrollDirection: Axis.horizontal,
-                          .map((song) => Padding(
+                              children: section.contents
-                              padding:
+                                  .map(
-                                  EdgeInsets.only(right: 12, bottom: 4, top: 2),
+                                    (song) => Padding(
-                              child: Thumbnail(
+                                      padding: EdgeInsets.only(
-                                url: song.thumbnails.first.url,
+                                        right: 12,
-                                onClick: () => Navigator.of(context)
+                                        bottom: 4,
-                                    .push(MaterialPageRoute(
+                                        top: 2,
-                                        builder: (_) => switch (song) {
+                                      ),
-                                              PlaylistDetailed _ =>
+                                      child: Thumbnail(
-                                                PlaylistPage(),
+                                        url: song.thumbnails.first.url,
-                                              AlbumDetailed _ => AlbumPage(),
+                                        onClick: () => Navigator.of(context)
-                                              _ => throw "Unknown type",
+                                            .push(MaterialPageRoute(
-                                            })),
+                                          builder: (_) => switch (song) {
-                              )))
+                                            PlaylistDetailed _ =>
-                          .toList(),
+                                              PlaylistPage(),
+                                            AlbumDetailed _ => AlbumPage(),
+                                            _ => throw "Unknown type",
+                                          },
+                                        )),
+                                      ),
+                                    ),
+                                  )
+                                  .toList(),
+                            ),
+                          ),
+                        ),
+                      ],
                     ),
-                  ),
+                  )
-                ),
+                  .toList(),
-              )
+            ),
-              .toList(),
+          );
-        ),
-      );
 }

lib/screens/tabs/search.dart

@@ -1,4 +1,5 @@
 import 'package:brook/helpers/extension_helper.dart';
+import 'package:brook/widgets/result.dart';
 import 'package:collection/collection.dart';
 import 'package:brook/providers/search_provider.dart';
 import 'package:brook/widgets/thumbnail.dart';
@@ -9,7 +10,6 @@ import 'package:brook/models/search_type.dart';
 import 'package:brook/models/tab.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:yaru/yaru.dart';
 
 class SearchTab extends HookConsumerWidget implements TabPage {
   const SearchTab({super.key});
@@ -28,9 +28,8 @@ class SearchTab extends HookConsumerWidget implements TabPage {
     return ListView(
       padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
       children: [
-        YaruSearchField(
+        SearchBar(
-          hintText: "Search YouTube music...",
+          hintText: "Search YouTube Music...",
-          fillColor: Theme.of(context).colorScheme.surface,
           onChanged: (value) => search.value = value,
         ),
         Padding(
@@ -42,66 +41,71 @@ class SearchTab extends HookConsumerWidget implements TabPage {
           ),
         ),
         Divider(),
-        SizedBox(height: 8),
         ref
             .watch(searchProviderProvider(
               search: search.value,
               searchType: type.value,
             ))
             .betterWhen(
-              data: (results) => Column(
+              data: (results) => LayoutBuilder(
-                children: results
+                builder: (_, constraints) {
-                    .mapIndexed((index, result) => switch (result) {
+                  final maxGridSize = (constraints.maxWidth / 3) - 4 * 3 * 2;
-                          SongDetailed _ => Builder(builder: (_) {
+                  final gridSize = maxGridSize < 300 ? null : maxGridSize;
-                              final padding =
+
-                                  EdgeInsets.symmetric(horizontal: 16);
+                  return Wrap(
-                              final leading = Thumbnail(
+                    children: [
-                                url: result.thumbnails.first.url,
+                      ...results
-                                onClick: () {},
+                          .mapIndexed((index, result) => switch (result) {
-                              );
+                                SongDetailed _ => Result(
-                              return index == 0
+                                    thumb: result.thumbnails.first.url,
-                                  ? SizedBox(
+                                    onClick: () {},
-                                      height: 128,
+                                    title: result.name,
-                                      child: YaruBanner.tile(
+                                    subtitle: result.artist.name,
-                                        padding: padding,
+                                  ),
-                                        icon: leading,
+                                AlbumDetailed _ => Result(
-                                        title: Text(result.name),
+                                    thumb: result.thumbnails.first.url,
-                                        subtitle: Text(result.artist.name),
+                                    onClick: () {},
-                                      ),
+                                    title: result.name,
-                                    )
+                                    subtitle: result.artist.name,
-                                  : YaruTile(
+                                  ),
-                                      padding: padding,
+                                VideoDetailed _ => Thumbnail(
-                                      leading: leading,
+                                    url: result.thumbnails.first.url,
-                                      title: Text(result.name),
+                                    onClick: () {},
-                                      subtitle: Text(result.artist.name),
+                                    child: Icon(
-                                    );
+                                      Icons.play_circle,
-                            }),
+                                      size: 48,
-                          AlbumDetailed _ => Thumbnail(
+                                    ),
-                              url: result.thumbnails.first.url,
+                                  ),
-                              onClick: () {},
+                                ArtistDetailed _ => Result(
-                            ),
+                                    thumb: result.thumbnails.first.url,
-                          VideoDetailed _ => Thumbnail(
+                                    onClick: () {},
-                              url: result.thumbnails.first.url,
+                                    title: result.name,
-                              onClick: () {},
+                                  ),
-                              radius: 0,
+                                PlaylistDetailed _ => Result(
-                            ),
+                                    thumb: result.thumbnails.first.url,
-                          ArtistDetailed _ => Thumbnail(
+                                    subtitle: result.artist.name,
-                              url: result.thumbnails.first.url,
+                                    onClick: () {},
-                              onClick: () {},
+                                    title: result.name,
-                            ),
+                                  ),
-                          PlaylistDetailed _ => Thumbnail(
+                                _ => throw Exception(
-                              url: result.thumbnails.first.url,
+                                    "Unknown Detailed Result: ${result.runtimeType}",
-                              onClick: () {},
+                                  ),
-                            ),
+                              })
-                          _ => throw Exception(
+                          .mapIndexed((index, element) => index == 0
-                              "Unknown Detailed Result: ${result.runtimeType}",
+                              ? element
-                            ),
+                              : Padding(
-                        })
+                                  padding: EdgeInsets.symmetric(
-                    .map((element) => Padding(
+                                    horizontal: 4,
-                          padding: EdgeInsets.only(bottom: 16),
+                                    vertical: 6,
-                          child: element,
+                                  ),
-                        ))
+                                  child: SizedBox(
-                    .toList(),
+                                    width: gridSize?.toDouble(),
+                                    child: element,
+                                  ),
+                                ))
+                    ],
+                  );
+                },
               ),
             ),
       ],

lib/widgets/app.dart

@@ -10,7 +10,6 @@ import "package:flutter/material.dart";
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:yaru/yaru.dart';
 import 'package:brook/providers/button_layout_provider.dart';
 import 'package:brook/providers/warmup_provider.dart';
 
@@ -30,30 +29,28 @@ class App extends HookConsumerWidget {
               ytmusicProvider,
             ])))
             .betterWhen(
-              data: (_) => YaruDetailPage(
+              data: (_) => Scaffold(
-                appBar: const Appbar(title: "Brook"),
+                appBar: Appbar(title: "Brook"),
-                body: tabs[selected.value],
                 bottomNavigationBar: NavigationBar(
                   destinations: tabs
                       .map(
                         (tab) => NavigationDestination(
-                          icon: Icon(tab.icon),
+                          icon: Icon(
+                            tab.icon,
+                          ),
                           label: tab.title,
                         ),
                       )
                       .toList(),
-                  selectedIndex: selected.value,
                   onDestinationSelected: (index) => selected.value = index,
+                  selectedIndex: selected.value,
                 ),
+                body: tabs[selected.value],
               ),
             ),
       ),
-      theme: AdwaitaThemeData.light().copyWith(
+      theme: AdwaitaThemeData.light().tweaked(),
-        textTheme: const YaruThemeData().theme?.textTheme,
+      darkTheme: AdwaitaThemeData.dark(),
-      ),
-      darkTheme: AdwaitaThemeData.dark().copyWith(
-        textTheme: const YaruThemeData().darkTheme?.textTheme,
-      ),
       debugShowCheckedModeBanner: false,
     );
   }

lib/widgets/appbar.dart

@@ -1,7 +1,9 @@
+import 'package:adwaita_icons/adwaita_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:brook/providers/decorations_provider.dart';
-import 'package:yaru/yaru.dart';
+import 'package:brook/models/decoration_type.dart';
+import 'package:window_manager/window_manager.dart';
 
 class Appbar extends ConsumerWidget implements PreferredSizeWidget {
   final String title;
@@ -11,42 +13,61 @@ class Appbar extends ConsumerWidget implements PreferredSizeWidget {
   });
 
   @override
-  Size get preferredSize => const YaruWindowTitleBar().preferredSize;
+  Size get preferredSize => AppBar().preferredSize;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final window = YaruWindow.of(context);
+    List<Widget> getControl(List<DecorationType> types) => [
-
+          SizedBox(width: 6),
-    List<Widget> getControl(List<YaruWindowControlType> types) => [
-          const SizedBox(width: 6),
           ...types.map(
-            (type) => Padding(
+            (type) {
-              padding: const EdgeInsets.symmetric(horizontal: 6),
+              final decoration = switch (type) {
-              child: YaruWindowControl(
+                DecorationType.close => (
-                type: type,
+                    onClick: windowManager.close,
-                onTap: switch (type) {
+                    icon: AdwaitaIcons.window_close,
-                  YaruWindowControlType.close => window.close,
+                  ),
-                  YaruWindowControlType.maximize => () => window.state().then(
+                DecorationType.maximize => (
-                        (state) => state.isMaximized!
+                    onClick: windowManager.maximize,
-                            ? window.restore()
+                    icon: AdwaitaIcons.window_maximize,
-                            : window.maximize(),
+                  ),
+                DecorationType.minimize => (
+                    onClick: windowManager.minimize,
+                    icon: AdwaitaIcons.window_minimize,
+                  ),
+                DecorationType.restore => (
+                    onClick: windowManager.restore,
+                    icon: AdwaitaIcons.window_restore,
+                  ),
+              };
+              return Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 6),
+                child: SizedBox(
+                  width: 24,
+                  height: 24,
+                  child: IconButton(
+                    padding: EdgeInsets.all(4),
+                    onPressed: decoration.onClick,
+                    style: ButtonStyle(
+                      backgroundColor: WidgetStatePropertyAll(
+                        Theme.of(context).colorScheme.surface,
                       ),
-                  YaruWindowControlType.minimize => window.minimize,
+                    ),
-                  YaruWindowControlType.restore => window.restore,
+                    icon: AdwaitaIcon(decoration.icon),
-                },
+                  ),
-              ),
+                ),
-            ),
+              );
+            },
           ),
-          const SizedBox(width: 6),
+          SizedBox(width: 6),
         ];
 
     final decorations = ref.watch(decorationsProvider);
-
+    return AppBar(
-    return YaruWindowTitleBar(
       backgroundColor: Colors.transparent,
+      surfaceTintColor: Colors.transparent,
       title: Text(title),
       leading: Row(children: [
-        SizedBox(width: 12),
+        ...getControl(decorations.leading),
         if (Navigator.of(context).canPop())
           BackButton(
             style: ButtonStyle(
@@ -55,12 +76,9 @@ class Appbar extends ConsumerWidget implements PreferredSizeWidget {
               padding: WidgetStatePropertyAll(EdgeInsets.zero),
             ),
           ),
-        ...getControl(decorations.leading)
       ]),
-      buttonPadding: const EdgeInsets.symmetric(horizontal: 12),
       actions: getControl(decorations.trailing),
-      border: BorderSide.none,
+      centerTitle: true,
-      style: YaruTitleBarStyle.undecorated,
     );
   }
 }

lib/widgets/result.dart

@@ -0,0 +1,35 @@
+import 'package:brook/widgets/thumbnail.dart';
+import 'package:flutter/material.dart';
+
+class Result extends StatelessWidget {
+  final String thumb;
+  final String title;
+  final String? subtitle;
+  final VoidCallback onClick;
+  const Result({
+    required this.thumb,
+    required this.onClick,
+    required this.title,
+    this.subtitle,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) => SizedBox(
+        height: 64,
+        child: ListTile(
+          leading: AspectRatio(
+            aspectRatio: 1,
+            child: Thumbnail(
+              url: thumb,
+              onClick: onClick,
+            ),
+          ),
+          title: Text(
+            title,
+            overflow: TextOverflow.ellipsis,
+          ),
+          subtitle: subtitle == null ? null : Text(subtitle!),
+        ),
+      );
+}

lib/widgets/select_button.dart

@@ -17,6 +17,10 @@ class SelectButton<T extends Enum> extends HookWidget {
   Widget build(BuildContext context) {
     final oldValue = useState(<T>{});
     return SegmentedButton(
+      style: SegmentedButton.styleFrom(
+        side: BorderSide.none,
+        backgroundColor: Theme.of(context).colorScheme.surface,
+      ),
       segments: values
           .map((value) => ButtonSegment(
                 value: value,

lib/widgets/thumbnail.dart

@@ -4,21 +4,29 @@ class Thumbnail extends StatelessWidget {
   final String url;
   final VoidCallback onClick;
   final double radius;
+  final ShapeBorder? border;
+  final Widget? child;
   const Thumbnail({
     super.key,
     required this.url,
     required this.onClick,
     this.radius = 16,
+    this.border,
+    this.child,
   });
 
   @override
   Widget build(BuildContext context) => ClipRRect(
         borderRadius: BorderRadius.all(Radius.circular(radius)),
-        child: InkWell(
+        child: Material(
-            onTap: onClick,
+          child: Ink.image(
-            child: Image.network(
+            image: NetworkImage(url),
-              url,
+            fit: BoxFit.fill,
-              fit: BoxFit.fill,
+            child: InkWell(
-            )),
+              onTap: onClick,
+              child: child,
+            ),
+          ),
+        ),
       );
 }

linux/flutter/generated_plugin_registrant.cc

@@ -6,26 +6,14 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <gtk/gtk_plugin.h>
 #include <screen_retriever_linux/screen_retriever_linux_plugin.h>
 #include <window_manager/window_manager_plugin.h>
-#include <window_size/window_size_plugin.h>
-#include <yaru_window_linux/yaru_window_linux_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  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_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
   screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_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);
-  g_autoptr(FlPluginRegistrar) window_size_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowSizePlugin");
-  window_size_plugin_register_with_registrar(window_size_registrar);
-  g_autoptr(FlPluginRegistrar) yaru_window_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "YaruWindowLinuxPlugin");
-  yaru_window_linux_plugin_register_with_registrar(yaru_window_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,11 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  gtk
   screen_retriever_linux
   window_manager
-  window_size
-  yaru_window_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

pubspec.lock

@@ -22,6 +22,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  adwaita_icons:
+    dependency: "direct main"
+    description:
+      name: adwaita_icons
+      sha256: "2d6f3cc7499b33375a65fe885255cd24cf77afc4726c5b0d4f185e1bb4611ba6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   analyzer:
     dependency: transitive
     description:
@@ -38,30 +46,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.3"
-  animated_vector:
-    dependency: transitive
-    description:
-      name: animated_vector
-      sha256: f1beb10e6fcfd8bd15abb788e20345def786d1c7391d7c1426bb2a1f2adf2132
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
-  animated_vector_annotations:
-    dependency: transitive
-    description:
-      name: animated_vector_annotations
-      sha256: "07c1ea603a2096f7eb6f1c2b8f16c3c330c680843ea78b7782a3217c3c53f979"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
   args:
     dependency: transitive
     description:
@@ -348,6 +332,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_adaptive_scaffold:
+    dependency: "direct main"
+    description:
+      name: flutter_adaptive_scaffold
+      sha256: "8c515a2cb8abb3a567f8e77f10b33f47bb6fcadfe31f62364e0aca36280cdf93"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   flutter_hooks:
     dependency: "direct main"
     description:
@@ -372,11 +364,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.1"
-  flutter_web_plugins:
+  flutter_svg:
     dependency: transitive
-    description: flutter
+    description:
-    source: sdk
+      name: flutter_svg
-    version: "0.0.0"
+      sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.6"
   freezed:
     dependency: "direct dev"
     description:
@@ -426,14 +421,6 @@ packages:
       url: "https://github.com/Henry-Hiles/gsettings.dart"
     source: git
     version: "0.2.8"
-  gtk:
-    dependency: transitive
-    description:
-      name: gtk
-      sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   hooks_riverpod:
     dependency: "direct main"
     description:
@@ -482,14 +469,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.2"
   intl:
     dependency: "direct overridden"
     description:
@@ -602,6 +581,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
@@ -618,22 +605,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.2"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  platform_linux:
-    dependency: transitive
-    description:
-      name: platform_linux
-      sha256: "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -650,14 +621,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  posix:
-    dependency: transitive
-    description:
-      name: posix
-      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.1"
   pub_semver:
     dependency: transitive
     description:
@@ -952,22 +915,13 @@ packages:
     source: hosted
     version: "3.0.1"
   window_manager:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: window_manager
       sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
       url: "https://pub.dev"
     source: hosted
     version: "0.4.3"
-  window_size:
-    dependency: "direct main"
-    description:
-      path: "plugins/window_size"
-      ref: HEAD
-      resolved-ref: eb3964990cf19629c89ff8cb4a37640c7b3d5601
-      url: "https://github.com/google/flutter-desktop-embedding"
-    source: git
-    version: "0.1.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -992,54 +946,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.3"
-  yaru:
-    dependency: "direct main"
-    description:
-      name: yaru
-      sha256: b582f1d552a5c40796cd1a00dbfe2b5e075d14655103eb60d284d7b183dfbc0a
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.0"
-  yaru_window:
-    dependency: transitive
-    description:
-      name: yaru_window
-      sha256: bc2a1df3c6f33477b47f84bf0a9325df411dbb7bd483ac88e5bc1c019d2f2560
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+1"
-  yaru_window_linux:
-    dependency: transitive
-    description:
-      name: yaru_window_linux
-      sha256: "46a1a0743dfd45794cdaf8c5b3a48771ab73632b50a693f59c83b07988e96689"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
-  yaru_window_manager:
-    dependency: transitive
-    description:
-      name: yaru_window_manager
-      sha256: b36c909fa082a7cb6e2f259d4357e16f08d3d8ab086685b81d1916e457100d1e
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2+1"
-  yaru_window_platform_interface:
-    dependency: transitive
-    description:
-      name: yaru_window_platform_interface
-      sha256: "93493d7e17a9e887ffa94c518bc5a4b3eb5425c009446e3294c689cb1a87b7e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2+1"
-  yaru_window_web:
-    dependency: transitive
-    description:
-      name: yaru_window_web
-      sha256: "31468aeb515f72d5eeddcd62773094a4f48fee96f7f0494f8ce53ad3b38054f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.3+1"
 sdks:
   dart: ">=3.5.4 <4.0.0"
-  flutter: ">=3.24.3"
+  flutter: ">=3.22.0"

pubspec.yaml

@@ -20,14 +20,12 @@ dependencies:
   hooks_riverpod: ^2.5.1
   json_annotation: ^4.9.0
   riverpod_annotation: ^2.3.5
-  yaru: ^5.1.0
-  window_size:
-    git:
-      url: https://github.com/google/flutter-desktop-embedding
-      path: plugins/window_size
   dart_ytmusic_api:
     git:
       url: https://github.com/Henry-Hiles/dart_ytmusic_api
+  flutter_adaptive_scaffold: ^0.3.1
+  window_manager: ^0.4.3
+  adwaita_icons: ^0.2.1
 
 dependency_overrides:
   collection: ^1.19.1

windows/flutter/generated_plugin_registrant.cc

@@ -8,13 +8,10 @@
 
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <window_manager/window_manager_plugin.h>
-#include <window_size/window_size_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
   WindowManagerPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("WindowManagerPlugin"));
-  WindowSizePluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("WindowSizePlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -5,7 +5,6 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   screen_retriever_windows
   window_manager
-  window_size
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST