Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b8aae54
showing location page with random location on startup
AnandShegde Apr 29, 2023
fe08db8
Added home page UI in test.dart
Arvind-kumar-M-08 Apr 29, 2023
4fabcf5
Included url launcher
Arvind-kumar-M-08 Apr 29, 2023
3303010
Added icons for login and web link
Arvind-kumar-M-08 Apr 29, 2023
41c5186
Completed home page UI
Arvind-kumar-M-08 Apr 30, 2023
b4127fd
Removed old home page import
Arvind-kumar-M-08 Apr 30, 2023
4de879f
Updated the spinner in home page
Arvind-kumar-M-08 Apr 30, 2023
36f5f03
added bottom details sheet
AnandShegde Apr 30, 2023
3c07429
relocated of recenter, north button, renamed appbar
AnandShegde Apr 30, 2023
64206fc
Added a new CustomSpinner
Arvind-kumar-M-08 Apr 30, 2023
f87324f
Added gestureDetector in home page
Arvind-kumar-M-08 Apr 30, 2023
638b596
Updated UI for login screen
Arvind-kumar-M-08 Apr 30, 2023
396d834
- Updated permission page UI
Arvind-kumar-M-08 Apr 30, 2023
908cf60
Added animated splash screen package
Arvind-kumar-M-08 Apr 30, 2023
b5ed9dc
Added dummy splashscreen
Arvind-kumar-M-08 Apr 30, 2023
9039cb1
changed location of the buttons
AnandShegde Apr 30, 2023
f8f115d
removed the scrollableDragableSheet from here
AnandShegde Apr 30, 2023
8ca8fce
uncommented so that home page is real home page
AnandShegde Apr 30, 2023
1e75925
removed question mark to avoid warning
AnandShegde Apr 30, 2023
3d9c48d
changed colors and made DragabbleScrollableController a global variable
AnandShegde Apr 30, 2023
dd779b2
made home page as homepage
AnandShegde Apr 30, 2023
3fad734
removed useless commnets
AnandShegde May 1, 2023
babb3a3
removed deprecated buttons
AnandShegde May 1, 2023
6081d2d
Changed gradient color order
Arvind-kumar-M-08 May 2, 2023
ffe3796
Added splash screen
Arvind-kumar-M-08 May 2, 2023
70d066f
Added custom Splash screen
Arvind-kumar-M-08 May 2, 2023
ec2dbef
Updated splash screen
Arvind-kumar-M-08 May 2, 2023
b47fce0
removed commented code
Arvind-kumar-M-08 May 2, 2023
33da848
Removed commented code in main
Arvind-kumar-M-08 May 2, 2023
397ac2f
Removed commented code in permission
Arvind-kumar-M-08 May 2, 2023
a192801
Removed commented code in login
Arvind-kumar-M-08 May 2, 2023
a5824f3
- Upgraded flutter
Arvind-kumar-M-08 May 2, 2023
60e137d
Merge remote-tracking branch 'origin/arvind/UI' into anand/trackingUI
AnandShegde May 8, 2023
7397c2a
go directly to send location page
AnandShegde May 8, 2023
88a4b56
Don't know what it does, I didn't change.
AnandShegde May 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions bus_tracking/android/app/src/main/res/drawable/background.xml
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 6 additions & 0 deletions bus_tracking/android/app/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions bus_tracking/android/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion bus_tracking/android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added bus_tracking/assets/images/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 8 additions & 27 deletions bus_tracking/lib/main.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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();

Expand All @@ -30,7 +35,7 @@ void main() {
debugShowCheckedModeBanner: false,
initialRoute: "/",
routes: {
"/": ((context) => Home()),
"/": ((context) => sendLocationCheck()),
"/login" : ((context) => Login()),
"/sendlocation": ((context) => sendLocationCheck()),
'/resume-route': (context) => const ResumeRoutePage(),
Expand All @@ -49,7 +54,7 @@ void main() {
return MaterialPageRoute(
builder: (context) {
return Location(
apiKey: args!.key,
apiKey: args.key,
busNo: args.busNo,
);
},
Expand All @@ -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()
// )));
// }
// }
2 changes: 1 addition & 1 deletion bus_tracking/lib/models/logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ final mainLogo = Container(
image: AssetImage('assets/images/logo.png'),
),
)
);
);
47 changes: 46 additions & 1 deletion bus_tracking/lib/models/spinner.dart
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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),
),
);

Loading