Cleanup and Splash

emem365 · Aug 20, 2020 · 068ec84 · 068ec84
1 parent 6e87879
commit 068ec84
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -4,7 +4,6 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:news_app/src/controllers/news_notifier.dart';
 import 'package:news_app/src/controllers/sources_page_controller.dart';
 import 'package:news_app/src/data/service_locator.dart';
-import 'package:news_app/src/views/about.dart';
 import 'package:news_app/src/views/splash.dart';
 import 'package:provider/provider.dart';
 

diff --git a/lib/src/views/sources_page.dart b/lib/src/views/sources_page.dart
@@ -1,12 +1,8 @@
-import 'package:chopper/chopper.dart';
 import 'package:flutter/material.dart';
 import 'package:news_app/src/controllers/news_notifier.dart';
 import 'package:news_app/src/controllers/sources_page_controller.dart';
-import 'package:news_app/src/controllers/subscribed_sources_controller.dart';
 import 'package:news_app/src/data/persistent_database.dart';
 import 'package:news_app/src/data/service_locator.dart';
-import 'package:news_app/src/models/source.dart';
-import 'package:news_app/src/models/sources_response.dart';
 import 'package:news_app/src/util/sources_search.dart';
 import 'package:news_app/src/views/show_subscribed_sources.dart';
 import 'package:provider/provider.dart';

diff --git a/lib/src/views/splash.dart b/lib/src/views/splash.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:news_app/src/controllers/about_data.dart';
 import 'package:news_app/src/controllers/news_notifier.dart';
 import 'package:news_app/src/views/home_page.dart';
 import 'package:progress_indicators/progress_indicators.dart';
@@ -17,12 +18,12 @@ class _SplashState extends State<Splash> {
   }
 
   pushIfReady() {
-      delay().then((value) => Navigator.pushReplacement(
-        context,
-        MaterialPageRoute(
-          builder: (context) => HomePage(title: 'News App'),
-        ),
-      ));
+    delay().then((value) => Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+            builder: (context) => HomePage(title: 'News App'),
+          ),
+        ));
   }
 
   @override
@@ -35,25 +36,36 @@ class _SplashState extends State<Splash> {
     final newsNotifier = Provider.of<NewsNotifier>(context);
 
     if(!newsNotifier.isLoading)
-      pushIfReady();
+    pushIfReady();
     return Material(
       color: Theme.of(context).primaryColor,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.end,
         children: <Widget>[
-          Text(
-            'NewsApp',
-            textAlign: TextAlign.center,
-          ),
+          Spacer(),
           SizedBox(
             height: 150,
+            width: double.infinity,
+            child: Image.asset(
+              AboutData.logoAsset,
+              fit: BoxFit.fitHeight,
+              color: Colors.white70,
+            ),
           ),
-          JumpingDotsProgressIndicator(
-            fontSize: 48,
-            color: Colors.white70,
+          Text(
+            AboutData.appName,
+            style: Theme.of(context)
+                .textTheme
+                .headline4
+                .copyWith(color: Colors.white70),
           ),
-          SizedBox(
-            height: 150,
+          Spacer(),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 100.0),
+            child: JumpingDotsProgressIndicator(
+              fontSize: 48,
+              color: Colors.white70,
+            ),
           ),
         ],
       ),