diff --git a/lib/config.dart b/lib/config.dart index 7b9858c..e9418ec 100644 --- a/lib/config.dart +++ b/lib/config.dart @@ -10,4 +10,6 @@ class Config { static const String discordApiUrl = "https://discord.com/api/v9"; static const String evergreenBootstrapperUrl = "https://go.microsoft.com/fwlink/p/?LinkId=2124703"; + + static const double progressBarThumbSize = 2.438; } diff --git a/lib/widget/progress_bar.dart b/lib/widget/progress_bar.dart index 9cb1171..7fbd8ec 100644 --- a/lib/widget/progress_bar.dart +++ b/lib/widget/progress_bar.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:landart/landart.dart'; +import 'package:lanyard_listening_along/config.dart'; class ProgressBar extends StatefulWidget { @@ -21,8 +22,6 @@ class _ProgressBarState extends State { late int _songLength = widget.timestamp.end! - widget.timestamp.start!; int _songProgress = 0; late final Timer _updateTimer; - static const double _thumbSize = 2.438; - @override void initState() { @@ -76,8 +75,8 @@ class _ProgressBarState extends State { data: SliderThemeData( overlayShape: SliderComponentShape.noOverlay, thumbShape: const RoundSliderThumbShape( - enabledThumbRadius: _thumbSize, - disabledThumbRadius: _thumbSize, + enabledThumbRadius: Config.progressBarThumbSize, + disabledThumbRadius: Config.progressBarThumbSize, elevation: 0 ), trackHeight: 3, @@ -92,7 +91,11 @@ class _ProgressBarState extends State { ), ), Padding( - padding: const EdgeInsets.only(right: _thumbSize / 2, left: _thumbSize / 2, top: 1), + padding: const EdgeInsets.only( + right: Config.progressBarThumbSize / 2, + left: Config.progressBarThumbSize / 2, + top: 1.2 + ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/widget/spotify_card.dart b/lib/widget/spotify_card.dart index 7598b91..727959e 100644 --- a/lib/widget/spotify_card.dart +++ b/lib/widget/spotify_card.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:landart/landart.dart'; +import 'package:lanyard_listening_along/config.dart'; import 'package:lanyard_listening_along/widget/progress_bar.dart'; @@ -43,32 +44,47 @@ class _SpotifyCardState extends State { child: SizedBox( height: 130, child: Padding( - padding: const EdgeInsets.only(left: 14, top: 6), + padding: const EdgeInsets.only(left: 12, top: 6), child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.max, children: [ - Text( - widget.spotifyData.song, - style: const TextStyle( - fontSize: 20, - fontWeight: FontWeight.bold, - overflow: TextOverflow.ellipsis + Padding( + padding: const EdgeInsets.only( + left: Config.progressBarThumbSize / 2 + ), + child: Text( + widget.spotifyData.song, + style: const TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + overflow: TextOverflow.ellipsis + ), ), ), - Text( - "by ${widget.spotifyData.artist}", - style: const TextStyle( - fontSize: 16, - overflow: TextOverflow.ellipsis + Padding( + padding: const EdgeInsets.only( + left: Config.progressBarThumbSize / 2 + ), + child: Text( + "by ${widget.spotifyData.artist}", + style: const TextStyle( + fontSize: 16, + overflow: TextOverflow.ellipsis + ), ), ), - Text( - "on ${widget.spotifyData.album}", - style: const TextStyle( - fontSize: 16, - overflow: TextOverflow.ellipsis + Padding( + padding: const EdgeInsets.only( + left: Config.progressBarThumbSize / 2 + ), + child: Text( + "on ${widget.spotifyData.album}", + style: const TextStyle( + fontSize: 16, + overflow: TextOverflow.ellipsis + ), ), ), Expanded(