feat: ajout de champs jauge et contact mail et télphone.

Changement des icons de l'app
This commit is contained in:
ElPoyo
2025-12-20 15:38:27 +01:00
parent 28d9e008af
commit df9e24d3b3
52 changed files with 353 additions and 222 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@@ -0,0 +1,20 @@
flutter_launcher_icons:
android: true
ios: true
image_path: "assets/EM2_NsurB.jpg"
web:
generate: true
image_path: "assets/EM2_NsurB.jpg"
background_color: "#ffffff"
theme_color: "#0175C2"
windows:
generate: true
image_path: "assets/EM2_NsurB.jpg"
icon_size: 48
macos:
generate: true
image_path: "assets/EM2_NsurB.jpg"
linux:
generate: true
image_path: "assets/EM2_NsurB.jpg"

View File

@@ -427,7 +427,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";

View File

@@ -1,122 +1 @@
{ {"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
"images" : [
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-App-20x20@2x.png",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-App-20x20@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@1x.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-App-29x29@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@3x.png",
"scale" : "3x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "Icon-App-20x20@1x.png",
"scale" : "1x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "Icon-App-20x20@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-App-29x29@1x.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-App-29x29@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-App-40x40@1x.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-App-40x40@2x.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@1x.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@2x.png",
"scale" : "2x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "Icon-App-83.5x83.5@2x.png",
"scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "Icon-App-1024x1024@1x.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 703 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@@ -1,6 +1,6 @@
/// Configuration de la version de l'application /// Configuration de la version de l'application
class AppVersion { class AppVersion {
static const String version = '0.3.4'; static const String version = '0.3.5';
/// Retourne la version complète de l'application /// Retourne la version complète de l'application
static String get fullVersion => 'v$version'; static String get fullVersion => 'v$version';

View File

@@ -17,6 +17,9 @@ class EventFormController extends ChangeNotifier {
final TextEditingController installationController = TextEditingController(); final TextEditingController installationController = TextEditingController();
final TextEditingController disassemblyController = TextEditingController(); final TextEditingController disassemblyController = TextEditingController();
final TextEditingController addressController = TextEditingController(); final TextEditingController addressController = TextEditingController();
final TextEditingController jaugeController = TextEditingController();
final TextEditingController contactEmailController = TextEditingController();
final TextEditingController contactPhoneController = TextEditingController();
// State variables // State variables
DateTime? _startDateTime; DateTime? _startDateTime;
@@ -67,6 +70,9 @@ class EventFormController extends ChangeNotifier {
disassemblyController.addListener(_onAnyFieldChanged); disassemblyController.addListener(_onAnyFieldChanged);
addressController.addListener(_onAnyFieldChanged); addressController.addListener(_onAnyFieldChanged);
descriptionController.addListener(_onAnyFieldChanged); descriptionController.addListener(_onAnyFieldChanged);
jaugeController.addListener(_onAnyFieldChanged);
contactEmailController.addListener(_onAnyFieldChanged);
contactPhoneController.addListener(_onAnyFieldChanged);
} }
void _onAnyFieldChanged() { void _onAnyFieldChanged() {
@@ -97,6 +103,9 @@ class EventFormController extends ChangeNotifier {
installationController.text = event.installationTime.toString(); installationController.text = event.installationTime.toString();
disassemblyController.text = event.disassemblyTime.toString(); disassemblyController.text = event.disassemblyTime.toString();
addressController.text = event.address; addressController.text = event.address;
jaugeController.text = event.jauge?.toString() ?? '';
contactEmailController.text = event.contactEmail ?? '';
contactPhoneController.text = event.contactPhone ?? '';
_startDateTime = event.startDateTime; _startDateTime = event.startDateTime;
_endDateTime = event.endDateTime; _endDateTime = event.endDateTime;
_assignedEquipment = List<EventEquipment>.from(event.assignedEquipment); _assignedEquipment = List<EventEquipment>.from(event.assignedEquipment);
@@ -310,6 +319,9 @@ class EventFormController extends ChangeNotifier {
documents: finalDocuments, documents: finalDocuments,
options: _selectedOptions, options: _selectedOptions,
status: _selectedStatus, status: _selectedStatus,
jauge: jaugeController.text.isNotEmpty ? int.tryParse(jaugeController.text) : null,
contactEmail: contactEmailController.text.isNotEmpty ? contactEmailController.text.trim() : null,
contactPhone: contactPhoneController.text.isNotEmpty ? contactPhoneController.text.trim() : null,
assignedEquipment: _assignedEquipment, assignedEquipment: _assignedEquipment,
assignedContainers: _assignedContainers, assignedContainers: _assignedContainers,
preparationStatus: existingEvent.preparationStatus, preparationStatus: existingEvent.preparationStatus,
@@ -352,6 +364,9 @@ class EventFormController extends ChangeNotifier {
documents: _uploadedFiles, documents: _uploadedFiles,
options: _selectedOptions, options: _selectedOptions,
status: _selectedStatus, status: _selectedStatus,
jauge: jaugeController.text.isNotEmpty ? int.tryParse(jaugeController.text) : null,
contactEmail: contactEmailController.text.isNotEmpty ? contactEmailController.text.trim() : null,
contactPhone: contactPhoneController.text.isNotEmpty ? contactPhoneController.text.trim() : null,
assignedContainers: _assignedContainers, assignedContainers: _assignedContainers,
assignedEquipment: _assignedEquipment, assignedEquipment: _assignedEquipment,
); );
@@ -437,6 +452,9 @@ class EventFormController extends ChangeNotifier {
installationController.dispose(); installationController.dispose();
disassemblyController.dispose(); disassemblyController.dispose();
addressController.dispose(); addressController.dispose();
jaugeController.dispose();
contactEmailController.dispose();
contactPhoneController.dispose();
super.dispose(); super.dispose();
} }
} }

View File

@@ -172,6 +172,11 @@ class EventModel {
final List<Map<String, dynamic>> options; final List<Map<String, dynamic>> options;
final EventStatus status; final EventStatus status;
// Champs de contact
final int? jauge;
final String? contactEmail;
final String? contactPhone;
// Nouveaux champs pour la gestion du matériel // Nouveaux champs pour la gestion du matériel
final List<EventEquipment> assignedEquipment; final List<EventEquipment> assignedEquipment;
final List<String> assignedContainers; // IDs des conteneurs assignés final List<String> assignedContainers; // IDs des conteneurs assignés
@@ -197,6 +202,9 @@ class EventModel {
required this.documents, required this.documents,
this.options = const [], this.options = const [],
this.status = EventStatus.waitingForApproval, this.status = EventStatus.waitingForApproval,
this.jauge,
this.contactEmail,
this.contactPhone,
this.assignedEquipment = const [], this.assignedEquipment = const [],
this.assignedContainers = const [], this.assignedContainers = const [],
this.preparationStatus, this.preparationStatus,
@@ -329,6 +337,9 @@ class EventModel {
documents: docs, documents: docs,
options: options, options: options,
status: eventStatusFromString(map['status'] as String?), status: eventStatusFromString(map['status'] as String?),
jauge: map['jauge'] != null ? _parseInt(map['jauge']) : null,
contactEmail: map['contactEmail']?.toString(),
contactPhone: map['contactPhone']?.toString(),
assignedEquipment: assignedEquipment, assignedEquipment: assignedEquipment,
preparationStatus: preparationStatusFromString(map['preparationStatus'] as String?), preparationStatus: preparationStatusFromString(map['preparationStatus'] as String?),
returnStatus: returnStatusFromString(map['returnStatus'] as String?), returnStatus: returnStatusFromString(map['returnStatus'] as String?),
@@ -384,6 +395,9 @@ class EventModel {
'documents': documents, 'documents': documents,
'options': options, 'options': options,
'status': eventStatusToString(status), 'status': eventStatusToString(status),
'jauge': jauge,
'contactEmail': contactEmail,
'contactPhone': contactPhone,
'assignedEquipment': assignedEquipment.map((e) => e.toMap()).toList(), 'assignedEquipment': assignedEquipment.map((e) => e.toMap()).toList(),
'assignedContainers': assignedContainers, 'assignedContainers': assignedContainers,
'preparationStatus': preparationStatus != null ? preparationStatusToString(preparationStatus!) : null, 'preparationStatus': preparationStatus != null ? preparationStatusToString(preparationStatus!) : null,

View File

@@ -238,6 +238,9 @@ class _EventAddEditPageState extends State<EventAddEditPage> {
installationController: controller.installationController, installationController: controller.installationController,
disassemblyController: controller.disassemblyController, disassemblyController: controller.disassemblyController,
addressController: controller.addressController, addressController: controller.addressController,
jaugeController: controller.jaugeController,
contactEmailController: controller.contactEmailController,
contactPhoneController: controller.contactPhoneController,
isMobile: isMobile, isMobile: isMobile,
onAnyFieldChanged: () {}, // Géré automatiquement par le contrôleur onAnyFieldChanged: () {}, // Géré automatiquement par le contrôleur
), ),

View File

@@ -12,6 +12,8 @@ class EventDetailsDescription extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final bool isMobile = MediaQuery.of(context).size.width < 600;
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@@ -24,10 +26,17 @@ class EventDetailsDescription extends StatelessWidget {
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
SelectableText( SelectableText(
event.description, event.description.isEmpty ? 'Aucune description' : event.description,
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
// Informations de contact et jauge
if (event.jauge != null || event.contactEmail != null || event.contactPhone != null) ...[
isMobile ? _buildContactInfoMobile(context) : _buildContactInfoDesktop(context),
const SizedBox(height: 16),
],
Text( Text(
'Adresse', 'Adresse',
style: Theme.of(context).textTheme.titleLarge?.copyWith( style: Theme.of(context).textTheme.titleLarge?.copyWith(
@@ -50,5 +59,104 @@ class EventDetailsDescription extends StatelessWidget {
], ],
); );
} }
Widget _buildContactInfoMobile(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (event.jauge != null) ...[
_buildInfoRow(context, Icons.people, 'Jauge', '${event.jauge} personnes'),
const SizedBox(height: 8),
],
if (event.contactEmail != null) ...[
_buildInfoRow(context, Icons.email, 'Email', event.contactEmail!),
const SizedBox(height: 8),
],
if (event.contactPhone != null) ...[
_buildInfoRow(context, Icons.phone, 'Téléphone', event.contactPhone!),
],
],
);
}
Widget _buildContactInfoDesktop(BuildContext context) {
return Wrap(
spacing: 24,
runSpacing: 12,
children: [
if (event.jauge != null)
_buildInfoChip(context, Icons.people, 'Jauge', '${event.jauge} personnes'),
if (event.contactEmail != null)
_buildInfoChip(context, Icons.email, 'Email', event.contactEmail!),
if (event.contactPhone != null)
_buildInfoChip(context, Icons.phone, 'Téléphone', event.contactPhone!),
],
);
}
Widget _buildInfoRow(BuildContext context, IconData icon, String label, String value) {
return Row(
children: [
Icon(icon, size: 20, color: Theme.of(context).primaryColor),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey[600],
),
),
SelectableText(
value,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w500,
),
),
],
),
),
],
);
}
Widget _buildInfoChip(BuildContext context, IconData icon, String label, String value) {
final primaryColor = Theme.of(context).primaryColor;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: primaryColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
border: Border.all(color: primaryColor.withOpacity(0.2)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 18, color: primaryColor),
const SizedBox(width: 8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
label,
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Colors.grey[600],
),
),
SelectableText(
value,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.w500,
),
),
],
),
],
),
);
}
} }

