Henry-Hiles/brook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

canal -> brook

Browse source
This commit is contained in:
Henry Hiles 2025-01-04 12:14:46 -05:00
parent a2ef7da707
commit a6f2291309
25 changed files with 169 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/helpers/extension_helper.dart
View file

@ -1,4 +1,4 @@
import 'package:canal/widgets/loading.dart';
import 'package:brook/widgets/loading.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

2
lib/main.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:canal/widgets/app.dart';
import 'package:brook/widgets/app.dart';
import 'package:window_size/window_size.dart';
import 'package:yaru/yaru.dart';

4
lib/providers/decorations_provider.dart
View file

@ -1,7 +1,7 @@
import 'package:hooks_riverpod/hooks_riverpod.dart';
import "package:riverpod_annotation/riverpod_annotation.dart";
import 'package:canal/models/decorations.dart';
import 'package:canal/providers/button_layout_provider.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';

2
lib/providers/home_sections_provider.dart
View file

@ -1,4 +1,4 @@
import 'package:canal/providers/ytmusic_provider.dart';
import 'package:brook/providers/ytmusic_provider.dart';
import 'package:dart_ytmusic_api/dart_ytmusic_api.dart';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

26
lib/providers/search_provider.dart
View file

@ -1,23 +1,27 @@
import 'package:canal/models/search_type.dart';
import 'package:brook/models/search_type.dart';
import 'package:dart_ytmusic_api/types.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:canal/providers/ytmusic_provider.dart';
import 'package:brook/providers/ytmusic_provider.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
part "search_provider.g.dart";
@riverpod
Future<IList<dynamic>> searchProvider(
Future<IList<SearchResult>> searchProvider(
Ref ref, {
required String search,
required SearchType searchType,
}) async {
final yt = await ytmusic(ref);
return IList(switch (searchType) {
SearchType.any => await yt.search(search),
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.playlists => await yt.searchPlaylists(search),
});
return IList(
switch (searchType) {
SearchType.any =>
await yt.search(search).then((search) => search.cast<SearchResult>()),
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.playlists => await yt.searchPlaylists(search),
},
);
}

2
lib/screens/album_page.dart
View file

@ -1,4 +1,4 @@
import 'package:canal/widgets/appbar.dart';
import 'package:brook/widgets/appbar.dart';
import 'package:flutter/material.dart';
class AlbumPage extends StatelessWidget {

2
lib/screens/playlist_page.dart
View file

@ -1,4 +1,4 @@
import 'package:canal/widgets/appbar.dart';
import 'package:brook/widgets/appbar.dart';
import 'package:flutter/material.dart';
class PlaylistPage extends StatelessWidget {

2
lib/screens/tabs/account.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:canal/models/tab.dart';
import 'package:brook/models/tab.dart';
class AccountTab extends StatelessWidget implements TabPage {
const AccountTab({super.key});

12
lib/screens/tabs/home.dart
View file

@ -1,11 +1,11 @@
import 'package:canal/helpers/extension_helper.dart';
import 'package:canal/providers/home_sections_provider.dart';
import 'package:canal/screens/album_page.dart';
import 'package:canal/screens/playlist_page.dart';
import 'package:canal/widgets/thumbnail.dart';
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/playlist_page.dart';
import 'package:brook/widgets/thumbnail.dart';
import 'package:dart_ytmusic_api/dart_ytmusic_api.dart';
import 'package:flutter/material.dart';
import 'package:canal/models/tab.dart';
import 'package:brook/models/tab.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:yaru/yaru.dart';

104
lib/screens/tabs/search.dart
View file

@ -1,11 +1,12 @@
import 'package:canal/helpers/extension_helper.dart';
import 'package:canal/providers/search_provider.dart';
import 'package:canal/widgets/thumbnail.dart';
import 'package:brook/helpers/extension_helper.dart';
import 'package:collection/collection.dart';
import 'package:brook/providers/search_provider.dart';
import 'package:brook/widgets/thumbnail.dart';
import 'package:dart_ytmusic_api/types.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:canal/widgets/select_button.dart';
import 'package:canal/models/search_type.dart';
import 'package:canal/models/tab.dart';
import 'package:brook/widgets/select_button.dart';
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';
@ -23,7 +24,6 @@ class SearchTab extends HookConsumerWidget implements TabPage {
Widget build(BuildContext context, WidgetRef ref) {
final type = useState(SearchType.any);
final search = useState("");
final debouncedSearch = useDebounced(search, Duration(milliseconds: 250));
return ListView(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
@ -45,39 +45,65 @@ class SearchTab extends HookConsumerWidget implements TabPage {
SizedBox(height: 8),
ref
.watch(searchProviderProvider(
search: search.value, searchType: type.value))
search: search.value,
searchType: type.value,
))
.betterWhen(
data: (results) => Wrap(
children: results
.map((result) => SizedBox(
height: 64,
width: 64,
child: switch (result) {
SongDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
AlbumDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
VideoDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
ArtistDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
PlaylistDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
_ => throw Exception(
"Unknown Detailed Result: ${result.runtimeType}",
),
}))
.toList())),
data: (results) => Column(
children: results
.mapIndexed((index, result) => switch (result) {
SongDetailed _ => Builder(builder: (_) {
final padding =
EdgeInsets.symmetric(horizontal: 16);
final leading = Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
);
return index == 0
? SizedBox(
height: 128,
child: YaruBanner.tile(
padding: padding,
icon: leading,
title: Text(result.name),
subtitle: Text(result.artist.name),
),
)
: YaruTile(
padding: padding,
leading: leading,
title: Text(result.name),
subtitle: Text(result.artist.name),
);
}),
AlbumDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
VideoDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
radius: 0,
),
ArtistDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
PlaylistDetailed _ => Thumbnail(
url: result.thumbnails.first.url,
onClick: () {},
),
_ => throw Exception(
"Unknown Detailed Result: ${result.runtimeType}",
),
})
.map((element) => Padding(
padding: EdgeInsets.only(bottom: 16),
child: element,
))
.toList(),
),
),
],
);
}

