From e6daba77bd6ec5f999d427719301a153a0f0d01f Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Thu, 10 Feb 2022 21:37:46 +0600
Subject: [PATCH] Player._playTrack unsafe null modifier removed SpotifyDI was
 using ChangeNotifier as mixin & wasn't extending

---
 lib/components/Player/Player.dart | 2 +-
 lib/provider/SpotifyDI.dart       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/components/Player/Player.dart b/lib/components/Player/Player.dart
index a638298c..dd689c6f 100644
--- a/lib/components/Player/Player.dart
+++ b/lib/components/Player/Player.dart
@@ -138,7 +138,7 @@ class _PlayerState extends State<Player> with WidgetsBindingObserver {
   Future _playTrack(Track currentTrack, Playback playback) async {
     try {
       if (currentTrack.id != _currentTrackId) {
-        Uri? parsedUri = Uri.tryParse(currentTrack.uri!);
+        Uri? parsedUri = Uri.tryParse(currentTrack.uri ?? "");
         if (parsedUri != null && parsedUri.hasAbsolutePath) {
           await player
               .setAudioSource(
diff --git a/lib/provider/SpotifyDI.dart b/lib/provider/SpotifyDI.dart
index fcec7a46..f8723440 100644
--- a/lib/provider/SpotifyDI.dart
+++ b/lib/provider/SpotifyDI.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:spotify/spotify.dart';
 
-class SpotifyDI with ChangeNotifier {
+class SpotifyDI extends ChangeNotifier {
   SpotifyApi _spotifyApi;
 
   SpotifyDI(this._spotifyApi);