Arvind/UI

bus_tracking/android/app/src/main/res/drawable/background.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/background"/>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launcher_icon"/>
+    </item>
+
+</layer-list>

bus_tracking/android/app/src/main/res/drawable/gradient_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
+    android:layerType="software"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="@color/gradient_start"
+        android:endColor="@color/gradient_end"
+        android:angle="45" />
+</shape>

bus_tracking/android/app/src/main/res/values-night/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#28578B</color>
+    <color name="gradient_start">#1565C0</color>
+    <color name="gradient_end">#37474F</color>
+</resources>

bus_tracking/android/app/src/main/res/values-night/styles.xml

@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@drawable/background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

bus_tracking/android/app/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#28578B</color>
+    <color name="gradient_start">#1565C0</color>
+    <color name="gradient_end">#37474F</color>
+</resources>

bus_tracking/android/app/src/main/res/values/styles.xml

@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@drawable/background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

bus_tracking/lib/main.dart

@@ -1,8 +1,11 @@
 import 'package:bus_tracking/models/locationKey.dart';
-import 'package:bus_tracking/pages/home.dart';
+import 'package:bus_tracking/pages/customSplashscreen.dart';
+import 'package:bus_tracking/pages/home_old.dart';
+// import 'package:bus_tracking/pages/home_old.dart';
 import 'package:bus_tracking/pages/location.dart';
 import 'package:bus_tracking/pages/resumepage.dart';
 import 'package:bus_tracking/pages/getLocationPermission/permission.dart';
+import 'package:bus_tracking/pages/splashScreen.dart';
 // import 'package:bus_tracking/pages/sendlocationpage.dart';
 import 'package:flutter/foundation.dart';
 import 'package:bus_tracking/poc.dart';
@@ -18,6 +21,8 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uni_links/uni_links.dart';
 
+import 'package:bus_tracking/pages/home.dart';
+
 
 final storage = FlutterSecureStorage();
 
@@ -30,7 +35,7 @@ void main() {
     debugShowCheckedModeBanner: false,
     initialRoute: "/",
     routes: {
-      "/": ((context) => Home()),
+      "/": ((context) => HomePage()),
       "/login" : ((context) => Login()),
       "/sendlocation": ((context) => sendLocationCheck()),
       '/resume-route': (context) => const ResumeRoutePage(),
@@ -68,27 +73,3 @@ void main() {
   ));
 }
 
-// class PocApp extends StatelessWidget {
-//   // This widget is the root of your application.
-//   @override
-//   Widget build(BuildContext context) {
-//     DeepLinkBloc _bloc = DeepLinkBloc();
-//     return MaterialApp(
-//         title: 'Flutter and Deep Linsk PoC',
-//         theme: ThemeData(
-//             primarySwatch: Colors.blue,
-//             textTheme: TextTheme(
-//               subtitle1: const TextStyle(
-//                 fontWeight: FontWeight.w300,
-//                 color: Colors.blue,
-//                 fontSize: 25.0,
-//               ),
-//             )),
-//         home: Scaffold(
-//             body: Provider<DeepLinkBloc>(
-//                 create: (context) => _bloc,
-//                 dispose: (context, bloc) => bloc.dispose(),
-//                 child: PocWidget()
-//                 )));
-//   }
-// }

bus_tracking/lib/models/logo.dart

@@ -12,4 +12,4 @@ final mainLogo = Container(
         image: AssetImage('assets/images/logo.png'),
     ),
   )
-);
+);

bus_tracking/lib/models/spinner.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
+import 'dart:ui' as ui;
 
 final CustomSpinner = SpinKitFadingFour(
   size: 60,
@@ -22,4 +23,48 @@ final CustomSpinnerWithTitle = SafeArea(
       backgroundColor: Colors.grey,
       body: CustomSpinner,
   ),
-);
+);
+
+// final CustomNewSpinner = SpinKitChasingDots(
+//   size: 60,
+//   itemBuilder: (BuildContext context, int index) {
+//     return DecoratedBox(
+//       decoration: BoxDecoration(
+//         color: index.isEven ? Colors.blueGrey[800] : Colors.blue[800],
+//       ),
+//     );
+//   },
+// );
+
+// final CustomNewSpinner = Container(
+//   width: 50.0,
+//   height: 50.0,
+//   decoration: BoxDecoration(
+//     gradient: LinearGradient(
+//       colors: [Color(0xFF1565C0), Color(0xFF424242)],
+//       begin: Alignment.topLeft,
+//       end: Alignment.bottomRight,
+//     ),
+//     shape: BoxShape.circle,
+//   ),
+//   child: SpinKitChasingDots(
+//     color: Colors.white,
+//     size: 30.0,
+//   ),
+// );
+
+final CustomNewSpinner = ShaderMask(
+  shaderCallback: (bounds) => LinearGradient(
+    begin: Alignment.topLeft,
+    end: Alignment.bottomRight,
+    colors: [Color(0xFF1565C0), Color(0xFF424242)],
+    tileMode: TileMode.repeated,
+  ).createShader(bounds),
+  child: SpinKitRing(
+    color: Colors.white,
+    size: 60.0,
+    lineWidth: 3.0,
+    duration: Duration(milliseconds: 1500),
+  ),
+);
+