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

fix: ios dialog action buttons, local tracks crashing app, shimmer color and android wrong status bar color

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2022-12-09 15:46:51 +06:00
parent 359fcee98c
commit 90c1200a08
17 changed files with 326 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/components/library/user_local_tracks.dart
View File

@ -242,7 +242,8 @@ class UserLocalTracks extends HookConsumerWidget {
),
);
},
loading: () => const ShimmerTrackTile(noSliver: true),
loading: () =>
const Expanded(child: ShimmerTrackTile(noSliver: true)),
error: (error, stackTrace) =>
Text(error.toString() + stackTrace.toString()),
)

45
lib/components/lyrics/lyric_delay_adjust_dialog.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -21,16 +22,33 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
macosAppIcon: Sidebar.brandLogo(),
title: const Center(child: Text("Adjust Lyrics Delay")),
secondaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
isSecondary: true,
onPressed: () {
Navigator.of(context).pop();
},
child: const Text("Cancel"),
onPressed: () {
Navigator.pop(context);
},
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context);
},
isDestructiveAction: true,
child: const Text("Cancel"),
);
},
),
],
primaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
child: const Text("Done"),
onPressed: () {
Navigator.of(context).pop(
@ -39,7 +57,22 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
),
);
},
)
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.of(context).pop(
Duration(
milliseconds: getValue().toInt(),
),
);
},
isDefaultAction: true,
child: const Text("Done"),
);
},
),
],
content: SizedBox(
height: 100,

51
lib/components/playlist/playlist_create_dialog.dart
View File

@ -1,4 +1,5 @@
import 'package:fl_query/fl_query.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -25,13 +26,7 @@ class PlaylistCreateDialog extends HookConsumerWidget {
final public = useState(false);
final collaborative = useState(false);
return PlatformAlertDialog(
macosAppIcon: Sidebar.brandLogo(),
title: const Text("Create a Playlist"),
primaryActions: [
PlatformFilledButton(
child: const Text("Create"),
onPressed: () async {
onCreate() async {
if (playlistName.text.isEmpty) return;
final me = await spotify.me.get();
await spotify.playlists.createPlaylist(
@ -47,14 +42,50 @@ class PlaylistCreateDialog extends HookConsumerWidget {
)
?.refetch();
Navigator.pop(context);
}
return PlatformAlertDialog(
macosAppIcon: Sidebar.brandLogo(),
title: const Text("Create a Playlist"),
primaryActions: [
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
onPressed: onCreate,
child: const Text("Create"),
);
},
)
ios: (context, data) {
return CupertinoDialogAction(
isDefaultAction: true,
onPressed: onCreate,
child: const Text("Create"),
);
},
),
],
secondaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
isSecondary: true,
onPressed: () => Navigator.of(context).pop(),
child: const Text("Cancel"),
onPressed: () {
Navigator.pop(context);
},
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context);
},
isDestructiveAction: true,
child: const Text("Cancel"),
);
},
),
],
content: Container(

47
lib/components/settings/color_scheme_picker_dialog.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -67,13 +68,7 @@ class ColorSchemePickerDialog extends HookConsumerWidget {
},
).key);
return PlatformAlertDialog(
macosAppIcon: Sidebar.brandLogo(),
title: Text("Pick ${schemeType.name} color scheme"),
primaryActions: [
PlatformFilledButton(
child: const Text("Save"),
onPressed: () {
onOk() {
switch (schemeType) {
case ColorSchemeType.accent:
preferences.setAccentColorScheme(colorsMap[active.value]!);
@ -84,16 +79,50 @@ class ColorSchemePickerDialog extends HookConsumerWidget {
);
}
Navigator.pop(context);
}
return PlatformAlertDialog(
macosAppIcon: Sidebar.brandLogo(),
title: Text("Pick ${schemeType.name} color scheme"),
primaryActions: [
PlatformBuilder(
android: (context, data) {
return PlatformFilledButton(
onPressed: onOk,
child: const Text("Save"),
);
},
)
ios: (context, data) {
return CupertinoDialogAction(
onPressed: onOk,
isDefaultAction: true,
child: const Text("Save"),
);
},
fallback: PlatformBuilderFallback.android,
),
],
secondaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
isSecondary: true,
child: const Text("Cancel"),
onPressed: () {
Navigator.pop(context);
},
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context);
},
isDestructiveAction: true,
child: const Text("Cancel"),
);
},
),
],
content: SizedBox(

35
lib/components/shared/dialogs/confirm_download_dialog.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:spotube/components/shared/image/universal_image.dart';
@ -62,20 +63,46 @@ class ConfirmDownloadDialog extends StatelessWidget {
),
),
primaryActions: [
PlatformFilledButton(
PlatformBuilder(
android: (context, _) {
return PlatformFilledButton(
style: const ButtonStyle(
foregroundColor: MaterialStatePropertyAll(Colors.white),
backgroundColor: MaterialStatePropertyAll(Colors.red),
),
onPressed: () => Navigator.of(context).pop(true),
child: const Text("Accept"),
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () => Navigator.of(context).pop(true),
isDestructiveAction: true,
child: const Text("Accept"),
);
},
)
],
secondaryActions: [
PlatformFilledButton(
isSecondary: true,
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
child: const Text("Decline"),
onPressed: () => Navigator.of(context).pop(false),
onPressed: () {
Navigator.pop(context, false);
},
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context, false);
},
isDefaultAction: true,
child: const Text("Decline"),
);
},
),
],
);

