samre-cli 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samre-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "CLI officiel d'injection automatique du SDK Samré dans les applications mobiles (Flutter, React Native)",
   "main": "bin/samre.js",
   "bin": {

package/src/templates/flutter_sdk.js

@@ -1,4 +1,4 @@
-// Modèle complet pour lib/samre_sdk.dart
+// Modèle complet pour lib/samre_sdk.dart (Version 100% autonome sans dépendance au Navigator)
 
 export function generateFlutterSdkCode({ apiUrl, apiKey, appId, appName, dureeJours }) {
   return `// =================================================================
@@ -33,6 +33,7 @@ class SamreOverlay extends StatefulWidget {
 class _SamreOverlayState extends State<SamreOverlay> {
   int _secondsRemaining = SamreConfig.requiredDurationSeconds;
   bool _canSubmit = false;
+  bool _showValidationDialog = false;
   Timer? _timer;
 
   @override
@@ -62,69 +63,91 @@ class _SamreOverlayState extends State<SamreOverlay> {
     super.dispose();
   }
 
-  void _openValidationDialog() {
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (ctx) => const SamreValidationDialog(),
-    );
+  void _openDialog() {
+    setState(() => _showValidationDialog = true);
+  }
+
+  void _closeDialog() {
+    setState(() => _showValidationDialog = false);
   }
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        widget.child,
-        Positioned(
-          bottom: 24,
-          right: 20,
-          child: Material(
-            elevation: 8,
-            borderRadius: BorderRadius.circular(24),
-            color: _canSubmit ? const Color(0xFF2563EB) : Colors.black.withOpacity(0.75),
-            child: InkWell(
+    return Directionality(
+      textDirection: TextDirection.ltr,
+      child: Stack(
+        children: [
+          widget.child,
+
+          // ── Bouton Flottant en Bas à Droite ──────────────────────────────
+          Positioned(
+            bottom: 24,
+            right: 20,
+            child: Material(
+              elevation: 8,
               borderRadius: BorderRadius.circular(24),
-              onTap: _canSubmit ? _openValidationDialog : null,
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(
-                      _canSubmit ? Icons.verified_user : Icons.timer_outlined,
-                      color: Colors.white,
-                      size: 18,
-                    ),
-                    const SizedBox(width: 8),
-                    Text(
-                      _canSubmit ? 'Valider Journée' : 'Test en cours (\${_secondsRemaining}s)',
-                      style: const TextStyle(
+              color: _canSubmit ? const Color(0xFF2563EB) : Colors.black.withOpacity(0.75),
+              child: InkWell(
+                borderRadius: BorderRadius.circular(24),
+                onTap: _canSubmit ? _openDialog : null,
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(
+                        _canSubmit ? Icons.verified_user : Icons.timer_outlined,
                         color: Colors.white,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 12,
-                        decoration: TextDecoration.none,
+                        size: 18,
+                      ),
+                      const SizedBox(width: 8),
+                      Text(
+                        _canSubmit ? 'Valider Journée' : 'Test en cours (\${_secondsRemaining}s)',
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                          fontSize: 12,
+                          decoration: TextDecoration.none,
+                        ),
                       ),
-                    ),
-                  ],
+                    ],
+                  ),
                 ),
               ),
             ),
           ),
-        ),
-      ],
+
+          // ── Fenêtre Modale de Validation (Indépendante du Navigator) ─────
+          if (_showValidationDialog)
+            Positioned.fill(
+              child: Container(
+                color: Colors.black.withOpacity(0.75),
+                alignment: Alignment.center,
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: Material(
+                  color: Colors.transparent,
+                  child: SamreValidationCard(
+                    onClose: _closeDialog,
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
     );
   }
 }
 
-/// Boîte de dialogue de validation du code quotidien par le panéliste
-class SamreValidationDialog extends StatefulWidget {
-  const SamreValidationDialog({Key? key}) : super(key: key);
+/// Carte de dialogue de validation du code quotidien
+class SamreValidationCard extends StatefulWidget {
+  final VoidCallback onClose;
+  const SamreValidationCard({Key? key, required this.onClose}) : super(key: key);
 
   @override
-  State<SamreValidationDialog> createState() => _SamreValidationDialogState();
+  State<SamreValidationCard> createState() => _SamreValidationCardState();
 }
 
-class _SamreValidationDialogState extends State<SamreValidationDialog> {
+class _SamreValidationCardState extends State<SamreValidationCard> {
   final _panelisteCtrl = TextEditingController();
   final _codeCtrl = TextEditingController();
   bool _loading = false;
@@ -200,103 +223,136 @@ class _SamreValidationDialogState extends State<SamreValidationDialog> {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
-      backgroundColor: const Color(0xFF0F172A),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-        side: const BorderSide(color: Color(0xFF334155)),
-      ),
-      title: Row(
-        children: [
-          Container(
-            padding: const EdgeInsets.all(8),
-            decoration: BoxDecoration(
-              color: const Color(0xFF2563EB).withOpacity(0.2),
-              borderRadius: BorderRadius.circular(10),
-            ),
-            child: const Icon(Icons.verified, color: Color(0xFF60A5FA), size: 22),
-          ),
-          const SizedBox(width: 12),
-          const Expanded(
-            child: Text(
-              'Validation Samré',
-              style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
-            ),
+    return Container(
+      constraints: const BoxConstraints(maxWidth: 420),
+      decoration: BoxDecoration(
+        color: const Color(0xFF0F172A),
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(color: const Color(0xFF334155), width: 1.5),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withOpacity(0.5),
+            blurRadius: 25,
+            spreadRadius: 5,
           ),
         ],
       ),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            const Text(
-              'Saisissez vos identifiants fournis par la plateforme Samré pour enregistrer votre journée.',
-              style: TextStyle(color: Color(0xFF94A3B8), fontSize: 13),
-            ),
-            const SizedBox(height: 16),
-            TextField(
-              controller: _panelisteCtrl,
-              style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w600),
-              decoration: InputDecoration(
-                labelText: 'Identifiant Panéliste',
-                labelStyle: const TextStyle(color: Color(0xFF94A3B8)),
-                hintText: 'Ex: TST-7A8B9C',
-                hintStyle: const TextStyle(color: Color(0xFF475569)),
-                filled: true,
-                fillColor: const Color(0xFF1E293B),
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
-              ),
-            ),
-            const SizedBox(height: 12),
-            TextField(
-              controller: _codeCtrl,
-              textCapitalization: TextCapitalization.characters,
-              style: const TextStyle(color: Colors.white, letterSpacing: 2, fontWeight: FontWeight.bold),
-              decoration: InputDecoration(
-                labelText: 'Code Unique du Jour',
-                labelStyle: const TextStyle(color: Color(0xFF94A3B8)),
-                hintText: 'Ex: 7K9P-4MX2',
-                hintStyle: const TextStyle(color: Color(0xFF475569), letterSpacing: 0),
-                filled: true,
-                fillColor: const Color(0xFF1E293B),
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
-              ),
-            ),
-            if (_message != null) ...[
-              const SizedBox(height: 14),
+      padding: const EdgeInsets.all(22),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          // Titre
+          Row(
+            children: [
               Container(
-                padding: const EdgeInsets.all(12),
+                padding: const EdgeInsets.all(8),
                 decoration: BoxDecoration(
-                  color: _success ? const Color(0xFF065F46).withOpacity(0.3) : const Color(0xFF991B1B).withOpacity(0.3),
+                  color: const Color(0xFF2563EB).withOpacity(0.2),
                   borderRadius: BorderRadius.circular(10),
-                  border: Border.all(color: _success ? const Color(0xFF10B981) : const Color(0xFFEF4444)),
                 ),
+                child: const Icon(Icons.verified, color: Color(0xFF60A5FA), size: 22),
+              ),
+              const SizedBox(width: 12),
+              const Expanded(
                 child: Text(
-                  _message!,
-                  style: TextStyle(color: _success ? const Color(0xFF34D399) : const Color(0xFFF87171), fontSize: 12, fontWeight: FontWeight.w600),
+                  'Validation Samré',
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
+              IconButton(
+                icon: const Icon(Icons.close, color: Color(0xFF94A3B8), size: 20),
+                onPressed: widget.onClose,
+              ),
             ],
+          ),
+          const SizedBox(height: 12),
+          const Text(
+            'Saisissez vos identifiants pour enregistrer votre journée de test.',
+            style: TextStyle(color: Color(0xFF94A3B8), fontSize: 13),
+          ),
+          const SizedBox(height: 16),
+          TextField(
+            controller: _panelisteCtrl,
+            style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w600),
+            decoration: InputDecoration(
+              labelText: 'Identifiant Panéliste',
+              labelStyle: const TextStyle(color: Color(0xFF94A3B8)),
+              hintText: 'Ex: TST-7A8B9C',
+              hintStyle: const TextStyle(color: Color(0xFF475569)),
+              filled: true,
+              fillColor: const Color(0xFF1E293B),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12),
+                borderSide: const BorderSide(color: Color(0xFF334155)),
+              ),
+            ),
+          ),
+          const SizedBox(height: 12),
+          TextField(
+            controller: _codeCtrl,
+            textCapitalization: TextCapitalization.characters,
+            style: const TextStyle(color: Colors.white, letterSpacing: 2, fontWeight: FontWeight.bold),
+            decoration: InputDecoration(
+              labelText: 'Code Unique du Jour',
+              labelStyle: const TextStyle(color: Color(0xFF94A3B8)),
+              hintText: 'Ex: 7K9P-4MX2',
+              hintStyle: const TextStyle(color: Color(0xFF475569), letterSpacing: 0),
+              filled: true,
+              fillColor: const Color(0xFF1E293B),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12),
+                borderSide: const BorderSide(color: Color(0xFF334155)),
+              ),
+            ),
+          ),
+          if (_message != null) ...[
+            const SizedBox(height: 14),
+            Container(
+              padding: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: _success ? const Color(0xFF065F46).withOpacity(0.3) : const Color(0xFF991B1B).withOpacity(0.3),
+                borderRadius: BorderRadius.circular(10),
+                border: Border.all(color: _success ? const Color(0xFF10B981) : const Color(0xFFEF4444)),
+              ),
+              child: Text(
+                _message!,
+                style: TextStyle(
+                  color: _success ? const Color(0xFF34D399) : const Color(0xFFF87171),
+                  fontSize: 12,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ),
           ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context),
-          child: const Text('Fermer', style: TextStyle(color: Color(0xFF94A3B8))),
-        ),
-        ElevatedButton(
-          onPressed: _loading ? null : _verify,
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFF2563EB),
-            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+          const SizedBox(height: 18),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              TextButton(
+                onPressed: widget.onClose,
+                child: const Text('Fermer', style: TextStyle(color: Color(0xFF94A3B8))),
+              ),
+              const SizedBox(width: 8),
+              ElevatedButton(
+                onPressed: _loading ? null : _verify,
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: const Color(0xFF2563EB),
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                ),
+                child: _loading
+                    ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
+                    : const Text('Valider', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
+              ),
+            ],
           ),
-          child: _loading
-              ? const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
-              : const Text('Valider', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
-        ),
-      ],
+        ],
+      ),
     );
   }
 }

package/src/utils/flutter.js

@@ -82,8 +82,28 @@ export const FlutterUtil = {
       modified = importStatement + modified;
     }
 
-    // 2. Tenter d'envelopper builder ou home dans MaterialApp
-    // Exemple de pattern courant : home: QuelqueChose() -> home: SamreOverlay(child: QuelqueChose())
+    // 2. Tenter d'injecter dans builder de MaterialApp (Idéal pour tous les écrans et le routage)
+    if (modified.includes('MaterialApp(') && !modified.includes('SamreOverlay')) {
+      // Si MaterialApp a déjà une propriété builder
+      const builderRegex = /builder\s*:\s*\(([^)]*)\)\s*=>\s*([^,\n;]+)/;
+      if (builderRegex.test(modified)) {
+        modified = modified.replace(builderRegex, (match, args, body) => {
+          return `builder: (${args}) => SamreOverlay(child: ${body.trim()})`;
+        });
+        fs.writeFileSync(mainPath, modified, 'utf-8');
+        return { injected: true, modifiedBuilder: true, backupPath };
+      }
+
+      // Sinon insérer la propriété builder juste après MaterialApp(
+      modified = modified.replace(
+        /MaterialApp\s*\(/,
+        'MaterialApp(\n      builder: (context, child) => SamreOverlay(child: child ?? const SizedBox()),'
+      );
+      fs.writeFileSync(mainPath, modified, 'utf-8');
+      return { injected: true, modifiedBuilder: true, backupPath };
+    }
+
+    // Fallback : injection sur home:
     const homeRegex = /home\s*:\s*([^,\n\);]+)/;
     if (homeRegex.test(modified) && !modified.includes('SamreOverlay')) {
       modified = modified.replace(homeRegex, (match, p1) => {
@@ -93,8 +113,6 @@ export const FlutterUtil = {
       return { injected: true, modifiedHome: true, backupPath };
     }
 
-    // Si injection automatique du widget home n'a pas pu matcher le pattern exact,
-    // on sauvegarde le fichier avec l'import et on informe le dev
     fs.writeFileSync(mainPath, modified, 'utf-8');
     return { injected: false, importAdded: true, backupPath };
   },
@@ -121,6 +139,7 @@ export const FlutterUtil = {
       // Nettoyage manuel si pas de backup
       let content = fs.readFileSync(mainPath, 'utf-8');
       content = content.replace(/import\s+['"]samre_sdk\.dart['"];\s*\n?/g, '');
+      content = content.replace(/builder\s*:\s*\([^)]*\)\s*=>\s*SamreOverlay\s*\(\s*child\s*:\s*child\s*\?\?\s*const\s*SizedBox\(\)\s*\),?\s*\n?/g, '');
       content = content.replace(/SamreOverlay\s*\(\s*child\s*:\s*([^)]+)\)/g, '$1');
       fs.writeFileSync(mainPath, content, 'utf-8');
       mainRestored = true;