20
lib/widgets/app.dart
View file

@ -1,18 +1,18 @@
import 'package:adwaita/adwaita.dart';
import 'package:canal/helpers/extension_helper.dart';
import 'package:canal/models/tab.dart';
import 'package:canal/providers/ytmusic_provider.dart';
import 'package:canal/screens/tabs/account.dart';
import 'package:canal/screens/tabs/home.dart';
import 'package:canal/screens/tabs/search.dart';
import 'package:canal/widgets/appbar.dart';
import 'package:brook/helpers/extension_helper.dart';
import 'package:brook/models/tab.dart';
import 'package:brook/providers/ytmusic_provider.dart';
import 'package:brook/screens/tabs/account.dart';
import 'package:brook/screens/tabs/home.dart';
import 'package:brook/screens/tabs/search.dart';
import 'package:brook/widgets/appbar.dart';
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:canal/providers/button_layout_provider.dart';
import 'package:canal/providers/warmup_provider.dart';
import 'package:brook/providers/button_layout_provider.dart';
import 'package:brook/providers/warmup_provider.dart';
const List<TabPage> tabs = [HomeTab(), SearchTab(), AccountTab()];
@ -31,7 +31,7 @@ class App extends HookConsumerWidget {
])))
.betterWhen(
data: (_) => YaruDetailPage(
appBar: const Appbar(title: "Canal"),
appBar: const Appbar(title: "Brook"),
body: tabs[selected.value],
bottomNavigationBar: NavigationBar(
destinations: tabs

2
lib/widgets/appbar.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:canal/providers/decorations_provider.dart';
import 'package:brook/providers/decorations_provider.dart';
import 'package:yaru/yaru.dart';
class Appbar extends ConsumerWidget implements PreferredSizeWidget {

2
lib/widgets/package_card.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:canal/models/package.dart';
import 'package:brook/models/package.dart';
class PackageCard extends StatelessWidget {
final Package package;

2
lib/widgets/select_button.dart
View file

@ -1,4 +1,4 @@
import 'package:canal/helpers/extension_helper.dart';
import 'package:brook/helpers/extension_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';

10
lib/widgets/thumbnail.dart
View file

@ -3,11 +3,17 @@ import 'package:flutter/material.dart';
class Thumbnail extends StatelessWidget {
final String url;
final VoidCallback onClick;
const Thumbnail({required this.url, required this.onClick, super.key});
final double radius;
const Thumbnail({
super.key,
required this.url,
required this.onClick,
this.radius = 16,
});
@override
Widget build(BuildContext context) => ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(16)),
borderRadius: BorderRadius.all(Radius.circular(radius)),
child: InkWell(
onTap: onClick,
child: Image.network(