[ui] md3 migration | part 2

BrightDV · Feb 11, 2024 · f5b945c · f5b945c
1 parent d8bf750
commit f5b945c
Show file tree

Hide file tree

Showing 45 changed files with 770 additions and 1,222 deletions.
diff --git a/lib/Screens/FormulaYou/home.dart b/lib/Screens/FormulaYou/home.dart
@@ -43,8 +43,6 @@ class _PersonalizedHomeScreenState extends State<PersonalizedHomeScreen> {
  Widget build(BuildContext context) {
  List selectedTags =
  Hive.box('settings').get('selectedTags', defaultValue: []) as List;
- bool useDarkMode =
- Hive.box('settings').get('darkMode', defaultValue: true) as bool;
  Map availableTags = FormulaYouTags().unifiedTags();
  List selectedTagsIds = [];
  for (String tagName in selectedTags) {
@@ -75,10 +73,8 @@ class _PersonalizedHomeScreenState extends State<PersonalizedHomeScreen> {
  ),
  ),
  ],
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
- backgroundColor: useDarkMode
- ? Theme.of(context).scaffoldBackgroundColor
- : Colors.white,
  body: NewsFeed(
  tagId: selectedTagsIds.join(','),
  ),

diff --git a/lib/Screens/FormulaYou/settings.dart b/lib/Screens/FormulaYou/settings.dart
@@ -34,17 +34,12 @@ class FormulaYouSettingsScreen extends StatefulWidget {
 class _FormulaYouSettingsScreenState extends State<FormulaYouSettingsScreen> {
  @override
  Widget build(BuildContext context) {
- bool useDarkMode =
- Hive.box('settings').get('darkMode', defaultValue: true) as bool;
  List selectedTags =
  Hive.box('settings').get('selectedTags', defaultValue: []) as List;
  List availableTags = FormulaYouTags().tags();
  int i = 0;
 
  return Scaffold(
- backgroundColor: useDarkMode
- ? Theme.of(context).scaffoldBackgroundColor
- : Colors.white,
  appBar: AppBar(
  title: Text(
  AppLocalizations.of(context)!.formulaYouSettings,
@@ -53,6 +48,7 @@ class _FormulaYouSettingsScreenState extends State<FormulaYouSettingsScreen> {
  fontSize: 18,
  ),
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
  body: ListView(
  shrinkWrap: true,
@@ -68,33 +64,22 @@ class _FormulaYouSettingsScreenState extends State<FormulaYouSettingsScreen> {
  ? AppLocalizations.of(context)!.topics.capitalize()
  : AppLocalizations.of(context)!.other.capitalize(),
  ),
- collapsedIconColor: useDarkMode ? Colors.white : Colors.black,
- collapsedTextColor: useDarkMode ? Colors.white : Colors.black,
  children: [
  for (String key in availableTags[i].keys.toList()..sort())
- Theme(
- data: Theme.of(context).copyWith(
- unselectedWidgetColor:
- useDarkMode ? Colors.white : Colors.black,
- ),
- child: CheckboxListTile(
- value: selectedTags.contains(key) ? true : false,
- onChanged: (value) {
- selectedTags.contains(key)
- ? selectedTags.remove(key)
- : selectedTags.add(key);
- Hive.box('settings').put('selectedTags', selectedTags);
- if (widget.update != null) {
- widget.update!();
- }
- setState(() {});
- },
- title: Text(
- key,
- style: TextStyle(
- color: useDarkMode ? Colors.white : Colors.black,
- ),
- ),
+ CheckboxListTile(
+ value: selectedTags.contains(key) ? true : false,
+ onChanged: (value) {
+ selectedTags.contains(key)
+ ? selectedTags.remove(key)
+ : selectedTags.add(key);
+ Hive.box('settings').put('selectedTags', selectedTags);
+ if (widget.update != null) {
+ widget.update!();
+ }
+ setState(() {});
+ },
+ title: Text(
+ key,
  ),
  ),
  ],

diff --git a/lib/Screens/LivetimingArchive/races_list.dart b/lib/Screens/LivetimingArchive/races_list.dart
@@ -17,6 +17,8 @@
  * Copyright (c) 2022-2024, BrightDV
  */
 
+// TODO: md3
+
 import 'package:boxbox/Screens/LivetimingArchive/live_timing.dart';
 import 'package:boxbox/Screens/schedule.dart';
 import 'package:boxbox/api/ergast.dart';

diff --git a/lib/Screens/MixedNews/edit_order.dart b/lib/Screens/MixedNews/edit_order.dart
@@ -47,18 +47,16 @@ class _EditOrderScreenState extends State<EditOrderScreen> {
  'Thecheckeredflag.co.uk',
  'Motorsportweek.com',
  'Crash.net',
- 'Pitpass.com',
+ //'Pitpass.com', // TODO: fix Pitpass
  ],
  ) as List;
  return Scaffold(
  appBar: AppBar(
  title: Text(
  AppLocalizations.of(context)!.edit,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  ),
- backgroundColor: useDarkMode
- ? Theme.of(context).scaffoldBackgroundColor
- : Colors.white,
  body: Theme(
  data: ThemeData(
  canvasColor: Colors.transparent,

diff --git a/lib/Screens/MixedNews/mixed_news.dart b/lib/Screens/MixedNews/mixed_news.dart
@@ -84,13 +84,11 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  'https://www.pitpass.com/fes_php/fes_usr_sit_newsfeed.php?fes_prepend_aty_sht_name=1',
  };
  return Scaffold(
- backgroundColor: useDarkMode
- ? Theme.of(context).scaffoldBackgroundColor
- : Colors.white,
  appBar: AppBar(
  title: Text(
  AppLocalizations.of(context)!.newsMix,
  ),
+ backgroundColor: Theme.of(context).colorScheme.onPrimary,
  actions: [
  IconButton(
  onPressed: () {
@@ -103,7 +101,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  },
  icon: Icon(
  useMergedFeeds ? Icons.splitscreen : Icons.merge,
- color: Colors.white,
  ),
  ),
  useMergedFeeds
@@ -119,7 +116,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  ),
  icon: const Icon(
  Icons.edit,
- color: Colors.white,
  ),
  ),
  ],
@@ -142,9 +138,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  shape: RoundedRectangleBorder(
  borderRadius: BorderRadius.circular(15.0),
  ),
- color: useDarkMode
- ? const Color(0xff1d1d28)
- : Colors.white,
  child: InkWell(
  onTap: () => Navigator.push(
  context,
@@ -230,14 +223,11 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  .replaceAll('&#8220;', '"')
  .replaceAll('&#8221;', '"'),
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  fontSize: 18,
  fontWeight: FontWeight.w500,
  ),
  overflow: TextOverflow.ellipsis,
- maxLines: 5,
+ maxLines: 4,
  textAlign: TextAlign.justify,
  ),
  subtitle: newsLayout != 'big' &&
@@ -276,11 +266,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  styleSheet: MarkdownStyleSheet(
  textAlign:
  WrapAlignment.spaceBetween,
- p: TextStyle(
- color: useDarkMode
- ? Colors.grey[400]
- : Colors.grey[800],
- ),
  ),
  ),
  ),
@@ -311,9 +296,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  )
  .split('.')[0],
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.grey[900],
  fontWeight: FontWeight.w500,
  ),
  ),
@@ -375,9 +357,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  Text(
  feed,
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  fontSize: 16,
  fontWeight: FontWeight.w500,
  ),
@@ -397,9 +376,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  child: Text(
  AppLocalizations.of(context)!.viewMore,
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  fontSize: 12,
  fontWeight: FontWeight.w500,
  decoration: TextDecoration.underline,
@@ -409,9 +385,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  ),
  Icon(
  Icons.arrow_forward,
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  ),
  ],
  ),
@@ -472,10 +445,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  ),
  child: Card(
  elevation: 5.0,
- color: useDarkMode
- ? const Color(
- 0xff1d1d28)
- : Colors.white,
  child: Column(
  children: [
  FutureBuilder<
@@ -525,11 +494,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  '"'),
  style:
  TextStyle(
- color: useDarkMode
- ? Colors
- .white
- : Colors
- .black,
  fontSize:
  14,
  ),
@@ -539,7 +503,7 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  textAlign:
  TextAlign
  .justify,
- maxLines: 5,
+ maxLines: 4,
  ),
  ),
  ],
@@ -567,9 +531,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  Text(
  feed,
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  fontSize: 16,
  fontWeight: FontWeight.w500,
  ),
@@ -589,9 +550,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  child: Text(
  AppLocalizations.of(context)!.viewMore,
  style: TextStyle(
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  fontSize: 12,
  fontWeight: FontWeight.w500,
  decoration: TextDecoration.underline,
@@ -601,9 +559,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  ),
  Icon(
  Icons.arrow_forward,
- color: useDarkMode
- ? Colors.white
- : Colors.black,
  ),
  ],
  ),
@@ -674,10 +629,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  ),
  child: Card(
  elevation: 5.0,
- color: useDarkMode
- ? const Color(
- 0xff1d1d28)
- : Colors.white,
  child: Column(
  children: [
  feedItem.enclosure !=
@@ -714,11 +665,6 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  .title!,
  style:
  TextStyle(
- color: useDarkMode
- ? Colors
- .white
- : Colors
- .black,
  fontSize:
  14,
  ),
@@ -728,7 +674,7 @@ class _MixedNewsScreenState extends State<MixedNewsScreen> {
  textAlign:
  TextAlign
  .justify,
- maxLines: 5,
+ maxLines: 4,
  ),
  ),
  ],