huge refactors+speed improvements+schedule fix

BrightDV · Jan 4, 2024 · 7a52e9f · 7a52e9f
1 parent 78acfa8
commit 7a52e9f
Show file tree

Hide file tree

Showing 19 changed files with 526 additions and 568 deletions.
diff --git a/lib/Screens/FormulaYou/home.dart b/lib/Screens/FormulaYou/home.dart
@@ -79,7 +79,7 @@ class _PersonalizedHomeScreenState extends State<PersonalizedHomeScreen> {
  backgroundColor: useDarkMode
  ? Theme.of(context).scaffoldBackgroundColor
  : Colors.white,
- body: NewsFeedWidget(
+ body: NewsFeed(
  tagId: selectedTagsIds.join(','),
  ),
  );

diff --git a/lib/Screens/article.dart b/lib/Screens/article.dart
@@ -18,7 +18,7 @@
  */
 
 import 'package:boxbox/api/article_parts.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
 import 'package:boxbox/helpers/request_error.dart';
 import 'package:flutter/material.dart';
@@ -117,7 +117,7 @@ class _ArticleScreenState extends State<ArticleScreen> {
 class ArticleProvider extends StatelessWidget {
  Future<Article> getArticleData(
  String articleId, Function updateArticleTitle) async {
- Article article = await F1NewsFetcher().getArticleData(articleId);
+ Article article = await Formula1().getArticleData(articleId);
  updateArticleTitle(article.articleName);
  return article;
  }

diff --git a/lib/Screens/circuit.dart b/lib/Screens/circuit.dart
@@ -23,10 +23,11 @@ import 'package:boxbox/Screens/article.dart';
 import 'package:boxbox/Screens/race_details.dart';
 import 'package:boxbox/api/ergast.dart';
 import 'package:boxbox/api/event_tracker.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/api/race_components.dart';
 import 'package:boxbox/helpers/convert_ergast_and_formula_one.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/helpers/racetracks_url.dart';
 import 'package:boxbox/helpers/request_error.dart';
 import 'package:boxbox/Screens/circuit_map_screen.dart';
@@ -38,7 +39,7 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-class CircuitScreen extends StatefulWidget {
+class CircuitScreen extends StatelessWidget {
  final Race race;
  final bool? isFetched;
 
@@ -48,14 +49,8 @@ class CircuitScreen extends StatefulWidget {
  this.isFetched,
  }) : super(key: key);
 
- @override
- State<CircuitScreen> createState() => _CircuitScreenState();
-}
-
-class _CircuitScreenState extends State<CircuitScreen> {
  @override
  Widget build(BuildContext context) {
- final Race race = widget.race;
  bool useDarkMode =
  Hive.box('settings').get('darkMode', defaultValue: true) as bool;
  bool useDataSaverMode = Hive.box('settings')
@@ -64,7 +59,7 @@ class _CircuitScreenState extends State<CircuitScreen> {
  backgroundColor: useDarkMode
  ? Theme.of(context).scaffoldBackgroundColor
  : Colors.white,
- body: widget.isFetched ?? true
+ body: isFetched ?? true
  ? NestedScrollView(
  headerSliverBuilder:
  (BuildContext context, bool innerBoxIsScrolled) {

diff --git a/lib/Screens/driver_details.dart b/lib/Screens/driver_details.dart
@@ -20,10 +20,11 @@
 import 'package:boxbox/Screens/race_details.dart';
 import 'package:boxbox/api/driver_components.dart';
 import 'package:boxbox/api/ergast.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/convert_ergast_and_formula_one.dart';
 import 'package:boxbox/helpers/custom_physics.dart';
 import 'package:boxbox/helpers/driver_result_item.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/scraping/formula_one.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/foundation.dart';
@@ -34,7 +35,7 @@ import 'package:boxbox/helpers/driver_image.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
 import 'package:boxbox/helpers/request_error.dart';
 
-class DriverDetailsScreen extends StatefulWidget {
+class DriverDetailsScreen extends StatelessWidget {
  final String driverId;
  final String givenName;
  final String familyName;
@@ -45,11 +46,6 @@ class DriverDetailsScreen extends StatefulWidget {
  super.key,
  });
 
- @override
- State<DriverDetailsScreen> createState() => _DriverDetailsScreenState();
-}
-
-class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
  @override
  Widget build(BuildContext context) {
  bool useDarkMode =
@@ -59,7 +55,7 @@ class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
  child: Scaffold(
  appBar: AppBar(
  title: Text(
- '${widget.givenName} ${widget.familyName.toUpperCase()}',
+ '${givenName} ${familyName.toUpperCase()}',
  style: const TextStyle(
  fontWeight: FontWeight.w600,
  ),
@@ -91,8 +87,8 @@ class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
  : Colors.white,
  body: TabBarView(
  children: [
- DriverInfo(widget.driverId),
- DriverResults(widget.driverId),
+ DriverInfo(driverId),
+ DriverResults(driverId),
  ],
  ),
  ),
@@ -404,7 +400,7 @@ class DriverDetailsFragment extends StatelessWidget {
  ),
  itemCount: driverDetails[1].length,
  itemBuilder: (context, index) => FutureBuilder<Article>(
- future: F1NewsFetcher().getArticleData(
+ future: Formula1().getArticleData(
  driverDetails[1][index][0],
  ),
  builder: (context, snapshot) {