kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-13 07:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: dialogs to shadcn dialog

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2025-01-05 08:58:57 +06:00
parent af295be8c6
commit bbad701c07
12 changed files with 124 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
lib/components/dialogs/confirm_download_dialog.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/components/image/universal_image.dart';
import 'package:spotube/extensions/constrains.dart';
import 'package:spotube/extensions/context.dart';
@ -9,13 +8,15 @@ class ConfirmDownloadDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Padding(
padding: const EdgeInsets.all(15),
child: Row(
final screenSize = MediaQuery.sizeOf(context);
return ConstrainedBox(
constraints: BoxConstraints(maxWidth: Breakpoints.sm),
child: AlertDialog(
title: Row(
spacing: 10,
children: [
Text(context.l10n.are_you_sure),
const SizedBox(width: 10),
const UniversalImage(
path:
"https://c.tenor.com/kHcmsxlKHEAAAAAM/rock-one-eyebrow-raised-rock-staring.gif",
@ -24,58 +25,53 @@ class ConfirmDownloadDialog extends StatelessWidget {
)
],
),
),
content: Container(
padding: const EdgeInsets.all(15),
constraints: BoxConstraints(maxWidth: Breakpoints.sm),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.l10n.download_warning,
textAlign: TextAlign.justify,
),
const SizedBox(height: 10),
Text(
context.l10n.download_ip_ban_warning,
style: const TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
content: Expanded(
flex: screenSize.smAndUp ? 0 : 1,
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
context.l10n.download_warning,
textAlign: TextAlign.justify,
),
textAlign: TextAlign.justify,
),
const SizedBox(height: 10),
Text(
context.l10n.by_clicking_accept_terms,
),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_1),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_2),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_3),
],
const SizedBox(height: 10),
Text(
context.l10n.download_ip_ban_warning,
style: const TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.justify,
),
const SizedBox(height: 10),
Text(
context.l10n.by_clicking_accept_terms,
),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_1),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_2),
const SizedBox(height: 10),
BulletPoint(context.l10n.download_agreement_3),
],
),
),
),
actions: [
Button.outline(
child: Text(context.l10n.decline),
onPressed: () {
Navigator.pop(context, false);
},
),
Button.destructive(
onPressed: () => Navigator.of(context).pop(true),
child: Text(context.l10n.accept),
),
],
),
actions: [
OutlinedButton(
child: Text(context.l10n.decline),
onPressed: () {
Navigator.pop(context, false);
},
),
FilledButton(
style: FilledButton.styleFrom(
foregroundColor: Colors.white,
backgroundColor: Colors.red,
),
onPressed: () => Navigator.of(context).pop(true),
child: Text(context.l10n.accept),
),
],
);
}
}

