dialer/android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
     <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
     <application
-        android:label="Icing Dialer"
+        android:label="com.example.dialer"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:enableOnBackInvokedCallback="true">

dialer/build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-IMG=git.gmoker.com/icing/flutter:main
-
-docker run --rm -v "$PWD:/app/" "$IMG" build apk

dialer/lib/features/contacts/contact_state.dart

@@ -102,25 +102,6 @@ class _ContactStateState extends State<ContactState> {
     });
   }
 
-  bool doesContactExist(Contact contact) {
-    // Example: consider it "existing" if there's a matching phone number
-    for (final existing in _allContacts) {
-      if (existing.toVCard() == contact.toVCard()) {
-        return true;
-      }
-      // for (final phone in existing.phones) {
-      //   for (final newPhone in contact.phones) {
-      //     // Simple exact match; you can do more advanced logic
-      //     if (phone.normalizedNumber == newPhone.normalizedNumber) {
-      //       return true;
-      //     }
-      //   }
-      // }  We might switch to finer and smarter logic later, ex: remove trailing spaces, capitals
-    }
-    return false;
-  }
-
-
   @override
   Widget build(BuildContext context) {
     return _InheritedContactState(

dialer/lib/features/contacts/widgets/add_contact_button.dart

@@ -1,14 +1,22 @@
+import 'package:android_intent_plus/android_intent.dart';
 import 'package:dialer/widgets/qr_scanner.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
 
 class AddContactButton extends StatelessWidget {
   const AddContactButton({super.key});
 
+  Future<void> createNewContact() async {
+    AndroidIntent intent = AndroidIntent(
+      action: 'android.intent.action.INSERT',
+      type: 'vnd.android.cursor.dir/contact',
+    );
+    await intent.launch();
+  }
+
   @override
   Widget build(BuildContext context) {
     return IconButton(
-      icon: const Icon(Icons.add, color: Colors.blue),
+      icon: Icon(Icons.add, color: Colors.blue),
       onPressed: () {
         showDialog(
           context: context,
@@ -20,37 +28,22 @@ class AddContactButton extends StatelessWidget {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   TextButton(
-                    onPressed: () async {
+                    onPressed: () {
-                      Navigator.of(context).pop(); // close dialog
+                      Navigator.of(context).pop();
-
+                      Navigator.push(
-                      // Go to QR Scanner
-                      final vCardString = await Navigator.push(
                         context,
-                        MaterialPageRoute(
+                        MaterialPageRoute(builder: (context) => QRCodeScannerScreen()),
-                          builder: (context) => const QRCodeScannerScreen(),
-                        ),
                       );
-
-                      if (vCardString != null && vCardString is String) {
-                        await FlutterContacts.openExternalInsert(Contact
-                            .fromVCard(vCardString));
-                      }
                     },
-                    child: const Text(
+                    child: Text("Scan QR code", style: TextStyle(color: Colors.white)),
-                      "Scan QR code",
-                      style: TextStyle(color: Colors.white),
-                    ),
                   ),
+
                   TextButton(
                     onPressed: () async {
+                      createNewContact();
                       Navigator.of(context).pop();
-                      // Create a blank contact entry
-                      await FlutterContacts.openExternalInsert();
                     },
-                    child: const Text(
+                    child: Text("Create new contact", style: TextStyle(color: Colors.white)),
-                      "Create new contact",
-                      style: TextStyle(color: Colors.white),
-                    ),
                   ),
                 ],
               ),

dialer/lib/widgets/qr_scanner.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
 
 class QRCodeScannerScreen extends StatefulWidget {
   const QRCodeScannerScreen({Key? key}) : super(key: key);
@@ -9,7 +10,8 @@ class QRCodeScannerScreen extends StatefulWidget {
 }
 
 class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
-  final MobileScannerController cameraController = MobileScannerController();
+  MobileScannerController cameraController = MobileScannerController();
+
   bool isScanning = true;
 
   @override
@@ -18,22 +20,104 @@ class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
     super.dispose();
   }
 
-  void _showInvalidQRDialog() {
+  Future<void> _createContactFromVCard(String vCardData) async {
+    // Parse VCard data
+    final Map<String, dynamic> contactInfo = _parseVCard(vCardData);
+
+    debugPrint("contactInfo: $contactInfo");
+
+    // // Create a new contact
+    // Contact newContact = Contact();
+    //
+    // // Set contact's name
+    // newContact.name = Name(
+    //   first: contactInfo['firstName'] ?? '',
+    //   last: contactInfo['lastName'] ?? '',
+    // );
+    //
+    // // Set contact's phone numbers
+    // if (contactInfo['phone'] != null) {
+    //   newContact.phones = [
+    //     Phone(contactInfo['phone'], label: PhoneLabel.mobile),
+    //   ];
+    // }
+    //
+    // // Set contact's emails
+    // if (contactInfo['email'] != null) {
+    //   newContact.emails = [
+    //     Email(contactInfo['email'], label: EmailLabel.home),
+    //   ];
+    // }
+    //
+    // // Request permission to write contacts
+    // bool permission = await FlutterContacts.requestPermission(readonly: false);
+    // if (!permission) {
+    //   // Handle permission denied
+    //   ScaffoldMessenger.of(context).showSnackBar(
+    //     SnackBar(content: Text('Contacts permission denied')),
+    //   );
+    //   return;
+    // }
+    //
+    // // Save the contact
+    // await newContact.insert();
+  }
+
+  Map<String, dynamic> _parseVCard(String vCardData) {
+    // Simple parser for VCard data
+    final Map<String, dynamic> contactInfo = {};
+
+    final lines = vCardData.split(RegExp(r'\r?\n'));
+    for (var line in lines) {
+      if (line.startsWith('FN:')) {
+        contactInfo['fullName'] = line.substring(3).trim();
+      } else if (line.startsWith('N:')) {
+        final names = line.substring(2).split(';');
+        contactInfo['lastName'] = names[0].trim();
+        contactInfo['firstName'] = names.length > 1 ? names[1].trim() : '';
+      } else if (line.startsWith('TEL:')) {
+        contactInfo['phone'] = line.substring(4).trim();
+      } else if (line.startsWith('EMAIL:')) {
+        contactInfo['email'] = line.substring(6).trim();
+      }
+      // Add more fields as needed
+    }
+
+    return contactInfo;
+  }
+
+  void _showContactAddedDialog() {
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: const Text('Invalid QR Code'),
+        title: Text('Contact Added'),
-        content:
+        content: Text('The contact has been added to your address book.'),
-        const Text('The scanned QR code does not contain valid vCard data.'),
         actions: [
           TextButton(
             onPressed: () {
               Navigator.of(context).pop(); // Close dialog
-              setState(() {
+              Navigator.of(context).pop(); // Go back to previous screen
-                isScanning = true; // Resume scanning
-              });
             },
-            child: const Text('Try Again'),
+            child: Text('OK'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showInvalidQRDialog() {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Invalid QR Code'),
+        content: Text('The scanned QR code does not contain valid contact information.'),
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.of(context).pop(); // Close dialog
+              isScanning = true; // Resume scanning
+            },
+            child: Text('Try Again'),
           ),
         ],
       ),
@@ -44,27 +128,32 @@ class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Scan Contact QR Code'),
+        title: Text('Scan Contact QR Code'),
       ),
       body: MobileScanner(
         controller: cameraController,
-        // allowDuplicates: false, // or true, depending on your preference
         onDetect: (capture) {
           if (!isScanning) return;
-          isScanning = false; // Stop multiple triggers
 
+          isScanning = false; // Prevent multiple scans
           final List<Barcode> barcodes = capture.barcodes;
+
           for (final barcode in barcodes) {
             final String? code = barcode.rawValue;
-            // If the QR code contains 'BEGIN:VCARD', let's assume it's a valid vCard
             if (code != null && code.contains('BEGIN:VCARD')) {
-              Navigator.pop(context, code); // pop back with the full vCard text
+              // Handle valid vCard QR code
-              return;
+              _createContactFromVCard(code);
+              _showContactAddedDialog(); // TODO: Be a confirmation button "do you want to add XXX to your contacts?"
+              break;
             }
           }
 
-          // If no valid vCard was found in any of the barcodes
+          if (!barcodes.any((barcode) =>
-          _showInvalidQRDialog();
+          barcode.rawValue != null && barcode.rawValue!.contains('BEGIN:VCARD'))) {
+            // If no valid QR code is found
+            _showInvalidQRDialog();
+            isScanning = true; // Allow scanning again for invalid QR codes
+          }
         },
       ),
     );

dialer/packages/mobile_number/example/ios/Runner/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Icing Dialer</string>
+	<string>mobile_number_example</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

dialer/run.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-IMG=git.gmoker.com/icing/flutter:main
-
-docker run --rm -p 5037:5037 -v "$PWD:/app/" "$IMG" run