agenda/mobile-flutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: agenda:feature/internationale
Branches Tags
agenda:main
agenda:feature/internationale
..
compare: agenda:main
Branches Tags
agenda:feature/internationale
agenda:main

No commits in common. "feature/internationale" and "main" have entirely different histories.
feature/in ... main

14 changed files with 73 additions and 385 deletions
Show Stats Expand all files Collapse all files

4
covas_mobile/l10n.yaml
View File

@ -1,4 +0,0 @@
arb-dir: lib/l10n
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart
output-class: AppLocalizations

56
covas_mobile/lib/classes/MyDrawer.dart
View File

@ -13,10 +13,6 @@ import '../pages/LoginDemo.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart'; // Import dotenv import 'package:flutter_dotenv/flutter_dotenv.dart'; // Import dotenv
import 'package:encrypt_shared_preferences/provider.dart'; import 'package:encrypt_shared_preferences/provider.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class MyDrawer extends StatelessWidget with ShowAlertDialog { class MyDrawer extends StatelessWidget with ShowAlertDialog {
Future<void> logout(BuildContext context) async { Future<void> logout(BuildContext context) async {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
@ -91,8 +87,6 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final loc = AppLocalizations.of(context);
final localeProvider = Provider.of<LocaleProvider>(context);
return Drawer( return Drawer(
child: ListView( child: ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
@ -113,7 +107,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
// Drawer Items // Drawer Items
ListTile( ListTile(
leading: Icon(Icons.home), leading: Icon(Icons.home),
title: Text(loc?.home ?? "Home"), title: Text('Home'),
onTap: () { onTap: () {
Navigator.pushReplacement( Navigator.pushReplacement(
context, MaterialPageRoute(builder: (_) => ListItemMenu())); context, MaterialPageRoute(builder: (_) => ListItemMenu()));
@ -123,7 +117,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
), ),
ListTile( ListTile(
leading: Icon(Icons.settings), leading: Icon(Icons.settings),
title: Text(loc?.settings ?? 'Settings'), title: Text('Settings'),
onTap: () { onTap: () {
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,
@ -133,7 +127,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
), ),
ListTile( ListTile(
leading: Icon(Icons.account_circle), leading: Icon(Icons.account_circle),
title: Text(loc?.update_profile ?? 'Update profile'), title: Text('Update profile'),
onTap: () { onTap: () {
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,
@ -141,53 +135,17 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
builder: (_) => EditProfile())); // Close the drawer builder: (_) => EditProfile())); // Close the drawer
}, },
), ),
ListTile(
leading: Icon(Icons.language),
title: Text(loc?.language ?? 'Language'),
onTap: () {
showDialog(
context: context,
builder: (_) => AlertDialog(
title: Text(loc?.select_language ?? 'Select Language'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
ListTile(
leading: Icon(Icons.flag),
title: Text(loc?.french ?? 'Français'),
onTap: () {
Provider.of<LocaleProvider>(context, listen: false)
.setLocale(const Locale('fr'));
Navigator.of(context).pop();
},
),
ListTile(
leading: Icon(Icons.flag_outlined),
title: Text(loc?.english ?? 'English'),
onTap: () {
Provider.of<LocaleProvider>(context, listen: false)
.setLocale(const Locale('en'));
Navigator.of(context).pop();
},
),
],
),
),
);
},
),
ListTile( ListTile(
leading: Icon(Icons.info), leading: Icon(Icons.info),
title: Text(loc?.about ?? 'About'), title: Text('About'),
onTap: () { onTap: () {
showAlertDialog(context, loc?.about ?? 'About', showAlertDialog(
"Version 0.0.1"); // Close the drawer context, 'About', "Version 0.0.1"); // Close the drawer
}, },
), ),
ListTile( ListTile(
leading: Icon(Icons.logout), leading: Icon(Icons.logout),
title: Text(loc?.log_out ?? 'Log out'), title: Text('Log out'),
onTap: () async { onTap: () async {
logout(context); logout(context);
// Close the drawer // Close the drawer

59
covas_mobile/lib/l10n/app_en.arb
View File

@ -1,59 +0,0 @@
{
"@@locale": "en",
"menu_list": "Event list menu",
"language": "Language",
"home": "Home",
"settings": "Settings",
"update_profile": "Update profile",
"about": "About",
"log_out": "Log out",
"french": "French",
"english": "English",
"select_language": "Select language",
"search_item": "Search by item",
"search_tag": "Search by tags",
"search_geographical": "Search by geographical zone",
"show_date_field": "Show Date Fields",
"hide_date_field": "Hide Date Fields",
"no_data": "No data available",
"search": "Search",
"no_events": "No events available for this location.",
"start_date": "Start date",
"end_date": "End date",
"failed_suggestions": "Failed to load suggestions",
"error":"Error",
"password_different":"Must write a different password",
"create": "Creation",
"user_create": "Your user created",
"request_error": "Poorly constructed query",
"incorrect_password": "Incorrect password",
"unknown_user": "Unknown user",
"disabled_user": "User disabled",
"invalid_token": "Invalid token",
"internal_error_server": "Internal error server",
"unknown_error_auth": "Unknown error authentification",
"required_input": "Required input",
"create_profile": "Create profile",
"edit_pseudo": "Edit pseudo",
"password":"Password",
"enter_password": "Enter the passord",
"password_confirmed": "Password confirmed",
"last_name": "Last name",
"first_name": "First name",
"email": "Mail",
"edit_last_name": "Edit name",
"edit_first_name": "Edit first name",
"edit_email": "Edit email address",
"birth_date": "Birth date",
"edit_birth": "Edit birth date",
"create_profile_button": "Create profile",
"take_picture": "Take a picture",
"error_ia": "Google AI failed to analyze picture. Retry with another one",
"no_data_geo": "No geographical data",
"response_status_update": "response status code update",
"error_token": "Token error",
"error_format": "Data format error given by AI",
"display_picture": "Display the Picture",
"analyze_image": "Image Analyze in progress",
"loading_progress": "Loading progress"
}

60
covas_mobile/lib/l10n/app_fr.arb
View File

@ -1,60 +0,0 @@
{
"@@locale": "fr",
"menu_list": "Liste d'évènement",
"language": "Langue",
"home": "Accueil",
"settings": "Paramètres",
"update_profile": "Modifier profil",
"about": "À propos",
"log_out": "Se déconnecter",
"french": "Français",
"english": "Anglais",
"select_language": "Selectionne la langue",
"search_item": "Recherche par item",
"search_tag": "Recherche par tags",
"search_geographical": "Recherche par zone géographique",
"show_date_field": "Afficher champ date",
"hide_date_field": "Cacher Date Fields",
"no_data": "Aucune donnée disponible",
"search": "Recherche",
"no_events": "Pas d'évènements dans cette localisation",
"start_date": "Date de début",
"end_date": "Date de fin",
"failed_suggestions": "Echec de chargement des suggestions",
"error":"Erreur",
"password_different":"Tu dois écrire un mot de passe different",
"create": "Création",
"user_create": "Votre utilisateur a été créé",
"request_error": "Requête mal construite",
"incorrect_password": "Mot de passe incorrect",
"unknown_user": "Utilisateur inconnu",
"disabled_user": "Utilisateur désactivé",
"invalid_token": "Token invalide",
"internal_error_server": "Erreur interne de serveur",
"unknown_error_auth": "Problème d'authentification inconnu",
"required_input": "Champ requis",
"create_profile": "Creation profil",
"edit_pseudo": "Modifier le pseudo",
"password":"Mot de passe",
"enter_password": "Entrez le password",
"password_confirmed": "Confirmez le mot de passe",
"last_name": "Nom",
"first_name": "Prénom",
"email": "Email",
"edit_last_name": "Modifier le nom",
"edit_first_name": "Modifier le prénom",
"edit_email": "Modifier l'email",
"birth_date": "Date de naissance",
"edit_birth": "Modifier la date de naissance",
"create_profile_button": "Créer le profil",
"take_picture": "Take a picture",
"error_ia": "L'IA de Google n'a pas su analyser l'image. Recommencer avec une autre",
"no_data_geo": "Aucune donnée géographique",
"response_status_update": "Code du statut de réponse de la modification",
"error_token": "Erreur de token",
"error_format": "Erreur de format de donnée fourni par l'IA",
"display_picture": "Display the Picture",
"analyze_image": "Analyse de l'image en cours",
"loading_progress": "Chargement en cours"
}

21
covas_mobile/lib/locale_provider.dart
View File

@ -1,21 +0,0 @@
import 'package:flutter/material.dart';
class LocaleProvider with ChangeNotifier {
Locale _locale = const Locale('en');
Locale get locale => _locale;
void setLocale(Locale locale) {
if (!L10n.all.contains(locale)) return;
_locale = locale;
notifyListeners();
}
}
class L10n {
static final all = [
const Locale('en'),
const Locale('fr'),
];
}

19
covas_mobile/lib/main.dart
View File

@ -1,36 +1,19 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart';
import 'package:provider/provider.dart';
import 'pages/LoginDemo.dart'; import 'pages/LoginDemo.dart';
import 'locale_provider.dart'; // <-- à adapter selon ton arborescence
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await MobileAds.instance.initialize(); await MobileAds.instance.initialize();
runApp( runApp(MyApp());
ChangeNotifierProvider(
create: (_) => LocaleProvider(),
child: MyApp(),
),
);
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final localeProvider = Provider.of<LocaleProvider>(
context); // écoute les changements de langue
return MaterialApp( return MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
locale: localeProvider.locale, // <-- utilise la locale courante
supportedLocales: const [
Locale('en'),
Locale('fr'),
],
localizationsDelegates: AppLocalizations.localizationsDelegates,
home: LoginDemo(), home: LoginDemo(),
); );
} }

91
covas_mobile/lib/pages/AddProfile.dart
View File

@ -13,10 +13,6 @@ import '../variable/globals.dart' as globals;
import '../classes/ad_helper.dart'; import '../classes/ad_helper.dart';
import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé plus loin
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
@ -99,11 +95,7 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
if ((password.isNotEmpty) && (confirmedPassword.isNotEmpty)) { if ((password.isNotEmpty) && (confirmedPassword.isNotEmpty)) {
if (password != confirmedPassword) { if (password != confirmedPassword) {
showAlertDialog( showAlertDialog(context, "Erreur", "Mot de passe different");
context,
AppLocalizations.of(context)?.error ?? "Error",
AppLocalizations.of(context)?.password_different ??
"Must write a different password");
return; return;
} }
} }
@ -125,32 +117,24 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
})); }));
print(responsePost.statusCode); print(responsePost.statusCode);
if (responsePost.statusCode == 200) { if (responsePost.statusCode == 200) {
showAlertDialog( showAlertDialog(context, "Creation", "Votre utilisateur a été créé");
context,
AppLocalizations.of(context)?.create ?? "Creation",
AppLocalizations.of(context)?.user_create ?? "Your user created");
Navigator.pushReplacement( Navigator.pushReplacement(
context, MaterialPageRoute(builder: (_) => LoginDemo())); context, MaterialPageRoute(builder: (_) => LoginDemo()));
return; return;
} }
final errorMessages = { final errorMessages = {
400: AppLocalizations.of(context)?.request_error ?? 400: "Requête mal construite",
"Poorly constructed query", 406: "Mot de passe incorrect",
406: AppLocalizations.of(context)?.incorrect_password ?? 404: "Utilisateur inconnu",
"Incorrect password", 403: "Utilisateur désactivé",
404: AppLocalizations.of(context)?.unknown_user ?? "Unknown user", 410: "Token invalide",
403: AppLocalizations.of(context)?.disabled_user ?? "Disabled user", 500: "Problème interne du serveur",
410: AppLocalizations.of(context)?.invalid_token ?? "Invalid token",
500: AppLocalizations.of(context)?.internal_error_server ??
"Internal error server"
}; };
final text = errorMessages[responsePost.statusCode] ?? final text = errorMessages[responsePost.statusCode] ??
AppLocalizations.of(context)?.unknown_error_auth ?? "Problème d'authentification inconnu";
"Unknown error auth"; showAlertDialog(context, "Erreur serveur", text);
showAlertDialog(
context, AppLocalizations.of(context)?.error ?? "Error", text);
} }
@override @override
@ -166,9 +150,7 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
String? _validateField(String? value) { String? _validateField(String? value) {
return value!.isEmpty return value!.isEmpty ? 'Champ requis' : null;
? AppLocalizations.of(context)?.required_input ?? 'Required input'
: null;
} }
@override @override
@ -176,8 +158,7 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBar( appBar: AppBar(
title: Text( title: Text("Create profile"),
AppLocalizations.of(context)?.create_profile ?? "Create profile"),
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
foregroundColor: Colors.white, foregroundColor: Colors.white,
), ),
@ -202,8 +183,7 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Pseudo', labelText: 'Pseudo',
hintText: AppLocalizations.of(context)?.edit_pseudo ?? hintText: 'Modifier le pseudo'),
'Edit pseudo'),
), ),
), ),
Padding( Padding(
@ -216,11 +196,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
obscureText: true, obscureText: true,
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: AppLocalizations.of(context)?.password ?? labelText: 'Mot de passe',
'Password', hintText: 'Entrez le mot de passe'),
hintText:
AppLocalizations.of(context)?.enter_password ??
'Enter the password'),
), ),
), ),
Padding( Padding(
@ -233,13 +210,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
obscureText: true, obscureText: true,
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: labelText: 'Confirmez le mot de passe',
AppLocalizations.of(context)?.password_confirmed ?? hintText: 'Confirmez le mot de passe'),
'Password confirmed',
hintText:
AppLocalizations.of(context)?.password_confirmed ??
'Password confirmed',
),
), ),
), ),
Padding( Padding(
@ -251,11 +223,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
validator: (value) => _validateField(value), validator: (value) => _validateField(value),
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: AppLocalizations.of(context)?.last_name ?? labelText: 'Nom',
'Last name', hintText: 'Modifier le nom'),
hintText:
AppLocalizations.of(context)?.edit_last_name ??
'Edit last name'),
), ),
), ),
Padding( Padding(
@ -267,11 +236,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
validator: (value) => _validateField(value), validator: (value) => _validateField(value),
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: AppLocalizations.of(context)?.first_name ?? labelText: 'Prénom',
'First name', hintText: 'Modifier le prénom'),
hintText:
AppLocalizations.of(context)?.edit_first_name ??
'Edit first name'),
), ),
), ),
Padding( Padding(
@ -283,10 +249,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
validator: (value) => _validateField(value), validator: (value) => _validateField(value),
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: labelText: 'Email',
AppLocalizations.of(context)?.email ?? 'Email', hintText: 'Modifier l\'adresse mail'),
hintText: AppLocalizations.of(context)?.edit_email ??
'Edit email'),
), ),
), ),
Padding( Padding(
@ -299,10 +263,8 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
validator: (value) => _validateField(value), validator: (value) => _validateField(value),
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: AppLocalizations.of(context)?.birth_date ?? labelText: 'Date de naissance',
'Birth date', hintText: 'Cliquez ici pour selectionner une date'),
hintText: AppLocalizations.of(context)?.edit_birth ??
'Edit birth date'),
onTap: () => onTapFunctionDatePicker(context: context)), onTap: () => onTapFunctionDatePicker(context: context)),
), ),
SizedBox( SizedBox(
@ -321,8 +283,7 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
} }
}, },
child: Text( child: Text(
AppLocalizations.of(context)?.create_profile_button ?? 'Créer le profil',
"Create profile",
style: TextStyle(color: Colors.white, fontSize: 25), style: TextStyle(color: Colors.white, fontSize: 25),
), ),
), ),