59
lib/components/shared/dialogs/playlist_add_track_dialog.dart
View File

@ -1,4 +1,5 @@
import 'package:fl_query_hooks/fl_query_hooks.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -31,19 +32,7 @@ class PlaylistAddTrackDialog extends HookConsumerWidget {
);
final playlistsCheck = useState(<String, bool>{});
return PlatformAlertDialog(
title: const PlatformText("Add to Playlist"),
secondaryActions: [
PlatformFilledButton(
isSecondary: true,
child: const PlatformText("Cancel"),
onPressed: () => Navigator.pop(context),
),
],
primaryActions: [
PlatformFilledButton(
child: const PlatformText("Add"),
onPressed: () async {
Future<void> onAdd() async {
final selectedPlaylists = playlistsCheck.value.entries
.where((entry) => entry.value)
.map((entry) => entry.key);
@ -59,8 +48,50 @@ class PlaylistAddTrackDialog extends HookConsumerWidget {
playlistId),
),
).then((_) => Navigator.pop(context));
}
return PlatformAlertDialog(
title: const PlatformText("Add to Playlist"),
secondaryActions: [
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
isSecondary: true,
child: const Text("Cancel"),
onPressed: () {
Navigator.pop(context);
},
)
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context);
},
isDestructiveAction: true,
child: const Text("Cancel"),
);
},
),
],
primaryActions: [
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
onPressed: onAdd,
child: const Text("Add"),
);
},
ios: (context, data) {
return CupertinoDialogAction(
isDefaultAction: true,
onPressed: onAdd,
child: const Text("Add"),
);
},
),
],
content: SizedBox(
height: 300,

35
lib/components/shared/dialogs/replace_downloaded_dialog.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:platform_ui/platform_ui.dart';
@ -51,20 +52,48 @@ class ReplaceDownloadedDialog extends ConsumerWidget {
],
),
primaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
child: const Text("Yes"),
onPressed: () {
Navigator.pop(context, true);
},
)
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context, true);
},
isDefaultAction: true,
child: const Text("Yes"),
);
},
),
],
secondaryActions: [
PlatformFilledButton(
PlatformBuilder(
fallback: PlatformBuilderFallback.android,
android: (context, _) {
return PlatformFilledButton(
isSecondary: true,
child: const Text("No"),
onPressed: () {
Navigator.pop(context, false);
},
);
},
ios: (context, data) {
return CupertinoDialogAction(
onPressed: () {
Navigator.pop(context, false);
},
isDestructiveAction: true,
child: const Text("No"),
);
},
),
],
);

