copilot/frosty
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Tweak font weights, sizes, & theme (#90)

Browse source
This commit is contained in:
Tommy Chow 2022-05-26 18:04:04 -04:00
parent 9116e12dc9
commit 16475c107b
5 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/main.dart
View file

@ -82,6 +82,9 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
const gray = Color.fromRGBO(22, 22, 22, 1.0);
const purple = Color(0xff9146ff);
final lightTheme = ThemeData(
scaffoldBackgroundColor: Colors.white,
splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
@ -92,16 +95,16 @@ class MyApp extends StatelessWidget {
titleTextStyle: TextStyle(
fontFamily: 'Inter',
fontSize: 24,
fontWeight: FontWeight.w800,
fontWeight: FontWeight.bold,
color: Colors.black,
),
iconTheme: IconThemeData(color: Colors.black),
),
colorScheme: ColorScheme.fromSwatch(
primarySwatch: Colors.deepPurple,
accentColor: const Color(0xff9146ff),
accentColor: purple,
),
toggleableActiveColor: const Color(0xff9146ff),
toggleableActiveColor: purple,
tabBarTheme: const TabBarTheme(
labelColor: Colors.black,
unselectedLabelColor: Colors.grey,
@ -109,26 +112,27 @@ class MyApp extends StatelessWidget {
);
final darkTheme = ThemeData(
scaffoldBackgroundColor: Colors.grey.shade900,
scaffoldBackgroundColor: gray,
brightness: Brightness.dark,
splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
fontFamily: 'Inter',
appBarTheme: AppBarTheme(
color: Colors.grey.shade900,
appBarTheme: const AppBarTheme(
color: gray,
elevation: 0.0,
titleTextStyle: const TextStyle(
titleTextStyle: TextStyle(
fontFamily: 'Inter',
fontSize: 24,
fontWeight: FontWeight.w800,
fontWeight: FontWeight.bold,
),
),
bottomNavigationBarTheme: const BottomNavigationBarThemeData(backgroundColor: gray),
colorScheme: ColorScheme.fromSwatch(
brightness: Brightness.dark,
primarySwatch: Colors.deepPurple,
accentColor: const Color(0xff9146ff),
accentColor: purple,
),
dialogBackgroundColor: Colors.grey.shade900,
toggleableActiveColor: const Color(0xff9146ff),
toggleableActiveColor: purple,
);
final oledTheme = ThemeData(
@ -141,16 +145,16 @@ class MyApp extends StatelessWidget {
titleTextStyle: TextStyle(
fontFamily: 'Inter',
fontSize: 24,
fontWeight: FontWeight.w800,
fontWeight: FontWeight.bold,
),
),
colorScheme: ColorScheme.fromSwatch(
brightness: Brightness.dark,
primarySwatch: Colors.deepPurple,
accentColor: const Color(0xff9146ff),
accentColor: purple,
),
dialogBackgroundColor: Colors.black,
toggleableActiveColor: const Color(0xff9146ff),
toggleableActiveColor: purple,
);
return Observer(

4
lib/screens/channel/video/video_overlay.dart
View file

@ -198,7 +198,7 @@ class VideoOverlay extends StatelessWidget {
child: Text(
streamerName,
style: const TextStyle(
fontSize: 16,
fontSize: 16.0,
fontWeight: FontWeight.bold,
color: Colors.white,
),
@ -281,6 +281,7 @@ class VideoOverlay extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.w500,
),
),
),
@ -288,7 +289,6 @@ class VideoOverlay extends StatelessWidget {
Text(
'${videoStore.streamInfo?.gameName} \u2022 ${NumberFormat().format(videoStore.streamInfo?.viewerCount)} viewers',
style: const TextStyle(
fontSize: 12.0,
color: Colors.white,
),
),

2
lib/screens/home/top/category_streams.dart
View file

@ -70,7 +70,7 @@ class _CategoryStreamsState extends State<CategoryStreams> {
centerTitle: true,
title: Text(
widget.listStore.categoryInfo!.name,
style: Theme.of(context).textTheme.headline6?.copyWith(fontWeight: FontWeight.w800),
style: Theme.of(context).textTheme.headline6?.copyWith(fontWeight: FontWeight.bold),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),

14
lib/screens/home/top/top_section.dart
View file

@ -15,18 +15,8 @@ class TopSection extends StatelessWidget {
TabBar(
indicatorColor: Color(0xff9146ff),
tabs: [
Tab(
child: Text(
'Streams',
style: TextStyle(fontWeight: FontWeight.bold),
),
),
Tab(
child: Text(
'Categories',
style: TextStyle(fontWeight: FontWeight.bold),
),
),
Tab(child: Text('Streams')),
Tab(child: Text('Categories')),
],
),
Expanded(

7
lib/screens/home/widgets/stream_card.dart
View file

@ -125,7 +125,7 @@ class _StreamCardState extends State<StreamCard> {
child: Text(
streamerName,
style: const TextStyle(
fontSize: 16,
fontSize: 16.0,
fontWeight: FontWeight.bold,
),
overflow: TextOverflow.ellipsis,
@ -142,6 +142,9 @@ class _StreamCardState extends State<StreamCard> {
child: Text(
widget.streamInfo.title.trim(),
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontWeight: FontWeight.w500,
),
),
),
const SizedBox(height: 5.0),
@ -154,7 +157,6 @@ class _StreamCardState extends State<StreamCard> {
widget.streamInfo.gameName,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.0,
color: DefaultTextStyle.of(context).style.color?.withOpacity(0.8),
),
),
@ -185,7 +187,6 @@ class _StreamCardState extends State<StreamCard> {
Text(
'${NumberFormat().format(widget.streamInfo.viewerCount)} viewers',
style: TextStyle(
fontSize: 12.0,
color: DefaultTextStyle.of(context).style.color?.withOpacity(0.8),
),
),