8
covas_mobile/lib/pages/Camera.dart
View File

@ -7,10 +7,6 @@ import 'DisplayPictureScreen.dart';
import 'package:camera/camera.dart'; import 'package:camera/camera.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../classes/auth_service.dart'; import '../classes/auth_service.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé plus loin
Future<void> main() async { Future<void> main() async {
// Ensure that plugin services are initialized so that `availableCameras()` // Ensure that plugin services are initialized so that `availableCameras()`
@ -96,9 +92,7 @@ class CameraState extends State<Camera> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(title: const Text('Take a picture')),
title: Text(AppLocalizations.of(context)?.take_picture ??
"Take a picture")),
// You must wait until the controller is initialized before displaying the // You must wait until the controller is initialized before displaying the
// camera preview. Use a FutureBuilder to display a loading spinner until the // camera preview. Use a FutureBuilder to display a loading spinner until the
// controller has finished initializing. // controller has finished initializing.

8
covas_mobile/lib/pages/CameraEdit.dart
View File

@ -8,10 +8,6 @@ import 'EditEvent.dart';
import 'package:camera/camera.dart'; import 'package:camera/camera.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../classes/auth_service.dart'; import '../classes/auth_service.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé
Future<void> main() async { Future<void> main() async {
// Ensure that plugin services are initialized so that `availableCameras()` // Ensure that plugin services are initialized so that `availableCameras()`
@ -98,9 +94,7 @@ class CameraEditState extends State<CameraEdit> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(title: const Text('Take a picture')),
title: Text(AppLocalizations.of(context)?.take_picture ??
'Take a picture')),
// You must wait until the controller is initialized before displaying the // You must wait until the controller is initialized before displaying the
// camera preview. Use a FutureBuilder to display a loading spinner until the // camera preview. Use a FutureBuilder to display a loading spinner until the
// controller has finished initializing. // controller has finished initializing.

43
covas_mobile/lib/pages/DisplayPictureScreen.dart
View File

@ -17,10 +17,6 @@ import '../classes/MyDrawer.dart';
import '../classes/ad_helper.dart'; import '../classes/ad_helper.dart';
import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart';
import '../classes/auth_service.dart'; import '../classes/auth_service.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
@ -102,11 +98,8 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen>
Future<void> displayError(String e) async { Future<void> displayError(String e) async {
print("problem gemini : ${e}"); print("problem gemini : ${e}");
showAlertDialog( showAlertDialog(context, 'Error IA',
context, "L'IA de Google n'a pas su analyser l'image. Recommecer avec une autre");
AppLocalizations.of(context)?.error ?? 'Error',
AppLocalizations.of(context)?.error_ia ??
'Google AI failed to analyze picture. Retry with another one');
} }
void _showErrorDialog(BuildContext context, String title, String message) { void _showErrorDialog(BuildContext context, String title, String message) {
@ -161,10 +154,7 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen>
final location = await _fetchGeolocation(place); final location = await _fetchGeolocation(place);
if (location == null) { if (location == null) {
_showErrorDialog( _showErrorDialog(
context, context, "Erreur serveur", "Aucune donnée geographique");
AppLocalizations.of(context)?.error ?? 'Error',
AppLocalizations.of(context)?.no_data_geo ??
'No geographical data');
return; return;
} }
@ -191,23 +181,15 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen>
builder: (_) => ItemMenu(title: events[0]["id"]))); builder: (_) => ItemMenu(title: events[0]["id"])));
} }
} else { } else {
String error = AppLocalizations.of(context)?.response_status_update ?? showAlertDialog(context, 'Erreur de reponse',
'Response status update : ${response.statusCode}'; "response status code update : ${response.statusCode}");
showAlertDialog(
context,
AppLocalizations.of(context)?.error ?? 'Error',
"${error} : ${response.statusCode}");
} }
} else { } else {
showAlertDialog(context, AppLocalizations.of(context)?.error ?? 'Error', showAlertDialog(context, "Erreur de reponse", "Erreur de token");
AppLocalizations.of(context)?.error_token ?? "Token error");
} }
} catch (e) { } catch (e) {
showAlertDialog( showAlertDialog(
context, context, "Erreur IA", "Erreur de format de donnée fourni par l'IA");
AppLocalizations.of(context)?.error ?? "Error",
AppLocalizations.of(context)?.error_format ??
"Data format error given by AI");
} }
//showDescImageAddDialog(context, message); //showDescImageAddDialog(context, message);
@ -235,9 +217,7 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(title: const Text('Display the Picture')),
title: Text(AppLocalizations.of(context)?.display_picture ??
"Display The Picture")),
// The image is stored as a file on the device. Use the `Image.file` // The image is stored as a file on the device. Use the `Image.file`
// constructor with the given path to display the image. // constructor with the given path to display the image.
drawer: MyDrawer(), drawer: MyDrawer(),
@ -253,15 +233,12 @@ class DisplayPictureScreenState extends State<DisplayPictureScreen>
width: _bannerAd!.size.width.toDouble(), width: _bannerAd!.size.width.toDouble(),
child: AdWidget(ad: _bannerAd!)), child: AdWidget(ad: _bannerAd!)),
Text( Text(
AppLocalizations.of(context)?.analyze_image ?? 'Analyse de l\'image en cours',
'Image analyze in progress',
style: Theme.of(context).textTheme.titleLarge, style: Theme.of(context).textTheme.titleLarge,
), ),
CircularProgressIndicator( CircularProgressIndicator(
value: controller.value, value: controller.value,
semanticsLabel: semanticsLabel: 'Loading progress',
AppLocalizations.of(context)?.loading_progress ??
'Loading progress',
), ),
]))); ])));
} }