15
lib/components/shared/shimmers/shimmer_artist_profile.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:skeleton_text/skeleton_text.dart';
import 'package:spotube/components/shared/shimmers/shimmer_track_tile.dart';
import 'package:spotube/extensions/theme.dart';
@ -10,12 +11,14 @@ class ShimmerArtistProfile extends HookWidget {
@override
Widget build(BuildContext context) {
final shimmerColor =
Theme.of(context).extension<ShimmerColorTheme>()?.shimmerColor ??
Colors.white;
final shimmerBackgroundColor = Theme.of(context)
.extension<ShimmerColorTheme>()
?.shimmerBackgroundColor;
final isDark = PlatformTheme.of(context).brightness == Brightness.dark;
final shimmerTheme = ShimmerColorTheme(
shimmerBackgroundColor: isDark ? Colors.grey[700] : Colors.grey[200],
shimmerColor: isDark ? Colors.grey[800] : Colors.grey[300],
);
final shimmerColor = shimmerTheme.shimmerColor ?? Colors.white;
final shimmerBackgroundColor =
shimmerTheme.shimmerBackgroundColor ?? Colors.grey;
final avatarWidth = useBreakpointValue(
sm: MediaQuery.of(context).size.width * 0.80,

14
lib/components/shared/shimmers/shimmer_categories.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:spotube/components/shared/shimmers/shimmer_playbutton_card.dart';
import 'package:spotube/extensions/theme.dart';
@ -7,13 +8,12 @@ class ShimmerCategories extends StatelessWidget {
@override
Widget build(BuildContext context) {
final shimmerColor =
Theme.of(context).extension<ShimmerColorTheme>()?.shimmerColor ??
Colors.white;
final shimmerBackgroundColor = Theme.of(context)
.extension<ShimmerColorTheme>()
?.shimmerBackgroundColor ??
Colors.grey;
final isDark = PlatformTheme.of(context).brightness == Brightness.dark;
final shimmerTheme = ShimmerColorTheme(
shimmerBackgroundColor: isDark ? Colors.grey[700] : Colors.grey[200],
);
final shimmerBackgroundColor =
shimmerTheme.shimmerBackgroundColor ?? Colors.grey;
return Padding(
padding: const EdgeInsets.all(8.0),

16
lib/components/shared/shimmers/shimmer_lyrics.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:skeleton_text/skeleton_text.dart';
import 'package:spotube/extensions/theme.dart';
import 'package:spotube/hooks/use_breakpoints.dart';
@ -11,13 +12,14 @@ class ShimmerLyrics extends HookWidget {
@override
Widget build(BuildContext context) {
final shimmerColor =
Theme.of(context).extension<ShimmerColorTheme>()?.shimmerColor ??
Colors.white;
final shimmerBackgroundColor = Theme.of(context)
.extension<ShimmerColorTheme>()
?.shimmerBackgroundColor ??
Colors.grey;
final isDark = PlatformTheme.of(context).brightness == Brightness.dark;
final shimmerTheme = ShimmerColorTheme(
shimmerBackgroundColor: isDark ? Colors.grey[700] : Colors.grey[200],
shimmerColor: isDark ? Colors.grey[800] : Colors.grey[300],
);
final shimmerColor = shimmerTheme.shimmerColor ?? Colors.white;
final shimmerBackgroundColor =
shimmerTheme.shimmerBackgroundColor ?? Colors.grey;
final breakpoint = useBreakpoints();

11
lib/components/shared/shimmers/shimmer_playbutton_card.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:spotube/extensions/theme.dart';
class ShimmerPlaybuttonCardPainter extends CustomPainter {
@ -52,7 +53,11 @@ class ShimmerPlaybuttonCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final shimmerTheme = Theme.of(context).extension<ShimmerColorTheme>();
final isDark = PlatformTheme.of(context).brightness == Brightness.dark;
final shimmerTheme = ShimmerColorTheme(
shimmerBackgroundColor: isDark ? Colors.grey[700] : Colors.grey[200],
shimmerColor: isDark ? Colors.grey[800] : Colors.grey[300],
);
return Row(
mainAxisSize: MainAxisSize.min,
@ -61,10 +66,10 @@ class ShimmerPlaybuttonCard extends StatelessWidget {
CustomPaint(
size: const Size(200, 250),
painter: ShimmerPlaybuttonCardPainter(
background: shimmerTheme?.shimmerBackgroundColor ??
background: shimmerTheme.shimmerBackgroundColor ??
Theme.of(context).scaffoldBackgroundColor,
foreground:
shimmerTheme?.shimmerColor ?? Theme.of(context).cardColor,
shimmerTheme.shimmerColor ?? Theme.of(context).cardColor,
),
),
const SizedBox(width: 10),

11
lib/components/shared/shimmers/shimmer_track_tile.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:platform_ui/platform_ui.dart';
import 'package:spotube/extensions/theme.dart';
class ShimmerTrackTilePainter extends CustomPainter {
@ -66,7 +67,11 @@ class ShimmerTrackTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final shimmerTheme = Theme.of(context).extension<ShimmerColorTheme>();
final isDark = PlatformTheme.of(context).brightness == Brightness.dark;
final shimmerTheme = ShimmerColorTheme(
shimmerBackgroundColor: isDark ? Colors.grey[700] : Colors.grey[200],
shimmerColor: isDark ? Colors.grey[800] : Colors.grey[300],
);
if (noSliver) {
return ListView.builder(
@ -77,10 +82,10 @@ class ShimmerTrackTile extends StatelessWidget {
child: CustomPaint(
size: const Size(double.infinity, 50),
painter: ShimmerTrackTilePainter(
background: shimmerTheme?.shimmerBackgroundColor ??
background: shimmerTheme.shimmerBackgroundColor ??
Theme.of(context).scaffoldBackgroundColor,
foreground:
shimmerTheme?.shimmerColor ?? Theme.of(context).cardColor,
shimmerTheme.shimmerColor ?? Theme.of(context).cardColor,
),
),
);

2
lib/components/shared/track_table/track_collection_view.dart
View File

@ -98,7 +98,7 @@ class TrackCollectionView<T> extends HookConsumerWidget {
final collapsed = useState(false);
useCustomStatusBarColor(
color?.color ?? Theme.of(context).backgroundColor,
color?.color ?? PlatformTheme.of(context).scaffoldBackgroundColor!,
GoRouter.of(context).location == routePath,
);

3
lib/hooks/use_custom_status_bar_color.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:platform_ui/platform_ui.dart';
void useCustomStatusBarColor(
Color color,
@ -8,7 +9,7 @@ void useCustomStatusBarColor(
bool noSetBGColor = false,
}) {
final context = useContext();
final backgroundColor = Theme.of(context).backgroundColor;
final backgroundColor = PlatformTheme.of(context).scaffoldBackgroundColor!;
resetStatusbar() => SystemChrome.setSystemUIOverlayStyle(
SystemUiOverlayStyle(
statusBarColor: backgroundColor, // status bar color

2
lib/pages/player/player.dart
View File

@ -89,7 +89,7 @@ class PlayerView extends HookConsumerWidget {
textStyle: PlatformTheme.of(context).textTheme!.body!,
color: paletteColor.color.withOpacity(.5),
child: SafeArea(
child: ListView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(10),

2
lib/pages/root/root_app.dart
View File

@ -51,7 +51,7 @@ class RootApp extends HookConsumerWidget {
// checks for latest version of the application
useUpdateChecker(ref);
final backgroundColor = Theme.of(context).backgroundColor;
final backgroundColor = PlatformTheme.of(context).scaffoldBackgroundColor!;
useEffect(() {
SystemChrome.setSystemUIOverlayStyle(

6
lib/themes/light_theme.dart
View File

@ -126,9 +126,6 @@ final windowsTheme = fluent_ui.ThemeData.light().copyWith(
iconSize: fluent_ui.ButtonState.all(20),
),
),
navigationPaneTheme: fluent_ui.NavigationPaneThemeData(
backgroundColor: Colors.grey[100]?.withOpacity(0.5),
),
);
final windowsDarkTheme = fluent_ui.ThemeData.dark().copyWith(
buttonTheme: fluent_ui.ButtonThemeData(
@ -136,9 +133,6 @@ final windowsDarkTheme = fluent_ui.ThemeData.dark().copyWith(
iconSize: fluent_ui.ButtonState.all(20),
),
),
navigationPaneTheme: fluent_ui.NavigationPaneThemeData(
backgroundColor: Colors.grey[900]?.withOpacity(0.5),
),
);
final macosTheme = MacosThemeData.light().copyWith(
pushButtonTheme: const PushButtonThemeData(