Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #20 : Added Custom Router with animation #21

Merged
merged 1 commit into from Dec 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 30 additions & 2 deletions lib/main.dart
Expand Up @@ -4,6 +4,27 @@ import 'package:cerebro_flutter/screens/events.dart';

void main() => runApp(MyApp());

class CustomRoute<T> extends MaterialPageRoute<T> {
CustomRoute({WidgetBuilder builder, RouteSettings settings})
: super(builder: builder, settings: settings);

@override
Widget buildTransitions(BuildContext context, Animation<double> anim,
Animation<double> secondaryAnim, Widget child) {
if (settings.isInitialRoute) return child;
// Slide Transition for routing
return SlideTransition(
position: Tween<Offset>(begin: Offset(1.0, 0.0), end: Offset.zero)
.animate(anim),
child: SlideTransition(
position: Tween<Offset>(begin: Offset.zero, end: Offset(1.0, 0.0))
.animate(secondaryAnim),
child: child,
),
);
}
}

class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
Expand All @@ -12,8 +33,15 @@ class MyApp extends StatelessWidget {
title: 'Events',
home: Splash(),
theme: ThemeData.dark(),
routes: {
'/events': (context) => EventsPage(),
onGenerateRoute: (RouteSettings settings) {
switch (settings.name) {
case '/events':
return CustomRoute(
builder: (_) => EventsPage(),
settings: settings,
);
}
assert(false);
},
);
}
Expand Down
10 changes: 0 additions & 10 deletions lib/screens/login.dart
Expand Up @@ -15,19 +15,9 @@ class LoginPage extends StatefulWidget {
class _LoginPageState extends State<LoginPage> {
final String _kUserPref = "UserPref";

Future<Null> getSharedPref() async {
final SharedPreferences _localPref = await SharedPreferences.getInstance();
String userProfile = _localPref.getString(_kUserPref);
if (userProfile != null) {
print('Already present user: ' + userProfile);
Navigator.pushNamed(context, '/events');
}
}

@override
initState() {
super.initState();
getSharedPref();
}

Future<FirebaseUser> _handleSignIn() async {
Expand Down
26 changes: 25 additions & 1 deletion lib/screens/splash.dart
@@ -1,5 +1,7 @@
import 'package:cerebro_flutter/screens/login.dart';
import 'package:cerebro_flutter/screens/events.dart';
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:splashscreen/splashscreen.dart';

class Splash extends StatefulWidget {
Expand All @@ -8,11 +10,33 @@ class Splash extends StatefulWidget {
}

class _SplashState extends State<Splash> {
final String _kUserPref = "UserPref";
Widget _routingWidget = LoginPage();

Future<Null> getSharedPref() async {
final SharedPreferences _localPref = await SharedPreferences.getInstance();
String userProfile = _localPref.getString(_kUserPref);
// Check if user is already saved in Shared Preference then move to Events Page
// and not to LoginPage
if (userProfile != null) {
print('Already present user: ' + userProfile);
setState(() {
_routingWidget = EventsPage();
});
}
}

@override
void initState() {
super.initState();
getSharedPref();
}

@override
Widget build(BuildContext context) {
return new SplashScreen(
seconds: 7,
navigateAfterSeconds: LoginPage(),
navigateAfterSeconds: _routingWidget,
title: Text(
'Just wait a little longer...',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20.0),
Expand Down