activate French; style clickable artist

This commit is contained in:
Moritz Weber 2023-08-23 21:36:16 -04:00
parent fd4877a159
commit 9eb71b3b76
3 changed files with 39 additions and 30 deletions

View file

@ -360,7 +360,6 @@
"@exportData": {}, "@exportData": {},
"exportDescription": "Select the data you want to export. By default, everything is exported. When exporting, you can select a folder for the file to be stored.", "exportDescription": "Select the data you want to export. By default, everything is exported. When exporting, you can select a folder for the file to be stored.",
"@exportDescription": {}, "@exportDescription": {},
"exportingData": "Exporting data",
"songsAlbumsArtists": "Songs, Albums, and Artists", "songsAlbumsArtists": "Songs, Albums, and Artists",
"@songsAlbumsArtists": {}, "@songsAlbumsArtists": {},
"librarySettings": "Library Settings", "librarySettings": "Library Settings",

View file

@ -75,7 +75,8 @@ class MyApp extends StatelessWidget {
Locale('nb'), Locale('nb'),
Locale('es'), Locale('es'),
Locale('ru'), Locale('ru'),
Locale('uk') Locale('uk'),
Locale('fr')
], ],
); );
} }

View file

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart'; import 'package:get_it/get_it.dart';
@ -125,14 +124,16 @@ class Header extends StatelessWidget {
} }
double _calculateExpandRatio(BoxConstraints constraints) { double _calculateExpandRatio(BoxConstraints constraints) {
var expandRatio = (constraints.maxHeight - minHeight) / (maxHeight - minHeight); var expandRatio =
(constraints.maxHeight - minHeight) / (maxHeight - minHeight);
if (expandRatio > 1.0) expandRatio = 1.0; if (expandRatio > 1.0) expandRatio = 1.0;
if (expandRatio < 0.0) expandRatio = 0.0; if (expandRatio < 0.0) expandRatio = 0.0;
return expandRatio; return expandRatio;
} }
double _calculateExpandRatio2(BoxConstraints constraints) { double _calculateExpandRatio2(BoxConstraints constraints) {
var expandRatio = (constraints.maxHeight - minHeight) / (maxHeight - minHeight); var expandRatio =
(constraints.maxHeight - minHeight) / (maxHeight - minHeight);
if (expandRatio > 1.0) if (expandRatio > 1.0)
expandRatio = 1.0; expandRatio = 1.0;
else if (expandRatio < 0.8) else if (expandRatio < 0.8)
@ -191,14 +192,22 @@ class Header extends StatelessWidget {
width: 10.0, width: 10.0,
), ),
if (subtitle != null) if (subtitle != null)
_buildSubtitle(context, subtitle, animation, animation2, onTapSubtitle), _buildSubtitle(
context,
subtitle,
animation,
animation2,
onTapSubtitle,
),
if (subtitle2 != null) if (subtitle2 != null)
Text( Text(
subtitle2, subtitle2,
style: TextStyle( style: TextStyle(
fontSize: Tween<double>(begin: 0, end: 13).evaluate(animation), fontSize:
color: Colors.white Tween<double>(begin: 0, end: 13).evaluate(animation),
.withOpacity(Tween<double>(begin: 0, end: 1).evaluate(animation2)), color: Colors.white.withOpacity(
Tween<double>(begin: 0, end: 1).evaluate(animation2),
),
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
), ),
), ),
@ -219,6 +228,7 @@ class Header extends StatelessWidget {
subtitle, subtitle,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
softWrap: false,
style: TextStyle( style: TextStyle(
fontSize: Tween<double>(begin: 0, end: 16).evaluate(animation), fontSize: Tween<double>(begin: 0, end: 16).evaluate(animation),
color: Colors.white.withOpacity( color: Colors.white.withOpacity(
@ -226,26 +236,21 @@ class Header extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
); );
return TextButton( return GestureDetector(
onPressed: onTapSubtitle, onTap: onTapSubtitle,
style: TextButton.styleFrom( child: Container(
padding: const EdgeInsets.symmetric(horizontal: 4), color: Colors.transparent,
minimumSize: Size.zero, child: Text(
tapTargetSize: MaterialTapTargetSize.shrinkWrap, subtitle,
backgroundColor: Colors.white24, maxLines: 1,
shape: RoundedRectangleBorder( overflow: TextOverflow.fade,
borderRadius: BorderRadius.circular(4), softWrap: false,
side: const BorderSide(color: Colors.white24), style: TextStyle(
)), fontSize: Tween<double>(begin: 0, end: 16).evaluate(animation),
child: Text( color: Colors.white.withOpacity(
subtitle, Tween<double>(begin: 0, end: 1).evaluate(animation2)),
maxLines: 1, fontWeight: FontWeight.w500,
overflow: TextOverflow.fade, ).underlined(),
style: TextStyle(
fontSize: Tween<double>(begin: 0, end: 16).evaluate(animation),
color: Colors.white.withOpacity(
Tween<double>(begin: 0, end: 1).evaluate(animation2)),
fontWeight: FontWeight.w500,
), ),
)); ));
} }
@ -278,7 +283,11 @@ class Header extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4.0), borderRadius: BorderRadius.circular(4.0),
boxShadow: const [ boxShadow: const [
BoxShadow(color: Colors.black54, blurRadius: 8, offset: Offset(0, 2)), BoxShadow(
color: Colors.black54,
blurRadius: 8,
offset: Offset(0, 2),
),
], ],
), ),
), ),