Skip to content
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

Implemented marquee text for album titles, descriptions and artist names #47

Merged
merged 3 commits into from
Apr 1, 2022
Merged

Implemented marquee text for album titles, descriptions and artist names #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fd5d6f
Added support for marquee text on album's with long descriptions and …
SteliosPapamichail Mar 31, 2022
5df96b5
Added support for marquee text for the ArtistCard and made adjustment…
SteliosPapamichail Mar 31, 2022
8a10a52
Created a custom SpotubeMarqueeText widget to improve maintainability…
SteliosPapamichail Apr 1, 2022
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
17 changes: 13 additions & 4 deletions lib/components/Artist/ArtistCard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:marquee/marquee.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/components/Shared/SpotubeWidgets.dart';

class ArtistCard extends StatelessWidget {
final Artist artist;
Expand Down Expand Up @@ -41,10 +43,17 @@ class ArtistCard extends StatelessWidget {
minRadius: 20,
backgroundImage: backgroundImage,
),
Text(
artist.name!,
style: Theme.of(context).textTheme.headline5,
overflow: TextOverflow.ellipsis,
SizedBox(
height: 30,
child: artist.name!.length > 15
? SpotubeMarqueeText(
text: artist.name!,
textStyle: Theme.of(context).textTheme.headline5!,
)
: Text(
artist.name!,
style: Theme.of(context).textTheme.headline5,
),
),
Text(
"Artist",
Expand Down
53 changes: 40 additions & 13 deletions lib/components/Shared/PlaybuttonCard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:spotube/components/Shared/SpotubeWidgets.dart';

class PlaybuttonCard extends StatelessWidget {
final void Function()? onTap;
Expand Down Expand Up @@ -82,30 +83,56 @@ class PlaybuttonCard extends StatelessWidget {
const SizedBox(height: 5),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 8, vertical: 10),
const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
child: Column(
children: [
Tooltip(
message: title,
child: Text(
title,
style: const TextStyle(fontWeight: FontWeight.bold),
overflow: TextOverflow.ellipsis,
child: SizedBox(
height: 20,
child: title.length > 25
? SpotubeMarqueeText(
text: title,
textStyle: const TextStyle(
fontWeight: FontWeight.bold),
)
: Text(
title,
style: const TextStyle(
fontWeight: FontWeight.bold),
),
),
),
if (description != null) ...[
const SizedBox(height: 10),
Text(
description!,
style: TextStyle(
fontSize: 13,
color: Theme.of(context).textTheme.headline4?.color,
),
)
SizedBox(
height: 30,
child: description!.length > 30
? SpotubeMarqueeText(
text: description!,
textStyle: TextStyle(
fontSize: 13,
color: Theme.of(context)
.textTheme
.headline4
?.color,
),
)
: Text(
description!,
style: TextStyle(
fontSize: 13,
color: Theme.of(context)
.textTheme
.headline4
?.color,
),
),
),
]
],
),
)
),
],
),
),
Expand Down
30 changes: 30 additions & 0 deletions lib/components/Shared/SpotubeWidgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import 'package:flutter/material.dart';
import 'package:marquee/marquee.dart';

class SpotubeMarqueeText extends StatelessWidget {
const SpotubeMarqueeText(
{Key? key, required this.text, required this.textStyle})
: super(key: key);
final TextStyle textStyle;
final String text;

@override
Widget build(BuildContext context) {
return Marquee(
text: text,
style: textStyle,
scrollAxis: Axis.horizontal,
crossAxisAlignment: CrossAxisAlignment.start,
blankSpace: 60.0,
velocity: 30.0,
startAfter: const Duration(seconds: 2),
pauseAfterRound: const Duration(seconds: 2),
accelerationDuration: const Duration(seconds: 1),
accelerationCurve: Curves.linear,
decelerationDuration: const Duration(milliseconds: 500),
decelerationCurve: Curves.easeOut,
fadingEdgeStartFraction: 0.15,
fadingEdgeEndFraction: 0.15,
);
}
}
14 changes: 14 additions & 0 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
fading_edge_scrollview:
dependency: transitive
description:
name: fading_edge_scrollview
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
fake_async:
dependency: transitive
description:
Expand Down Expand Up @@ -387,6 +394,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
marquee:
dependency: "direct main"
description:
name: marquee
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
matcher:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ dependencies:
just_audio_background: ^0.0.1-beta.5
logger: ^1.1.0
permission_handler: ^9.2.0
marquee: ^2.2.1

dev_dependencies:
flutter_test:
Expand Down