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.

Sign up for GitHub

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

Jump to bottom

New UI Changes Added #201

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

New UI Changes Added #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ import 'package:overlay_support/overlay_support.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
EnvironmentConfig.loadEnvVariables();
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
]);
SystemChrome.setPreferredOrientations(
[
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
],
);
setupLocator();
localNotif.initialize();
await hiveDb.init();
Expand Down
31 changes: 21 additions & 10 deletions lib/router.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,36 @@ Route<dynamic> generateRoute(RouteSettings settings) {
switch (settings.name) {
case Routes.authScreen:
return MaterialPageRoute(
builder: (context) => const AuthScreen(key: Key('auth')));
builder: (context) => const AuthScreen(
key: Key('auth'),
),
);
case Routes.mainScreen:
return MaterialPageRoute(
builder: (context) => const MainScreen(key: Key('MainScreen')));
builder: (context) => const MainScreen(
key: Key('MainScreen'),
),
);
case Routes.hikeScreen:
HikeScreen arguments = settings.arguments;
return MaterialPageRoute(
builder: (context) => HikeScreen(
arguments.beacon,
isLeader: arguments.isLeader,
));
builder: (context) => HikeScreen(
arguments.beacon,
isLeader: arguments.isLeader,
),
);
case Routes.groupScreen:
GroupScreen arguments = settings.arguments;
return MaterialPageRoute(
builder: (context) => GroupScreen(
arguments.group,
));
builder: (context) => GroupScreen(
arguments.group,
),
);
default:
return MaterialPageRoute(
builder: (context) => const SplashScreen(key: Key('SplashScreen')));
builder: (context) => const SplashScreen(
key: Key('SplashScreen'),
),
);
}
}
113 changes: 68 additions & 45 deletions lib/splash_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,64 +22,87 @@ class _SplashScreenState extends State<SplashScreen> {
bool isCheckingUrl = false;

Future<void> _handleInitialUri() async {
_sub = uriLinkStream.listen((Uri uri) {
if (!mounted) return;
setState(() {
_latestUri = uri;
});
}, onError: (Object err) {
if (!mounted) return;
setState(() {
_latestUri = null;
});
});
_sub = uriLinkStream.listen(
(Uri uri) {
if (!mounted) return;
setState(
() {
_latestUri = uri;
},
);
},
onError: (Object err) {
if (!mounted) return;
setState(
() {
_latestUri = null;
},
);
},
);
try {
final uri = await getInitialUri();
if (!mounted) return;
setState(() => _initialUri = uri);
} on PlatformException {
if (!mounted) return;
setState(() => _initialUri = null);
setState(
() => _initialUri = null,
);
} on FormatException catch (err) {
debugPrint(err.toString());
debugPrint(
err.toString(),
);
if (!mounted) return;
setState(() => _initialUri = null);
setState(
() => _initialUri = null,
);
}
await databaseFunctions.init();
await userConfig.userLoggedIn().then((value) async {
if (_latestUri == null && _initialUri == null) {
if (value || hiveDb.currentUserBox.containsKey('user')) {
navigationService.pushReplacementScreen('/main');
} else {
navigationService.pushReplacementScreen('/auth');
}
} else {
if (_initialUri != null) {
var shortcode = _initialUri.queryParameters['shortcode'];
if (value) {
await databaseFunctions.joinBeacon(shortcode).then((val) {
if (val != null) {
navigationService.pushScreen('/hikeScreen',
arguments: HikeScreen(val, isLeader: false));
} else {
navigationService.pushReplacementScreen('/main');
}
});
await userConfig.userLoggedIn().then(
(value) async {
if (_latestUri == null && _initialUri == null) {
if (value || hiveDb.currentUserBox.containsKey('user')) {
navigationService.pushReplacementScreen('/main');
} else {
// login in anonymously and join hike
await databaseFunctions.signup(name: "Anonymous");
await databaseFunctions.joinBeacon(shortcode).then((val) async {
if (value != null) {
navigationService.pushScreen('/hikeScreen',
arguments: HikeScreen(val, isLeader: false));
} else {
navigationService.pushReplacementScreen('/main');
}
});
navigationService.pushReplacementScreen('/auth');
}
} else {
if (_initialUri != null) {
var shortcode = _initialUri.queryParameters['shortcode'];
if (value) {
await databaseFunctions.joinBeacon(shortcode).then(
(val) {
if (val != null) {
navigationService.pushScreen(
'/hikeScreen',
arguments: HikeScreen(val, isLeader: false),
);
} else {
navigationService.pushReplacementScreen('/main');
}
},
);
} else {
// login in anonymously and join hike
await databaseFunctions.signup(name: "Anonymous");
await databaseFunctions.joinBeacon(shortcode).then(
(val) async {
if (value != null) {
navigationService.pushScreen(
'/hikeScreen',
arguments: HikeScreen(val, isLeader: false),
);
} else {
navigationService.pushReplacementScreen('/main');
}
},
);
}
}
}
}
});
},
);
}

@override
Expand Down
Loading