diff --git a/lib/screens/channel/chat/emote_menu/emote_menu.dart b/lib/screens/channel/chat/emote_menu/emote_menu.dart index f1ae1bf9..f21440a3 100644 --- a/lib/screens/channel/chat/emote_menu/emote_menu.dart +++ b/lib/screens/channel/chat/emote_menu/emote_menu.dart @@ -23,8 +23,8 @@ class _EmoteMenuState extends State { @override Widget build(BuildContext context) { const sections = [ - 'Recent', - 'Twitch', + 'RECENT', + 'TWITCH', 'BTTV', 'FFZ', '7TV', @@ -48,7 +48,13 @@ class _EmoteMenuState extends State { widget.chatStore.assetsStore.emoteMenuIndex = index; }, style: index == widget.chatStore.assetsStore.emoteMenuIndex ? null : TextButton.styleFrom(primary: Colors.grey), - child: Text(section), + child: Text( + section, + style: const TextStyle( + letterSpacing: 0.5, + fontWeight: FontWeight.w600, + ), + ), ), ), ) diff --git a/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart b/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart index 53e1dfde..3416491f 100644 --- a/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart +++ b/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart @@ -59,7 +59,14 @@ class _RecentEmotesPanelState extends State { height: 30, child: TextButton( onPressed: widget.chatStore.assetsStore.recentEmotes.isEmpty ? null : _showClearDialog, - child: const Text('Clear'), + child: const Text( + 'CLEAR', + style: TextStyle( + letterSpacing: 0.5, + fontSize: 12.0, + fontWeight: FontWeight.w500, + ), + ), ), ), ], diff --git a/lib/screens/channel/video/video_overlay.dart b/lib/screens/channel/video/video_overlay.dart index 40dfb12c..ccb28645 100644 --- a/lib/screens/channel/video/video_overlay.dart +++ b/lib/screens/channel/video/video_overlay.dart @@ -281,7 +281,6 @@ class VideoOverlay extends StatelessWidget { overflow: TextOverflow.ellipsis, style: const TextStyle( color: Colors.white, - fontWeight: FontWeight.w500, ), ), ), @@ -291,7 +290,6 @@ class VideoOverlay extends StatelessWidget { style: const TextStyle( fontSize: 12.0, color: Colors.white, - fontWeight: FontWeight.w300, ), ), ], diff --git a/lib/screens/home/search/search.dart b/lib/screens/home/search/search.dart index f92e488a..c787373e 100644 --- a/lib/screens/home/search/search.dart +++ b/lib/screens/home/search/search.dart @@ -67,7 +67,6 @@ class _SearchState extends State { const SectionHeader( 'History', padding: headerPadding, - fontWeight: FontWeight.bold, ), Expanded( child: ListView( @@ -103,7 +102,6 @@ class _SearchState extends State { child: SectionHeader( 'Channels', padding: headerPadding, - fontWeight: FontWeight.bold, ), ), SearchResultsChannels( @@ -114,7 +112,6 @@ class _SearchState extends State { child: SectionHeader( 'Categories', padding: headerPadding, - fontWeight: FontWeight.bold, ), ), SearchResultsCategories(searchStore: _searchStore), diff --git a/lib/screens/home/top/top_section.dart b/lib/screens/home/top/top_section.dart index 18905dd2..bcab3ff5 100644 --- a/lib/screens/home/top/top_section.dart +++ b/lib/screens/home/top/top_section.dart @@ -22,10 +22,11 @@ class TopSection extends StatelessWidget { ), ), Tab( - child: Text( - 'Categories', - style: TextStyle(fontWeight: FontWeight.bold), - )), + child: Text( + 'Categories', + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), ], ), Expanded( diff --git a/lib/screens/home/widgets/stream_card.dart b/lib/screens/home/widgets/stream_card.dart index ee528144..8b55ca19 100644 --- a/lib/screens/home/widgets/stream_card.dart +++ b/lib/screens/home/widgets/stream_card.dart @@ -139,7 +139,6 @@ class _StreamCardState extends State { child: Text( widget.streamInfo.title.trim(), overflow: TextOverflow.ellipsis, - style: const TextStyle(fontWeight: FontWeight.w500), ), ), const SizedBox(height: 5.0), @@ -153,7 +152,6 @@ class _StreamCardState extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 12.0, - fontWeight: FontWeight.w300, color: DefaultTextStyle.of(context).style.color?.withOpacity(0.8), ), ), @@ -185,7 +183,6 @@ class _StreamCardState extends State { '${NumberFormat().format(widget.streamInfo.viewerCount)} viewers', style: TextStyle( fontSize: 12.0, - fontWeight: FontWeight.w300, color: DefaultTextStyle.of(context).style.color?.withOpacity(0.8), ), ), diff --git a/lib/screens/settings/sections/chat_settings.dart b/lib/screens/settings/sections/chat_settings.dart index 56a4a47e..5d7859ca 100644 --- a/lib/screens/settings/sections/chat_settings.dart +++ b/lib/screens/settings/sections/chat_settings.dart @@ -21,7 +21,7 @@ class _ChatSettingsState extends State { Widget build(BuildContext context) { const timestamps = ['Disabled', '12-Hour', '24-Hour']; - const sectionPadding = EdgeInsets.only(left: 15.0, bottom: 5.0, top: 20.0); + const sectionPadding = EdgeInsets.only(left: 15.0, bottom: 5.0, top: 30.0); final settingsStore = widget.settingsStore; @@ -39,7 +39,7 @@ class _ChatSettingsState extends State { children: [ const SectionHeader( 'Layout', - padding: sectionPadding, + padding: EdgeInsets.only(left: 15.0, bottom: 5.0, top: 20.0), ), SwitchListTile.adaptive( title: const Text('Bottom Bar'), diff --git a/lib/widgets/section_header.dart b/lib/widgets/section_header.dart index d943a558..9653f8ea 100644 --- a/lib/widgets/section_header.dart +++ b/lib/widgets/section_header.dart @@ -4,14 +4,12 @@ class SectionHeader extends StatelessWidget { final String text; final EdgeInsets padding; final double fontSize; - final FontWeight fontWeight; const SectionHeader( this.text, { Key? key, this.padding = const EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 5.0), this.fontSize = 12.0, - this.fontWeight = FontWeight.bold, }) : super(key: key); @override @@ -23,7 +21,7 @@ class SectionHeader extends StatelessWidget { style: TextStyle( color: DefaultTextStyle.of(context).style.color?.withOpacity(0.8), fontSize: fontSize, - fontWeight: fontWeight, + fontWeight: FontWeight.w500, letterSpacing: 0.5, ), ),