diff --git a/lib/main.dart b/lib/main.dart index 275b3ba4..6fd9dd73 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -96,9 +96,9 @@ class MyApp extends StatelessWidget { ), colorScheme: ColorScheme.fromSwatch( primarySwatch: Colors.deepPurple, - accentColor: Colors.deepPurpleAccent, + accentColor: const Color(0xff9146ff), ), - toggleableActiveColor: Colors.deepPurpleAccent, + toggleableActiveColor: const Color(0xff9146ff), tabBarTheme: const TabBarTheme( labelColor: Colors.black, unselectedLabelColor: Colors.grey, @@ -122,10 +122,10 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSwatch( brightness: Brightness.dark, primarySwatch: Colors.deepPurple, - accentColor: Colors.deepPurpleAccent, + accentColor: const Color(0xff9146ff), ), dialogBackgroundColor: Colors.grey.shade900, - toggleableActiveColor: Colors.deepPurpleAccent, + toggleableActiveColor: const Color(0xff9146ff), ); final oledTheme = ThemeData( @@ -144,10 +144,10 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSwatch( brightness: Brightness.dark, primarySwatch: Colors.deepPurple, - accentColor: Colors.deepPurpleAccent, + accentColor: const Color(0xff9146ff), ), dialogBackgroundColor: Colors.black, - toggleableActiveColor: Colors.deepPurpleAccent, + toggleableActiveColor: const Color(0xff9146ff), ); return Observer( diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart index db0eaf3f..d8b5a237 100644 --- a/lib/screens/home/home.dart +++ b/lib/screens/home/home.dart @@ -37,7 +37,12 @@ class _HomeState extends State { 'Search', ]; - return Text(titles[_homeStore.selectedIndex]); + return Text( + titles[_homeStore.selectedIndex], + style: const TextStyle( + fontWeight: FontWeight.w800, + ), + ); }, ), actions: [ diff --git a/lib/screens/home/search/search_results_channels.dart b/lib/screens/home/search/search_results_channels.dart index 0059fbc0..c09263ce 100644 --- a/lib/screens/home/search/search_results_channels.dart +++ b/lib/screens/home/search/search_results_channels.dart @@ -82,7 +82,10 @@ class SearchResultsChannels extends StatelessWidget { padding: const EdgeInsets.all(10.0), child: const Text( 'LIVE', - style: TextStyle(fontWeight: FontWeight.bold), + style: TextStyle( + fontWeight: FontWeight.bold, + color: Colors.white, + ), ), ), ) diff --git a/lib/screens/home/top/top_section.dart b/lib/screens/home/top/top_section.dart index d98dad4f..18905dd2 100644 --- a/lib/screens/home/top/top_section.dart +++ b/lib/screens/home/top/top_section.dart @@ -13,10 +13,19 @@ class TopSection extends StatelessWidget { child: Column( children: const [ TabBar( - indicatorColor: Colors.deepPurpleAccent, + indicatorColor: Color(0xff9146ff), tabs: [ - Tab(text: 'Streams'), - Tab(text: 'Categories'), + Tab( + child: Text( + 'Streams', + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + Tab( + child: Text( + 'Categories', + style: TextStyle(fontWeight: FontWeight.bold), + )), ], ), Expanded( diff --git a/lib/screens/settings/sections/chat_settings.dart b/lib/screens/settings/sections/chat_settings.dart index d71e1731..f7669666 100644 --- a/lib/screens/settings/sections/chat_settings.dart +++ b/lib/screens/settings/sections/chat_settings.dart @@ -79,7 +79,7 @@ class _ChatSettingsState extends State { padding: const EdgeInsets.all(20.0), margin: const EdgeInsets.all(10.0), decoration: BoxDecoration( - border: Border.all(color: Colors.deepPurple), + border: Border.all(color: const Color(0xff9146ff)), borderRadius: BorderRadius.circular(15.0), ), child: DefaultTextStyle( @@ -127,7 +127,13 @@ class _ChatSettingsState extends State { ), ListTile( isThreeLine: true, - title: Text('Message scale: ${settingsStore.messageScale.toStringAsFixed(1)}x'), + title: Row( + children: [ + const Text('Message scale'), + const Spacer(), + Text('${settingsStore.messageScale.toStringAsFixed(1)}x'), + ], + ), subtitle: Slider.adaptive( value: settingsStore.messageScale, min: 0.5, @@ -137,7 +143,13 @@ class _ChatSettingsState extends State { ), ), ListTile( - title: Text('Message spacing: ${settingsStore.messageSpacing.toStringAsFixed(0)}'), + title: Row( + children: [ + const Text('Message spacing'), + const Spacer(), + Text(settingsStore.messageSpacing.toStringAsFixed(0)), + ], + ), subtitle: Slider.adaptive( value: settingsStore.messageSpacing, min: 0.0, @@ -148,7 +160,13 @@ class _ChatSettingsState extends State { ), ListTile( isThreeLine: true, - title: Text('Font size: ${settingsStore.fontSize.toInt()}'), + title: Row( + children: [ + const Text('Font size'), + const Spacer(), + Text(settingsStore.fontSize.toStringAsFixed(0)), + ], + ), subtitle: Slider.adaptive( value: settingsStore.fontSize, min: 5, @@ -158,7 +176,13 @@ class _ChatSettingsState extends State { ), ), ListTile( - title: Text('Badge height: ${settingsStore.badgeHeight.toStringAsFixed(0)}'), + title: Row( + children: [ + const Text('Badge height'), + const Spacer(), + Text(settingsStore.badgeHeight.toStringAsFixed(0)), + ], + ), subtitle: Slider.adaptive( value: settingsStore.badgeHeight, min: 10.0, @@ -168,7 +192,13 @@ class _ChatSettingsState extends State { ), ), ListTile( - title: Text('Emote height: ${settingsStore.emoteHeight.toStringAsFixed(0)}'), + title: Row( + children: [ + const Text('Emote height'), + const Spacer(), + Text(settingsStore.emoteHeight.toStringAsFixed(0)), + ], + ), subtitle: Slider.adaptive( value: settingsStore.emoteHeight, min: 10.0, diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart index b29c5109..357c8f65 100644 --- a/lib/screens/settings/settings.dart +++ b/lib/screens/settings/settings.dart @@ -27,7 +27,10 @@ class Settings extends StatelessWidget { return Scaffold( appBar: AppBar( - title: const Text('Settings'), + title: const Text( + 'Settings', + style: TextStyle(fontWeight: FontWeight.w800), + ), actions: [ if (Platform.isAndroid) IconButton(