4
covas_mobile/lib/pages/EditEvent.dart
View File

@ -22,10 +22,6 @@ import '../variable/globals.dart' as globals;
import '../classes/ad_helper.dart'; import '../classes/ad_helper.dart';
import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart';
import '../classes/auth_service.dart'; import '../classes/auth_service.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();

66
covas_mobile/lib/pages/ListItemMenu.dart
View File

@ -20,9 +20,6 @@ import '../classes/ad_helper.dart';
import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart';
import '../classes/auth_service.dart'; import '../classes/auth_service.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import '../locale_provider.dart'; // Créé plus loin
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
@ -30,10 +27,7 @@ void main() async {
await MobileAds.instance.initialize(); await MobileAds.instance.initialize();
await initializeDateFormatting("fr_FR", null); await initializeDateFormatting("fr_FR", null);
runApp(ChangeNotifierProvider( runApp(const MyApp());
create: (_) => LocaleProvider(),
child: const MyApp(),
));
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
@ -41,17 +35,16 @@ class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final localeProvider = Provider.of<LocaleProvider>(context);
return MaterialApp( return MaterialApp(
localizationsDelegates: [ localizationsDelegates: [
AppLocalizations.delegate,
GlobalMaterialLocalizations.delegate, GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate, GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
], ],
supportedLocales: [const Locale('fr', 'FR'), const Locale('en')], supportedLocales: [
locale: localeProvider.locale, const Locale('fr', 'FR'),
home: Builder(builder: (context) => ListItemMenu()), ],
home: const ListItemMenu(),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
); );
} }
@ -303,6 +296,7 @@ class _MyHomePageState extends State<ListItemMenu> {
} }
} catch (e) { } catch (e) {
fetchPostsByLocation(); fetchPostsByLocation();
print("Error getting city and country: $e");
} }
} }
@ -353,8 +347,7 @@ class _MyHomePageState extends State<ListItemMenu> {
} }
}); });
} else { } else {
throw Exception(AppLocalizations.of(context)?.failed_suggestions ?? throw Exception('Failed to load suggestions');
'Failed to load suggestions');
} }
} }
@ -452,13 +445,16 @@ class _MyHomePageState extends State<ListItemMenu> {
"Content-Type": "application/json", "Content-Type": "application/json",
HttpHeaders.cookieHeader: "access_token=$accessToken" HttpHeaders.cookieHeader: "access_token=$accessToken"
}); });
print("status code tags : ${response.statusCode}");
if (response.statusCode == 200) { if (response.statusCode == 200) {
final data = json.decode(utf8.decode(response.bodyBytes)); final data = json.decode(utf8.decode(response.bodyBytes));
print("tags ${data}");
setState(() { setState(() {
suggestionsTags = (data as List) suggestionsTags = (data as List)
.map((feature) => {'name': feature['name']}) .map((feature) => {'name': feature['name']})
.toList(); .toList();
print("suggesttion tag : ${suggestionsTags}");
if (suggestionsTags.isNotEmpty) { if (suggestionsTags.isNotEmpty) {
showInputGeo = false; showInputGeo = false;
showInputSearch = false; showInputSearch = false;
@ -524,10 +520,10 @@ class _MyHomePageState extends State<ListItemMenu> {
Padding _buildDateField(String position) { Padding _buildDateField(String position) {
TextEditingController datePicker = startDatepicker; TextEditingController datePicker = startDatepicker;
String hintText = AppLocalizations.of(context)?.start_date ?? "Start date"; String hintText = "Date de début";
if (position == "end") { if (position == "end") {
datePicker = endDatepicker; datePicker = endDatepicker;
hintText = AppLocalizations.of(context)?.end_date ?? "End date"; hintText = "Date de fin";
} }
return Padding( return Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
@ -612,11 +608,9 @@ class _MyHomePageState extends State<ListItemMenu> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final loc = AppLocalizations.of(context);
final localeProvider = Provider.of<LocaleProvider>(context);
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(loc?.menu_list ?? "Item list menu"), title: const Text("Item list menu"),
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
foregroundColor: Colors.white, foregroundColor: Colors.white,
), ),
@ -633,7 +627,7 @@ class _MyHomePageState extends State<ListItemMenu> {
if (showInputSearch) if (showInputSearch)
_buildSearchField( _buildSearchField(
controller: inputItem, controller: inputItem,
labelText: loc?.search_item ?? "Search by item", labelText: 'Search by item',
onChanged: (value) { onChanged: (value) {
_fetchCount = 0; _fetchCount = 0;
if (value.isNotEmpty) { if (value.isNotEmpty) {
@ -679,7 +673,7 @@ class _MyHomePageState extends State<ListItemMenu> {
if ((showDateFields) && (showInputTag)) if ((showDateFields) && (showInputTag))
_buildSearchField( _buildSearchField(
controller: inputTags, controller: inputTags,
labelText: loc?.search_tag ?? "Search by tags", labelText: 'Search by tags',
onChanged: (value) { onChanged: (value) {
_fetchCount = 0; _fetchCount = 0;
if (value.isNotEmpty) { if (value.isNotEmpty) {
@ -730,8 +724,7 @@ class _MyHomePageState extends State<ListItemMenu> {
if ((showDateFields) && (showInputGeo)) if ((showDateFields) && (showInputGeo))
_buildSearchField( _buildSearchField(
controller: inputGeo, controller: inputGeo,
labelText: labelText: 'Search by geographical zone',
loc?.search_geographical ?? 'Search by geographical zone',
onChanged: (value) async { onChanged: (value) async {
_fetchCount = 0; _fetchCount = 0;
@ -802,26 +795,21 @@ class _MyHomePageState extends State<ListItemMenu> {
: Icons.keyboard_arrow_down, : Icons.keyboard_arrow_down,
color: Colors.blue, color: Colors.blue,
), ),
tooltip: showDateFields tooltip: showDateFields ? 'Show Date Fields' : 'Hide Date Fields',
? loc?.show_date_field ?? 'Show Date Fields'
: loc?.hide_date_field ?? 'Hide Date Fields',
), ),
Expanded( Expanded(
child: FutureBuilder<List<Events>>( child: FutureBuilder<List<Events>>(
future: postsFuture, future: postsFuture,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator());
} else if (snapshot.hasData) { } else if (snapshot.hasData) {
final posts = snapshot.data!; final posts = snapshot.data!;
final displayedPosts = final displayedPosts =
filteredPosts.isEmpty ? posts : filteredPosts; filteredPosts.isEmpty ? posts : filteredPosts;
return buildPosts(displayedPosts); return buildPosts(displayedPosts);
} else { } else {
return Center( return const Text("No data available");
child: Text(AppLocalizations.of(context)?.no_data ??
"No data available"),
);
} }
}, },
), ),
@ -831,7 +819,7 @@ class _MyHomePageState extends State<ListItemMenu> {
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
onPressed: popCamera, onPressed: popCamera,
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
tooltip: loc?.search ?? 'Recherche', tooltip: 'Recherche',
child: const Icon(Icons.photo_camera, color: Colors.white), child: const Icon(Icons.photo_camera, color: Colors.white),
), ),
); );
@ -839,13 +827,14 @@ class _MyHomePageState extends State<ListItemMenu> {
// Function to display fetched data on screen // Function to display fetched data on screen
Widget buildPosts(List<Events> posts) { Widget buildPosts(List<Events> posts) {
print("posts : ${posts}");
print("filteredposts : ${filteredPosts}");
final displayedPosts = filteredPosts; final displayedPosts = filteredPosts;
print("results ${displayedPosts}");
// If filteredPosts is empty, show a message saying no data is available // If filteredPosts is empty, show a message saying no data is available
if (displayedPosts.isEmpty) { if (displayedPosts.isEmpty) {
return Center( return const Center(
child: Text( child: Text('No events available for this location.',
AppLocalizations.of(context)?.no_events ??
'No events available for this location.',
style: TextStyle(fontSize: 18, color: Colors.grey)), style: TextStyle(fontSize: 18, color: Colors.grey)),
); );
} }
@ -866,11 +855,8 @@ class _MyHomePageState extends State<ListItemMenu> {
final startDate = DateTime.parse(post.startDate!); final startDate = DateTime.parse(post.startDate!);
//final date = DateFormat.yMd().format(startDate); //final date = DateFormat.yMd().format(startDate);
//final time = DateFormat.Hm().format(startDate); //final time = DateFormat.Hm().format(startDate);
final locale =
Provider.of<LocaleProvider>(context).locale?.toString() ??
'en_US';
final dateLongue = final dateLongue =
DateFormat('EEEE d MMMM y', locale).format(startDate); DateFormat('EEEE d MMMM y', 'fr_FR').format(startDate);
return ListTile( return ListTile(
title: Text('${post.name!}'), title: Text('${post.name!}'),
subtitle: Text('${post.place!}\n${dateLongue}'), subtitle: Text('${post.place!}\n${dateLongue}'),

16
covas_mobile/pubspec.lock
View File

@ -565,14 +565,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.6" version: "1.0.6"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
path: path:
dependency: "direct main" dependency: "direct main"
description: description:
@ -709,14 +701,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.9.1" version: "3.9.1"
provider:
dependency: "direct main"
description:
name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
url: "https://pub.dev"
source: hosted
version: "6.1.5"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:

1
covas_mobile/pubspec.yaml
View File

@ -55,7 +55,6 @@ dependencies:
mapbox_gl: ^0.16.0 mapbox_gl: ^0.16.0
google_mobile_ads: ^5.3.1 google_mobile_ads: ^5.3.1
encrypt_shared_preferences: ^0.8.8 encrypt_shared_preferences: ^0.8.8
provider: ^6.1.2 # ou la dernière version
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: