Skip to content

* add toggle to settings -> personalization to enable/disable long so… #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

* add toggle to settings -> personalization to enable/disable long so… #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
327 changes: 197 additions & 130 deletions lib/ui/player/components/gesture_player.dart
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 22 additions & 16 deletions lib/ui/player/components/mini_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class MiniPlayer extends StatelessWidget {
final size = MediaQuery.of(context).size;
final isWideScreen = size.width > 800;
final bottomNavEnabled = Get.find<SettingsScreenController>().isBottomNavBarEnabled.isTrue;
final settingsController = Get.find<SettingsScreenController>();
return Obx(() {
return Visibility(
visible: playerController.isPlayerpanelTopVisible.value,
Expand Down Expand Up @@ -140,22 +141,27 @@ class MiniPlayer extends StatelessWidget {
),
SizedBox(
height: 20,
child: Marquee(
id: "${playerController.currentSong.value}_mini",
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
child: Text(
playerController.currentSong.value !=
null
? playerController
.currentSong.value!.artist!
: "",
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleSmall,
),
),
child: Obx(() => settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
id: "${playerController.currentSong.value}_mini",
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
child: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.artist!
: "",
maxLines: 1,
style: Theme.of(context).textTheme.titleSmall,
),
)
: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.artist!
: "",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleSmall,
)),
),
],
),
Expand Down
70 changes: 45 additions & 25 deletions lib/ui/player/components/player_control.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ionicons/ionicons.dart';
import 'package:widget_marquee/widget_marquee.dart';
import 'package:harmonymusic/ui/screens/Settings/settings_screen_controller.dart';

import '/ui/player/components/animated_play_button.dart';
import '../player_controller.dart';
Expand All @@ -13,6 +14,7 @@ class PlayerControlWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final PlayerController playerController = Get.find<PlayerController>();
final SettingsScreenController settingsController = Get.find<SettingsScreenController>();
return Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
Expand Down Expand Up @@ -43,34 +45,52 @@ class PlayerControlWidget extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 10),
id: "${playerController.currentSong.value}_title",
child: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.title
: "NA",
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.labelMedium!,
),
),
Obx(() => settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 10),
id: "${playerController.currentSong.value}_title",
child: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.title
: "NA",
textAlign: TextAlign.start,
style: Theme.of(context).textTheme.labelMedium!,
),
)
: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.title
: "NA",
textAlign: TextAlign.start,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelMedium!,
)),
const SizedBox(
height: 5,
),
Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 10),
id: "${playerController.currentSong.value}_subtitle",
child: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.artist!
: "NA",
textAlign: TextAlign.start,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelSmall,
),
)
Obx(() => settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 10),
id: "${playerController.currentSong.value}_subtitle",
child: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.artist!
: "NA",
textAlign: TextAlign.start,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelSmall,
),
)
: Text(
playerController.currentSong.value != null
? playerController.currentSong.value!.artist!
: "NA",
textAlign: TextAlign.start,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.labelSmall,
)),
],
);
}),
Expand Down
71 changes: 47 additions & 24 deletions lib/ui/screens/Album/album_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:harmonymusic/models/thumbnail.dart';
import 'package:harmonymusic/ui/widgets/playlist_album_scroll_behaviour.dart';
import 'package:share_plus/share_plus.dart';
import 'package:widget_marquee/widget_marquee.dart';
import 'package:harmonymusic/ui/screens/Settings/settings_screen_controller.dart';

import '../../../services/downloader.dart';
import '../../player/player_controller.dart';
Expand Down Expand Up @@ -495,37 +496,59 @@ class AlbumScreen extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: title.hashCode.toString(),
child: Text(
title.length > 50 ? title.substring(0, 50) : title,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
),
),
Obx(() {
final settingsController = Get.find<SettingsScreenController>();
return settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: title.hashCode.toString(),
child: Text(
title.length > 50 ? title.substring(0, 50) : title,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
),
)
: Text(
title.length > 50 ? title.substring(0, 50) : title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
);
}),
Text(
description ?? "",
maxLines: 1,
style: Theme.of(context).textTheme.titleMedium,
),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: artists.hashCode.toString(),
child: Text(
artists,
maxLines: 1,
style: Theme.of(context).textTheme.titleSmall,
),
),
),
child: Obx(() {
final settingsController = Get.find<SettingsScreenController>();
return settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay: const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: artists.hashCode.toString(),
child: Text(
artists,
maxLines: 1,
style: Theme.of(context).textTheme.titleSmall,
),
)
: Text(
artists,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.titleSmall,
);
})),
],
),
),
Expand Down
89 changes: 58 additions & 31 deletions lib/ui/screens/Playlist/playlist_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:share_plus/share_plus.dart';
import 'package:widget_marquee/widget_marquee.dart';
import 'package:harmonymusic/ui/screens/Settings/settings_screen_controller.dart';

import '/models/playling_from.dart';
import '/models/thumbnail.dart';
Expand Down Expand Up @@ -564,40 +565,66 @@ class PlaylistScreen extends StatelessWidget {
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Marquee(
delay:
const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: title.hashCode.toString(),
child: Text(
title.length > 50
? title.substring(0, 50)
: title,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
),
),
Obx(() {
final settingsController = Get.find<SettingsScreenController>();
return settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay:
const Duration(milliseconds: 300),
duration: const Duration(seconds: 5),
id: title.hashCode.toString(),
child: Text(
title.length > 50
? title.substring(0, 50)
: title,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
),
)
: Text(
title.length > 50
? title.substring(0, 50)
: title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
.titleLarge!
.copyWith(fontSize: 30),
);
}),
Padding(
padding:
const EdgeInsets.only(top: 8.0),
child: Marquee(
delay: const Duration(
milliseconds: 300),
duration:
const Duration(seconds: 5),
id: description.hashCode.toString(),
child: Text(
description ?? "playlist".tr,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleSmall,
),
),
),
child: Obx(() {
final settingsController = Get.find<SettingsScreenController>();
return settingsController.songTitleMarqueeEnabled.isTrue
? Marquee(
delay: const Duration(
milliseconds: 300),
duration:
const Duration(seconds: 5),
id: description.hashCode.toString(),
child: Text(
description ?? "playlist".tr,
maxLines: 1,
style: Theme.of(context)
.textTheme
.titleSmall,
),
)
: Text(
description ?? "playlist".tr,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
.titleSmall,
);
})),
],
),
),
Expand Down
10 changes: 10 additions & 0 deletions lib/ui/screens/Settings/settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,16 @@ class SettingsScreen extends StatelessWidget {
settingsController.slidableActionEnabled.isTrue,
onChanged: settingsController.toggleSlidableAction),
)),
ListTile(
contentPadding: const EdgeInsets.only(left: 5, right: 10),
title: Text("Song Title Marquee"),
subtitle: Text("Toggle scrolling for long titles",
style: Theme.of(context).textTheme.bodyMedium),
trailing: Obx(
() => CustSwitch(
value: settingsController.songTitleMarqueeEnabled.value,
onChanged: settingsController.toggleSongTitleMarquee),
)),
],
),
CustomExpansionTile(
Expand Down
Loading