From 699b236ce5077fc7e00665961b31da7201e1fef0 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Wed, 28 Jun 2023 17:55:17 +0600 Subject: [PATCH] chore: fix dep problem and code style --- lib/components/player/player_track_details.dart | 1 - .../shared/shimmers/shimmer_track_tile.dart | 1 - lib/hooks/use_custom_status_bar_color.dart | 2 +- lib/pages/home/genres.dart | 4 ---- lib/pages/lyrics/plain_lyrics.dart | 2 +- lib/pages/player/player.dart | 2 +- lib/pages/settings/about.dart | 3 +-- .../custom_spotify_endpoints/spotify_endpoints.dart | 4 +++- lib/services/mutations/playlist.dart | 1 - pubspec.lock | 12 ++---------- pubspec.yaml | 4 ++-- 11 files changed, 11 insertions(+), 25 deletions(-) diff --git a/lib/components/player/player_track_details.dart b/lib/components/player/player_track_details.dart index 36c6ab25..d6f275fa 100644 --- a/lib/components/player/player_track_details.dart +++ b/lib/components/player/player_track_details.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:spotify/spotify.dart'; diff --git a/lib/components/shared/shimmers/shimmer_track_tile.dart b/lib/components/shared/shimmers/shimmer_track_tile.dart index 1717d50b..070b2f09 100644 --- a/lib/components/shared/shimmers/shimmer_track_tile.dart +++ b/lib/components/shared/shimmers/shimmer_track_tile.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:spotube/collections/spotube_icons.dart'; import 'package:spotube/extensions/theme.dart'; diff --git a/lib/hooks/use_custom_status_bar_color.dart b/lib/hooks/use_custom_status_bar_color.dart index b0b893df..92f845cf 100644 --- a/lib/hooks/use_custom_status_bar_color.dart +++ b/lib/hooks/use_custom_status_bar_color.dart @@ -8,7 +8,7 @@ void useCustomStatusBarColor( bool noSetBGColor = false, }) { final context = useContext(); - final backgroundColor = Theme.of(context).scaffoldBackgroundColor!; + final backgroundColor = Theme.of(context).scaffoldBackgroundColor; resetStatusbar() => SystemChrome.setSystemUIOverlayStyle( SystemUiOverlayStyle( statusBarColor: backgroundColor, // status bar color diff --git a/lib/pages/home/genres.dart b/lib/pages/home/genres.dart index 2aad00f7..af0d3836 100644 --- a/lib/pages/home/genres.dart +++ b/lib/pages/home/genres.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:collection/collection.dart'; import 'package:fuzzywuzzy/fuzzywuzzy.dart'; @@ -7,11 +6,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:spotify/spotify.dart'; import 'package:spotube/collections/spotube_icons.dart'; import 'package:spotube/components/genre/category_card.dart'; -import 'package:spotube/components/shared/compact_search.dart'; import 'package:spotube/components/shared/expandable_search/expandable_search.dart'; import 'package:spotube/components/shared/shimmers/shimmer_categories.dart'; import 'package:spotube/components/shared/waypoint.dart'; -import 'package:spotube/extensions/context.dart'; import 'package:spotube/provider/user_preferences_provider.dart'; import 'package:spotube/services/queries/queries.dart'; @@ -21,7 +18,6 @@ class GenrePage extends HookConsumerWidget { @override Widget build(BuildContext context, ref) { - final theme = Theme.of(context); final scrollController = useScrollController(); final recommendationMarket = ref.watch( userPreferencesProvider.select((s) => s.recommendationMarket), diff --git a/lib/pages/lyrics/plain_lyrics.dart b/lib/pages/lyrics/plain_lyrics.dart index eadb2efe..1d1237e6 100644 --- a/lib/pages/lyrics/plain_lyrics.dart +++ b/lib/pages/lyrics/plain_lyrics.dart @@ -105,7 +105,7 @@ class PlainLyrics extends HookConsumerWidget { : 2, ), child: Text( - lyrics == null && playlist?.activeTrack == null + lyrics == null && playlist.activeTrack == null ? "No Track being played currently" : lyrics ?? "", ), diff --git a/lib/pages/player/player.dart b/lib/pages/player/player.dart index 9bd6bc8b..dbe2ca82 100644 --- a/lib/pages/player/player.dart +++ b/lib/pages/player/player.dart @@ -240,7 +240,7 @@ class PlayerView extends HookConsumerWidget { .7, ), builder: (context) { - return PlayerQueue( + return const PlayerQueue( floating: false); }, ); diff --git a/lib/pages/settings/about.dart b/lib/pages/settings/about.dart index 668a4d8f..97a0aae9 100644 --- a/lib/pages/settings/about.dart +++ b/lib/pages/settings/about.dart @@ -10,7 +10,6 @@ import 'package:spotube/hooks/use_package_info.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:url_launcher/url_launcher_string.dart'; final _licenseProvider = FutureProvider((ref) async { return await rootBundle.loadString("LICENSE"); @@ -25,7 +24,7 @@ class AboutSpotube extends HookConsumerWidget { final license = ref.watch(_licenseProvider); final theme = Theme.of(context); - final colon = Text(":"); + const colon = Text(":"); return Scaffold( appBar: PageWindowTitleBar( diff --git a/lib/services/custom_spotify_endpoints/spotify_endpoints.dart b/lib/services/custom_spotify_endpoints/spotify_endpoints.dart index cfd291e1..a0c54fb9 100644 --- a/lib/services/custom_spotify_endpoints/spotify_endpoints.dart +++ b/lib/services/custom_spotify_endpoints/spotify_endpoints.dart @@ -144,7 +144,9 @@ class CustomSpotifyEndpoints { 'seed_tracks': seedTracks }.forEach((key, list) => _addList(parameters, key, list!)); if (market != null) parameters['market'] = market; - [min, max, target].forEach((map) => _addTunableTrackMap(parameters, map)); + for (var map in [min, max, target]) { + _addTunableTrackMap(parameters, map); + } final pathQuery = "$_baseUrl/recommendations?${parameters.entries.map((e) => '${e.key}=${e.value}').join('&')}"; final res = await _client.get( diff --git a/lib/services/mutations/playlist.dart b/lib/services/mutations/playlist.dart index fff2f8b2..106f4cdc 100644 --- a/lib/services/mutations/playlist.dart +++ b/lib/services/mutations/playlist.dart @@ -1,5 +1,4 @@ import 'package:fl_query/fl_query.dart'; -import 'package:fl_query_hooks/fl_query_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:spotube/hooks/use_spotify_mutation.dart'; diff --git a/pubspec.lock b/pubspec.lock index 03a2e9e6..2190c041 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -566,10 +566,10 @@ packages: dependency: "direct main" description: name: fl_query_connectivity_plus_adapter - sha256: ce170730117b2da27467953c2d8a063ea89a99cfb666b332b6ea621211f09b8a + sha256: a0e69615e25f6dfe74d1e5a0909aeeb865e93c65dd4e0b236f0846f9e54f758b url: "https://pub.dev" source: hosted - version: "0.1.0-alpha.1" + version: "0.1.0-alpha.2" fl_query_hooks: dependency: "direct main" description: @@ -1654,14 +1654,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - simple_icons: - dependency: "direct main" - description: - name: simple_icons - sha256: "8aa6832dc7a263a3213e40ecbf1328a392308c809d534a3b860693625890483b" - url: "https://pub.dev" - source: hosted - version: "7.10.0" skeleton_text: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index dc70baff..8a995280 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 2.7.1+18 environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.0.2 <4.0.0" flutter: ">=3.10.0" dependencies: @@ -27,7 +27,7 @@ dependencies: file_picker: ^5.2.2 fl_query: ^1.0.0-alpha.3 fl_query_hooks: ^1.0.0-alpha.3 - fl_query_connectivity_plus_adapter: ^0.1.0-alpha.1 + fl_query_connectivity_plus_adapter: ^0.1.0-alpha.2 fluentui_system_icons: ^1.1.189 flutter: sdk: flutter