Skip to content

Commit

Permalink
Merge pull request #288 from DarkNinja15/main
Browse files Browse the repository at this point in the history 
feat(player): add slide gesture to song tile for playing next song
  • Loading branch information
@anandnet
anandnet authored Sep 27, 2024
2 parents 1982c87 + ae64aa0 commit 86712b8
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 136 deletions.
190 changes: 104 additions & 86 deletions lib/ui/widgets/list_widget.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:audio_service/audio_service.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:harmonymusic/ui/widgets/snackbar.dart';
import 'package:widget_marquee/widget_marquee.dart';
import 'package:flutter_slidable/flutter_slidable.dart';

import '../../models/playlist.dart';
import '../navigator.dart';
Expand Down Expand Up @@ -82,95 +84,111 @@ class ListWidget extends StatelessWidget {
physics: isCompleteList
? const BouncingScrollPhysics()
: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => ListTile(
onTap: () {
(isPlaylist || isArtistSongs)
? playerController.playPlayListSong(
List<MediaItem>.from(items), index)
: playerController.pushSongToQueue(items[index] as MediaItem);
},
onLongPress: () async {
showModalBottomSheet(
constraints: const BoxConstraints(maxWidth: 500),
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(10.0)),
),
isScrollControlled: true,
context: playerController.homeScaffoldkey.currentState!.context,
//constraints: BoxConstraints(maxHeight:Get.height),
barrierColor: Colors.transparent.withAlpha(100),
builder: (context) => SongInfoBottomSheet(
items[index] as MediaItem,
playlist: playlist,
itemBuilder: (context, index) => Slidable(
endActionPane: ActionPane(motion: const DrawerMotion(), children: [
SlidableAction(
onPressed: (context) {
playerController.playNext(items[index] as MediaItem);
ScaffoldMessenger.of(context).showSnackBar(snackbar(
context, "Upcoming ${(items[index] as MediaItem).title}".tr,
size: SanckBarSize.MEDIUM));
},
backgroundColor: Color(Colors.transparent.value),
foregroundColor: Colors.white,
icon: Icons.next_plan_outlined,
label: 'Play Next',
),
]),
child: ListTile(
onTap: () {
(isPlaylist || isArtistSongs)
? playerController.playPlayListSong(
List<MediaItem>.from(items), index)
: playerController.pushSongToQueue(items[index] as MediaItem);
},
onLongPress: () async {
showModalBottomSheet(
constraints: const BoxConstraints(maxWidth: 500),
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(10.0)),
),
isScrollControlled: true,
context: playerController.homeScaffoldkey.currentState!.context,
//constraints: BoxConstraints(maxHeight:Get.height),
barrierColor: Colors.transparent.withAlpha(100),
builder: (context) => SongInfoBottomSheet(
items[index] as MediaItem,
playlist: playlist,
),
).whenComplete(() => Get.delete<SongInfoController>());
},
contentPadding: const EdgeInsets.only(top: 0, left: 5, right: 30),
leading: ImageWidget(
size: 55,
song: items[index],
),
title: Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: items[index].title.hashCode.toString(),
child: Text(
items[index].title.length > 50
? items[index].title.substring(0, 50)
: items[index].title,
maxLines: 1,
style: Theme.of(context).textTheme.titleMedium,
),
).whenComplete(() => Get.delete<SongInfoController>());
},
contentPadding: const EdgeInsets.only(top: 0, left: 5, right: 30),
leading: ImageWidget(
size: 55,
song: items[index],
),
title: Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: items[index].title.hashCode.toString(),
child: Text(
items[index].title.length > 50
? items[index].title.substring(0, 50)
: items[index].title,
),
subtitle: Text(
"${items[index].artist}",
maxLines: 1,
style: Theme.of(context).textTheme.titleMedium,
style: Theme.of(context).textTheme.titleSmall,
),
),
subtitle: Text(
"${items[index].artist}",
maxLines: 1,
style: Theme.of(context).textTheme.titleSmall,
),
trailing: SizedBox(
width: Get.size.width > 800 ? 80 : 40,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (isPlaylist)
Obx(() => playerController.currentSong.value?.id ==
items[index].id
? const Icon(
Icons.equalizer_rounded,
)
: const SizedBox.shrink()),
Text(
items[index].extras!['length'] ?? "",
style: Theme.of(context).textTheme.titleSmall,
),
],
),
if (GetPlatform.isDesktop)
IconButton(
splashRadius: 20,
onPressed: () {
showModalBottomSheet(
constraints: const BoxConstraints(maxWidth: 500),
shape: const RoundedRectangleBorder(
borderRadius:
BorderRadius.vertical(top: Radius.circular(10.0)),
),
isScrollControlled: true,
context: playerController
.homeScaffoldkey.currentState!.context,
//constraints: BoxConstraints(maxHeight:Get.height),
barrierColor: Colors.transparent.withAlpha(100),
builder: (context) => SongInfoBottomSheet(
items[index] as MediaItem,
playlist: playlist,
),
).whenComplete(() => Get.delete<SongInfoController>());
},
icon: const Icon(Icons.more_vert))
],
trailing: SizedBox(
width: Get.size.width > 800 ? 80 : 40,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (isPlaylist)
Obx(() => playerController.currentSong.value?.id ==
items[index].id
? const Icon(
Icons.equalizer_rounded,
)
: const SizedBox.shrink()),
Text(
items[index].extras!['length'] ?? "",
style: Theme.of(context).textTheme.titleSmall,
),
],
),
if (GetPlatform.isDesktop)
IconButton(
splashRadius: 20,
onPressed: () {
showModalBottomSheet(
constraints: const BoxConstraints(maxWidth: 500),
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(10.0)),
),
isScrollControlled: true,
context: playerController
.homeScaffoldkey.currentState!.context,
//constraints: BoxConstraints(maxHeight:Get.height),
barrierColor: Colors.transparent.withAlpha(100),
builder: (context) => SongInfoBottomSheet(
items[index] as MediaItem,
playlist: playlist,
),
).whenComplete(() => Get.delete<SongInfoController>());
},
icon: const Icon(Icons.more_vert))
],
),
),
),
),
Expand Down
12 changes: 10 additions & 2 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.82.6"
flutter_slidable:
dependency: "direct main"
description:
name: flutter_slidable
sha256: "2c5611c0b44e20d180e4342318e1bbc28b0a44ad2c442f5df16962606fd3e8e3"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down Expand Up @@ -1110,10 +1118,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.2.4"
web:
dependency: transitive
description:
Expand Down
88 changes: 40 additions & 48 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,82 +28,77 @@ environment:
# the latest version available on pub.dev. To see which dependencies have newer
# versions available, run `flutter pub outdated`.
dependencies:
flutter:
sdk: flutter

# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
#cupertino_icons: ^1.0.2
just_audio: ^0.9.40
animations: ^2.0.11
app_links: ^3.5.1
archive: ^3.1.6
audio_service: ^0.18.15
audio_service_mpris: ^0.1.5
audio_video_progress_bar: ^2.0.3
get: ^4.6.6
#http: ^0.13.5
dio: ^5.7.0
audiotags: ^1.4.1
buttons_tabbar: ^1.3.13
cached_network_image: ^3.4.0
audio_service: ^0.18.15
palette_generator: ^0.3.3+4
path_provider: ^2.1.1
shimmer: ^3.0.0
hive: ^2.2.3
hive_flutter: ^1.1.0
flutter_keyboard_visibility: ^6.0.0
url_launcher: ^6.2.1
share_plus: ^9.0.0
device_equalizer:
git:
url: https://github.com/anandnet/device_equalizer.git
ref: 29ea7ff4e284101af114de64bafca25a1a0c01d8
app_links: ^3.5.1
permission_handler: ^11.0.1
sdk_int:
git:
url: https://github.com/anandnet/sdk_int.git
ref: 91b2d4e0863de4effb2c89dd7868506cbd85a1ee
dio: ^5.7.0
file_picker: ^8.0.6
audiotags: ^1.4.1
google_fonts: ^6.1.0
toggle_switch: ^2.1.0
flutter:
sdk: flutter
flutter_keyboard_visibility: ^6.0.0
flutter_lyric: ^2.0.4+6
buttons_tabbar: ^1.3.13
animations: ^2.0.11
flutter_slidable: ^3.1.1
get: ^4.6.6
google_fonts: ^6.1.0
hive: ^2.2.3
hive_flutter: ^1.1.0
ionicons: ^0.2.2
just_audio: ^0.9.40
just_audio_media_kit:
git:
url: https://github.com/anandnet/just_audio_media_kit.git
ref: 06de226da469f5c55dd780b215bcc45a0d6269fb
sidebar_with_animation:
git:
url: https://github.com/anandnet/animated_side_bar.git
branch: main
ref: b53567a42b4ba3793a3cf00d478bdba0ecce33d7
logger: ^2.4.0
palette_generator: ^0.3.3+4
path: ^1.8.3
path_provider: ^2.1.1
permission_handler: ^11.0.1
player_response:
git:
url: https://github.com/anandnet/Player-Response.git
branch: main
ref: d7244f52d427b4aabde57be404d4316474613508
window_manager: ^0.4.2
restart_app: ^1.2.1
sdk_int:
git:
url: https://github.com/anandnet/sdk_int.git
ref: 91b2d4e0863de4effb2c89dd7868506cbd85a1ee
share_plus: ^9.0.0
shimmer: ^3.0.0
sidebar_with_animation:
git:
url: https://github.com/anandnet/animated_side_bar.git
branch: main
ref: b53567a42b4ba3793a3cf00d478bdba0ecce33d7
smtc_windows: ^0.1.2
audio_service_mpris: ^0.1.5
ionicons: ^0.2.2
archive: ^3.1.6
path: ^1.8.3
toggle_switch: ^2.1.0
tray_manager: ^0.2.3
url_launcher: ^6.2.1
widget_marquee: ^0.0.8
restart_app: ^1.2.1
logger: ^2.4.0
window_manager: ^0.4.2
dev_dependencies:
flutter_test:
sdk: flutter

# The "flutter_lints" package below contains a set of recommended lints to
# encourage good coding practices. The lint set provided by the package is
# activated in the `analysis_options.yaml` file located at the root of your
# package. See that file for information about deactivating specific lint
# rules and activating additional ones.
flutter_lints: ^4.0.0
flutter_test:
sdk: flutter

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

# The following section is specific to Flutter packages.
flutter:
# The following line ensures that the Material Icons font is
Expand All @@ -115,13 +110,10 @@ flutter:
assets:
- assets/icons/
# - images/a_dot_ham.jpeg

# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware

# For details regarding adding assets from package dependencies, see
# https://flutter.dev/assets-and-images/#from-packages

# To add custom fonts to your application, add a fonts section here,
# in this "flutter" section. Each entry in this list should have a
# "family" key with the font family name, and a "fonts" key with a
Expand Down

0 comments on commit 86712b8

Please sign in to comment.