View File

@@ -6,6 +6,9 @@ class EventDetailsSection extends StatefulWidget {
final TextEditingController installationController; final TextEditingController installationController;
final TextEditingController disassemblyController; final TextEditingController disassemblyController;
final TextEditingController addressController; final TextEditingController addressController;
final TextEditingController jaugeController;
final TextEditingController contactEmailController;
final TextEditingController contactPhoneController;
final bool isMobile; final bool isMobile;
final VoidCallback onAnyFieldChanged; final VoidCallback onAnyFieldChanged;
@@ -15,6 +18,9 @@ class EventDetailsSection extends StatefulWidget {
required this.installationController, required this.installationController,
required this.disassemblyController, required this.disassemblyController,
required this.addressController, required this.addressController,
required this.jaugeController,
required this.contactEmailController,
required this.contactPhoneController,
required this.isMobile, required this.isMobile,
required this.onAnyFieldChanged, required this.onAnyFieldChanged,
}); });
@@ -51,27 +57,15 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
_buildSectionTitle('Détails'), _buildSectionTitle('Détails'),
AnimatedContainer(
duration: const Duration(milliseconds: 200), // Description et champs de contact
constraints: BoxConstraints( widget.isMobile
minHeight: 48, ? _buildMobileLayout()
maxHeight: widget.isMobile ? 48.0 * 20 : 48.0 * 10, : _buildDesktopLayout(),
),
child: TextFormField(
controller: widget.descriptionController,
minLines: 1,
maxLines: _descriptionMaxLines > (widget.isMobile ? 20 : 10)
? (widget.isMobile ? 20 : 10)
: _descriptionMaxLines,
decoration: const InputDecoration(
labelText: 'Description',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.description),
),
onChanged: (_) => widget.onAnyFieldChanged(),
),
),
const SizedBox(height: 20), const SizedBox(height: 20),
// Installation et démontage
Row( Row(
children: [ children: [
Expanded( Expanded(
@@ -93,6 +87,7 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
), ),
], ],
), ),
_buildSectionTitle('Adresse*'), _buildSectionTitle('Adresse*'),
TextFormField( TextFormField(
controller: widget.addressController, controller: widget.addressController,
@@ -108,6 +103,100 @@ class _EventDetailsSectionState extends State<EventDetailsSection> {
); );
} }
Widget _buildMobileLayout() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildDescriptionField(),
const SizedBox(height: 16),
_buildContactFields(),
],
);
}
Widget _buildDesktopLayout() {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 2,
child: _buildDescriptionField(),
),
const SizedBox(width: 16),
Expanded(
flex: 1,
child: _buildContactFields(),
),
],
);
}
Widget _buildDescriptionField() {
return AnimatedContainer(
duration: const Duration(milliseconds: 200),
constraints: BoxConstraints(
minHeight: 48,
maxHeight: widget.isMobile ? 48.0 * 20 : 48.0 * 10,
),
child: TextFormField(
controller: widget.descriptionController,
minLines: 1,
maxLines: _descriptionMaxLines > (widget.isMobile ? 20 : 10)
? (widget.isMobile ? 20 : 10)
: _descriptionMaxLines,
decoration: const InputDecoration(
labelText: 'Description',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.description),
),
onChanged: (_) => widget.onAnyFieldChanged(),
),
);
}
Widget _buildContactFields() {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField(
controller: widget.jaugeController,
decoration: const InputDecoration(
labelText: 'Jauge',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.people),
hintText: 'Nombre de personnes',
),
keyboardType: TextInputType.number,
onChanged: (_) => widget.onAnyFieldChanged(),
),
const SizedBox(height: 12),
TextFormField(
controller: widget.contactEmailController,
decoration: const InputDecoration(
labelText: 'Email de contact',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.email),
hintText: 'contact@exemple.com',
),
keyboardType: TextInputType.emailAddress,
onChanged: (_) => widget.onAnyFieldChanged(),
),
const SizedBox(height: 12),
TextFormField(
controller: widget.contactPhoneController,
decoration: const InputDecoration(
labelText: 'Téléphone de contact',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.phone),
hintText: '06 12 34 56 78',
),
keyboardType: TextInputType.phone,
onChanged: (_) => widget.onAnyFieldChanged(),
),
],
);
}
Widget _buildSectionTitle(String title) { Widget _buildSectionTitle(String title) {
return Padding( return Padding(
padding: const EdgeInsets.only(top: 16.0, bottom: 8.0), padding: const EdgeInsets.only(top: 16.0, bottom: 8.0),

View File

@@ -1,68 +1,68 @@
{ {
"images" : [ "info": {
{ "version": 1,
"size" : "16x16", "author": "xcode"
"idiom" : "mac",
"filename" : "app_icon_16.png",
"scale" : "1x"
}, },
{ "images": [
"size" : "16x16", {
"idiom" : "mac", "size": "16x16",
"filename" : "app_icon_32.png", "idiom": "mac",
"scale" : "2x" "filename": "app_icon_16.png",
}, "scale": "1x"
{ },
"size" : "32x32", {
"idiom" : "mac", "size": "16x16",
"filename" : "app_icon_32.png", "idiom": "mac",
"scale" : "1x" "filename": "app_icon_32.png",
}, "scale": "2x"
{ },
"size" : "32x32", {
"idiom" : "mac", "size": "32x32",
"filename" : "app_icon_64.png", "idiom": "mac",
"scale" : "2x" "filename": "app_icon_32.png",
}, "scale": "1x"
{ },
"size" : "128x128", {
"idiom" : "mac", "size": "32x32",
"filename" : "app_icon_128.png", "idiom": "mac",
"scale" : "1x" "filename": "app_icon_64.png",
}, "scale": "2x"
{ },
"size" : "128x128", {
"idiom" : "mac", "size": "128x128",
"filename" : "app_icon_256.png", "idiom": "mac",
"scale" : "2x" "filename": "app_icon_128.png",
}, "scale": "1x"
{ },
"size" : "256x256", {
"idiom" : "mac", "size": "128x128",
"filename" : "app_icon_256.png", "idiom": "mac",
"scale" : "1x" "filename": "app_icon_256.png",
}, "scale": "2x"
{ },
"size" : "256x256", {
"idiom" : "mac", "size": "256x256",
"filename" : "app_icon_512.png", "idiom": "mac",
"scale" : "2x" "filename": "app_icon_256.png",
}, "scale": "1x"
{ },
"size" : "512x512", {
"idiom" : "mac", "size": "256x256",
"filename" : "app_icon_512.png", "idiom": "mac",
"scale" : "1x" "filename": "app_icon_512.png",
}, "scale": "2x"
{ },
"size" : "512x512", {
"idiom" : "mac", "size": "512x512",
"filename" : "app_icon_1024.png", "idiom": "mac",
"scale" : "2x" "filename": "app_icon_512.png",
} "scale": "1x"
], },
"info" : { {
"version" : 1, "size": "512x512",
"author" : "xcode" "idiom": "mac",
} "filename": "app_icon_1024.png",
"scale": "2x"
}
]
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
em2rp/web/favicon.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -18,18 +18,18 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible"> <meta content="IE=Edge" http-equiv="X-UA-Compatible">
<meta name="description" content="A new Flutter project."> <meta name="description" content="Application de gestion d'événements professionnels - EM2RP">
<!-- iOS meta tags & icons --> <!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="em2rp"> <meta name="apple-mobile-web-app-title" content="EM2RP">
<link rel="apple-touch-icon" href="icons/Icon-192.png"> <link rel="apple-touch-icon" href="favicon.jpg">
<!-- Favicon --> <!-- Favicon -->
<link rel="icon" type="image/png" href="../assets/EM2_NsurB.jpg"/> <link rel="icon" type="image/jpeg" href="favicon.jpg"/>
<title>em2rp</title> <title>EM2RP - Event Management</title>
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
<style> <style>
html, body, #flt-glass-pane { html, body, #flt-glass-pane {

View File

@@ -1,11 +1,11 @@
{ {
"name": "em2rp", "name": "EM2RP - Event Management",
"short_name": "em2rp", "short_name": "EM2RP",
"start_url": ".", "start_url": ".",
"display": "standalone", "display": "standalone",
"background_color": "#0175C2", "background_color": "#ffffff",
"theme_color": "#0175C2", "theme_color": "#0175C2",
"description": "A new Flutter project.", "description": "Application de gestion d'événements professionnels",
"orientation": "portrait-primary", "orientation": "portrait-primary",
"prefer_related_applications": false, "prefer_related_applications": false,
"icons": [ "icons": [

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB