From 462a8864d789861cd4631c194c9dde405a7649e6 Mon Sep 17 00:00:00 2001 From: Gauthier EHOLOUM Date: Tue, 19 Jul 2022 20:04:47 +0000 Subject: [PATCH] feat: Add authentication --- .metadata | 2 +- lib/common/form_validator.dart | 32 +++ lib/common/providers.dart | 13 + lib/common/routes.dart | 24 +- lib/main.dart | 5 +- lib/models/user_model.dart | 26 ++ lib/providers/auth/auth_notifier.dart | 32 +++ lib/providers/auth/auth_state.dart | 35 +++ lib/repositories/auth_repository.dart | 54 ++++ lib/repositories/quote_repository.dart | 30 +- lib/screens/auth/login_screen.dart | 185 ++++++++++++ lib/screens/auth/register_screen.dart | 265 ++++++++++++++++++ .../request_list_screen.dart} | 18 +- .../{ => home}/submit_request_screen.dart | 19 +- lib/screens/widgets/loading_widget.dart | 16 ++ linux/.gitignore | 1 + linux/CMakeLists.txt | 138 +++++++++ linux/flutter/CMakeLists.txt | 88 ++++++ linux/flutter/generated_plugin_registrant.cc | 15 + linux/flutter/generated_plugin_registrant.h | 15 + linux/flutter/generated_plugins.cmake | 24 ++ linux/main.cc | 6 + linux/my_application.cc | 104 +++++++ linux/my_application.h | 18 ++ 24 files changed, 1120 insertions(+), 45 deletions(-) create mode 100644 lib/models/user_model.dart create mode 100644 lib/providers/auth/auth_notifier.dart create mode 100644 lib/providers/auth/auth_state.dart create mode 100644 lib/repositories/auth_repository.dart create mode 100644 lib/screens/auth/login_screen.dart create mode 100644 lib/screens/auth/register_screen.dart rename lib/screens/{home_screen.dart => home/request_list_screen.dart} (86%) rename lib/screens/{ => home}/submit_request_screen.dart (92%) create mode 100644 lib/screens/widgets/loading_widget.dart create mode 100644 linux/.gitignore create mode 100644 linux/CMakeLists.txt create mode 100644 linux/flutter/CMakeLists.txt create mode 100644 linux/flutter/generated_plugin_registrant.cc create mode 100644 linux/flutter/generated_plugin_registrant.h create mode 100644 linux/flutter/generated_plugins.cmake create mode 100644 linux/main.cc create mode 100644 linux/my_application.cc create mode 100644 linux/my_application.h diff --git a/.metadata b/.metadata index 245a8e8..e3b08fc 100644 --- a/.metadata +++ b/.metadata @@ -15,7 +15,7 @@ migration: - platform: root create_revision: 85684f9300908116a78138ea4c6036c35c9a1236 base_revision: 85684f9300908116a78138ea4c6036c35c9a1236 - - platform: android + - platform: linux create_revision: 85684f9300908116a78138ea4c6036c35c9a1236 base_revision: 85684f9300908116a78138ea4c6036c35c9a1236 diff --git a/lib/common/form_validator.dart b/lib/common/form_validator.dart index cb9f80b..013d93e 100644 --- a/lib/common/form_validator.dart +++ b/lib/common/form_validator.dart @@ -24,4 +24,36 @@ class FormValidator { static String? validateProductQuantity(String? value) { return value!.isEmpty ? 'Please enter product quantity' : null; } + + //Authentication + static String? validateEmail(String? value) { + String emailPattern = + r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'; + RegExp regExp = RegExp(emailPattern); + + if (value!.isEmpty) { + return 'Please enter your email address'; + } else if (!regExp.hasMatch(value)) { + return 'Please enter a valid email'; + } + return null; + } + + static String? validatePassword(String? value) { + return value!.isEmpty ? 'Please enter your password' : null; + } + + static String? validateFullName(String? value) { + return value!.isEmpty ? 'Please enter your fullname' : null; + } + + //validatePasswordConfirmation + static String? validatePasswordConfirmation(String? value, String password) { + if (value!.isEmpty) { + return 'Please enter your password confirmation'; + } else if (value != password) { + return 'Password confirmation does not match'; + } + return null; + } } diff --git a/lib/common/providers.dart b/lib/common/providers.dart index 0fdd91b..f8724a6 100644 --- a/lib/common/providers.dart +++ b/lib/common/providers.dart @@ -1,10 +1,13 @@ import 'package:dio/dio.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../providers/auth/auth_notifier.dart'; +import '../providers/auth/auth_state.dart'; import '../providers/quotes_list_notifier.dart'; import '../providers/quotes_list_state.dart'; import '../providers/submit_quote_notifier.dart'; import '../providers/submit_quote_state.dart'; +import '../repositories/auth_repository.dart'; import '../repositories/quote_repository.dart'; import 'constants.dart'; @@ -20,10 +23,16 @@ final dioProvider = Provider( ), ); +//Repositories final repositoryProvider = Provider( (ref) => QuoteRepositoryImpl(ref.read(dioProvider)), ); +final authRepositoryProvider = Provider( + (ref) => AuthRepositoryImpl(ref.read(dioProvider)), +); + +//Notifiers final quotesListNotifier = StateNotifierProvider( (ref) => QuotesListNotifier(ref.read(repositoryProvider)), @@ -36,3 +45,7 @@ final submitQuoteNotifier = return SubmitQuoteNotifier(ref.read(repositoryProvider), notifier); }, ); + +final authNotifier = StateNotifierProvider( + (ref) => AuthNotifier(ref.read(authRepositoryProvider)), +); diff --git a/lib/common/routes.dart b/lib/common/routes.dart index 9391dc9..63c048b 100644 --- a/lib/common/routes.dart +++ b/lib/common/routes.dart @@ -1,24 +1,38 @@ import 'package:flutter/cupertino.dart'; -import '../screens/home_screen.dart'; -import '../screens/submit_request_screen.dart'; +import '../screens/auth/login_screen.dart'; +import '../screens/auth/register_screen.dart'; +import '../screens/home/request_list_screen.dart'; +import '../screens/home/submit_request_screen.dart'; Route onGenerate(RouteSettings settings) { switch (settings.name) { - case '/': + case '/request-list': return CupertinoPageRoute( + builder: (_) => const RequestListScreen(), settings: settings, - builder: (_) => const HomeScreen(), ); case '/request-quote': return CupertinoPageRoute( settings: settings, builder: (BuildContext context) => const RequestQuoteScreen(), ); + case '/login': + return CupertinoPageRoute( + settings: settings, + builder: (BuildContext context) => const LoginScreen(), + ); + case '/register': + return CupertinoPageRoute( + settings: settings, + builder: (BuildContext context) => const RegisterScreen(), + ); default: return CupertinoPageRoute( settings: settings, - builder: (_) => const CupertinoPageScaffold(child: SizedBox()), + builder: (_) => const CupertinoPageScaffold( + child: Center(child: Text('Not Found')), + ), ); } } diff --git a/lib/main.dart b/lib/main.dart index 6d0d04e..46b1421 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:quote_request_app/screens/auth/login_screen.dart'; import 'common/routes.dart' as routes; -import 'screens/home_screen.dart'; - void main() { runApp(const QuoteRequestApp()); } @@ -24,7 +23,7 @@ class QuoteRequestApp extends StatelessWidget { textTheme: GoogleFonts.dosisTextTheme(), ), onGenerateRoute: routes.onGenerate, - home: const HomeScreen(), + home: const LoginScreen(), ), ); } diff --git a/lib/models/user_model.dart b/lib/models/user_model.dart new file mode 100644 index 0000000..862fe2a --- /dev/null +++ b/lib/models/user_model.dart @@ -0,0 +1,26 @@ +import 'package:flutter/foundation.dart'; + +class UserModel { + final String? uuid; + final String email; + final String? password; + final String fullname; + final String? address; + + UserModel({ + this.uuid, + this.password, + this.address, + required this.email, + required this.fullname, + }); + + factory UserModel.fromJson(Map json) { + return UserModel( + uuid: json['id'], + email: json['email'], + fullname: json['user_metadata']['fullname'], + address: json['user_metadata']['address'], + ); + } +} diff --git a/lib/providers/auth/auth_notifier.dart b/lib/providers/auth/auth_notifier.dart new file mode 100644 index 0000000..7582fda --- /dev/null +++ b/lib/providers/auth/auth_notifier.dart @@ -0,0 +1,32 @@ +import 'package:quote_request_app/providers/auth/auth_state.dart'; +import 'package:quote_request_app/repositories/auth_repository.dart'; +import 'package:riverpod/riverpod.dart'; + +class AuthNotifier extends StateNotifier { + AuthNotifier(this._authRepository) : super(AuthInitial()); + + final AuthRepository _authRepository; + + Future login(Map credentials) async { + state = AuthLoading(); + try { + final user = await _authRepository.login( + credentials['email'], + credentials['password'], + ); + state = AuthSuccess(user); + } catch (e) { + state = AuthError(e.toString()); + } + } + + Future register(Map userData) async { + state = AuthLoading(); + try { + final user = await _authRepository.register(userData); + state = AuthSuccess(user); + } catch (e) { + state = AuthError(e.toString()); + } + } +} diff --git a/lib/providers/auth/auth_state.dart b/lib/providers/auth/auth_state.dart new file mode 100644 index 0000000..ed3cd21 --- /dev/null +++ b/lib/providers/auth/auth_state.dart @@ -0,0 +1,35 @@ +import 'package:equatable/equatable.dart'; + +import '../../models/user_model.dart'; + +abstract class AuthState extends Equatable { + const AuthState(); +} + +class AuthInitial extends AuthState { + @override + List get props => []; +} + +class AuthLoading extends AuthState { + @override + List get props => []; +} + +class AuthSuccess extends AuthState { + const AuthSuccess(this.user); + + final UserModel user; + + @override + List get props => [user]; +} + +class AuthError extends AuthState { + final String message; + + const AuthError(this.message); + + @override + List get props => [message]; +} diff --git a/lib/repositories/auth_repository.dart b/lib/repositories/auth_repository.dart new file mode 100644 index 0000000..b738813 --- /dev/null +++ b/lib/repositories/auth_repository.dart @@ -0,0 +1,54 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/foundation.dart'; + +import '../models/user_model.dart'; + +abstract class AuthRepository { + Future login(String email, String password); + Future register(Map userData); +} + +class AuthRepositoryImpl implements AuthRepository { + final Dio _dio; + + AuthRepositoryImpl(this._dio); + + @override + Future login(String email, String password) async { + try { + final response = await _dio.post( + '/auth/v1/token', + queryParameters: {'grant_type': 'password'}, + data: {'email': email, 'password': password}, + ); + + if (response.statusCode == 200) { + return UserModel.fromJson(response.data['user']); + } else { + throw Exception('An error occurred'); + } + } on DioError catch (e) { + throw await Future.error(e.response!.data['error_description']); + } catch (e) { + debugPrint('AuthRepositoryImpl.login: $e'); + throw await Future.error("Couldn't login. Is the device online?"); + } + } + + @override + Future register(Map userData) async { + try { + final response = await _dio.post('/auth/v1/signup', data: userData); + return UserModel.fromJson(response.data); + } on DioError catch (e) { + if (e.response!.statusCode == 400) { + throw await Future.error(e.response!.data['error_description']); + } else { + throw await Future.error(e.message); + } + } catch (e, stack) { + debugPrint('Error: $e\nStack : $stack'); + throw await Future.error("Couldn't register. Is the device online?"); + } + } +} diff --git a/lib/repositories/quote_repository.dart b/lib/repositories/quote_repository.dart index 3e43b69..82de5b4 100644 --- a/lib/repositories/quote_repository.dart +++ b/lib/repositories/quote_repository.dart @@ -13,22 +13,10 @@ class QuoteRepositoryImpl implements QuoteRepository { QuoteRepositoryImpl(this._dio); - @override - Future deleteRequestedQuote(int requestedQuoteId) async { - try { - await _dio.delete( - '/requests', - queryParameters: {'id': 'eq.$requestedQuoteId'}, //check PostgREST docs - ); - } catch (_) { - throw Future.error("Couldn't delete quote. Is the device online?"); - } - } - @override Future> getQuotes() async { try { - final response = await _dio.get('/requests', queryParameters: { + final response = await _dio.get('/rest/v1/requests', queryParameters: { 'order': 'created_at.desc', }); @@ -43,10 +31,10 @@ class QuoteRepositoryImpl implements QuoteRepository { @override Future submitQuote(Map quote) async { try { - final response = await _dio.post('/requests', data: quote); + final response = await _dio.post('/rest/v1/requests', data: quote); if (response.statusCode == 201) { - return Quote.fromMap(response.data[0]); + return Quote.fromMap(response.data.first); } else { throw Exception('Error submitting request quote'); } @@ -54,4 +42,16 @@ class QuoteRepositoryImpl implements QuoteRepository { throw Future.error("Couldn't submit quote. Is the device online?"); } } + + @override + Future deleteRequestedQuote(int requestedQuoteId) async { + try { + await _dio.delete( + '/rest/v1/requests', + queryParameters: {'id': 'eq.$requestedQuoteId'}, //check PostgREST docs + ); + } catch (_) { + throw Future.error("Couldn't delete quote. Is the device online?"); + } + } } diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart new file mode 100644 index 0000000..b1dcde7 --- /dev/null +++ b/lib/screens/auth/login_screen.dart @@ -0,0 +1,185 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:quote_request_app/common/form_validator.dart'; + +import '../../common/providers.dart'; +import '../../common/styles.dart'; +import '../../providers/auth/auth_state.dart'; +import '../widgets/loading_widget.dart'; + +class LoginScreen extends ConsumerStatefulWidget { + const LoginScreen({Key? key}) : super(key: key); + + @override + LoginScreenState createState() => LoginScreenState(); +} + +class LoginScreenState extends ConsumerState { + final _formKey = GlobalKey(); + final _emailController = TextEditingController(); + final _passwordController = TextEditingController(); + + bool _hidePassword = true; + + void _handleUserLogin() { + if (_formKey.currentState!.validate()) { + _formKey.currentState!.save(); + + Map credentials = { + 'email': _emailController.text, + 'password': _passwordController.text, + }; + + ref.read(authNotifier.notifier).login(credentials); + } + } + + void _togglePasswordVisibility() { + setState(() { + _hidePassword = !_hidePassword; + }); + } + + @override + Widget build(BuildContext context) { + final authState = ref.watch(authNotifier); + final isLoading = authState is AuthLoading; + + ref.listen(authNotifier, (_, state) { + if (state is AuthSuccess) { + Navigator.pushReplacementNamed(context, '/request-list'); + } + + if (state is AuthError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(state.message), + backgroundColor: Colors.red, + ), + ); + } + }); + + return Scaffold( + backgroundColor: const Color(0xFFFAFAFA), + appBar: AppBar( + elevation: 2.0, + title: const Text( + 'Login', + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24, + ), + ), + centerTitle: true, + ), + body: Form( + key: _formKey, + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.25, + decoration: BoxDecoration( + color: Theme.of(context).primaryColor, + borderRadius: BorderRadius.circular(10), + ), + child: const Center( + child: Icon(Icons.lock_open, size: 64, color: Colors.white), + ), + ), + const SizedBox(height: 24), + const Text( + "Email address", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _emailController, + keyboardType: TextInputType.emailAddress, + decoration: const InputDecoration( + hintText: 'yourname@email.com', + labelStyle: TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: EdgeInsets.all(10), + ), + validator: FormValidator.validateEmail, + ), + const SizedBox(height: 16), + const Text( + "Password", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _passwordController, + keyboardType: TextInputType.visiblePassword, + obscureText: _hidePassword, + decoration: InputDecoration( + hintText: '*******************', + labelStyle: const TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: const EdgeInsets.all(10), + suffixIcon: IconButton( + icon: Icon( + _hidePassword ? Icons.visibility : Icons.visibility_off, + color: Colors.grey, + ), + onPressed: _togglePasswordVisibility, + ), + ), + validator: FormValidator.validatePassword, + ), + const SizedBox(height: 20), + SizedBox( + width: double.infinity, + child: ElevatedButton( + onPressed: isLoading ? null : _handleUserLogin, + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + padding: const EdgeInsets.symmetric(vertical: 16), + ), + child: isLoading ? const LoadingWidget() : const Text('LOGIN'), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 16, right: 16), + child: Divider(height: 64), + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: const [ + Text("Don't have an account?"), + ], + ), + const SizedBox(height: 8), + SizedBox( + width: double.infinity, + child: OutlinedButton( + onPressed: () => Navigator.pushNamed(context, '/register'), + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + padding: const EdgeInsets.symmetric(vertical: 16), + ), + child: const Text('CREATE ACCOUNT'), + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/screens/auth/register_screen.dart b/lib/screens/auth/register_screen.dart new file mode 100644 index 0000000..a4e97e5 --- /dev/null +++ b/lib/screens/auth/register_screen.dart @@ -0,0 +1,265 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:quote_request_app/common/form_validator.dart'; +import 'package:quote_request_app/common/providers.dart'; +import 'package:quote_request_app/providers/auth/auth_state.dart'; +import 'package:quote_request_app/screens/widgets/loading_widget.dart'; + +import '../../common/styles.dart'; +import '../../providers/auth/auth_notifier.dart'; + +class RegisterScreen extends ConsumerStatefulWidget { + const RegisterScreen({Key? key}) : super(key: key); + + @override + RegisterScreenState createState() => RegisterScreenState(); +} + +class RegisterScreenState extends ConsumerState { + final _formKey = GlobalKey(); + final _fullnameController = TextEditingController(); + final _emailController = TextEditingController(); + final _passwordController = TextEditingController(); + final _passwordConfirmController = TextEditingController(); + final _addressController = TextEditingController(); + + bool _hidePassword = true; + bool _hidePasswordConfirm = true; + + void _handleUserRegistration() { + if (_formKey.currentState!.validate()) { + _formKey.currentState!.save(); + + final Map userData = { + 'email': _emailController.text, + 'password': _passwordController.text, + 'data': { + 'fullname': _fullnameController.text, + 'address': _addressController.text, + }, + }; + + ref.read(authNotifier.notifier).register(userData); + } + } + + void _togglePasswordVisibility() { + setState(() { + _hidePassword = !_hidePassword; + }); + } + + void _togglePasswordConfirmVisibility() { + setState(() { + _hidePasswordConfirm = !_hidePasswordConfirm; + }); + } + + @override + Widget build(BuildContext context) { + ref.listen(authNotifier.notifier, (_, state) { + if (state is AuthSuccess) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('Registration successful. Please login.'), + backgroundColor: Colors.green, + ), + ); + Navigator.pushReplacementNamed(context, '/login'); + } + + if (state is AuthError) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Error: ${(state as AuthError).message}'), + ), + ); + } + }); + + final authState = ref.watch(authNotifier); + final isLoading = authState is AuthLoading; + + return Scaffold( + backgroundColor: const Color(0xFFFAFAFA), + appBar: AppBar( + elevation: 2.0, + title: const Text( + 'Register', + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24, + ), + ), + centerTitle: true, + ), + body: Form( + key: _formKey, + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + const SizedBox(height: 16), + const Text( + "Fullname", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _fullnameController, + decoration: const InputDecoration( + hintText: 'Enter your fullname', + labelStyle: TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: EdgeInsets.all(10), + ), + validator: FormValidator.validateFullName, + ), + const SizedBox(height: 16), + const Text( + "Email address", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _emailController, + keyboardType: TextInputType.emailAddress, + decoration: const InputDecoration( + hintText: 'yourname@email.com', + labelStyle: TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: EdgeInsets.all(10), + ), + validator: FormValidator.validateEmail, + ), + const SizedBox(height: 16), + const Text( + "Password", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _passwordController, + keyboardType: TextInputType.visiblePassword, + obscureText: _hidePassword, + decoration: InputDecoration( + hintText: '*******************', + labelStyle: const TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: const EdgeInsets.all(10), + suffixIcon: IconButton( + icon: Icon( + _hidePassword ? Icons.visibility_off : Icons.visibility, + ), + onPressed: _togglePasswordVisibility, + ), + ), + validator: FormValidator.validatePassword, + ), + const SizedBox(height: 16), + const Text( + "Password confirmation", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _passwordConfirmController, + keyboardType: TextInputType.visiblePassword, + obscureText: _hidePasswordConfirm, + decoration: InputDecoration( + hintText: '*******************', + labelStyle: const TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: const EdgeInsets.all(10), + suffixIcon: IconButton( + icon: Icon( + _hidePasswordConfirm + ? Icons.visibility_off + : Icons.visibility, + ), + onPressed: _togglePasswordConfirmVisibility, + ), + ), + validator: (value) => FormValidator.validatePasswordConfirmation( + value, + _passwordController.text, + ), + ), + const SizedBox(height: 16), + const Text( + "Address", + style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + const SizedBox(height: 8), + TextFormField( + controller: _addressController, + keyboardType: TextInputType.streetAddress, + decoration: const InputDecoration( + hintText: 'Enter your address', + labelStyle: TextStyle(color: Colors.grey), + enabledBorder: AppInputBorder.enabledBorder, + focusedBorder: AppInputBorder.focusedBorder, + errorBorder: AppInputBorder.errorBorder, + focusedErrorBorder: AppInputBorder.focusedErrorBorder, + contentPadding: EdgeInsets.all(10), + ), + ), + const SizedBox(height: 20), + SizedBox( + width: double.infinity, + child: ElevatedButton( + onPressed: isLoading ? null : _handleUserRegistration, + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + padding: const EdgeInsets.symmetric(vertical: 16), + ), + child: + isLoading ? const LoadingWidget() : const Text('REGISTER'), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 16, right: 16), + child: Divider(height: 64), + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: const [ + Text("You already have an account?"), + ], + ), + const SizedBox(height: 8), + SizedBox( + width: double.infinity, + child: OutlinedButton( + onPressed: () => Navigator.pop(context), + style: ElevatedButton.styleFrom( + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + padding: const EdgeInsets.symmetric(vertical: 16), + ), + child: const Text('LOGIN'), + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/screens/home_screen.dart b/lib/screens/home/request_list_screen.dart similarity index 86% rename from lib/screens/home_screen.dart rename to lib/screens/home/request_list_screen.dart index fee9f93..d703f35 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home/request_list_screen.dart @@ -1,20 +1,20 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../common/providers.dart'; -import '../common/utils.dart'; -import '../providers/quotes_list_state.dart'; -import 'widgets/no_data_widget.dart'; -import 'widgets/request_quote_row.dart'; +import '../../common/providers.dart'; +import '../../common/utils.dart'; +import '../../providers/quotes_list_state.dart'; +import '../widgets/no_data_widget.dart'; +import '../widgets/request_quote_row.dart'; -class HomeScreen extends ConsumerStatefulWidget { - const HomeScreen({Key? key}) : super(key: key); +class RequestListScreen extends ConsumerStatefulWidget { + const RequestListScreen({Key? key}) : super(key: key); @override - HomeScreenState createState() => HomeScreenState(); + RequestListScreenState createState() => RequestListScreenState(); } -class HomeScreenState extends ConsumerState { +class RequestListScreenState extends ConsumerState { @override void initState() { super.initState(); diff --git a/lib/screens/submit_request_screen.dart b/lib/screens/home/submit_request_screen.dart similarity index 92% rename from lib/screens/submit_request_screen.dart rename to lib/screens/home/submit_request_screen.dart index 92ac88c..61bf767 100644 --- a/lib/screens/submit_request_screen.dart +++ b/lib/screens/home/submit_request_screen.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../widgets/loading_widget.dart'; -import '../common/form_validator.dart'; -import '../common/providers.dart'; -import '../common/styles.dart'; -import '../providers/submit_quote_state.dart'; +import '../../common/form_validator.dart'; +import '../../common/providers.dart'; +import '../../common/styles.dart'; +import '../../providers/submit_quote_state.dart'; class RequestQuoteScreen extends ConsumerStatefulWidget { const RequestQuoteScreen({Key? key}) : super(key: key); @@ -40,7 +41,7 @@ class RequestQuoteScreenState extends ConsumerState { Widget build(BuildContext context) { ref.listen(submitQuoteNotifier, (_, state) { if (state is SubmitQuoteSuccess) { - Navigator.pop(context);//Back to previous screen + Navigator.pop(context); //Back to previous screen } if (state is SubmitQuoteError) { ScaffoldMessenger.of(context).showSnackBar( @@ -159,13 +160,7 @@ class RequestQuoteScreenState extends ConsumerState { padding: const EdgeInsets.symmetric(vertical: 16), ), child: isLoading - ? const Center( - child: SizedBox( - width: 22, - height: 22, - child: CircularProgressIndicator(strokeWidth: 1.5), - ), - ) + ? const LoadingWidget() : const Text('SUBMIT REQUEST'), ), ], diff --git a/lib/screens/widgets/loading_widget.dart b/lib/screens/widgets/loading_widget.dart new file mode 100644 index 0000000..e15be6c --- /dev/null +++ b/lib/screens/widgets/loading_widget.dart @@ -0,0 +1,16 @@ +import 'package:flutter/material.dart'; + +class LoadingWidget extends StatelessWidget { + const LoadingWidget({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return const Center( + child: SizedBox( + width: 22, + height: 22, + child: CircularProgressIndicator(strokeWidth: 1.5), + ), + ); + } +} diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..f4b49e2 --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "quote_request_app") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.quote_request_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..f6f23bf --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..f16b4c3 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/main.cc b/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/my_application.cc b/linux/my_application.cc new file mode 100644 index 0000000..03decc5 --- /dev/null +++ b/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "quote_request_app"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "quote_request_app"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/my_application.h b/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_