dynamic cover art for radio streams

change the cover art for radio streams from local to get images from internet that is located in github pages of radiosai also: - update packages - fix analysis issues
immadisairaj · Mar 3, 2023 · ee46cc9 · ee46cc9
1 parent f96e09b
commit ee46cc9
Show file tree

Hide file tree

Showing 31 changed files with 194 additions and 174 deletions.
diff --git a/android/.gitignore b/android/.gitignore
@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+upload-keystore.jks
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -201,6 +201,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -237,6 +238,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -54,5 +54,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/lib/audio_service/audio_handler.dart b/lib/audio_service/audio_handler.dart
@@ -153,7 +153,7 @@ class MyAudioHandler extends BaseAudioHandler {
         index = _player.shuffleIndices![index];
       }
       final oldMediaItem = newQueue[index]!;
-      final MediaItem? newMediaItem =
+      final MediaItem newMediaItem =
           oldMediaItem.copyWith(duration: duration ?? Duration.zero);
       newQueue[index] = newMediaItem;
       queue.add(newQueue as List<MediaItem>);

diff --git a/lib/audio_service/audio_manager.dart b/lib/audio_service/audio_manager.dart
@@ -21,7 +21,7 @@ class AudioManager {
   final isLastSongNotifier = ValueNotifier<bool>(true);
   final isShuffleModeEnabledNotifier = ValueNotifier<bool>(false);
 
-  final AudioHandler? _audioHandler = getIt<AudioHandler>();
+  final AudioHandler _audioHandler = getIt<AudioHandler>();
 
   /// if [mediaType] is [MediaType.radio],
   /// pass radioStream map which is located in "MyConstants"
@@ -42,7 +42,7 @@ class AudioManager {
   }
 
   _setMediaType(MediaType mediaType) {
-    _audioHandler!.customAction('setMediaType', {'mediaType': mediaType});
+    _audioHandler.customAction('setMediaType', {'mediaType': mediaType});
   }
 
   /// pass radioStream map which is located in constants
@@ -51,7 +51,8 @@ class AudioManager {
   /// and index of the radio playing as params['index']
   Future<void> _initRadio(Map<String, dynamic> params) async {
     mediaTypeNotifier.value = MediaType.radio;
-    final radio = await _getRadio(params['radioStream'], params['index']);
+    final radio = await _getRadio(
+        params['radioStream'], params['index'], params['artImages']);
     await _loadRadio(radio);
     _listenToChangesInQueue();
     _listenToPlaybackState();
@@ -64,31 +65,33 @@ class AudioManager {
 
   /// pass [radioStream] map which is located in constants
   /// and [index] of the radio playing
-  Future<MediaItem> _getRadio(
-      Map<String, String> radioStream, int index) async {
+  Future<MediaItem> _getRadio(Map<String, String> radioStream, int index,
+      Map<String, String> artLinks) async {
     // Get the path of image for artUri in notification
-    String path = await MediaHelper.getDefaultNotificationImage();
+    // String path = await MediaHelper.getDefaultNotificationImage();
     String key = radioStream.keys.toList()[index];
     String value = radioStream.values.toList()[index];
+    String artUri = artLinks.values.toList()[index];
     return MediaItem(
         id: key,
         title: key,
         album: 'Radio Sai Global Harmony',
         artist: 'Radio Sai',
-        artUri: Uri.parse('file://$path'),
+        artUri: Uri.parse(artUri),
+        // artUri: Uri.parse('file://$path'),
         extras: {'uri': value});
   }
 
   Future<void> _loadRadio(MediaItem radio) async {
-    _audioHandler!.addQueueItem(radio);
+    _audioHandler.addQueueItem(radio);
   }
 
   /// pass [radioIndex] - the index of 'radioStream'
   playRadio(int radioIndex) async {
     // radio title is media Id
     await load();
-    _audioHandler!.skipToQueueItem(radioIndex);
-    _audioHandler!.play();
+    _audioHandler.skipToQueueItem(radioIndex);
+    _audioHandler.play();
   }
 
   Future<void> _initMedia(Map<String, dynamic> params) async {
@@ -122,15 +125,15 @@ class AudioManager {
   }
 
   _loadMediaItem(MediaItem mediaItem) async {
-    _audioHandler!.addQueueItem(mediaItem);
+    _audioHandler.addQueueItem(mediaItem);
     await load();
   }
 
-  get queue => _audioHandler!.queue;
-  get currentMediaItem => _audioHandler!.mediaItem;
+  get queue => _audioHandler.queue;
+  get currentMediaItem => _audioHandler.mediaItem;
 
   void _listenToChangesInQueue() {
-    _audioHandler!.queue.listen((queue) {
+    _audioHandler.queue.listen((queue) {
       if (queue.isEmpty) {
         queueNotifier.value = [];
         currentSongTitleNotifier.value = '';
@@ -143,7 +146,7 @@ class AudioManager {
   }
 
   void _listenToPlaybackState() {
-    _audioHandler!.playbackState.listen((playbackState) {
+    _audioHandler.playbackState.listen((playbackState) {
       final processingState = playbackState.processingState;
       if (processingState == AudioProcessingState.loading ||
           processingState == AudioProcessingState.buffering) {
@@ -158,8 +161,8 @@ class AudioManager {
       } else if (processingState != AudioProcessingState.completed) {
         playButtonNotifier.value = PlayButtonState.playing;
       } else {
-        _audioHandler!.seek(Duration.zero);
-        _audioHandler!.pause();
+        _audioHandler.seek(Duration.zero);
+        _audioHandler.pause();
       }
     });
   }
@@ -176,7 +179,7 @@ class AudioManager {
   }
 
   void _listenToBufferedPosition() {
-    _audioHandler!.playbackState.listen((playbackState) {
+    _audioHandler.playbackState.listen((playbackState) {
       final ProgressBarState oldState = progressNotifier.value;
       progressNotifier.value = ProgressBarState(
         current: oldState.current,
@@ -187,7 +190,7 @@ class AudioManager {
   }
 
   void _listenToTotalDuration() {
-    _audioHandler!.mediaItem.listen((mediaItem) {
+    _audioHandler.mediaItem.listen((mediaItem) {
       final ProgressBarState oldState = progressNotifier.value;
       progressNotifier.value = ProgressBarState(
         current: oldState.current,
@@ -198,15 +201,15 @@ class AudioManager {
   }
 
   void _listenToChangesInSong() {
-    _audioHandler!.mediaItem.listen((mediaItem) {
+    _audioHandler.mediaItem.listen((mediaItem) {
       currentSongTitleNotifier.value = mediaItem?.title ?? '';
       _updateSkipButtons();
     });
   }
 
   void _updateSkipButtons() {
-    final mediaItem = _audioHandler!.mediaItem.value;
-    final playlist = _audioHandler!.queue.value;
+    final mediaItem = _audioHandler.mediaItem.value;
+    final playlist = _audioHandler.queue.value;
     if (playlist.length < 2 || mediaItem == null) {
       isFirstSongNotifier.value = true;
       isLastSongNotifier.value = true;
@@ -216,63 +219,63 @@ class AudioManager {
     }
   }
 
-  get playbackState => _audioHandler!.playbackState;
+  get playbackState => _audioHandler.playbackState;
 
   Future<void> addQueueItem(MediaItem mediaItem) =>
-      _audioHandler!.addQueueItem(mediaItem);
+      _audioHandler.addQueueItem(mediaItem);
 
   Future<void> removeQueueItemWithTitle(String mediaTitle) async {
     final index = queueNotifier.value.indexOf(mediaTitle);
     if (index == -1) return;
-    return _audioHandler!.removeQueueItemAt(index);
+    return _audioHandler.removeQueueItemAt(index);
   }
 
-  void play() => _audioHandler!.play();
-  void pause() => _audioHandler!.pause();
+  void play() => _audioHandler.play();
+  void pause() => _audioHandler.pause();
 
-  void seek(Duration position) => _audioHandler!.seek(position);
+  void seek(Duration position) => _audioHandler.seek(position);
 
   Future<void> skipToQueueItem(int index) =>
-      _audioHandler!.skipToQueueItem(index);
+      _audioHandler.skipToQueueItem(index);
 
-  void previous() => _audioHandler!.skipToPrevious();
-  void next() => _audioHandler!.skipToNext();
+  void previous() => _audioHandler.skipToPrevious();
+  void next() => _audioHandler.skipToNext();
 
   /// Stops the audio.
   Future<void> stop() async {
-    await _audioHandler!.pause();
-    return _audioHandler!.stop();
+    await _audioHandler.pause();
+    return _audioHandler.stop();
   }
 
   /// Clears the audio queue
   Future<void> clear() async {
-    await _audioHandler!.pause();
-    await _audioHandler!.stop();
-    return _audioHandler!.customAction('clear');
+    await _audioHandler.pause();
+    await _audioHandler.stop();
+    return _audioHandler.customAction('clear');
   }
 
   /// Clears and initializes the player for the next set
   /// to play.
   Future<void> initAudioPlayer() {
-    return _audioHandler!.customAction('init');
+    return _audioHandler.customAction('init');
   }
 
   void dispose() {
-    _audioHandler!.customAction('dispose');
+    _audioHandler.customAction('dispose');
   }
 
   void repeat() {
     repeatButtonNotifier.nextState();
     final RepeatState repeatMode = repeatButtonNotifier.value;
     switch (repeatMode) {
       case RepeatState.off:
-        _audioHandler!.setRepeatMode(AudioServiceRepeatMode.none);
+        _audioHandler.setRepeatMode(AudioServiceRepeatMode.none);
         break;
       case RepeatState.repeatSong:
-        _audioHandler!.setRepeatMode(AudioServiceRepeatMode.one);
+        _audioHandler.setRepeatMode(AudioServiceRepeatMode.one);
         break;
       case RepeatState.repeatQueue:
-        _audioHandler!.setRepeatMode(AudioServiceRepeatMode.all);
+        _audioHandler.setRepeatMode(AudioServiceRepeatMode.all);
         break;
     }
   }
@@ -281,13 +284,13 @@ class AudioManager {
     final enable = !isShuffleModeEnabledNotifier.value;
     isShuffleModeEnabledNotifier.value = enable;
     if (enable) {
-      _audioHandler!.setShuffleMode(AudioServiceShuffleMode.all);
+      _audioHandler.setShuffleMode(AudioServiceShuffleMode.all);
     } else {
-      _audioHandler!.setShuffleMode(AudioServiceShuffleMode.none);
+      _audioHandler.setShuffleMode(AudioServiceShuffleMode.none);
     }
   }
 
   Future<void> load() {
-    return _audioHandler!.customAction('load');
+    return _audioHandler.customAction('load');
   }
 }
diff --git a/lib/constants/constants.dart b/lib/constants/constants.dart
@@ -28,6 +28,17 @@ class MyConstants extends InheritedWidget {
     'Telugu Stream': 'https://stream.sssmediacentre.org:8443/telugu'
   };
 
+  final Map<String, String> radioStreamImages = const {
+    'Prasanthi Stream':
+        'https://www.immadisairaj.dev/radiosai/images/prasanthiStream.png',
+    'Bhajan Stream':
+        'https://www.immadisairaj.dev/radiosai/images/bhajanStream.png',
+    'Discourse Stream':
+        'https://www.immadisairaj.dev/radiosai/images/discourseStream.png',
+    'Telugu Stream':
+        'https://www.immadisairaj.dev/radiosai/images/teluguStream.png'
+  };
+
   /// The list of items in the top menu bar
   final Map<dynamic, String> menuTitles = const {
     MenuNavigation.schedule: 'Schedule',

diff --git a/lib/helper/media_helper.dart b/lib/helper/media_helper.dart
@@ -43,7 +43,7 @@ class MediaHelper {
 
     String fileId = await getFileIdFromUri(link!);
 
-    Map<String, dynamic> _extras = {
+    Map<String, dynamic> extras = {
       'uri': link,
     };
 
@@ -59,7 +59,7 @@ class MediaHelper {
       // art of the media
       artUri: Uri.parse('file://$path'),
       // extras['uri'] contain the uri of the media
-      extras: _extras,
+      extras: extras,
     );
 
     return tempMediaItem;

diff --git a/lib/main.dart b/lib/main.dart
@@ -99,9 +99,9 @@ class MyApp extends StatelessWidget {
       ],
       child: Consumer<AppThemeBloc>(
           // listen to change of app theme
-          builder: (context, _appThemeBloc, child) {
+          builder: (context, appThemeBloc, child) {
         return StreamBuilder<String?>(
-            stream: _appThemeBloc.appThemeStream as Stream<String?>?,
+            stream: appThemeBloc.appThemeStream as Stream<String?>?,
             builder: (context, snapshot) {
               String appTheme =
                   snapshot.data ?? MyConstants.of(context)!.appThemes[2];

diff --git a/lib/screens/audio_archive/audio_archive.dart b/lib/screens/audio_archive/audio_archive.dart
@@ -13,7 +13,7 @@ class AudioArchive extends StatefulWidget {
   static const String route = 'audioArchive';
 
   @override
-  _AudioArchive createState() => _AudioArchive();
+  State<AudioArchive> createState() => _AudioArchive();
 }
 
 class _AudioArchive extends State<AudioArchive> {

diff --git a/lib/screens/home.dart b/lib/screens/home.dart
@@ -12,7 +12,7 @@ class Home extends StatefulWidget {
   });
 
   @override
-  _Home createState() => _Home();
+  State<Home> createState() => _Home();
 }
 
 class _Home extends State<Home> {

diff --git a/lib/screens/media/media.dart b/lib/screens/media/media.dart
@@ -35,7 +35,7 @@ class Media extends StatefulWidget {
   final String? title;
 
   @override
-  _Media createState() => _Media();
+  State<Media> createState() => _Media();
 }
 
 class _Media extends State<Media> {
@@ -131,10 +131,10 @@ class _Media extends State<Media> {
 
                             // updates the media screen based on download state
                             child: Consumer<MediaScreenBloc>(builder:
-                                (context, _mediaScreenStateBloc, child) {
+                                (context, mediaScreenStateBloc, child) {
                               return StreamBuilder<bool?>(
-                                  stream: _mediaScreenStateBloc
-                                      .mediaScreenStream as Stream<bool?>?,
+                                  stream: mediaScreenStateBloc.mediaScreenStream
+                                      as Stream<bool?>?,
                                   builder: (context, snapshot) {
                                     // can use the below commented line to know if updated
                                     // bool screenUpdate = snapshot.data ?? false;
@@ -545,7 +545,7 @@ class _Media extends State<Media> {
         await MediaHelper.generateMediaItem(name, link, isFileExists);
 
     // passing params to send the source to play
-    Map<String, dynamic> _params = {
+    Map<String, dynamic> params = {
       'id': tempMediaItem.id,
       'album': tempMediaItem.album,
       'title': tempMediaItem.title,
@@ -555,7 +555,7 @@ class _Media extends State<Media> {
     };
 
     _audioManager!.stop();
-    await _audioManager!.init(MediaType.media, _params);
+    await _audioManager!.init(MediaType.media, params);
   }
 
   /// add a new media item to the end of the queue