[ui] lot of small improvements

BrightDV · Feb 21, 2024 · b81973c · b81973c
1 parent 0126417
commit b81973c
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 83 deletions.
diff --git a/lib/Screens/Compare/compare_drivers.dart b/lib/Screens/Compare/compare_drivers.dart
@@ -35,10 +35,8 @@ class CompareDriversScreen extends StatelessWidget {
  appBar: AppBar(
  title: const Text(
  'Compare drivers',
- style: TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  backgroundColor: useDarkMode
  ? Theme.of(context).scaffoldBackgroundColor

diff --git a/lib/Screens/Compare/compare_home.dart b/lib/Screens/Compare/compare_home.dart
@@ -37,10 +37,8 @@ class _CompareHomeScreenState extends State<CompareHomeScreen> {
  appBar: AppBar(
  title: const Text(
  'Compare',
- style: TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  backgroundColor: useDarkMode
  ? Theme.of(context).scaffoldBackgroundColor

diff --git a/lib/Screens/Compare/compare_results.dart b/lib/Screens/Compare/compare_results.dart
@@ -39,10 +39,8 @@ class CompareResultsScreen extends StatelessWidget {
  appBar: AppBar(
  title: const Text(
  'Compare',
- style: TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: SingleChildScrollView(
  child: Column(

diff --git a/lib/Screens/FormulaYou/home.dart b/lib/Screens/FormulaYou/home.dart
@@ -54,9 +54,6 @@ class _PersonalizedHomeScreenState extends State<PersonalizedHomeScreen> {
  appBar: AppBar(
  title: const Text(
  'Formula You',
- style: TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
  actions: [
  IconButton(

diff --git a/lib/Screens/FormulaYou/settings.dart b/lib/Screens/FormulaYou/settings.dart
@@ -44,7 +44,6 @@ class _FormulaYouSettingsScreenState extends State<FormulaYouSettingsScreen> {
  title: Text(
  AppLocalizations.of(context)!.formulaYouSettings,
  style: const TextStyle(
- fontWeight: FontWeight.w600,
  fontSize: 18,
  ),
  ),

diff --git a/lib/Screens/search.dart b/lib/Screens/search.dart
@@ -119,6 +119,7 @@ class _SearchScreenState extends State<SearchScreen> {
  ),
  ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: results.isNotEmpty
  ? ListView.builder(

diff --git a/lib/Screens/server_settings.dart b/lib/Screens/server_settings.dart
@@ -46,9 +46,6 @@ class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
  appBar: AppBar(
  title: Text(
  AppLocalizations.of(context)!.server,
- style: const TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
  backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),

diff --git a/lib/Screens/settings.dart b/lib/Screens/settings.dart
@@ -48,9 +48,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
  appBar: AppBar(
  title: Text(
  AppLocalizations.of(context)!.settings,
- style: const TextStyle(
- fontWeight: FontWeight.w600,
- ),
  ),
  backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),

diff --git a/lib/Screens/video.dart b/lib/Screens/video.dart
@@ -53,9 +53,6 @@ class _VideoScreenState extends State<VideoScreen> {
  )
  : Marquee(
  text: video.caption,
- style: const TextStyle(
- fontWeight: FontWeight.w600,
- ),
  pauseAfterRound: const Duration(seconds: 1),
  startAfter: const Duration(seconds: 1),
  velocity: 85,

diff --git a/lib/api/article_parts.dart b/lib/api/article_parts.dart
@@ -244,6 +244,8 @@ class WidgetsList extends StatelessWidget {
  title: Text(
  tag['fields']['tagName'],
  ),
+ backgroundColor:
+ Theme.of(context).colorScheme.onPrimary,
  ),
  body: NewsFeed(tagId: tag['id']),
  ),
@@ -352,6 +354,9 @@ class WidgetsList extends StatelessWidget {
  AppLocalizations.of(context)!
  .quiz,
  ),
+ backgroundColor: Theme.of(context)
+ .colorScheme
+ .onPrimary,
  ),
  body: InAppWebView(
  initialUrlRequest: URLRequest(
@@ -530,6 +535,10 @@ class WidgetsList extends StatelessWidget {
  context)!
  .liveBlog,
  ),
+ backgroundColor:
+ Theme.of(context)
+ .colorScheme
+ .onPrimary,
  ),
  body: InAppWebView(
  initialUrlRequest:
@@ -1068,6 +1077,7 @@ class WidgetsList extends StatelessWidget {
  ? AppLocalizations.of(context)!.startingGrid
  : AppLocalizations.of(context)!.qualifyings,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  backgroundColor: Theme.of(context).colorScheme.background,
  body: element['fields']['sessionType'] == 'Race' || element['fields']['sessionType'] == 'Sprint'
@@ -1502,67 +1512,54 @@ class WidgetsList extends StatelessWidget {
  ),
 
  // bottom action bar
- Padding(
- padding: const EdgeInsets.all(5),
- child: Container(
- decoration: BoxDecoration(
- border: Border.all(color: Colors.grey[700]!),
- borderRadius: BorderRadius.circular(10),
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Expanded(
- child: Padding(
- padding: const EdgeInsets.only(bottom: 10),
- child: Column(
- children: [
- IconButton(
- icon: Icon(
- Icons.share_outlined,
- color: useDarkMode ? Colors.white : Colors.black,
- ),
- onPressed: () => Share.share(
- "https://www.formula1.com/en/latest/article.${article.articleSlug}.${article.articleId}.html",
- ),
+
+ Card(
+ elevation: 5,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: Column(
+ children: [
+ IconButton(
+ icon: Icon(
+ Icons.share_outlined,
  ),
- Text(
- AppLocalizations.of(context)?.share ?? 'Share',
- style: TextStyle(
- color: useDarkMode ? Colors.white : Colors.black,
- ),
+ onPressed: () => Share.share(
+ "https://www.formula1.com/en/latest/article.${article.articleSlug}.${article.articleId}.html",
  ),
- ],
- ),
+ ),
+ Text(
+ AppLocalizations.of(context)?.share ?? 'Share',
+ ),
+ ],
  ),
  ),
- Expanded(
- child: Padding(
- padding: const EdgeInsets.only(bottom: 10),
- child: Column(
- children: [
- IconButton(
- icon: Icon(
- Icons.schedule,
- color: useDarkMode ? Colors.white : Colors.black,
- ),
- onPressed: () {},
- ),
- Text(
- DateFormat('kk:mm\nyyyy-MM-dd')
- .format(article.publishedDate),
- textAlign: TextAlign.center,
- style: TextStyle(
- color: useDarkMode ? Colors.white : Colors.black,
- ),
+ ),
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: Column(
+ children: [
+ IconButton(
+ icon: Icon(
+ Icons.schedule,
  ),
- ],
- ),
+ onPressed: () {},
+ ),
+ Text(
+ DateFormat('kk:mm\nyyyy-MM-dd')
+ .format(article.publishedDate),
+ textAlign: TextAlign.center,
+ ),
+ ],
  ),
  ),
- ],
- ),
+ ),
+ ],
  ),
  ),
 

diff --git a/lib/helpers/loading_indicator_util.dart b/lib/helpers/loading_indicator_util.dart
@@ -24,18 +24,25 @@ class LoadingIndicatorUtil extends StatelessWidget {
  final double? width;
  final bool replaceImage;
  final bool borderRadius;
+ final bool fullBorderRadius;
  const LoadingIndicatorUtil({
  Key? key,
  this.width,
  this.replaceImage = false,
  this.borderRadius = true,
+ this.fullBorderRadius = true,
  }) : super(key: key);
 
  @override
  Widget build(BuildContext context) {
  return replaceImage
  ? ClipRRect(
- borderRadius: BorderRadius.circular(borderRadius ? 16.0 : 0),
+ borderRadius: fullBorderRadius
+ ? BorderRadius.circular(16)
+ : BorderRadius.only(
+ topLeft: Radius.circular(borderRadius ? 16.0 : 0),
+ topRight: Radius.circular(borderRadius ? 16.0 : 0),
+ ),
  child: Image.asset('assets/images/image_loading_bg.png'),
  )
  : Padding(

diff --git a/lib/helpers/news.dart b/lib/helpers/news.dart
@@ -168,7 +168,6 @@ class NewsItem extends StatelessWidget {
  shape: RoundedRectangleBorder(
  borderRadius: BorderRadius.circular(15.0),
  ),
- //color: useDarkMode ? const Color(0xff1d1d28) : Colors.white,
  child: AnimatedContainer(
  duration: const Duration(milliseconds: 200),
  child: InkWell(
@@ -211,6 +210,7 @@ class NewsItem extends StatelessWidget {
  width: 300,
  child: LoadingIndicatorUtil(
  replaceImage: true,
+ fullBorderRadius: false,
  ),
  ),
  errorWidget: (context, url, error) =>
@@ -269,6 +269,7 @@ class NewsItem extends StatelessWidget {
  width: 300,
  child: LoadingIndicatorUtil(
  replaceImage: true,
+ fullBorderRadius: false,
  ),
  ),
  errorWidget: (context, url, error) =>
@@ -385,6 +386,7 @@ class NewsItem extends StatelessWidget {
  child:
  const LoadingIndicatorUtil(
  replaceImage: true,
+ fullBorderRadius: false,
  ),
  ),
  errorWidget:
@@ -683,6 +685,7 @@ class NewsItem extends StatelessWidget {
  : width / (16 / 9) - 10,
  child: const LoadingIndicatorUtil(
  replaceImage: true,
+ fullBorderRadius: false,
  ),
  ),
  errorWidget:
@@ -1209,6 +1212,7 @@ class TextParagraphRenderer extends StatelessWidget {
  fontWeight: FontWeight.w600,
  ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const StandingsScreen(),
  ),
@@ -1228,6 +1232,7 @@ class TextParagraphRenderer extends StatelessWidget {
  fontWeight: FontWeight.w600,
  ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const StandingsScreen(
  switchToTeamStandings: true,
@@ -1248,6 +1253,7 @@ class TextParagraphRenderer extends StatelessWidget {
  title: Text(
  AppLocalizations.of(context)!.schedule,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const ScheduleScreen(),
  ),
@@ -1297,11 +1303,7 @@ class TextParagraphRenderer extends StatelessWidget {
  strong: TextStyle(
  fontSize: fontUsedInArticles == 'Formula1' ? 16 : 20,
  fontWeight: FontWeight.w500,
- color: useDarkMode
- ? HSLColor.fromColor(
- Theme.of(context).colorScheme.onPrimary,
- ).withLightness(0.35).toColor()
- : Theme.of(context).colorScheme.onPrimary,
+ color: Theme.of(context).colorScheme.onPrimary,
  ),
  p: TextStyle(
  fontSize: fontUsedInArticles == 'Formula1' ? 14 : 18,

diff --git a/lib/helpers/route_handler.dart b/lib/helpers/route_handler.dart
@@ -84,6 +84,7 @@ class ArticleUrlHandler extends StatelessWidget {
  title: Text(
  AppLocalizations.of(context)!.schedule,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const ScheduleScreen(),
  );
@@ -93,6 +94,7 @@ class ArticleUrlHandler extends StatelessWidget {
  title: Text(
  AppLocalizations.of(context)!.schedule,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const StandingsScreen(),
  );
@@ -102,6 +104,7 @@ class ArticleUrlHandler extends StatelessWidget {
  title: Text(
  AppLocalizations.of(context)!.schedule,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: const StandingsScreen(
  switchToTeamStandings: true,
@@ -111,6 +114,7 @@ class ArticleUrlHandler extends StatelessWidget {
  return Scaffold(
  appBar: AppBar(
  title: const Text('Intent'),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: Center(
  child: Padding(

diff --git a/lib/main.dart b/lib/main.dart
@@ -252,6 +252,8 @@ class NotificationController {
  builder: (context) => Scaffold(
  appBar: AppBar(
  title: const Text('wrong payload'),
+ backgroundColor:
+ Theme.of(context).colorScheme.onPrimary,
  ),
  body: Center(
  child: Text(