6
lib/components/dialogs/prompt_dialog.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/extensions/context.dart';
Future<bool> showPromptDialog({
@ -16,13 +16,13 @@ Future<bool> showPromptDialog({
content: Text(message),
actions: [
if (cancelText != null)
OutlinedButton(
Button.outline(
onPressed: () => Navigator.of(context).pop(false),
child: Text(
cancelText == "Cancel" ? context.l10n.cancel : cancelText,
),
),
FilledButton(
Button.primary(
child: Text(okText == "Ok" ? context.l10n.ok : okText),
onPressed: () => Navigator.of(context).pop(true),
),

60
lib/components/dialogs/replace_downloaded_dialog.dart
View File

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/extensions/context.dart';
@ -13,45 +13,35 @@ class ReplaceDownloadedDialog extends ConsumerWidget {
@override
Widget build(BuildContext context, ref) {
final groupValue = ref.watch(replaceDownloadedFileState);
final theme = Theme.of(context);
final replaceAll = ref.watch(replaceDownloadedFileState);
return AlertDialog(
title: Text(context.l10n.track_exists(track.name ?? "")),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(context.l10n.do_you_want_to_replace),
RadioListTile<bool>(
dense: true,
contentPadding: EdgeInsets.zero,
activeColor: theme.colorScheme.primary,
value: true,
groupValue: groupValue,
onChanged: (value) {
if (value != null) {
ref.read(replaceDownloadedFileState.notifier).state = true;
}
},
title: Text(context.l10n.replace_downloaded_tracks),
),
RadioListTile<bool>(
dense: true,
contentPadding: EdgeInsets.zero,
activeColor: theme.colorScheme.primary,
value: false,
groupValue: groupValue,
onChanged: (value) {
if (value != null) {
ref.read(replaceDownloadedFileState.notifier).state = false;
}
},
title: Text(context.l10n.skip_download_tracks),
),
],
content: RadioGroup(
value: groupValue,
onChanged: (value) {
ref.read(replaceDownloadedFileState.notifier).state = value;
},
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(context.l10n.do_you_want_to_replace),
const Gap(16),
RadioItem<bool>(
value: true,
trailing: Text(context.l10n.replace_downloaded_tracks),
),
const Gap(8),
RadioItem<bool>(
value: false,
trailing: Text(context.l10n.skip_download_tracks),
),
],
),
),
actions: [
OutlinedButton(
Button.outline(
onPressed: replaceAll == true
? null
: () {
@ -59,7 +49,7 @@ class ReplaceDownloadedDialog extends ConsumerWidget {
},
child: Text(context.l10n.skip),
),
FilledButton(
Button.primary(
onPressed: replaceAll == false
? null
: () {

53
lib/components/dialogs/select_device_dialog.dart
View File

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/extensions/context.dart';
import 'package:spotube/provider/connect/clients.dart';
@ -16,31 +16,31 @@ class SelectDeviceDialog extends HookConsumerWidget {
return AlertDialog(
title: Text(context.l10n.choose_the_device),
insetPadding: const EdgeInsets.all(16),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(context.l10n.multiple_device_connected),
RadioListTile.adaptive(
title: Text(remoteService.name),
value: true,
groupValue: isRemoteService.value,
onChanged: (value) {
isRemoteService.value = value!;
},
),
RadioListTile.adaptive(
title: Text(context.l10n.this_device),
value: false,
groupValue: isRemoteService.value,
onChanged: (value) {
isRemoteService.value = !value!;
},
),
],
content: RadioGroup(
value: isRemoteService.value,
onChanged: (value) {
isRemoteService.value = value;
},
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(context.l10n.multiple_device_connected),
const Gap(16),
RadioItem(
trailing: Text(remoteService.name),
value: true,
),
const Gap(8),
RadioItem(
trailing: Text(context.l10n.this_device),
value: false,
),
],
),
),
actions: [
TextButton(
Button.primary(
onPressed: () {
Navigator.of(context).pop(isRemoteService.value);
},
@ -51,7 +51,8 @@ class SelectDeviceDialog extends HookConsumerWidget {
}
}
Future<bool> showSelectDeviceDialog(BuildContext context, WidgetRef ref) async {
Future<bool?> showSelectDeviceDialog(
BuildContext context, WidgetRef ref) async {
final connectClients = ref.read(connectClientsProvider);
if (connectClients.asData?.value.resolvedService == null) {
@ -63,5 +64,5 @@ Future<bool> showSelectDeviceDialog(BuildContext context, WidgetRef ref) async {
builder: (context) => const SelectDeviceDialog(),
);
return isRemote ?? false;
return isRemote;
}

13
lib/components/track_presentation/presentation_actions.dart
View File

@ -97,12 +97,13 @@ class TrackPresentationActionsSection extends HookConsumerWidget {
case "download":
{
final confirmed = audioSource == AudioSource.piped ||
await showDialog(
context: context,
builder: (context) {
return const ConfirmDownloadDialog();
},
);
(await showDialog<bool?>(
context: context,
builder: (context) {
return const ConfirmDownloadDialog();
},
) ??
false);
if (confirmed != true) return;
downloader.batchAddToQueue(tracks);
notifier.deselectAllTracks();

2
lib/components/track_presentation/use_action_callbacks.dart
View File

@ -40,6 +40,7 @@ UseActionCallbacks useActionCallbacks(WidgetRef ref) {
if (!context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final allTracks = await options.pagination.onFetchAll();
final remotePlayback = ref.read(connectProvider.notifier);
@ -90,6 +91,7 @@ UseActionCallbacks useActionCallbacks(WidgetRef ref) {
if (!context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final allTracks = await options.pagination.onFetchAll();
final remotePlayback = ref.read(connectProvider.notifier);

1
lib/components/track_presentation/use_track_tile_play_callback.dart
View File

@ -37,6 +37,7 @@ Future<void> Function(Track track, int index) useTrackTilePlayCallback(
}
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);

1
lib/modules/album/album_card.dart
View File

@ -91,6 +91,7 @@ class AlbumCard extends HookConsumerWidget {
if (fetchedTracks.isEmpty || !context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);
await remotePlayback.load(

1
lib/modules/playlist/playlist_card.dart
View File

@ -94,6 +94,7 @@ class PlaylistCard extends HookConsumerWidget {
if (fetchedInitialTracks.isEmpty || !context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);
final allTracks = await fetchAllTracks();

3
lib/pages/artist/section/top_tracks.dart
View File

@ -44,6 +44,9 @@ class ArtistPageTopTracks extends HookConsumerWidget {
currentTrack ??= tracks.first;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);
final remotePlaylist = ref.read(queueProvider);

1
lib/pages/connect/control/control.dart
View File

@ -188,6 +188,7 @@ class ConnectControlPage extends HookConsumerWidget {
SliverToBoxAdapter(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
spacing: 20,
children: [
Tooltip(
tooltip: TooltipContainer(

2
lib/pages/search/sections/tracks.dart
View File

@ -55,6 +55,8 @@ class SearchTracksSection extends HookConsumerWidget {
final isRemoteDevice =
await showSelectDeviceDialog(context, ref);
if (isRemoteDevice == null) return;
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);
final remotePlaylist = ref.read(queueProvider);