empathicqubit/mucke
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small cosmetics; end of playback behavior

Browse source
This commit is contained in:
Moritz Weber 2022-03-05 21:43:35 +01:00
parent 41cdeaa096
commit e920f77b30
6 changed files with 62 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/presentation/pages/currently_playing.dart
View file

@ -81,23 +81,28 @@ class CurrentlyPlayingPage extends StatelessWidget {
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
song.title,
overflow: TextOverflow.fade,
softWrap: false,
maxLines: 1,
style: TEXT_BIG,
),
Text(
'${song.artist} • ${song.album}',
style: TEXT_SUBTITLE.copyWith(
color: Colors.grey[100],
child: SizedBox(
width: double.infinity,
height: 72.0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
song.title,
overflow: TextOverflow.fade,
softWrap: false,
maxLines: 1,
style: TEXT_BIG,
),
),
],
Text(
'${song.artist} • ${song.album}',
style: TEXT_SUBTITLE.copyWith(
color: Colors.grey[100],
),
maxLines: 2,
),
],
),
),
),
const Spacer(

20
lib/presentation/widgets/currently_playing_bar.dart
View file

@ -29,15 +29,21 @@ class CurrentlyPlayingBar extends StatelessWidget {
GestureDetector(
onTap: () => _onTap(context),
child: Container(
color: Colors.transparent,
color: Colors.white.withOpacity(0.02),
child: Row(
children: <Widget>[
Image(
image: getAlbumImage(song.albumArtPath),
height: 64.0,
),
Container(
width: 10.0,
Padding(
padding: const EdgeInsets.only(left: 8.0, bottom: 8.0, top: 8.0, right: 12.0),
child: Container(
clipBehavior: Clip.antiAlias,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(1.5),
),
child: Image(
image: getAlbumImage(song.albumArtPath),
height: 56.0,
),
),
),
Expanded(
child: Column(

9
lib/presentation/widgets/navbar.dart
View file

@ -25,13 +25,10 @@ class _NavBarState extends State<NavBar> {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
const CurrentlyPlayingBar(),
Container(
color: Theme.of(context).primaryColorLight,
height: 1.0,
),
BottomNavigationBar(
currentIndex: widget.currentIndex,
onTap: widget.onTap,
type: BottomNavigationBarType.fixed,
items: const [
BottomNavigationBarItem(
icon: Icon(Icons.home),
@ -45,6 +42,10 @@ class _NavBarState extends State<NavBar> {
icon: Icon(Icons.search),
label: 'Search',
),
// BottomNavigationBarItem(
// icon: Icon(Icons.settings),
// label: 'Settings',
// ),
],
),
],

5
lib/system/datasources/audio_player_data_source_impl.dart
View file

@ -105,6 +105,9 @@ class AudioPlayerDataSourceImpl implements AudioPlayerDataSource {
@override
Future<void> play() async {
if (_audioPlayer.playerState.processingState == ja.ProcessingState.completed) {
await seekToPosition(0.0);
}
_audioPlayer.play();
}
@ -438,7 +441,7 @@ class AudioPlayerDataSourceImpl implements AudioPlayerDataSource {
Future<void> seekToPosition(double position) async {
final duration = _audioPlayer.duration;
if (duration != null) {
_audioPlayer.seek(duration * position);
await _audioPlayer.seek(duration * position);
}
}
}

15
lib/system/datasources/platform_integration_data_source_impl.dart
View file

@ -32,7 +32,7 @@ class PlatformIntegrationDataSourceImpl extends BaseAudioHandler
@override
Future<void> skipToNext() async {
_log.d('slipToNext');
_log.d('skipToNext');
_eventSubject.add(PlatformIntegrationEvent(type: PlatformIntegrationEventType.skipNext));
}
@ -81,6 +81,19 @@ class PlatformIntegrationDataSourceImpl extends BaseAudioHandler
playing: false,
));
}
} else if (pe.processingState == ProcessingState.completed) {
final timeDelta = DateTime.now().difference(pe.updateTime);
playbackState.add(playbackState.value.copyWith(
controls: [MediaControl.skipToPrevious, MediaControl.play, MediaControl.skipToNext],
systemActions: const {
MediaAction.seek,
},
processingState: AudioProcessingState.ready,
updatePosition: pe.updatePosition + timeDelta,
playing: false,
));
} else {
_log.d(pe.processingState.toString());
}
}

7
lib/system/repositories/audio_player_repository_impl.dart
View file

@ -125,8 +125,11 @@ class AudioPlayerRepositoryImpl implements AudioPlayerRepository {
}
@override
Future<void> loadSongs(
{required List<Song> songs, required int initialIndex, required Playable playable}) async {
Future<void> loadSongs({
required List<Song> songs,
required int initialIndex,
required Playable playable,
}) async {
_playableSubject.add(playable);
final shuffleMode = shuffleModeStream.value;
final _initialIndex =