diff --git a/README.md b/README.md index 80f1857..4866f91 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ This Flutter application helps entrepreneurs find the right co-founders who comp ## Screenshots +![Welcome screen](lib/assets/screenshots/welcome.png) ![Home screen](lib/assets/screenshots/home.png) ![Matching screen: Swipe left](lib/assets/screenshots/swipe_left.png) ![Matching screen: Swipe right](lib/assets/screenshots/swipe_right.png) diff --git a/lib/assets/screenshots/welcome.png b/lib/assets/screenshots/welcome.png new file mode 100644 index 0000000..95cc07b Binary files /dev/null and b/lib/assets/screenshots/welcome.png differ diff --git a/lib/pages/user_data_page.dart b/lib/pages/user_data_page.dart index db0e468..506346a 100644 --- a/lib/pages/user_data_page.dart +++ b/lib/pages/user_data_page.dart @@ -368,16 +368,9 @@ class _UserDataPageState extends State { return Scaffold( appBar: AppBar( title: - Text('${widget.isRegProcess ? 'User Data' : 'Edit your data'} '), + Text('${widget.isRegProcess ? 'About you' : 'Edit your data'} '), centerTitle: true, actions: [ - if (widget.isRegProcess) - IconButton( - onPressed: () { - AuthService().signOut(); - }, - icon: const Icon(Icons.logout), - ), if (widget.isEditMode && !widget.isRegProcess) IconButton( onPressed: () { @@ -504,7 +497,12 @@ class _UserDataPageState extends State { ], ), const SizedBox(height: 20), - const TextBold(text: 'Gender'), + const TextWithBold( + boldText: 'Gender ', + trailingText: ' (optional)', + boldSize: 18, + trailingSize: 12, + ), Align( alignment: Alignment.centerLeft, child: SegmentedButton( diff --git a/lib/pages/welcome_page.dart b/lib/pages/welcome_page.dart new file mode 100644 index 0000000..14e5a49 --- /dev/null +++ b/lib/pages/welcome_page.dart @@ -0,0 +1,85 @@ +import 'package:flutter/material.dart'; +import '../components/text_bold.dart'; +import '../constants.dart'; +import '../services/auth/auth_service.dart'; +import 'user_data_page.dart'; + +class WelcomePage extends StatelessWidget { + const WelcomePage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Start now'), + ), + body: Padding( + padding: const EdgeInsets.all(16.0), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const TextBold( + text: 'Welcome to ${Constants.appTitle}', + fontSize: 24, + ), + const SizedBox(height: 16), + const Text( + 'The goal of this app is to help you find the ideal co-founder for your startup. ' + 'It aims to connect people with similar goals, complementary ' + 'skills, and shared interests to create successful partnerships.', + style: TextStyle(fontSize: 16), + ), + const SizedBox(height: 16), + const Text( + 'To achieve this and get the most out of the app, ' + 'you will be asked to share some information about yourself ' + 'in the next steps. This includes the following details:\n' + '\u25CF Personal Information: Your name, year of birth, and spoken languages will help match you with others.\n' + '\u25CF Your Location: To suggest and find co-founders near you.\n' + '\u25CF Your Skills and Experiences: To find the ideal co-founder with complementary skills.\n' + '\u25CF Your Goals and Interests: To ensure you share a similar vision.\n', + style: TextStyle(fontSize: 16), + ), + const SizedBox(height: 24), + Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ElevatedButton.icon( + onPressed: () { + AuthService().signOut(); + }, + label: const Text('Sign out'), + icon: const Icon(Icons.logout), + ), + const SizedBox( + width: 16, + ), + ElevatedButton.icon( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) => + const UserDataPage( + isRegProcess: true, + isEditMode: false, + ), + ), + ); + }, + label: const Text('Continue'), + icon: const Icon(Icons.navigate_next), + iconAlignment: IconAlignment.start, + ), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/services/auth/auth_gate.dart b/lib/services/auth/auth_gate.dart index dad3685..2c49575 100644 --- a/lib/services/auth/auth_gate.dart +++ b/lib/services/auth/auth_gate.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:firebase_auth/firebase_auth.dart'; -import 'auth_service.dart'; -import 'login_or_register.dart'; + import '../../constants.dart'; import '../../pages/home_page.dart'; -import '../../pages/user_data_page.dart'; +import '../../pages/welcome_page.dart'; +import 'auth_service.dart'; +import 'login_or_register.dart'; class AuthGate extends StatelessWidget { const AuthGate({super.key}); @@ -37,10 +38,7 @@ class AuthGate extends StatelessWidget { return const HomePage(); } else { // also in case of (snapshot.hasError) - return const UserDataPage( - isRegProcess: true, - isEditMode: false, - ); + return const WelcomePage(); } }, );