Removed French / clean bad english (#21)

Reviewed-on: #21

.gitea/workflows/mirror.yaml

@@ -0,0 +1,11 @@
+on: push
+
+jobs:
+  mirror:
+    runs-on: debian
+    steps:
+      - uses: actions/mirror@v1
+        with:
+          ssh_priv: "${{ secrets.SSHGH }}"
+          known_hosts: "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"
+          url: "git@github.com:EpitechPromo2026/G-EIP-700-TLS-7-1-eip-stephane.corbiere.git"

.gitea/workflows/website.yaml

@@ -0,0 +1,38 @@
+on:
+  push:
+    paths:
+      - website/**
+
+jobs:
+  deploy:
+    runs-on: debian
+    defaults:
+      run:
+        working-directory: website
+    steps:
+      - uses: actions/checkout@v1
+      - name: setup env
+        run: |
+          . ./.env || true
+          if [ "${{ gitea.ref_name }}" == prod ] && [ -n "$PROD_URL" ]; then
+            BASE_URL="$PROD_URL"
+          else
+            BASE_URL="${{ gitea.ref_name }}.$(tr / '\n' <<< "${{ gitea.repository }}" | tac | tr '\n' .)k8s.gmoker.com"
+          fi
+          REGISTRY="$(sed 's .*://  ' <<< ${{ gitea.server_url }})"
+          cat <<EOF >> .env
+          BASE_URL="$(printf '%s' "$BASE_URL" | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-.' -)"
+          IMAGEAPP="$REGISTRY/$(printf '%s' "${{ gitea.repository }}:${{ gitea.ref_name }}" | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-/:_' _)"
+          EOF
+          cat .env
+
+      - uses: actions/kaniko@v1
+        with:
+          password: "${{ secrets.PKGRW }}"
+          dockerfile: website/Dockerfile
+
+      - uses: actions/k8sdeploy@v1
+        with:
+          kubeconfig: "${{ secrets.K8S }}"
+          registry_password: "${{ secrets.PKGRW }}"
+          workdir: website

README.md

@@ -0,0 +1,13 @@
+# Icing
+
+An Epitech Innovation Project
+
+*By*
+**Bartosz Michalak - Alexis Danlos - Florian Griffon - Ange Duhayon - Stéphane Corbière**
+
+---
+
+The **docs** folder contains documentation about:
+- The project
+- A user manual
+- Our automations

dialer/README.md

@@ -1,5 +0,0 @@
-# ICING Dialer
-
-Project aiming to <i>ice</i> your **non-internet** phone calls, thanks to a custom and super-cryptographic dialer app.
-
-Like & Follow !

dialer/android/.gitignore

@@ -5,6 +5,7 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+gradle.properties
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/to/reference-keystore

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

@@ -1,6 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
+    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

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

@@ -1,10 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
+    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
     <application
         android:label="com.example.dialer"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -1,6 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
+    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

dialer/android/build.gradle

@@ -16,3 +16,4 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+

dialer/android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64
+dev.steenbakker.mobile_scanner.useUnbundled=true

dialer/ios/.gitignore

@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3

dialer/ios/Flutter/Debug.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

dialer/ios/Flutter/Release.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

dialer/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

dialer/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dialer/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

dialer/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dialer/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

dialer/ios/Runner/AppDelegate.swift

@@ -1,13 +0,0 @@
-import Flutter
-import UIKit
-
-@main
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}

dialer/ios/Runner/Runner-Bridging-Header.h

@@ -1 +0,0 @@
-#import "GeneratedPluginRegistrant.h"

dialer/ios/RunnerTests/RunnerTests.swift

@@ -1,12 +0,0 @@
-import Flutter
-import UIKit
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}

dialer/lib/features/composition/composition.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../../widgets/contact_service.dart';
+import '../contacts/widgets/add_contact_button.dart';
 
 class CompositionPage extends StatefulWidget {
   const CompositionPage({super.key});
@@ -12,6 +15,7 @@ class _CompositionPageState extends State<CompositionPage> {
   String dialedNumber = "";
   List<Contact> _allContacts = [];
   List<Contact> _filteredContacts = [];
+  final ContactService _contactService = ContactService();
 
   @override
   void initState() {
@@ -20,11 +24,9 @@ class _CompositionPageState extends State<CompositionPage> {
   }
 
   Future<void> _fetchContacts() async {
-    if (await FlutterContacts.requestPermission()) {
-      _allContacts = await FlutterContacts.getContacts(withProperties: true);
-      _filteredContacts = _allContacts;
-      setState(() {});
-    }
+    _allContacts = await _contactService.fetchContacts();
+    _filteredContacts = _allContacts;
+    setState(() {});
   }
 
   void _filterContacts() {
@@ -63,9 +65,24 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
-  // Placeholder function for adding contact
-  void addContact(String number) {
-    // This function is empty for now
+  // Function to call a contact's number
+  void _launchPhoneDialer(String phoneNumber) async {
+    final uri = Uri(scheme: 'tel', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch $phoneNumber');
+    }
+  }
+
+  // Function to send an SMS to a contact's number
+  void _launchSms(String phoneNumber) async {
+    final uri = Uri(scheme: 'sms', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not send SMS to $phoneNumber');
+    }
   }
 
   @override
@@ -79,9 +96,9 @@ class _CompositionPageState extends State<CompositionPage> {
               // Top half: Display contacts matching dialed number
               Expanded(
                 flex: 2,
-                child:
-                Container(
-                  padding: const EdgeInsets.only(top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
+                child: Container(
+                  padding: const EdgeInsets.only(
+                      top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
                   color: Colors.black,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -90,32 +107,39 @@ class _CompositionPageState extends State<CompositionPage> {
                         child: ListView(
                           children: _filteredContacts.isNotEmpty
                               ? _filteredContacts.map((contact) {
+                                  final phoneNumber = contact.phones.isNotEmpty
+                                      ? contact.phones.first.number
+                                      : 'No phone number';
                                   return ListTile(
                                     title: Text(
                                       contact.displayName,
-                                      style: const TextStyle(color: Colors.white),
+                                      style:
+                                          const TextStyle(color: Colors.white),
+                                    ),
+                                    subtitle: Text(
+                                      phoneNumber,
+                                      style:
+                                          const TextStyle(color: Colors.grey),
                                     ),
-                                    subtitle: contact.phones.isNotEmpty
-                                        ? Text(
-                                            contact.phones.first.number,
-                                            style: const TextStyle(color: Colors.grey),
-                                          )
-                                        : null,
                                     trailing: Row(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
                                         // Call button
                                         IconButton(
-                                          icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
+                                          icon: Icon(Icons.phone,
+                                              color: Colors.green[300],
+                                              size: 20),
                                           onPressed: () {
-                                            print('Calling ${contact.displayName}');
+                                            _launchPhoneDialer(phoneNumber);
                                           },
                                         ),
-                                        // Text button
+                                        // Message button
                                         IconButton(
-                                          icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
+                                          icon: Icon(Icons.message,
+                                              color: Colors.blue[300],
+                                              size: 20),
                                           onPressed: () {
-                                            print('Texting ${contact.displayName}');
+                                            _launchSms(phoneNumber);
                                           },
                                         ),
                                       ],
@@ -125,7 +149,12 @@ class _CompositionPageState extends State<CompositionPage> {
                                     },
                                   );
                                 }).toList()
-                              : [Center(child: Text('No contacts found', style: TextStyle(color: Colors.white)))],
+                              : [
+                                  Center(
+                                      child: Text('No contacts found',
+                                          style:
+                                              TextStyle(color: Colors.white)))
+                                ],
                         ),
                       ),
                     ],
@@ -150,14 +179,16 @@ class _CompositionPageState extends State<CompositionPage> {
                               alignment: Alignment.center,
                               child: Text(
                                 dialedNumber,
-                                style: const TextStyle(fontSize: 24, color: Colors.white),
+                                style: const TextStyle(
+                                    fontSize: 24, color: Colors.white),
                                 overflow: TextOverflow.ellipsis,
                               ),
                             ),
                           ),
                           IconButton(
                             onPressed: _onClearPress,
-                            icon: const Icon(Icons.backspace, color: Colors.white),
+                            icon: const Icon(Icons.backspace,
+                                color: Colors.white),
                           ),
                         ],
                       ),
@@ -170,7 +201,8 @@ class _CompositionPageState extends State<CompositionPage> {
                             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                             children: [
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
                                 children: [
                                   _buildDialButton('1'),
                                   _buildDialButton('2'),
@@ -178,7 +210,8 @@ class _CompositionPageState extends State<CompositionPage> {
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
                                 children: [
                                   _buildDialButton('4'),
                                   _buildDialButton('5'),
@@ -186,7 +219,8 @@ class _CompositionPageState extends State<CompositionPage> {
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
                                 children: [
                                   _buildDialButton('7'),
                                   _buildDialButton('8'),
@@ -194,7 +228,8 @@ class _CompositionPageState extends State<CompositionPage> {
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceEvenly,
                                 children: [
                                   _buildDialButton('*'),
                                   _buildDialButton('0'),
@@ -209,20 +244,19 @@ class _CompositionPageState extends State<CompositionPage> {
                   ),
                 ),
               ),
-
-              // Add Contact Button with empty function call
-              Padding(
-                padding: const EdgeInsets.only(bottom: 20.0),
-                child: FloatingActionButton(
-                  backgroundColor: Colors.blue,
-                  onPressed: () {
-                    addContact(dialedNumber);
-                  },
-                  child: const Icon(Icons.person_add, color: Colors.white),
-                ),
-              ),
             ],
           ),
+
+          // Add Contact Button
+          Positioned(
+            bottom: 20.0,
+            left: 0,
+            right: 0,
+            child: Center(
+              child: AddContactButton(),
+            ),
+          ),
+
           // Top Row with Back Arrow
           Positioned(
             top: 40.0,

dialer/lib/features/contacts/contact_page.dart

@@ -17,8 +17,10 @@ class _ContactPageState extends State<ContactPage> {
     return Scaffold(
       body: contactState.loading
           ? const LoadingIndicatorWidget()
-          // : ContactListWidget(contacts: contactState.contacts),
-          : AlphabetScrollPage(contacts: contactState.contacts, scrollOffset: contactState.scrollOffset),
+          : AlphabetScrollPage(
+              scrollOffset: contactState.scrollOffset,
+              contacts: contactState.contacts, // Use all contacts here
+            ),
     );
   }
 }

dialer/lib/features/contacts/contact_service.dart

@@ -1,15 +0,0 @@
-import 'package:flutter_contacts/flutter_contacts.dart';
-
-// Service to manage contact-related operations
-class ContactService {
-  Future<List<Contact>> fetchContacts() async {
-    if (await FlutterContacts.requestPermission()) {
-      return await FlutterContacts.getContacts(withProperties: true, withThumbnail: true);
-    }
-    return [];
-  }
-
-  Future<void> addNewContact(Contact contact) async {
-    await FlutterContacts.insertContact(contact);
-  }
-}

dialer/lib/features/contacts/contact_state.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
-import 'contact_service.dart';
+import '../../widgets/contact_service.dart';
 
 class ContactState extends StatefulWidget {
   final Widget child;
@@ -8,7 +8,9 @@ class ContactState extends StatefulWidget {
   const ContactState({super.key, required this.child});
 
   static _ContactStateState of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<_InheritedContactState>()!.data;
+    return context
+        .dependOnInheritedWidgetOfExactType<_InheritedContactState>()!
+        .data;
   }
 
   @override
@@ -17,39 +19,81 @@ class ContactState extends StatefulWidget {
 
 class _ContactStateState extends State<ContactState> {
   final ContactService _contactService = ContactService();
-  List<Contact> _contacts = [];
+  List<Contact> _allContacts = [];
+  List<Contact> _favoriteContacts = [];
   bool _loading = true;
   double _scrollOffset = 0.0;
+  Contact? _selfContact = Contact();
 
-  List<Contact> get contacts => _contacts;
+  // Getters for all contacts and favorites
+  List<Contact> get contacts => _allContacts;
+  List<Contact> get favoriteContacts => _favoriteContacts;
   bool get loading => _loading;
   double get scrollOffset => _scrollOffset;
+  Contact? get selfContact => _selfContact;
 
   @override
   void initState() {
     super.initState();
-    _fetchContacts();
+    fetchContacts(); // Fetch all contacts by default
+    FlutterContacts.addListener(_onContactChange);
   }
 
-  Future<void> _fetchContacts() async {
-    List<Contact> contacts = await _contactService.fetchContacts();
+  void _onContactChange() => fetchContacts();
+
+  @override
+  void dispose() {
+    FlutterContacts.removeListener(_onContactChange);
+    super.dispose();
+  }
+
+  // Fetch all contacts
+  Future<void> fetchContacts() async {
+    setState(() => _loading = true);
+    try {
+      List<Contact> contacts = await _contactService.fetchContacts();
+      _processContacts(contacts);
+    } finally {
+      setState(() => _loading = false);
+    }
+  }
+
+  // Fetch only favorite contacts
+  Future<void> fetchFavoriteContacts() async {
+    setState(() => _loading = true);
+    try {
+      List<Contact> contacts = await _contactService.fetchFavoriteContacts();
+      setState(() => _favoriteContacts = contacts);
+    } finally {
+      setState(() => _loading = false);
+    }
+  }
+
+  void _processContacts(List<Contact> contacts) {
+    _selfContact = contacts.firstWhere(
+      (contact) => contact.displayName.toLowerCase() == "user",
+      orElse: () => Contact(),
+    );
+
+    if (_selfContact!.phones.isEmpty) {
+      debugPrint("Self contact has no phone numbers");
+      _selfContact = null;
+    }
+
     contacts = contacts.where((contact) => contact.phones.isNotEmpty).toList();
     contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
-    // contacts.sort((a, b) {
-      // String aName = a.displayName.isNotEmpty ? a.displayName : '􏿿';
-      // String bName = b.displayName.isNotEmpty ? b.displayName : '􏿿';
-      // return aName.compareTo(bName);
-    // });
+
     setState(() {
-      _contacts = contacts;
-      _loading = false;
+      _allContacts = contacts;
+      _favoriteContacts =
+          contacts.where((contact) => contact.isStarred).toList();
+      _selfContact = _selfContact;
     });
   }
 
-
   Future<void> addNewContact(Contact contact) async {
     await _contactService.addNewContact(contact);
-    await _fetchContacts();
+    await fetchContacts();
   }
 
   void setScrollOffset(double offset) {
@@ -67,6 +111,7 @@ class _ContactStateState extends State<ContactState> {
   }
 }
 
+
 class _InheritedContactState extends InheritedWidget {
   final _ContactStateState data;
 

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

@@ -0,0 +1,56 @@
+import 'package:android_intent_plus/android_intent.dart';
+import 'package:dialer/widgets/qr_scanner.dart';
+import 'package:flutter/material.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: Icon(Icons.add, color: Colors.blue),
+      onPressed: () {
+        showDialog(
+          context: context,
+          barrierDismissible: true, // Allows dismissal by tapping outside
+          builder: (BuildContext context) {
+            return AlertDialog(
+              backgroundColor: Colors.black,
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(builder: (context) => QRCodeScannerScreen()),
+                      );
+                    },
+                    child: Text("Scan QR code", style: TextStyle(color: Colors.white)),
+                  ),
+
+                  TextButton(
+                    onPressed: () async {
+                      createNewContact();
+                      Navigator.of(context).pop();
+                    },
+                    child: Text("Create new contact", style: TextStyle(color: Colors.white)),
+                  ),
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+}

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

@@ -2,12 +2,20 @@ import 'package:dialer/widgets/username_color_generator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import '../contact_state.dart';
+import '../../../widgets/color_darkener.dart';
+import 'add_contact_button.dart';
+import 'contact_modal.dart';
+import 'share_own_qr.dart';
 
 class AlphabetScrollPage extends StatefulWidget {
-  final List<Contact> contacts;
   final double scrollOffset;
+  final List<Contact> contacts;
 
-  const AlphabetScrollPage({super.key, required this.contacts, required this.scrollOffset});
+  const AlphabetScrollPage({
+    super.key,
+    required this.scrollOffset,
+    required this.contacts,
+  });
 
   @override
   _AlphabetScrollPageState createState() => _AlphabetScrollPageState();
@@ -28,11 +36,53 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
     contactState.setScrollOffset(_scrollController.offset);
   }
 
+  Future<void> _refreshContacts() async {
+    final contactState = ContactState.of(context);
+    try {
+      await contactState.fetchContacts();
+    } catch (e) {
+      print('Error refreshing contacts: $e');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to refresh contacts')),
+      );
+    }
+  }
+
+  void _toggleFavorite(Contact contact) async {
+    try {
+      if (await FlutterContacts.requestPermission()) {
+        Contact? fullContact = await FlutterContacts.getContact(contact.id,
+            withProperties: true,
+            withAccounts: true,
+            withPhoto: true,
+            withThumbnail: true);
+
+        if (fullContact != null) {
+          fullContact.isStarred = !fullContact.isStarred;
+          await FlutterContacts.updateContact(fullContact);
+        }
+        await _refreshContacts();
+      } else {
+        print("Could not fetch contact details");
+      }
+    } catch (e) {
+      print("Error updating favorite status: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to update contact favorite status')),
+      );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
+    final contacts = widget.contacts;
+    final selfContact = ContactState.of(context).selfContact;
+
     Map<String, List<Contact>> alphabetizedContacts = {};
-    for (var contact in widget.contacts) {
-      String firstLetter = contact.displayName.isNotEmpty ? contact.displayName[0].toUpperCase() : '#';
+    for (var contact in contacts) {
+      String firstLetter = contact.displayName.isNotEmpty
+          ? contact.displayName[0].toUpperCase()
+          : '#';
       if (!alphabetizedContacts.containsKey(firstLetter)) {
         alphabetizedContacts[firstLetter] = [];
       }
@@ -41,50 +91,125 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
 
     List<String> alphabetKeys = alphabetizedContacts.keys.toList()..sort();
 
-    return ListView.builder(
-      controller: _scrollController,
-      itemCount: alphabetKeys.length,
-      itemBuilder: (context, index) {
-        String letter = alphabetKeys[index];
-        List<Contact> contacts = alphabetizedContacts[letter]!;
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
-              child: Text(
-                letter,
-                style: TextStyle(
-                  fontSize: 28,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Column(
+        children: [
+          // Top buttons row
+          Container(
+            color: Colors.black,
+            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                AddContactButton(),
+                QRCodeButton(contacts: contacts, selfContact: selfContact),
+              ],
             ),
-            ...contacts.map((contact) {
-              String phoneNumber = contact.phones.isNotEmpty ? contact.phones.first.number : 'No phone number';
-              Color avatarColor = generateColorFromName(contact.displayName);
-              return ListTile(
-                leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
-                    ? CircleAvatar(
-                        backgroundImage: MemoryImage(contact.thumbnail!),
-                      )
-                    : CircleAvatar(
-                        backgroundColor: avatarColor,
-                        child: Text(
-                          contact.displayName.isNotEmpty ? contact.displayName[0].toUpperCase() : '?',
-                          style: TextStyle(color: Colors.white),
+          ),
+          // Contact List
+          Expanded(
+            child: ListView.builder(
+              controller: _scrollController,
+              itemCount: alphabetKeys.length,
+              itemBuilder: (context, index) {
+                String letter = alphabetKeys[index];
+                List<Contact> contactsForLetter = alphabetizedContacts[letter]!;
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    // Alphabet Letter Header
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 8.0, horizontal: 16.0),
+                      child: Text(
+                        letter,
+                        style: TextStyle(
+                          fontSize: 28,
+                          fontWeight: FontWeight.bold,
+                          color: Colors.white,
                         ),
                       ),
-                title: Text(contact.displayName),
-                subtitle: Text(phoneNumber),
-                onTap: () {
-                  // Handle contact tap
-                },
-              );
-            }),
-          ],
-        );
-      },
+                    ),
+                    // Contact Entries
+                    ...contactsForLetter.map((contact) {
+                      String phoneNumber = contact.phones.isNotEmpty
+                          ? contact.phones.first.number
+                          : 'No phone number';
+                      Color avatarColor =
+                          generateColorFromName(contact.displayName);
+                      return ListTile(
+                        leading: (contact.thumbnail != null &&
+                                contact.thumbnail!.isNotEmpty)
+                            ? CircleAvatar(
+                                backgroundImage:
+                                    MemoryImage(contact.thumbnail!),
+                              )
+                            : CircleAvatar(
+                                backgroundColor: avatarColor,
+                                child: Text(
+                                  contact.displayName.isNotEmpty
+                                      ? contact.displayName[0].toUpperCase()
+                                      : '?',
+                                  style: TextStyle(
+                                      color: darken(avatarColor, 0.4)),
+                                ),
+                              ),
+                        title: Text(contact.displayName,
+                            style: TextStyle(color: Colors.white)),
+                        subtitle: Text(phoneNumber,
+                            style: TextStyle(color: Colors.white70)),
+                        onTap: () {
+                          showModalBottomSheet(
+                            context: context,
+                            isScrollControlled: true,
+                            backgroundColor: Colors.transparent,
+                            builder: (context) {
+                              return ContactModal(
+                                contact: contact,
+                                onEdit: () async {
+                                  if (await FlutterContacts.requestPermission()) {
+                                    final updatedContact =
+                                        await FlutterContacts.openExternalEdit(
+                                            contact.id);
+                                    if (updatedContact != null) {
+                                      await _refreshContacts();
+                                      Navigator.of(context).pop();
+                                      ScaffoldMessenger.of(context)
+                                          .showSnackBar(
+                                        SnackBar(
+                                          content: Text(
+                                              '${contact.displayName} updated successfully!'),
+                                        ),
+                                      );
+                                    } else {
+                                      ScaffoldMessenger.of(context)
+                                          .showSnackBar(
+                                        SnackBar(
+                                          content:
+                                              Text('Edit canceled or failed.'),
+                                        ),
+                                      );
+                                    }
+                                  }
+                                },
+                                onToggleFavorite: () {
+                                  _toggleFavorite(contact);
+                                },
+                                isFavorite: contact.isStarred,
+                              );
+                            },
+                          );
+                        },
+                      );
+                    }),
+                  ],
+                );
+              },
+            ),
+          ),
+        ],
+      ),
     );
   }
 

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

@@ -1,40 +0,0 @@
-import 'package:dialer/widgets/color_darkener.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-
-class ContactListWidget extends StatelessWidget {
-  final List<Contact> contacts;
-
-  const ContactListWidget({super.key, required this.contacts});
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.builder(
-      itemCount: contacts.length,
-      itemBuilder: (context, index) {
-        Contact contact = contacts[index];
-        String phoneNumber = contact.phones.isNotEmpty ? contact.phones.first.number : 'No phone number';
-        Color avatarColor = generateColorFromName(contact.displayName);
-        return ListTile(
-          leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
-              ? CircleAvatar(
-                  backgroundImage: MemoryImage(contact.thumbnail!),
-                )
-              : CircleAvatar(
-                  backgroundColor: avatarColor,
-                  child: Text(
-                    contact.displayName.isNotEmpty ? contact.displayName[0].toUpperCase() : '?',
-                    style: TextStyle(fontSize: 25, color: darken(avatarColor, 0.4)),
-                  ),
-                ),
-          title: Text(contact.displayName),
-          subtitle: Text(phoneNumber),
-          onTap: () {
-            // Handle contact tap
-          },
-        );
-      },
-    );
-  }
-}

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

@@ -0,0 +1,341 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:dialer/widgets/username_color_generator.dart';
+import '../../../widgets/block_service.dart';
+
+class ContactModal extends StatefulWidget {
+  final Contact contact;
+  final Function onEdit;
+  final Function onToggleFavorite;
+  final bool isFavorite;
+
+  const ContactModal({
+    super.key,
+    required this.contact,
+    required this.onEdit,
+    required this.onToggleFavorite,
+    required this.isFavorite,
+  });
+
+  @override
+  _ContactModalState createState() => _ContactModalState();
+}
+
+class _ContactModalState extends State<ContactModal> {
+  late String phoneNumber;
+  bool isBlocked = false;
+
+  @override
+  void initState() {
+    super.initState();
+    phoneNumber = widget.contact.phones.isNotEmpty
+        ? widget.contact.phones.first.number
+        : 'No phone number';
+    _checkIfBlocked();
+  }
+
+  Future<void> _checkIfBlocked() async {
+    if (phoneNumber != 'No phone number') {
+      bool blocked = await BlockService().isNumberBlocked(phoneNumber);
+      setState(() {
+        isBlocked = blocked;
+      });
+    }
+  }
+
+  Future<void> _toggleBlockState() async {
+    if (phoneNumber == 'No phone number') {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('No phone number to block or unblock')),
+      );
+    } else if (isBlocked) {
+      await BlockService().unblockNumber(phoneNumber);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('$phoneNumber has been unblocked')),
+      );
+    } else {
+      await BlockService().blockNumber(phoneNumber);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('$phoneNumber has been blocked')),
+      );
+    }
+
+    if (phoneNumber != 'No phone number') {
+      _checkIfBlocked();
+    }
+    Navigator.of(context).pop();
+  }
+
+  void _launchPhoneDialer(String phoneNumber) async {
+    final uri = Uri(scheme: 'tel', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch $phoneNumber');
+    }
+  }
+
+  void _launchSms(String phoneNumber) async {
+    final uri = Uri(scheme: 'sms', path: phoneNumber);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch SMS to $phoneNumber');
+    }
+  }
+
+  void _launchEmail(String email) async {
+    final uri = Uri(scheme: 'mailto', path: email);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      debugPrint('Could not launch email to $email');
+    }
+  }
+
+void _deleteContact() async {
+  final bool shouldDelete = await showDialog(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: const Text('Delete Contact'),
+      content: Text('Are you sure you want to delete ${widget.contact.displayName}?'),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(false),
+          child: const Text('Cancel'),
+        ),
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(true),
+          child: const Text('Delete'),
+        ),
+      ],
+    ),
+  );
+
+  if (shouldDelete) {
+    try {
+      // Delete the contact
+      await FlutterContacts.deleteContact(widget.contact);
+
+      // Show success message
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('${widget.contact.displayName} deleted')),
+      );
+
+      // Close the modal
+      Navigator.of(context).pop();
+    } catch (e) {
+      // Handle errors and show a failure message
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to delete ${widget.contact.displayName}: $e')),
+      );
+    }
+  }
+}
+
+  @override
+  Widget build(BuildContext context) {
+    String email = widget.contact.emails.isNotEmpty
+        ? widget.contact.emails.first.address
+        : 'No email';
+
+    return GestureDetector(
+      onTap: () => Navigator.of(context).pop(),
+      child: Container(
+        color: Colors.black.withOpacity(0.5),
+        child: GestureDetector(
+          onTap: () {},
+          child: FractionallySizedBox(
+            child: Container(
+              decoration: BoxDecoration(
+                color: Colors.grey[900],
+                borderRadius:
+                    const BorderRadius.vertical(top: Radius.circular(20)),
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  // Modal Handle and Three-Dot Menu
+                  Stack(
+                    children: [
+                      Align(
+                        alignment: Alignment.center,
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 10),
+                          child: Container(
+                            width: 50,
+                            height: 5,
+                            decoration: BoxDecoration(
+                              color: Colors.grey.shade300,
+                              borderRadius: BorderRadius.circular(5),
+                            ),
+                          ),
+                        ),
+                      ),
+                      Align(
+                        alignment: Alignment.topRight,
+                        child: Padding(
+                          padding: const EdgeInsets.only(top: 10, right: 10),
+                          child: PopupMenuButton<String>(
+                            icon: const Icon(Icons.more_vert,
+                                color: Colors.white),
+                            onSelected: (String choice) {
+                              if (choice == 'delete') {
+                                _deleteContact();
+                              }
+                            },
+                            itemBuilder: (BuildContext context) {
+                              return [
+                                const PopupMenuItem<String>(
+                                  value: 'show_associated_contacts',
+                                  child: Text('Show associated contacts'),
+                                ),
+                                const PopupMenuItem<String>(
+                                  value: 'delete',
+                                  child: Text('Delete'),
+                                ),
+                                const PopupMenuItem<String>(
+                                  value: 'share',
+                                  child: Text('Share (via QR code)'),
+                                ),
+                                const PopupMenuItem<String>(
+                                  value: 'create_shortcut',
+                                  child:
+                                      Text('Create shortcut (to home screen)'),
+                                ),
+                                const PopupMenuItem<String>(
+                                  value: 'set_ringtone',
+                                  child: Text('Set ringtone'),
+                                ),
+                              ];
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  // Contact Profile
+                  Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: Column(
+                      children: [
+                        CircleAvatar(
+                          radius: 50,
+                          backgroundImage: (widget.contact.thumbnail != null &&
+                                  widget.contact.thumbnail!.isNotEmpty)
+                              ? MemoryImage(widget.contact.thumbnail!)
+                              : null,
+                          backgroundColor:
+                              generateColorFromName(widget.contact.displayName),
+                          child: (widget.contact.thumbnail == null ||
+                                  widget.contact.thumbnail!.isEmpty)
+                              ? Text(
+                                  widget.contact.displayName.isNotEmpty
+                                      ? widget.contact.displayName[0]
+                                          .toUpperCase()
+                                      : '?',
+                                  style: const TextStyle(
+                                      fontSize: 40, color: Colors.white),
+                                )
+                              : null,
+                        ),
+                        const SizedBox(height: 10),
+                        Text(
+                          widget.contact.displayName,
+                          style: const TextStyle(
+                              fontSize: 24, fontWeight: FontWeight.bold),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const Divider(),
+                  // Contact Actions
+                  ListTile(
+                    leading: const Icon(Icons.phone, color: Colors.green),
+                    title: Text(phoneNumber),
+                    onTap: () {
+                      if (widget.contact.phones.isNotEmpty) {
+                        _launchPhoneDialer(phoneNumber);
+                      }
+                    },
+                  ),
+                  ListTile(
+                    leading: const Icon(Icons.message, color: Colors.blue),
+                    title: Text(phoneNumber),
+                    onTap: () {
+                      if (widget.contact.phones.isNotEmpty) {
+                        _launchSms(phoneNumber);
+                      }
+                    },
+                  ),
+                  ListTile(
+                    leading: const Icon(Icons.email, color: Colors.orange),
+                    title: Text(email),
+                    onTap: () {
+                      if (widget.contact.emails.isNotEmpty) {
+                        _launchEmail(email);
+                      }
+                    },
+                  ),
+                  const Divider(),
+                  // Favorite, Edit, and Block/Unblock Buttons
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Column(
+                      children: [
+                        // Favorite button
+                        SizedBox(
+                          width: double
+                              .infinity, // This makes the button take full width
+                          child: ElevatedButton.icon(
+                            onPressed: () {
+                              Navigator.of(context).pop();
+                              widget.onToggleFavorite();
+                            },
+                            icon: Icon(widget.isFavorite
+                                ? Icons.star
+                                : Icons.star_border),
+                            label: Text(
+                                widget.isFavorite ? 'Unfavorite' : 'Favorite'),
+                          ),
+                        ),
+                        const SizedBox(height: 10), // Space between buttons
+
+                        // Edit button
+                        SizedBox(
+                          width: double
+                              .infinity, // This makes the button take full width
+                          child: ElevatedButton.icon(
+                            onPressed: () => widget.onEdit(),
+                            icon: const Icon(Icons.edit),
+                            label: const Text('Edit Contact'),
+                          ),
+                        ),
+                        const SizedBox(height: 10), // Space between buttons
+
+                        // Block/Unblock button
+                        SizedBox(
+                          width: double
+                              .infinity, // This makes the button take full width
+                          child: ElevatedButton.icon(
+                            onPressed: _toggleBlockState,
+                            icon: Icon(
+                                isBlocked ? Icons.block : Icons.block_flipped),
+                            label: Text(isBlocked ? 'Unblock' : 'Block'),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+
+                  const SizedBox(height: 16),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,55 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/contact.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+
+class QRCodeButton extends StatelessWidget {
+  final List<Contact> contacts;
+  final Contact? selfContact;
+
+  const QRCodeButton({super.key, required this.contacts, this.selfContact});
+
+  Contact? getSelfContact() {
+    if (kDebugMode) {
+      debugPrint("Checking for self contact");
+    }
+    for (var contact in contacts) {
+      if (contact.groups.any((group) => group.name.toLowerCase() == "user")) {
+        return contact;
+      }
+    }
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    return IconButton(
+      icon: Icon(Icons.qr_code, color: selfContact != null ? Colors.blue : Colors.grey),
+      onPressed: selfContact != null
+          ? () {
+        showDialog(
+          barrierColor: Colors.white24,
+          context: context,
+          barrierDismissible: true,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              backgroundColor: Colors.black,
+              content: SizedBox(
+                width: 200,
+                height: 220,
+                child: QrImageView(
+                  data: selfContact!.toVCard(),
+                  version: QrVersions.auto,
+                  backgroundColor: Colors.white, // Ensure QR code is visible on black background
+                  size: 200.0,
+                ),
+              ),
+            );
+          },
+        );
+      }
+          : null,
+    );
+  }
+}

dialer/lib/features/favorites/favorites_page.dart

@@ -1,23 +1,32 @@
+import 'package:dialer/features/contacts/contact_state.dart';
+import 'package:dialer/features/contacts/widgets/alphabet_scroll_page.dart';
 import 'package:flutter/material.dart';
+import 'package:dialer/widgets/loading_indicator.dart';
 
-class FavoritePage extends StatefulWidget {
-  const FavoritePage({super.key});
+class FavoritesPage extends StatefulWidget {
+  const FavoritesPage({super.key});
 
   @override
-  _FavoritePageState createState() => _FavoritePageState();
+  _FavoritesPageState createState() => _FavoritesPageState();
 }
 
-class _FavoritePageState extends State<FavoritePage> {
+class _FavoritesPageState extends State<FavoritesPage> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
+    final contactState = ContactState.of(context);
     return Scaffold(
-      backgroundColor: Colors.black,
-      body: Center( // Center the text within the body
-        child: Text(
-          "Hello",
-          style: TextStyle(color: Colors.white), // Change text color for visibility
-        ),
-      ),
+      body: contactState.loading
+          ? const LoadingIndicatorWidget()
+          : AlphabetScrollPage(
+              scrollOffset: contactState.scrollOffset,
+              contacts:
+                  contactState.favoriteContacts, // Use only favorites here
+            ),
     );
   }
 }

dialer/lib/features/history/history_page.dart

@@ -1,14 +1,15 @@
-// history_page.dart
-
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:intl/intl.dart'; // For date formatting
+import 'package:intl/intl.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:dialer/features/contacts/contact_state.dart';
+import 'package:dialer/widgets/username_color_generator.dart';
+import 'package:dialer/widgets/color_darkener.dart';
 
 class History {
   final Contact contact;
   final DateTime date;
-  final String callType;   // 'incoming' or 'outgoing'
+  final String callType; // 'incoming' or 'outgoing'
   final String callStatus; // 'missed' or 'answered'
   final int attempts;
 
@@ -28,9 +29,10 @@ class HistoryPage extends StatefulWidget {
   _HistoryPageState createState() => _HistoryPageState();
 }
 
-class _HistoryPageState extends State<HistoryPage> {
+class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStateMixin {
   List<History> histories = [];
   bool loading = true;
+  int? _expandedIndex;
 
   @override
   void didChangeDependencies() {
@@ -51,7 +53,6 @@ class _HistoryPageState extends State<HistoryPage> {
     }
     List<Contact> contacts = contactState.contacts;
 
-    // Ensure there are enough contacts
     if (contacts.isEmpty) {
       setState(() {
         loading = false;
@@ -59,7 +60,6 @@ class _HistoryPageState extends State<HistoryPage> {
       return;
     }
 
-    // Build histories using the contacts
     setState(() {
       histories = List.generate(
         contacts.length >= 10 ? 10 : contacts.length,
@@ -75,6 +75,47 @@ class _HistoryPageState extends State<HistoryPage> {
     });
   }
 
+  List _buildGroupedList(List<History> historyList) {
+    // Sort histories by date (most recent first)
+    historyList.sort((a, b) => b.date.compareTo(a.date));
+
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+    final yesterday = today.subtract(const Duration(days: 1));
+
+    List<History> todayHistories = [];
+    List<History> yesterdayHistories = [];
+    List<History> olderHistories = [];
+
+    for (var history in historyList) {
+      final callDate = DateTime(history.date.year, history.date.month, history.date.day);
+      if (callDate == today) {
+        todayHistories.add(history);
+      } else if (callDate == yesterday) {
+        yesterdayHistories.add(history);
+      } else {
+        olderHistories.add(history);
+      }
+    }
+
+    // Combine them with headers
+    final items = <dynamic>[];
+    if (todayHistories.isNotEmpty) {
+      items.add('Today');
+      items.addAll(todayHistories);
+    }
+    if (yesterdayHistories.isNotEmpty) {
+      items.add('Yesterday');
+      items.addAll(yesterdayHistories);
+    }
+    if (olderHistories.isNotEmpty) {
+      items.add('Older');
+      items.addAll(olderHistories);
+    }
+
+    return items;
+  }
+
   @override
   Widget build(BuildContext context) {
     final contactState = ContactState.of(context);
@@ -82,9 +123,6 @@ class _HistoryPageState extends State<HistoryPage> {
     if (loading || contactState.loading) {
       return Scaffold(
         backgroundColor: Colors.black,
-        appBar: AppBar(
-          title: const Text('History'),
-        ),
         body: const Center(
           child: CircularProgressIndicator(),
         ),
@@ -94,9 +132,6 @@ class _HistoryPageState extends State<HistoryPage> {
     if (histories.isEmpty) {
       return Scaffold(
         backgroundColor: Colors.black,
-        appBar: AppBar(
-          title: const Text('History'),
-        ),
         body: const Center(
           child: Text(
             'No call history available.',
@@ -106,46 +141,298 @@ class _HistoryPageState extends State<HistoryPage> {
       );
     }
 
+    // Filter missed calls
+    List<History> missedCalls = histories.where((h) => h.callStatus == 'missed').toList();
+
+    final allItems = _buildGroupedList(histories);
+    final missedItems = _buildGroupedList(missedCalls);
+
+    return DefaultTabController(
+      length: 2,
+      child: Scaffold(
+        backgroundColor: Colors.black,
+        appBar: PreferredSize(
+          preferredSize: const Size.fromHeight(kToolbarHeight),
+          child: Container(
+            color: Colors.black,
+            child: const TabBar(
+              tabs: [
+                Tab(text: 'All Calls'),
+                Tab(text: 'Missed Calls'),
+              ],
+              indicatorColor: Colors.white,
+            ),
+          ),
+        ),
+        body: TabBarView(
+          children: [
+            // All Calls
+            _buildListView(allItems),
+            // Missed Calls
+            _buildListView(missedItems),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildListView(List items) {
+    return ListView.builder(
+      itemCount: items.length,
+      itemBuilder: (context, index) {
+        final item = items[index];
+
+        if (item is String) {
+          // This is a header item
+          return Container(
+            padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+            color: Colors.grey[900],
+            child: Text(
+              item,
+              style: const TextStyle(
+                color: Colors.white70,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          );
+        } else if (item is History) {
+          final history = item;
+          final contact = history.contact;
+          final isExpanded = _expandedIndex == index;
+
+          // Generate the avatar color
+          Color avatarColor = generateColorFromName(contact.displayName);
+
+          return Column(
+            children: [
+              ListTile(
+                leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
+                    ? CircleAvatar(
+                  backgroundImage: MemoryImage(contact.thumbnail!),
+                )
+                    : CircleAvatar(
+                  backgroundColor: avatarColor,
+                  child: Text(
+                    contact.displayName.isNotEmpty
+                        ? contact.displayName[0].toUpperCase()
+                        : '?',
+                    style: TextStyle(color: darken(avatarColor, 0.4)),
+                  ),
+                ),
+                title: Text(
+                  contact.displayName,
+                  style: const TextStyle(color: Colors.white),
+                ),
+                subtitle: Text(
+                  '${history.callType} - ${history.callStatus} - ${DateFormat('MMM dd, hh:mm a').format(history.date)}',
+                  style: const TextStyle(color: Colors.grey),
+                ),
+                trailing: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      '${history.attempts}x',
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.phone, color: Colors.green),
+                      onPressed: () async {
+                        if (contact.phones.isNotEmpty) {
+                          final Uri callUri =
+                          Uri(scheme: 'tel', path: contact.phones.first.number);
+                          if (await canLaunchUrl(callUri)) {
+                            await launchUrl(callUri);
+                          } else {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(content: Text('Could not launch call')),
+                            );
+                          }
+                        } else {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(content: Text('Contact has no phone number')),
+                          );
+                        }
+                      },
+                    ),
+                  ],
+                ),
+                onTap: () {
+                  setState(() {
+                    _expandedIndex = isExpanded ? null : index;
+                  });
+                },
+              ),
+              if (isExpanded)
+                Container(
+                  color: Colors.grey[850],
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      TextButton.icon(
+                        onPressed: () async {
+                          if (history.contact.phones.isNotEmpty) {
+                            final Uri smsUri =
+                            Uri(scheme: 'sms', path: history.contact.phones.first.number);
+                            if (await canLaunchUrl(smsUri)) {
+                              await launchUrl(smsUri);
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                const SnackBar(content: Text('Could not send message')),
+                              );
+                            }
+                          } else {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(content: Text('Contact has no phone number')),
+                            );
+                          }
+                        },
+                        icon: const Icon(Icons.message, color: Colors.white),
+                        label: const Text('Message', style: TextStyle(color: Colors.white)),
+                      ),
+                      TextButton.icon(
+                        onPressed: () {
+                          // Navigate to Call Details page
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (_) => CallDetailsPage(history: history),
+                            ),
+                          );
+                        },
+                        icon: const Icon(Icons.info, color: Colors.white),
+                        label: const Text('Details', style: TextStyle(color: Colors.white)),
+                      ),
+                      TextButton.icon(
+                        onPressed: () {
+                          // Implement block number functionality
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(
+                              content: Text('Number blocked (functionality not implemented)'),
+                            ),
+                          );
+                        },
+                        icon: const Icon(Icons.block, color: Colors.white),
+                        label: const Text('Block', style: TextStyle(color: Colors.white)),
+                      ),
+                    ],
+                  ),
+                ),
+            ],
+          );
+        }
+
+        return const SizedBox.shrink();
+      },
+    );
+  }
+}
+
+class CallDetailsPage extends StatelessWidget {
+  final History history;
+
+  const CallDetailsPage({Key? key, required this.history}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final contact = history.contact;
+
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('History'),
+        title: const Text('Call Details'),
+        backgroundColor: Colors.black,
       ),
-      body: ListView.builder(
-        itemCount: histories.length,
-        itemBuilder: (context, index) {
-          final history = histories[index];
-          final contact = history.contact;
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            // Display Contact Name and Thumbnail
+            Row(
+              children: [
+                (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
+                    ? CircleAvatar(
+                  backgroundImage: MemoryImage(contact.thumbnail!),
+                  radius: 30,
+                )
+                    : CircleAvatar(
+                  backgroundColor: Colors.grey[700],
+                  radius: 30,
+                  child: Text(
+                    contact.displayName.isNotEmpty
+                        ? contact.displayName[0].toUpperCase()
+                        : '?',
+                    style: const TextStyle(color: Colors.white),
+                  ),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Text(
+                    contact.displayName,
+                    style: const TextStyle(color: Colors.white, fontSize: 24),
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
 
-          return ListTile(
-            leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
-                ? CircleAvatar(
-              backgroundImage: MemoryImage(contact.thumbnail!),
-            )
-                : CircleAvatar(
-              child: Text(
-                contact.displayName.isNotEmpty
-                    ? contact.displayName[0]
-                    : '?',
+            // Display call type, status, date, attempts
+            DetailRow(
+              label: 'Call Type:',
+              value: history.callType,
+            ),
+            DetailRow(
+              label: 'Call Status:',
+              value: history.callStatus,
+            ),
+            DetailRow(
+              label: 'Date:',
+              value: DateFormat('MMM dd, yyyy - hh:mm a').format(history.date),
+            ),
+            DetailRow(
+              label: 'Attempts:',
+              value: '${history.attempts}',
+            ),
+
+            const SizedBox(height: 24),
+
+            // If you have more details like duration, contact number, etc.
+            if (contact.phones.isNotEmpty)
+              DetailRow(
+                label: 'Number:',
+                value: contact.phones.first.number,
               ),
-            ),
-            title: Text(
-              contact.displayName,
-              style: const TextStyle(color: Colors.white),
-            ),
-            subtitle: Text(
-              '${history.callType} - ${history.callStatus} - ${DateFormat('MMM dd, hh:mm a').format(history.date)}',
-              style: const TextStyle(color: Colors.grey),
-            ),
-            trailing: Text(
-              '${history.attempts}x',
-              style: const TextStyle(color: Colors.white),
-            ),
-            onTap: () {
-              // Handle tap event if needed
-            },
-          );
-        },
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class DetailRow extends StatelessWidget {
+  final String label;
+  final String value;
+
+  const DetailRow({Key? key, required this.label, required this.value}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Row(
+        children: [
+          Text(
+            label,
+            style: const TextStyle(color: Colors.white70, fontWeight: FontWeight.bold),
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              value,
+              style: const TextStyle(color: Colors.white),
+              textAlign: TextAlign.right,
+            ),
+          ),
+        ],
       ),
     );
   }

dialer/lib/features/home/home_page.dart

@@ -5,26 +5,28 @@ import 'package:dialer/features/history/history_page.dart';
 import 'package:dialer/features/composition/composition.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:dialer/features/settings/settings.dart';
+import '../../widgets/contact_service.dart';
 
 class _MyHomePageState extends State<MyHomePage>
     with SingleTickerProviderStateMixin {
   late TabController _tabController;
   List<Contact> _allContacts = [];
   List<Contact> _contactSuggestions = [];
+  final ContactService _contactService = ContactService();
+
 
   @override
   void initState() {
     super.initState();
-    _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
+    // Set the TabController length to 3
+    _tabController = TabController(length: 3, vsync: this, initialIndex: 1);
     _tabController.addListener(_handleTabIndex);
     _fetchContacts();
   }
 
   void _fetchContacts() async {
-    if (await FlutterContacts.requestPermission()) {
-      _allContacts = await FlutterContacts.getContacts(withProperties: true);
-      setState(() {});
-    }
+    _allContacts = await _contactService.fetchContacts();
+    setState(() {});
   }
 
   void _onSearchChanged(String query) {
@@ -68,68 +70,97 @@ class _MyHomePageState extends State<MyHomePage>
               left: 16.0,
               right: 16.0,
             ),
-            child: Container(
-              decoration: BoxDecoration(
-                color: const Color.fromARGB(255, 30, 30, 30),
-                borderRadius: BorderRadius.circular(12.0),
-                border: Border(
-                  top: BorderSide(color: Colors.grey.shade800, width: 1),
-                  left: BorderSide(color: Colors.grey.shade800, width: 1),
-                  right: BorderSide(color: Colors.grey.shade800, width: 1),
-                  bottom: BorderSide(color: Colors.grey.shade800, width: 2),
-                ),
-              ),
-              child: SearchAnchor(
-                builder: (BuildContext context, SearchController controller) {
-                  return SearchBar(
-                    controller: controller,
-                    padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
-                      const EdgeInsets.only(
-                        top: 6.0,
-                        bottom: 6.0,
-                        left: 16.0,
-                        right: 16.0,
+            child: Row(
+              children: [
+                Expanded(
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: const Color.fromARGB(255, 30, 30, 30),
+                      borderRadius: BorderRadius.circular(12.0),
+                      border: Border(
+                        top: BorderSide(color: Colors.grey.shade800, width: 1),
+                        left: BorderSide(color: Colors.grey.shade800, width: 1),
+                        right: BorderSide(color: Colors.grey.shade800, width: 1),
+                        bottom:
+                        BorderSide(color: Colors.grey.shade800, width: 2),
                       ),
                     ),
-                    onTap: () {
-                      controller.openView();
-                      _onSearchChanged('');
-                    },
-                    backgroundColor: MaterialStateProperty.all(
-                        const Color.fromARGB(255, 30, 30, 30)),
-                    hintText: 'Search contacts',
-                    hintStyle: MaterialStateProperty.all(
-                      const TextStyle(color: Colors.grey, fontSize: 16.0),
-                    ),
-                    leading: const Icon(
-                      Icons.search,
-                      color: Colors.grey,
-                      size: 24.0,
-                    ),
-                    shape: MaterialStateProperty.all<RoundedRectangleBorder>(
-                      RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(12.0),
-                      ),
-                    ),
-                  );
-                },
-                viewOnChanged: (query) {
-                  _onSearchChanged(query);
-                },
-                suggestionsBuilder:
-                    (BuildContext context, SearchController controller) {
-                  return _contactSuggestions.map((contact) {
-                    return ListTile(
-                      key: ValueKey(contact.id),
-                      title: Text(contact.displayName,
-                          style: const TextStyle(color: Colors.white)),
-                      onTap: () {
-                        controller.closeView(contact.displayName);
+                    child: SearchAnchor(
+                      builder:
+                          (BuildContext context, SearchController controller) {
+                        return SearchBar(
+                          controller: controller,
+                          padding:
+                          MaterialStateProperty.all<EdgeInsetsGeometry>(
+                            const EdgeInsets.only(
+                              top: 6.0,
+                              bottom: 6.0,
+                              left: 16.0,
+                              right: 16.0,
+                            ),
+                          ),
+                          onTap: () {
+                            controller.openView();
+                            _onSearchChanged('');
+                          },
+                          backgroundColor: MaterialStateProperty.all(
+                              const Color.fromARGB(255, 30, 30, 30)),
+                          hintText: 'Search contacts',
+                          hintStyle: MaterialStateProperty.all(
+                            const TextStyle(color: Colors.grey, fontSize: 16.0),
+                          ),
+                          leading: const Icon(
+                            Icons.search,
+                            color: Colors.grey,
+                            size: 24.0,
+                          ),
+                          shape:
+                          MaterialStateProperty.all<RoundedRectangleBorder>(
+                            RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(12.0),
+                            ),
+                          ),
+                        );
                       },
-                    );
-                  }).toList();
-                },
-              ),
+                      viewOnChanged: (query) {
+                        _onSearchChanged(query);
+                      },
+                      suggestionsBuilder:
+                          (BuildContext context, SearchController controller) {
+                        return _contactSuggestions.map((contact) {
+                          return ListTile(
+                            key: ValueKey(contact.id),
+                            title: Text(contact.displayName,
+                                style: const TextStyle(color: Colors.white)),
+                            onTap: () {
+                              controller.closeView(contact.displayName);
+                            },
+                          );
+                        }).toList();
+                      },
+                    ),
+                  ),
+                ),
+                // 3-dot menu
+                PopupMenuButton<String>(
+                  icon: const Icon(Icons.more_vert, color: Colors.white),
+                  itemBuilder: (BuildContext context) => [
+                    const PopupMenuItem<String>(
+                      value: 'settings',
+                      child: Text('Settings'),
+                    ),
+                  ],
+                  onSelected: (String value) {
+                    if (value == 'settings') {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                            builder: (context) => const SettingsPage()),
+                      );
+                    }
+                  },
+                ),
+              ],
             ),
           ),
           // Main content with TabBarView
@@ -139,10 +170,9 @@ class _MyHomePageState extends State<MyHomePage>
                 TabBarView(
                   controller: _tabController,
                   children: const [
-                    FavoritePage(),
+                    FavoritesPage(),
                     HistoryPage(),
                     ContactPage(),
-                    SettingsPage(), // Add your SettingsPage here
                   ],
                 ),
                 Positioned(
@@ -186,10 +216,6 @@ class _MyHomePageState extends State<MyHomePage>
                 icon: Icon(_tabController.index == 2
                     ? Icons.contacts
                     : Icons.contacts_outlined)),
-            Tab(
-                icon: Icon(_tabController.index == 3 // Corrected index
-                    ? Icons.settings
-                    : Icons.settings_outlined)),
           ],
           labelColor: Colors.white,
           unselectedLabelColor: const Color.fromARGB(255, 158, 158, 158),

dialer/lib/features/settings/blocked/settings_blocked.dart

@@ -0,0 +1,167 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class BlockedNumbersPage extends StatefulWidget {
+  const BlockedNumbersPage({super.key});
+
+  @override
+  _BlockedNumbersPageState createState() => _BlockedNumbersPageState();
+}
+
+class _BlockedNumbersPageState extends State<BlockedNumbersPage> {
+  bool _blockUnknownNumbers = false; // Toggle for blocking unknown numbers
+  List<String> _blockedNumbers = []; // List of blocked numbers
+  final TextEditingController _numberController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    _loadPreferences(); // Load data on initialization
+  }
+
+  // Load preferences from local storage
+  Future<void> _loadPreferences() async {
+    final prefs = await SharedPreferences.getInstance();
+    setState(() {
+      _blockUnknownNumbers = prefs.getBool('blockUnknownNumbers') ?? false;
+      _blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
+    });
+  }
+
+  // Save preferences to local storage
+  Future<void> _savePreferences() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('blockUnknownNumbers', _blockUnknownNumbers);
+    await prefs.setStringList('blockedNumbers', _blockedNumbers);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Blocked Numbers'),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          SwitchListTile(
+            title: const Text(
+              'Block Unknown Numbers',
+              style: TextStyle(color: Colors.white),
+            ),
+            value: _blockUnknownNumbers,
+            onChanged: (bool value) {
+              setState(() {
+                _blockUnknownNumbers = value;
+                _savePreferences(); // Save the state to local storage
+              });
+            },
+          ),
+          const SizedBox(height: 16),
+          ListTile(
+            title: const Text(
+              'Blocked Numbers',
+              style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            subtitle: _blockedNumbers.isEmpty
+                ? const Text(
+                    'No blocked numbers',
+                    style: TextStyle(color: Colors.grey),
+                  )
+                : null,
+          ),
+          ..._blockedNumbers.map(
+            (number) => ListTile(
+              title: Text(
+                number,
+                style: const TextStyle(color: Colors.white),
+              ),
+              trailing: IconButton(
+                icon: const Icon(Icons.delete, color: Colors.red),
+                onPressed: () => _unblockNumber(number),
+              ),
+            ),
+          ),
+          const Divider(color: Colors.grey),
+          ListTile(
+            title: const Text(
+              'Block a Number',
+              style: TextStyle(color: Colors.white),
+            ),
+            trailing: const Icon(Icons.add, color: Colors.white),
+            onTap: () => _showBlockNumberDialog(),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // Function to block a number
+  void _blockNumber(String number) {
+    if (number.isNotEmpty && !_blockedNumbers.contains(number)) {
+      setState(() {
+        _blockedNumbers.add(number);
+        _savePreferences(); // Save the updated list
+      });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('$number has been blocked')),
+      );
+    }
+  }
+
+  // Function to unblock a number
+  void _unblockNumber(String number) {
+    setState(() {
+      _blockedNumbers.remove(number);
+      _savePreferences(); // Save the updated list
+    });
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text('$number has been unblocked')),
+    );
+  }
+
+  // Dialog for blocking a new number
+  void _showBlockNumberDialog() {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          backgroundColor: Colors.grey[900],
+          title: const Text('Block a Number', style: TextStyle(color: Colors.white)),
+          content: TextField(
+            controller: _numberController,
+            keyboardType: TextInputType.phone,
+            decoration: const InputDecoration(
+              hintText: 'Enter number',
+              hintStyle: TextStyle(color: Colors.grey),
+            ),
+            style: const TextStyle(color: Colors.white),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.pop(context);
+              },
+              child: const Text('Cancel', style: TextStyle(color: Colors.white)),
+            ),
+            TextButton(
+              onPressed: () {
+                _blockNumber(_numberController.text);
+                _numberController.clear();
+                Navigator.pop(context);
+              },
+              child: const Text('Block', style: TextStyle(color: Colors.red)),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _numberController.dispose();
+    super.dispose();
+  }
+}

dialer/lib/features/settings/key/delete_key_pair.dart

@@ -1,22 +1,19 @@
-// delete_key_pair.dart
-
 import 'package:flutter/material.dart';
+import 'key_storage.dart';
 
-class SuppressionPaireClesPage extends StatelessWidget {
-  const SuppressionPaireClesPage({super.key});
+class DeleteKeyPairPage extends StatelessWidget {
+  const DeleteKeyPairPage({super.key});
 
-  void _deleteKeyPair(BuildContext context) {
-    // key deletion logic (not implemented here)
-    // ...
+  Future<void> _deleteKeyPair(BuildContext context) async {
+    final keyStorage = KeyStorage();
+    await keyStorage.deleteKeys();
 
-    // Show confirmation message
     ScaffoldMessenger.of(context).showSnackBar(
       const SnackBar(
-        content: Text('La paire de clés a été supprimée.'),
+        content: Text('The key pair has been deleted.'),
       ),
     );
 
-    // Navigate back or update the UI as needed
     Navigator.pop(context);
   }
 
@@ -25,18 +22,18 @@ class SuppressionPaireClesPage extends StatelessWidget {
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Confirmer la Suppression'),
+          title: const Text('Confirm Deletion'),
           content: const Text(
-              'Êtes-vous sûr de vouloir supprimer la paire de clés ? Cette action est irréversible.'),
+              'Are you sure you want to delete the key pair? This action is irreversible.'),
           actions: [
             TextButton(
-              child: const Text('Annuler'),
+              child: const Text('Cancel'),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
             TextButton(
-              child: const Text('Supprimer'),
+              child: const Text('Delete'),
               onPressed: () {
                 Navigator.of(context).pop();
                 _deleteKeyPair(context);
@@ -53,14 +50,14 @@ class SuppressionPaireClesPage extends StatelessWidget {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Suppression d\'une Paire de Clés'),
+        title: const Text('Delete a Key Pair'),
       ),
       body: Center(
         child: ElevatedButton(
           onPressed: () {
             _showConfirmationDialog(context);
           },
-          child: const Text('Supprimer la Paire de Clés'),
+          child: const Text('Delete Key Pair'),
         ),
       ),
     );

dialer/lib/features/settings/key/export_private_key.dart

@@ -1,71 +1,97 @@
-// export_private_key.dart
-
 import 'package:flutter/material.dart';
 import 'dart:typed_data';
 import 'dart:convert';
 import 'package:pointycastle/export.dart' as crypto;
 import 'package:file_picker/file_picker.dart';
+import 'dart:io';
+import 'key_storage.dart';
 
-class ExportationClePriveePage extends StatefulWidget {
-  const ExportationClePriveePage({super.key});
+class ExportPrivateKeyPage extends StatefulWidget {
+  const ExportPrivateKeyPage({super.key});
 
   @override
-  _ExportationClePriveePageState createState() => _ExportationClePriveePageState();
+  _ExportPrivateKeyPageState createState() => _ExportPrivateKeyPageState();
 }
 
-class _ExportationClePriveePageState extends State<ExportationClePriveePage> {
+class _ExportPrivateKeyPageState extends State<ExportPrivateKeyPage> {
   final TextEditingController _passwordController = TextEditingController();
 
   Future<void> _exportPrivateKey() async {
-    // Replace with your actual private key retrieval logic
-    final String privateKeyPem = 'Votre clé privée ici';
+    final keyStorage = KeyStorage();
+    final privateKeyPem = await keyStorage.getPrivateKey();
 
-    // Get the password from the user input
-    final password = _passwordController.text;
-    if (password.isEmpty) {
-      // Show error message
+    if (privateKeyPem == null) {
+      // Show error message if there's no key
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('No private key found to export.'),
+        ),
+      );
+      return;
+    }
+
+    final password = _passwordController.text;
+    if (password.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Please enter a password.'),
+        ),
+      );
       return;
     }
 
-    // Encrypt the private key using AES-256
     final encryptedData = _encryptPrivateKey(privateKeyPem, password);
 
-    // Let the user pick a file location
     final outputFile = await FilePicker.platform.saveFile(
-      dialogTitle: 'Enregistrer la clé privée chiffrée',
+      dialogTitle: 'Save encrypted private key',
       fileName: 'private_key_encrypted.aes',
     );
 
     if (outputFile != null) {
-      // Write the encrypted data to the file
-      // Use appropriate file I/O methods (not shown here)
-      // ...
-      // Show a confirmation dialog or message
-      showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          title: const Text('Clé Exportée'),
-          content: const Text('La clé privée chiffrée a été exportée avec succès.'),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.pop(context),
-              child: const Text('OK'),
-            ),
-          ],
-        ),
-      );
+      try {
+        final file = File(outputFile);
+        await file.writeAsBytes(encryptedData);
+
+        showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: const Text('Key Exported'),
+            content: const Text('The encrypted private key has been exported successfully.'),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.pop(context),
+                child: const Text('OK'),
+              ),
+            ],
+          ),
+        );
+      } catch (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Failed to write file: $e'),
+          ),
+        );
+      }
     }
   }
 
   Uint8List _encryptPrivateKey(String privateKey, String password) {
-    // Encryption logic using AES-256
-    final key = crypto.PBKDF2KeyDerivator(crypto.HMac(crypto.SHA256Digest(), 64))
-        .process(Uint8List.fromList(utf8.encode(password)));
+    // Derive a key from the password using PBKDF2
+    final derivator = crypto.PBKDF2KeyDerivator(
+      crypto.HMac(crypto.SHA256Digest(), 64),
+    );
 
-    final params = crypto.PaddedBlockCipherParameters(
-      crypto.ParametersWithIV(crypto.KeyParameter(key), Uint8List(16)), // Initialization Vector
+    final salt = Uint8List.fromList(utf8.encode('some_salt')); // In production, use a random salt and store it securely
+    derivator.init(crypto.Pbkdf2Parameters(salt, 1000, 32));
+    final key = derivator.process(Uint8List.fromList(utf8.encode(password)));
+
+    // Initialize AES-CBC cipher with PKCS7 padding
+    final iv = Uint8List(16); // zero IV for example, in production use random IV and store it
+    final params = crypto.PaddedBlockCipherParameters<crypto.ParametersWithIV<crypto.KeyParameter>, Null>(
+      crypto.ParametersWithIV<crypto.KeyParameter>(crypto.KeyParameter(key), iv),
       null,
     );
+
     final cipher = crypto.PaddedBlockCipher('AES/CBC/PKCS7');
     cipher.init(true, params);
 
@@ -80,14 +106,14 @@ class _ExportationClePriveePageState extends State<ExportationClePriveePage> {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Exportation de la Clé Privée'),
+        title: const Text('Export Private Key'),
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           children: [
             const Text(
-              'Entrez un mot de passe pour chiffrer la clé privée:',
+              'Enter a password to encrypt the private key:',
               style: TextStyle(color: Colors.white),
             ),
             TextField(
@@ -95,14 +121,14 @@ class _ExportationClePriveePageState extends State<ExportationClePriveePage> {
               obscureText: true,
               style: const TextStyle(color: Colors.white),
               decoration: const InputDecoration(
-                hintText: 'Mot de passe',
+                hintText: 'Password',
                 hintStyle: TextStyle(color: Colors.grey),
               ),
             ),
             const SizedBox(height: 20),
             ElevatedButton(
               onPressed: _exportPrivateKey,
-              child: const Text('Exporter la Clé Privée Chiffrée'),
+              child: const Text('Export Encrypted Private Key'),
             ),
           ],
         ),

dialer/lib/features/settings/key/generate_new_key_pair.dart

@@ -4,12 +4,12 @@ import 'dart:math';
 import 'dart:convert';
 import 'dart:typed_data';
 import 'package:asn1lib/asn1lib.dart';
+import 'key_storage.dart';
 
-class GenerationNouvellePaireClesPage extends StatelessWidget {
-  const GenerationNouvellePaireClesPage({super.key});
+class GenerateNewKeyPairPage extends StatelessWidget {
+  const GenerateNewKeyPairPage({super.key});
 
   Future<Map<String, String>> _generateKeyPair() async {
-    // key generation logic using pointycastle
     final keyParams = crypto.RSAKeyGeneratorParameters(
       BigInt.parse('65537'),
       2048,
@@ -17,8 +17,6 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
     );
 
     final secureRandom = crypto.FortunaRandom();
-
-    // Seed the random number generator
     final random = Random.secure();
     final seeds = List<int>.generate(32, (_) => random.nextInt(256));
     secureRandom.seed(crypto.KeyParameter(Uint8List.fromList(seeds)));
@@ -31,11 +29,12 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
     final publicKey = pair.publicKey as crypto.RSAPublicKey;
     final privateKey = pair.privateKey as crypto.RSAPrivateKey;
 
-    // Convert keys to PEM format
     final publicKeyPem = _encodePublicKeyToPemPKCS1(publicKey);
     final privateKeyPem = _encodePrivateKeyToPemPKCS1(privateKey);
 
-    // Save keys securely (not implemented here)
+    // Save keys securely
+    final keyStorage = KeyStorage();
+    await keyStorage.saveKeys(publicKey: publicKeyPem, privateKey: privateKeyPem);
 
     return {'publicKey': publicKeyPem, 'privateKey': privateKeyPem};
   }
@@ -52,7 +51,8 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
 
   Uint8List _encodePublicKeyToDer(crypto.RSAPublicKey publicKey) {
     final algorithmSeq = ASN1Sequence();
-    algorithmSeq.add(ASN1ObjectIdentifier.fromName('rsaEncryption'));
+    // Create the OID directly with the arcs
+    algorithmSeq.add(ASN1ObjectIdentifier([1, 2, 840, 113549, 1, 1, 1]));
     algorithmSeq.add(ASN1Null());
 
     final publicKeySeq = ASN1Sequence();
@@ -84,8 +84,8 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
   }
 
   String _formatPem(Uint8List bytes, String label) {
-    final base64 = base64Encode(bytes);
-    final chunks = RegExp('.{1,64}').allMatches(base64).map((m) => m.group(0)!);
+    final base64Data = base64Encode(bytes);
+    final chunks = RegExp('.{1,64}').allMatches(base64Data).map((m) => m.group(0)!);
     return '-----BEGIN $label-----\n${chunks.join('\n')}\n-----END $label-----';
   }
 
@@ -94,18 +94,17 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Génération d\'une Nouvelle Paire de Clés'),
+        title: const Text('Generate a New Key Pair'),
       ),
       body: Center(
         child: ElevatedButton(
           onPressed: () async {
-            final keys = await _generateKeyPair();
-            // Display a confirmation dialog or message
+            await _generateKeyPair();
             showDialog(
               context: context,
               builder: (context) => AlertDialog(
-                title: const Text('Clés Générées'),
-                content: const Text('La nouvelle paire de clés a été générée avec succès.'),
+                title: const Text('Keys Generated'),
+                content: const Text('The new key pair has been generated and stored securely.'),
                 actions: [
                   TextButton(
                     onPressed: () => Navigator.pop(context),
@@ -115,7 +114,7 @@ class GenerationNouvellePaireClesPage extends StatelessWidget {
               ),
             );
           },
-          child: const Text('Générer une Nouvelle Paire de Clés'),
+          child: const Text('Generate a New Key Pair'),
         ),
       ),
     );

dialer/lib/features/settings/key/key_storage.dart

@@ -0,0 +1,28 @@
+// key_storage.dart
+
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class KeyStorage {
+  static const _publicKeyKey = 'public_key';
+  static const _privateKeyKey = 'private_key';
+
+  final FlutterSecureStorage _storage = const FlutterSecureStorage();
+
+  Future<void> saveKeys({required String publicKey, required String privateKey}) async {
+    await _storage.write(key: _publicKeyKey, value: publicKey);
+    await _storage.write(key: _privateKeyKey, value: privateKey);
+  }
+
+  Future<String?> getPublicKey() async {
+    return await _storage.read(key: _publicKeyKey);
+  }
+
+  Future<String?> getPrivateKey() async {
+    return await _storage.read(key: _privateKeyKey);
+  }
+
+  Future<void> deleteKeys() async {
+    await _storage.delete(key: _publicKeyKey);
+    await _storage.delete(key: _privateKeyKey);
+  }
+}

dialer/lib/features/settings/key/manage_keys_page.dart

@@ -1,49 +1,46 @@
-// manage_keys_page.dart
-
 import 'package:flutter/material.dart';
-import 'package:dialer/features/settings/key/show_public_key_text.dart';
-import 'package:dialer/features/settings/key/show_public_key_qr.dart';
-import 'package:dialer/features/settings/key/generate_new_key_pair.dart';
-import 'package:dialer/features/settings/key/export_private_key.dart';
-import 'package:dialer/features/settings/key/delete_key_pair.dart';
+import 'show_public_key_qr.dart';
+import 'show_public_key_text.dart';
+import 'generate_new_key_pair.dart';
+import 'export_private_key.dart';
+import 'delete_key_pair.dart';
 
-class GestionDeClesPage extends StatelessWidget {
-  const GestionDeClesPage({super.key});
+class KeyManagementPage extends StatelessWidget {
+  const KeyManagementPage({super.key});
 
   void _navigateToOption(BuildContext context, String option) {
     switch (option) {
-      case 'Affichage de la clé publique en texte':
+      case 'Display public key as text':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const AffichageClePubliqueTextePage()),
+          MaterialPageRoute(builder: (context) => const DisplayPublicKeyTextPage()),
         );
         break;
-      case 'Affichage de la clé publique en QR code':
+      case 'Display public key as QR code':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const AffichageClePubliqueQRCodePage()),
+          MaterialPageRoute(builder: (context) => const DisplayPublicKeyQRCodePage()),
         );
         break;
-      case 'Génération d\'une nouvelle paire de clés':
+      case 'Generate a new key pair':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const GenerationNouvellePaireClesPage()),
+          MaterialPageRoute(builder: (context) => const GenerateNewKeyPairPage()),
         );
         break;
-      case 'Exportation de la clé privée en fichier chiffré par mot de passe (AES 256)':
+      case 'Export private key to password-encrypted file (AES 256)':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const ExportationClePriveePage()),
+          MaterialPageRoute(builder: (context) => const ExportPrivateKeyPage()),
         );
         break;
-      case 'Suppression d\'une paire de clés, POPUP d\'avertissement':
+      case 'Delete a key pair':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const SuppressionPaireClesPage()),
+          MaterialPageRoute(builder: (context) => const DeleteKeyPairPage()),
         );
         break;
       default:
-      // Handle default or unknown options
         break;
     }
   }
@@ -51,17 +48,17 @@ class GestionDeClesPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final keyManagementOptions = [
-      'Affichage de la clé publique en texte',
-      'Affichage de la clé publique en QR code',
-      'Génération d\'une nouvelle paire de clés',
-      'Exportation de la clé privée en fichier chiffré par mot de passe (AES 256)',
-      'Suppression d\'une paire de clés, POPUP d\'avertissement',
+      'Display public key as text',
+      'Display public key as QR code',
+      'Generate a new key pair',
+      'Export private key to password-encrypted file (AES 256)',
+      'Delete a key pair',
     ];
 
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Gestion de clés'),
+        title: const Text('Key Management'),
       ),
       body: ListView.builder(
         itemCount: keyManagementOptions.length,

dialer/lib/features/settings/key/show_public_key_qr.dart

@@ -1,26 +1,48 @@
 import 'package:flutter/material.dart';
 import 'package:pretty_qr_code/pretty_qr_code.dart';
+import 'key_storage.dart';
 
-class AffichageClePubliqueQRCodePage extends StatelessWidget {
-  const AffichageClePubliqueQRCodePage({super.key});
+class DisplayPublicKeyQRCodePage extends StatelessWidget {
+  const DisplayPublicKeyQRCodePage({super.key});
+
+  Future<String?> _loadPublicKey() async {
+    final keyStorage = KeyStorage();
+    return keyStorage.getPublicKey();
+  }
 
   @override
   Widget build(BuildContext context) {
-    // Replace with your actual public key retrieval logic
-    final String publicKey = 'Votre clé publique ici';
-
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Clé Publique en QR Code'),
+        title: const Text('Public Key in QR Code'),
       ),
-      body: Center(
-        child: PrettyQr(
-          data: publicKey,
-          size: 250,
-          roundEdges: true,
-          elementColor: Colors.white,
-        ),
+      body: FutureBuilder<String?>(
+        future: _loadPublicKey(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          }
+
+          final publicKey = snapshot.data;
+          if (publicKey == null) {
+            return const Center(
+              child: Text(
+                'No public key found.',
+                style: TextStyle(color: Colors.white),
+              ),
+            );
+          }
+
+          return Center(
+            child: PrettyQr(
+              data: publicKey,
+              size: 250,
+              roundEdges: true,
+              elementColor: Colors.white,
+            ),
+          );
+        },
       ),
     );
   }

dialer/lib/features/settings/key/show_public_key_text.dart

@@ -1,29 +1,49 @@
-// show_public_key_text.dart
-
 import 'package:flutter/material.dart';
+import 'key_storage.dart';
 
-class AffichageClePubliqueTextePage extends StatelessWidget {
-  const AffichageClePubliqueTextePage({super.key});
+class DisplayPublicKeyTextPage extends StatelessWidget {
+  const DisplayPublicKeyTextPage({super.key});
+
+  Future<String?> _loadPublicKey() async {
+    final keyStorage = KeyStorage();
+    return await keyStorage.getPublicKey();
+  }
 
   @override
   Widget build(BuildContext context) {
-    // Replace with your actual public key retrieval logic
-    final String publicKey = 'Votre clé publique ici';
-
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Clé Publique en Texte'),
+        title: const Text('Public Key as Text'),
       ),
-      body: Center(
-        child: Padding(
-          padding: const EdgeInsets.all(16.0),
-          child: SelectableText(
-            publicKey,
-            style: const TextStyle(color: Colors.white),
-            textAlign: TextAlign.center,
-          ),
-        ),
+      body: FutureBuilder<String?>(
+        future: _loadPublicKey(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          }
+
+          final publicKey = snapshot.data;
+          if (publicKey == null) {
+            return const Center(
+              child: Text(
+                'No public key found.',
+                style: TextStyle(color: Colors.white),
+              ),
+            );
+          }
+
+          return Center(
+            child: Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: SelectableText(
+                publicKey,
+                style: const TextStyle(color: Colors.white),
+                textAlign: TextAlign.center,
+              ),
+            ),
+          );
+        },
       ),
     );
   }

dialer/lib/features/settings/settings.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:dialer/features/settings/call/settingsCall.dart';
 import 'package:dialer/features/settings/sim/settings_accounts.dart';
 import 'package:dialer/features/settings/key/manage_keys_page.dart';
+import 'package:dialer/features/settings/blocked/settings_blocked.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key});
@@ -16,21 +17,27 @@ class SettingsPage extends StatelessWidget {
           MaterialPageRoute(builder: (context) => const SettingsCallPage()),
         );
         break;
-      case 'Page des comptes téléphoniques':
+      case 'Sim settings':
         Navigator.push(
           context,
           MaterialPageRoute(builder: (context) => const SettingsAccountsPage()),
         );
         break;
-      case 'Gestion de clés':
+      case 'Key management':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const GestionDeClesPage()),
+          MaterialPageRoute(builder: (context) => const KeyManagementPage()),
         );
         break;
-    // Add more cases for other settings pages
+      case 'Blocked numbers':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const BlockedNumbersPage()),
+        );
+        break;
+      // Add more cases for other settings pages
       default:
-      // Handle default or unknown settings
+        // Handle default or unknown settings
         break;
     }
   }
@@ -39,14 +46,15 @@ class SettingsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final settingsOptions = [
       'Calling settings',
-      'Page des comptes téléphoniques',
-      'Gestion de clés', // Add the new option here
+      'Page of telephone accounts',
+      'Key management',
+      'Blocked numbers'
     ];
 
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('settings'),
+        title: const Text('Settings'),
       ),
       body: ListView.builder(
         itemCount: settingsOptions.length,

dialer/lib/features/settings/sim/choose_sim.dart

@@ -1,11 +1,8 @@
-// choose_sim.dart
-
 import 'package:flutter/material.dart';
-import 'package:sim_data/sim_data.dart';
-import 'package:permission_handler/permission_handler.dart';
+import 'package:mobile_number/mobile_number.dart';
 
 class ChooseSimPage extends StatefulWidget {
-  const ChooseSimPage({super.key});
+  const ChooseSimPage({Key? key}) : super(key: key);
 
   @override
   _ChooseSimPageState createState() => _ChooseSimPageState();
@@ -22,20 +19,27 @@ class _ChooseSimPageState extends State<ChooseSimPage> {
   }
 
   Future<void> _fetchSimCards() async {
-    if (await Permission.phone.request().isGranted) {
-      try {
-        final simData = await SimDataPlugin.getSimData();
-        setState(() {
-          _simCards = simData.cards;
-          _selectedSimIndex = 0;
-        });
-      } catch (e) {
-        // Handle error
-        print('Error fetching SIM data: $e');
+    try {
+      bool permissionsGranted = await MobileNumber.hasPhonePermission;
+      if (!permissionsGranted) {
+        await MobileNumber.requestPhonePermission;
+        permissionsGranted = await MobileNumber.hasPhonePermission;
       }
-    } else {
-      // Permission denied
-      print('Phone permission denied');
+      if (permissionsGranted) {
+        List<SimCard>? simCards = await MobileNumber.getSimCards;
+        if (simCards != null && mounted) {
+          setState(() {
+            _simCards = simCards;
+            _selectedSimIndex = 0;
+          });
+        } else {
+          print('No SIM cards found');
+        }
+      } else {
+        print('Phone permission denied');
+      }
+    } catch (e) {
+      print('Failed to get SIM cards: $e');
     }
   }
 
@@ -52,12 +56,12 @@ class _ChooseSimPageState extends State<ChooseSimPage> {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Choisir la SIM'),
+        title: const Text('Choose SIM'),
       ),
       body: _simCards.isEmpty
           ? const Center(
         child: Text(
-          'Aucune carte SIM trouvée',
+          'No SIM cards found',
           style: TextStyle(color: Colors.white),
         ),
       )
@@ -71,7 +75,7 @@ class _ChooseSimPageState extends State<ChooseSimPage> {
               style: const TextStyle(color: Colors.white),
             ),
             subtitle: Text(
-              'Opérateur: ${sim.carrierName}',
+              'Operator: ${sim.carrierName ?? 'N/A'}',
               style: const TextStyle(color: Colors.grey),
             ),
             trailing: Radio<int>(

dialer/lib/features/settings/sim/settings_accounts.dart

@@ -1,27 +1,24 @@
-// settings_accounts.dart
-
 import 'package:flutter/material.dart';
-import 'package:dialer/features/settings/sim/choose_sim.dart';
-import 'package:dialer/features/settings/sim/sim_parameters.dart';
+import 'choose_sim.dart';
+import 'sim_parameters.dart';
 
 class SettingsAccountsPage extends StatelessWidget {
-  const SettingsAccountsPage({super.key});
+  const SettingsAccountsPage({Key? key}) : super(key: key);
 
   void _navigateToAccountOption(BuildContext context, String option) {
     switch (option) {
-      case 'Choisir la SIM':
+      case 'Chose SIM card':
         Navigator.push(
           context,
           MaterialPageRoute(builder: (context) => const ChooseSimPage()),
         );
         break;
-      case 'Paramètre SIM':
+      case 'SIM card parameters':
         Navigator.push(
           context,
           MaterialPageRoute(builder: (context) => const SimParametersPage()),
         );
         break;
-    // Handle more options if needed
       default:
         break;
     }
@@ -30,14 +27,14 @@ class SettingsAccountsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final accountOptions = [
-      'Choisir la SIM',
-      'Paramètre SIM',
+      'Chose SIM card',
+      'SIM card parameters',
     ];
 
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Page des comptes téléphoniques'),
+        title: const Text('Sim settings'),
       ),
       body: ListView.builder(
         itemCount: accountOptions.length,
@@ -47,7 +44,8 @@ class SettingsAccountsPage extends StatelessWidget {
               accountOptions[index],
               style: const TextStyle(color: Colors.white),
             ),
-            trailing: const Icon(Icons.arrow_forward_ios, color: Colors.white),
+            trailing:
+            const Icon(Icons.arrow_forward_ios, color: Colors.white),
             onTap: () {
               _navigateToAccountOption(context, accountOptions[index]);
             },

dialer/lib/features/settings/sim/sim_parameters.dart

@@ -1,11 +1,8 @@
-// sim_parameters.dart
-
 import 'package:flutter/material.dart';
-import 'package:sim_data/sim_data.dart';
-import 'package:permission_handler/permission_handler.dart';
+import 'package:mobile_number/mobile_number.dart';
 
 class SimParametersPage extends StatefulWidget {
-  const SimParametersPage({super.key});
+  const SimParametersPage({Key? key}) : super(key: key);
 
   @override
   _SimParametersPageState createState() => _SimParametersPageState();
@@ -21,19 +18,27 @@ class _SimParametersPageState extends State<SimParametersPage> {
   }
 
   Future<void> _fetchSimParameters() async {
-    if (await Permission.phone.request().isGranted) {
-      try {
-        final simData = await SimDataPlugin.getSimData();
-        setState(() {
-          _simCards = simData.cards;
-        });
-      } catch (e) {
-        // Handle error
-        print('Error fetching SIM data: $e');
+    try {
+      bool permissionsGranted = await MobileNumber.hasPhonePermission;
+      if (!permissionsGranted) {
+        await MobileNumber.requestPhonePermission;
+        // Check again if permission is granted
+        permissionsGranted = await MobileNumber.hasPhonePermission;
       }
-    } else {
-      // Permission denied
-      print('Phone permission denied');
+      if (permissionsGranted) {
+        List<SimCard>? simCards = await MobileNumber.getSimCards;
+        if (simCards != null && mounted) {
+          setState(() {
+            _simCards = simCards;
+          });
+        } else {
+          print('No SIM cards found');
+        }
+      } else {
+        print('Phone permission denied');
+      }
+    } catch (e) {
+      print('Failed to get SIM cards: $e');
     }
   }
 
@@ -47,13 +52,12 @@ class _SimParametersPageState extends State<SimParametersPage> {
         ),
         subtitle: Text(
           '''
-Opérateur: ${sim.carrierName}
-Pays: ${sim.countryCode ?? 'N/A'}
-MCC: ${sim.mcc ?? 'N/A'}
-MNC: ${sim.mnc ?? 'N/A'}
-Slot Index: ${sim.slotIndex ?? 'N/A'}
+Carrier Name: ${sim.carrierName ?? 'N/A'}
+Country Iso: ${sim.countryIso ?? 'N/A'}
 Display Name: ${sim.displayName ?? 'N/A'}
-          ''',
+Slot Index: ${sim.slotIndex ?? 'N/A'}
+Number: ${sim.number ?? 'N/A'}
+''',
           style: const TextStyle(color: Colors.grey),
         ),
       ),
@@ -65,12 +69,12 @@ Display Name: ${sim.displayName ?? 'N/A'}
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        title: const Text('Paramètre SIM'),
+        title: const Text('SIM Parameters'),
       ),
       body: _simCards.isEmpty
           ? const Center(
         child: Text(
-          'Aucune carte SIM trouvée',
+          'No SIM cards found',
           style: TextStyle(color: Colors.white),
         ),
       )

dialer/lib/main.dart

@@ -1,5 +1,3 @@
-// This is DEV
-
 import 'package:dialer/features/home/home_page.dart';
 import 'package:flutter/material.dart';
 import 'package:dialer/features/contacts/contact_state.dart';
@@ -18,7 +16,7 @@ class MyApp extends StatelessWidget {
         theme: ThemeData(
           brightness: Brightness.dark
         ),
-        home: const MyHomePage(),
+        home: SafeArea(child: MyHomePage()),
       )
     );
   }

dialer/lib/widgets/block_service.dart

@@ -0,0 +1,52 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class BlockService {
+  static final BlockService _instance = BlockService._internal();
+
+  factory BlockService() {
+    return _instance;
+  }
+
+  BlockService._internal();
+
+  // Function to add a number to the blocked list
+  Future<void> blockNumber(String number) async {
+    if (number.isEmpty) return;
+
+    final prefs = await SharedPreferences.getInstance();
+    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
+
+    if (!blockedNumbers.contains(number)) {
+      blockedNumbers.add(number);
+      await prefs.setStringList('blockedNumbers', blockedNumbers);
+      print('$number has been blocked');
+    } else {
+      print('$number is already blocked');
+    }
+  }
+
+  // Function to remove a number from the blocked list
+  Future<void> unblockNumber(String number) async {
+    if (number.isEmpty) return;
+
+    final prefs = await SharedPreferences.getInstance();
+    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
+
+    if (blockedNumbers.contains(number)) {
+      blockedNumbers.remove(number);
+      await prefs.setStringList('blockedNumbers', blockedNumbers);
+      print('$number has been unblocked');
+    } else {
+      print('$number is not blocked');
+    }
+  }
+
+  // Check if a number is blocked
+  Future<bool> isNumberBlocked(String number) async {
+    if (number.isEmpty) return false;
+
+    final prefs = await SharedPreferences.getInstance();
+    List<String> blockedNumbers = prefs.getStringList('blockedNumbers') ?? [];
+    return blockedNumbers.contains(number);
+  }
+}

dialer/lib/widgets/contact_service.dart

@@ -0,0 +1,31 @@
+import 'package:flutter_contacts/flutter_contacts.dart';
+
+// Service to manage contact-related operations
+class ContactService {
+  Future<List<Contact>> fetchContacts() async {
+    if (await FlutterContacts.requestPermission()) {
+      return await FlutterContacts.getContacts(
+          withProperties: true,
+          withThumbnail: true,
+          withAccounts: true,
+          withGroups: true,
+          withPhoto: true);
+    }
+    return [];
+  }
+
+  Future<List<Contact>> fetchFavoriteContacts() async {
+    // Fetch all contacts
+    List<Contact> contacts = await fetchContacts();
+
+    // Filter contacts to only include those with isStarred: true
+    List<Contact> favoriteContacts =
+        contacts.where((contact) => contact.isStarred).toList();
+
+    return favoriteContacts;
+  }
+
+  Future<void> addNewContact(Contact contact) async {
+    await FlutterContacts.insertContact(contact);
+  }
+}

dialer/lib/widgets/qr_scanner.dart

@@ -0,0 +1,161 @@
+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);
+
+  @override
+  _QRCodeScannerScreenState createState() => _QRCodeScannerScreenState();
+}
+
+class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
+  MobileScannerController cameraController = MobileScannerController();
+
+  bool isScanning = true;
+
+  @override
+  void dispose() {
+    cameraController.dispose();
+    super.dispose();
+  }
+
+  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: Text('Contact Added'),
+        content: Text('The contact has been added to your address book.'),
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.of(context).pop(); // Close dialog
+              Navigator.of(context).pop(); // Go back to previous screen
+            },
+            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'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Scan Contact QR Code'),
+      ),
+      body: MobileScanner(
+        controller: cameraController,
+        onDetect: (capture) {
+          if (!isScanning) return;
+
+          isScanning = false; // Prevent multiple scans
+          final List<Barcode> barcodes = capture.barcodes;
+
+          for (final barcode in barcodes) {
+            final String? code = barcode.rawValue;
+            if (code != null && code.contains('BEGIN:VCARD')) {
+              // Handle valid vCard QR code
+              _createContactFromVCard(code);
+              _showContactAddedDialog(); // TODO: Be a confirmation button "do you want to add XXX to your contacts?"
+              break;
+            }
+          }
+
+          if (!barcodes.any((barcode) =>
+          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/linux/.gitignore

@@ -1 +0,0 @@
-flutter/ephemeral

dialer/linux/CMakeLists.txt

@@ -1,145 +0,0 @@
-# Project-level configuration.
-cmake_minimum_required(VERSION 3.10)
-project(runner LANGUAGES CXX)
-
-# The name of the executable created for the application. Change this to change
-# the on-disk name of your application.
-set(BINARY_NAME "dialer")
-# The unique GTK application identifier for this application. See:
-# https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.dialer")
-
-# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
-# versions of CMake.
-cmake_policy(SET CMP0063 NEW)
-
-# Load bundled libraries from the lib/ directory relative to the binary.
-set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
-
-# Root filesystem for cross-building.
-if(FLUTTER_TARGET_PLATFORM_SYSROOT)
-  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-# Define build configuration options.
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "Debug" CACHE
-    STRING "Flutter build mode" FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Profile" "Release")
-endif()
-
-# Compilation settings that should be applied to most targets.
-#
-# Be cautious about adding new options here, as plugins use this function by
-# default. In most cases, you should add new options to specific targets instead
-# of modifying this function.
-function(APPLY_STANDARD_SETTINGS TARGET)
-  target_compile_features(${TARGET} PUBLIC cxx_std_14)
-  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
-  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
-  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
-endfunction()
-
-# Flutter library and tool build rules.
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-add_subdirectory(${FLUTTER_MANAGED_DIR})
-
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-
-add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
-
-# Define the application target. To change its name, change BINARY_NAME above,
-# not the value here, or `flutter run` will no longer work.
-#
-# Any new source files that you add to the application should be added here.
-add_executable(${BINARY_NAME}
-  "main.cc"
-  "my_application.cc"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
-)
-
-# Apply the standard set of build settings. This can be removed for applications
-# that need different build settings.
-apply_standard_settings(${BINARY_NAME})
-
-# Add dependency libraries. Add any application-specific dependencies here.
-target_link_libraries(${BINARY_NAME} PRIVATE flutter)
-target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
-
-# Run the Flutter tool portions of the build. This must not be removed.
-add_dependencies(${BINARY_NAME} flutter_assemble)
-
-# Only the install-generated bundle's copy of the executable will launch
-# correctly, since the resources must in the right relative locations. To avoid
-# people trying to run the unbundled copy, put it in a subdirectory instead of
-# the default top-level location.
-set_target_properties(${BINARY_NAME}
-  PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
-)
-
-
-# Generated plugin build rules, which manage building the plugins and adding
-# them to the application.
-include(flutter/generated_plugins.cmake)
-
-
-# === Installation ===
-# By default, "installing" just makes a relocatable bundle in the build
-# directory.
-set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
-endif()
-
-# Start with a clean build bundle directory every time.
-install(CODE "
-  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
-  " COMPONENT Runtime)
-
-set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
-set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
-
-foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
-  install(FILES "${bundled_library}"
-    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endforeach(bundled_library)
-
-# Copy the native assets provided by the build.dart from all packages.
-set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
-install(DIRECTORY "${NATIVE_ASSETS_DIR}"
-   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-   COMPONENT Runtime)
-
-# Fully re-copy the assets directory on each build to avoid having stale files
-# from a previous install.
-set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
-install(CODE "
-  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
-  " COMPONENT Runtime)
-install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
-
-# Install the AOT library on non-Debug builds only.
-if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()

dialer/linux/flutter/CMakeLists.txt

@@ -1,88 +0,0 @@
-# This file controls Flutter-level build steps. It should not be edited.
-cmake_minimum_required(VERSION 3.10)
-
-set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
-
-# Configuration provided via flutter tool.
-include(${EPHEMERAL_DIR}/generated_config.cmake)
-
-# TODO: Move the rest of this into files in ephemeral. See
-# https://github.com/flutter/flutter/issues/57146.
-
-# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
-# which isn't available in 3.10.
-function(list_prepend LIST_NAME PREFIX)
-    set(NEW_LIST "")
-    foreach(element ${${LIST_NAME}})
-        list(APPEND NEW_LIST "${PREFIX}${element}")
-    endforeach(element)
-    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
-endfunction()
-
-# === Flutter Library ===
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
-pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-
-set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
-
-# Published to parent scope for install step.
-set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
-set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
-set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
-set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
-
-list(APPEND FLUTTER_LIBRARY_HEADERS
-  "fl_basic_message_channel.h"
-  "fl_binary_codec.h"
-  "fl_binary_messenger.h"
-  "fl_dart_project.h"
-  "fl_engine.h"
-  "fl_json_message_codec.h"
-  "fl_json_method_codec.h"
-  "fl_message_codec.h"
-  "fl_method_call.h"
-  "fl_method_channel.h"
-  "fl_method_codec.h"
-  "fl_method_response.h"
-  "fl_plugin_registrar.h"
-  "fl_plugin_registry.h"
-  "fl_standard_message_codec.h"
-  "fl_standard_method_codec.h"
-  "fl_string_codec.h"
-  "fl_value.h"
-  "fl_view.h"
-  "flutter_linux.h"
-)
-list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
-add_library(flutter INTERFACE)
-target_include_directories(flutter INTERFACE
-  "${EPHEMERAL_DIR}"
-)
-target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
-target_link_libraries(flutter INTERFACE
-  PkgConfig::GTK
-  PkgConfig::GLIB
-  PkgConfig::GIO
-)
-add_dependencies(flutter flutter_assemble)
-
-# === Flutter tool backend ===
-# _phony_ is a non-existent file to force this command to run every time,
-# since currently there's no way to get a full input/output list from the
-# flutter tool.
-add_custom_command(
-  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
-  COMMAND ${CMAKE_COMMAND} -E env
-    ${FLUTTER_TOOL_ENVIRONMENT}
-    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
-      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
-  VERBATIM
-)
-add_custom_target(flutter_assemble DEPENDS
-  "${FLUTTER_LIBRARY}"
-  ${FLUTTER_LIBRARY_HEADERS}
-)

dialer/linux/main.cc

@@ -1,6 +0,0 @@
-#include "my_application.h"
-
-int main(int argc, char** argv) {
-  g_autoptr(MyApplication) app = my_application_new();
-  return g_application_run(G_APPLICATION(app), argc, argv);
-}

dialer/linux/my_application.cc

@@ -1,124 +0,0 @@
-#include "my_application.h"
-
-#include <flutter_linux/flutter_linux.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
-#include "flutter/generated_plugin_registrant.h"
-
-struct _MyApplication {
-  GtkApplication parent_instance;
-  char** dart_entrypoint_arguments;
-};
-
-G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
-
-// Implements GApplication::activate.
-static void my_application_activate(GApplication* application) {
-  MyApplication* self = MY_APPLICATION(application);
-  GtkWindow* window =
-      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
-
-  // Use a header bar when running in GNOME as this is the common style used
-  // by applications and is the setup most users will be using (e.g. Ubuntu
-  // desktop).
-  // If running on X and not using GNOME then just use a traditional title bar
-  // in case the window manager does more exotic layout, e.g. tiling.
-  // If running on Wayland assume the header bar will work (may need changing
-  // if future cases occur).
-  gboolean use_header_bar = TRUE;
-#ifdef GDK_WINDOWING_X11
-  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen)) {
-    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-      use_header_bar = FALSE;
-    }
-  }
-#endif
-  if (use_header_bar) {
-    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "dialer");
-    gtk_header_bar_set_show_close_button(header_bar, TRUE);
-    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  } else {
-    gtk_window_set_title(window, "dialer");
-  }
-
-  gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
-
-  g_autoptr(FlDartProject) project = fl_dart_project_new();
-  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
-
-  FlView* view = fl_view_new(project);
-  gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
-
-  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
-
-  gtk_widget_grab_focus(GTK_WIDGET(view));
-}
-
-// Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
-  MyApplication* self = MY_APPLICATION(application);
-  // Strip out the first argument as it is the binary name.
-  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
-
-  g_autoptr(GError) error = nullptr;
-  if (!g_application_register(application, nullptr, &error)) {
-     g_warning("Failed to register: %s", error->message);
-     *exit_status = 1;
-     return TRUE;
-  }
-
-  g_application_activate(application);
-  *exit_status = 0;
-
-  return TRUE;
-}
-
-// Implements GApplication::startup.
-static void my_application_startup(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
-
-  // Perform any actions required at application startup.
-
-  G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
-}
-
-// Implements GApplication::shutdown.
-static void my_application_shutdown(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
-
-  // Perform any actions required at application shutdown.
-
-  G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
-}
-
-// Implements GObject::dispose.
-static void my_application_dispose(GObject* object) {
-  MyApplication* self = MY_APPLICATION(object);
-  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
-  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
-}
-
-static void my_application_class_init(MyApplicationClass* klass) {
-  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
-  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
-  G_APPLICATION_CLASS(klass)->startup = my_application_startup;
-  G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
-  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
-}
-
-static void my_application_init(MyApplication* self) {}
-
-MyApplication* my_application_new() {
-  return MY_APPLICATION(g_object_new(my_application_get_type(),
-                                     "application-id", APPLICATION_ID,
-                                     "flags", G_APPLICATION_NON_UNIQUE,
-                                     nullptr));
-}

dialer/linux/my_application.h

@@ -1,18 +0,0 @@
-#ifndef FLUTTER_MY_APPLICATION_H_
-#define FLUTTER_MY_APPLICATION_H_
-
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
-                     GtkApplication)
-
-/**
- * my_application_new:
- *
- * Creates a new Flutter-based application.
- *
- * Returns: a new #MyApplication.
- */
-MyApplication* my_application_new();
-
-#endif  // FLUTTER_MY_APPLICATION_H_

dialer/macos/.gitignore

@@ -1,7 +0,0 @@
-# Flutter-related
-**/Flutter/ephemeral/
-**/Pods/
-
-# Xcode-related
-**/dgph
-**/xcuserdata/

dialer/macos/Flutter/Flutter-Debug.xcconfig

@@ -1 +0,0 @@
-#include "ephemeral/Flutter-Generated.xcconfig"

dialer/macos/Flutter/Flutter-Release.xcconfig

@@ -1 +0,0 @@
-#include "ephemeral/Flutter-Generated.xcconfig"

dialer/macos/Runner.xcodeproj/project.pbxproj

@@ -1,705 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 54;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		33CC111A2044C6BA0003C045 /* Flutter Assemble */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */;
-			buildPhases = (
-				33CC111E2044C6BF0003C045 /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = "Flutter Assemble";
-			productName = FLX;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
-		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
-		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
-		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
-		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
-		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 33CC10EC2044A3C60003C045;
-			remoteInfo = Runner;
-		};
-		33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 33CC111A2044C6BA0003C045;
-			remoteInfo = FLX;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		33CC110E2044A8840003C045 /* Bundle Framework */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Bundle Framework";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
-		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* dialer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "dialer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
-		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = "<group>"; };
-		33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = "<group>"; };
-		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
-		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
-		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
-		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
-		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
-		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		331C80D2294CF70F00263BE5 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10EA2044A3C60003C045 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		331C80D6294CF71000263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C80D7294CF71000263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		33BA886A226E78AF003329D5 /* Configs */ = {
-			isa = PBXGroup;
-			children = (
-				33E5194F232828860026EE4D /* AppInfo.xcconfig */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				333000ED22D3DE5D00554162 /* Warnings.xcconfig */,
-			);
-			path = Configs;
-			sourceTree = "<group>";
-		};
-		33CC10E42044A3C60003C045 = {
-			isa = PBXGroup;
-			children = (
-				33FAB671232836740065AC1E /* Runner */,
-				33CEB47122A05771004F2AC0 /* Flutter */,
-				331C80D6294CF71000263BE5 /* RunnerTests */,
-				33CC10EE2044A3C60003C045 /* Products */,
-				D73912EC22F37F3D000D13A0 /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-		33CC10EE2044A3C60003C045 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10ED2044A3C60003C045 /* dialer.app */,
-				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		33CC11242044D66E0003C045 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10F22044A3C60003C045 /* Assets.xcassets */,
-				33CC10F42044A3C60003C045 /* MainMenu.xib */,
-				33CC10F72044A3C60003C045 /* Info.plist */,
-			);
-			name = Resources;
-			path = ..;
-			sourceTree = "<group>";
-		};
-		33CEB47122A05771004F2AC0 /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
-				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
-				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
-				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
-			);
-			path = Flutter;
-			sourceTree = "<group>";
-		};
-		33FAB671232836740065AC1E /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
-				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
-				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
-				33E51914231749380026EE4D /* Release.entitlements */,
-				33CC11242044D66E0003C045 /* Resources */,
-				33BA886A226E78AF003329D5 /* Configs */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		331C80D4294CF70F00263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				331C80D1294CF70F00263BE5 /* Sources */,
-				331C80D2294CF70F00263BE5 /* Frameworks */,
-				331C80D3294CF70F00263BE5 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C80DA294CF71000263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		33CC10EC2044A3C60003C045 /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				33CC10E92044A3C60003C045 /* Sources */,
-				33CC10EA2044A3C60003C045 /* Frameworks */,
-				33CC10EB2044A3C60003C045 /* Resources */,
-				33CC110E2044A8840003C045 /* Bundle Framework */,
-				3399D490228B24CF009A79C7 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				33CC11202044C79F0003C045 /* PBXTargetDependency */,
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* dialer.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		33CC10E52044A3C60003C045 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = YES;
-				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					331C80D4294CF70F00263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 33CC10EC2044A3C60003C045;
-					};
-					33CC10EC2044A3C60003C045 = {
-						CreatedOnToolsVersion = 9.2;
-						LastSwiftMigration = 1100;
-						ProvisioningStyle = Automatic;
-						SystemCapabilities = {
-							com.apple.Sandbox = {
-								enabled = 1;
-							};
-						};
-					};
-					33CC111A2044C6BA0003C045 = {
-						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Manual;
-					};
-				};
-			};
-			buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 33CC10E42044A3C60003C045;
-			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				33CC10EC2044A3C60003C045 /* Runner */,
-				331C80D4294CF70F00263BE5 /* RunnerTests */,
-				33CC111A2044C6BA0003C045 /* Flutter Assemble */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		331C80D3294CF70F00263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10EB2044A3C60003C045 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
-				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3399D490228B24CF009A79C7 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
-		};
-		33CC111E2044C6BF0003C045 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				Flutter/ephemeral/FlutterInputs.xcfilelist,
-			);
-			inputPaths = (
-				Flutter/ephemeral/tripwire,
-			);
-			outputFileListPaths = (
-				Flutter/ephemeral/FlutterOutputs.xcfilelist,
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		331C80D1294CF70F00263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		33CC10E92044A3C60003C045 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */,
-				33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */,
-				335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		331C80DA294CF71000263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 33CC10EC2044A3C60003C045 /* Runner */;
-			targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */;
-		};
-		33CC11202044C79F0003C045 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
-			targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		33CC10F42044A3C60003C045 /* MainMenu.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				33CC10F52044A3C60003C045 /* Base */,
-			);
-			name = MainMenu.xib;
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		331C80DB294CF71000263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/dialer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/dialer";
-			};
-			name = Debug;
-		};
-		331C80DC294CF71000263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/dialer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/dialer";
-			};
-			name = Release;
-		};
-		331C80DD294CF71000263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/dialer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/dialer";
-			};
-			name = Profile;
-		};
-		338D0CE9231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-			};
-			name = Profile;
-		};
-		338D0CEA231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Profile;
-		};
-		338D0CEB231458BD00FA5F75 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Manual;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Profile;
-		};
-		33CC10F92044A3C60003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		33CC10FA2044A3C60003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-			};
-			name = Release;
-		};
-		33CC10FC2044A3C60003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		33CC10FD2044A3C60003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
-		33CC111C2044C6BA0003C045 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Manual;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		33CC111D2044C6BA0003C045 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C80DB294CF71000263BE5 /* Debug */,
-				331C80DC294CF71000263BE5 /* Release */,
-				331C80DD294CF71000263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC10F92044A3C60003C045 /* Debug */,
-				33CC10FA2044A3C60003C045 /* Release */,
-				338D0CE9231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC10FC2044A3C60003C045 /* Debug */,
-				33CC10FD2044A3C60003C045 /* Release */,
-				338D0CEA231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				33CC111C2044C6BA0003C045 /* Debug */,
-				33CC111D2044C6BA0003C045 /* Release */,
-				338D0CEB231458BD00FA5F75 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
-}

dialer/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dialer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1510"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "dialer.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "dialer.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "dialer.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "dialer.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

dialer/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

dialer/macos/Runner/AppDelegate.swift

@@ -1,9 +0,0 @@
-import Cocoa
-import FlutterMacOS
-
-@main
-class AppDelegate: FlutterAppDelegate {
-  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-    return true
-  }
-}

dialer/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

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

dialer/macos/Runner/Base.lproj/MainMenu.xib

@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
-            <connections>
-                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Runner" customModuleProvider="target">
-            <connections>
-                <outlet property="applicationMenu" destination="uQy-DD-JDr" id="XBo-yE-nKs"/>
-                <outlet property="mainFlutterWindow" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
-            </connections>
-        </customObject>
-        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-        <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
-            <items>
-                <menuItem title="APP_NAME" id="1Xt-HY-uBw">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="APP_NAME" systemMenu="apple" id="uQy-DD-JDr">
-                        <items>
-                            <menuItem title="About APP_NAME" id="5kV-Vb-QxS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
-                            <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
-                            <menuItem title="Services" id="NMo-om-nkz">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide APP_NAME" keyEquivalent="h" id="Olw-nP-bQN">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="Kd2-mp-pUS">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit APP_NAME" keyEquivalent="q" id="4sb-4s-VLi">
-                                <connections>
-                                    <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Edit" id="5QF-Oa-p0T">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Edit" id="W48-6f-4Dl">
-                        <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="M6e-cu-g7V"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
-                                <connections>
-                                    <action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
-                            <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="YJe-68-I9s"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="G1f-GL-Joy"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
-                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="pa3-QI-u2k">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
-                            <menuItem title="Find" id="4EN-yA-p0u">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Find" id="1b7-l0-nxx">
-                                    <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
-                                    <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
-                                        <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Substitutions" id="9ic-FL-obx">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
-                                    <items>
-                                        <menuItem title="Show Substitutions" id="z6F-FW-3nz">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
-                                        <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" id="hQb-2v-fYv">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Dashes" id="rgM-f4-ycn">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Links" id="cwL-P1-jid">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Data Detectors" id="tRr-pd-1PS">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Text Replacement" id="HFQ-gK-NFA">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Transformations" id="2oI-Rn-ZJC">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Transformations" id="c8a-y6-VQd">
-                                    <items>
-                                        <menuItem title="Make Upper Case" id="vmV-6d-7jI">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Make Lower Case" id="d9M-CD-aMd">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Capitalize" id="UEZ-Bs-lqG">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                            <menuItem title="Speech" id="xrE-MZ-jX0">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Speech" id="3rS-ZA-NoH">
-                                    <items>
-                                        <menuItem title="Start Speaking" id="Ynk-f8-cLZ">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="Oyz-dy-DGm">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="View" id="H8h-7b-M4v">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="View" id="HyV-fh-RgO">
-                        <items>
-                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
-                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleFullScreen:" target="-1" id="dU3-MA-1Rq"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Window" id="aUF-d1-5bR">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
-                        <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="R4o-n2-Eq4">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
-                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem title="Help" id="EPT-qC-fAb">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Help" systemMenu="help" id="rJ0-wn-3NY"/>
-                </menuItem>
-            </items>
-            <point key="canvasLocation" x="142" y="-258"/>
-        </menu>
-        <window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="Runner" customModuleProvider="target">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <rect key="contentRect" x="335" y="390" width="800" height="600"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1577"/>
-            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </view>
-        </window>
-    </objects>
-</document>

dialer/macos/Runner/Configs/AppInfo.xcconfig

@@ -1,14 +0,0 @@
-// Application-level settings for the Runner target.
-//
-// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the
-// future. If not, the values below would default to using the project name when this becomes a
-// 'flutter create' template.
-
-// The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = dialer
-
-// The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer
-
-// The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.

dialer/macos/Runner/Configs/Debug.xcconfig

@@ -1,2 +0,0 @@
-#include "../../Flutter/Flutter-Debug.xcconfig"
-#include "Warnings.xcconfig"

dialer/macos/Runner/Configs/Release.xcconfig

@@ -1,2 +0,0 @@
-#include "../../Flutter/Flutter-Release.xcconfig"
-#include "Warnings.xcconfig"

dialer/macos/Runner/Configs/Warnings.xcconfig

@@ -1,13 +0,0 @@
-WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings
-GCC_WARN_UNDECLARED_SELECTOR = YES
-CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES
-CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE
-CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
-CLANG_WARN_PRAGMA_PACK = YES
-CLANG_WARN_STRICT_PROTOTYPES = YES
-CLANG_WARN_COMMA = YES
-GCC_WARN_STRICT_SELECTOR_MATCH = YES
-CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
-CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
-GCC_WARN_SHADOW = YES
-CLANG_WARN_UNREACHABLE_CODE = YES

dialer/macos/Runner/DebugProfile.entitlements

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
-</dict>
-</plist>

dialer/macos/Runner/Info.plist

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>$(PRODUCT_COPYRIGHT)</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

dialer/macos/Runner/MainFlutterWindow.swift

@@ -1,15 +0,0 @@
-import Cocoa
-import FlutterMacOS
-
-class MainFlutterWindow: NSWindow {
-  override func awakeFromNib() {
-    let flutterViewController = FlutterViewController()
-    let windowFrame = self.frame
-    self.contentViewController = flutterViewController
-    self.setFrame(windowFrame, display: true)
-
-    RegisterGeneratedPlugins(registry: flutterViewController)
-
-    super.awakeFromNib()
-  }
-}

dialer/macos/Runner/Release.entitlements

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-</dict>
-</plist>

dialer/macos/RunnerTests/RunnerTests.swift

@@ -1,12 +0,0 @@
-import Cocoa
-import FlutterMacOS
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}

dialer/packages/mobile_number/CHANGELOG.md

@@ -0,0 +1,59 @@
+## 2.1.1
+
+* Fix Android building
+
+## 2.1.0
+
+* Make min sdk to Flutter 3.0.0 
+
+## 2.0.0
+
+* Remove null check operator from method ListenPhone 
+
+## 1.0.4
+
+* Null safety support
+
+## 1.0.3
+
+* Fix crash because of null value on empty number
+
+## 1.0.2
+
+* Support old Flutter plugin V1
+
+## 1.0.1
+
+* Fix crash related to Android 10
+
+## 1.0.0
+
+* Addded has phone permission
+* Added request phone permission
+* Added phone permission listener
+* Fix bugs
+
+## 0.0.6
+
+* Add sample image.
+
+## 0.0.5
+
+* Add support for dual sim card.
+
+## 0.0.4
+
+* Print exception message on debugging console.
+
+## 0.0.3
+
+* Migrate to AndroidX
+
+## 0.0.2
+
+* Add gt mobile number native code to Android
+
+
+## 0.0.1
+
+* Initial Release.

dialer/packages/mobile_number/LICENSE

@@ -0,0 +1,13 @@
+   Copyright 2023 Amr Eniou
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

dialer/packages/mobile_number/README.md

@@ -0,0 +1,66 @@
+# mobile_number
+
+This is a FLutter Plugin to get the device mobile number.
+#### Note: It works for Android only because getting mobile number of sim card is not supported in iOS.
+#### Note: If the mobile number is not pre-exist on sim card it will not return te phone number.
+
+## Installation 
+#### Link on Flutter plugins
+https://pub.dev/packages/mobile_number
+
+#### Note: 
+if you still using depecated FlutterActivty on MainActivity.java
+which is import of 
+- `import io.flutter.app.FlutterActivity;`
+
+not 
+- `import io.flutter.embedding.android.FlutterActivity;`
+
+then you need to add the following to your MainActivity.java
+``` 
+@Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MobileNumberPlugin.registerWith(registrarFor("com.amorenew.mobile_number.MobileNumberPlugin()"));
+    }
+  ```
+
+## Usage
+
+#### Check Phone Permission
+
+```await MobileNumber.hasPhonePermission```
+
+#### Request Phone Permission
+
+```await MobileNumber.requestPhonePermission```
+
+#### Listen to widget resume after Phone Permission request
+
+```MobileNumber.listenPhonePermission((isPermissionGranted) {
+      if (isPermissionGranted) {
+        //Get mobile number
+      } else {
+        //Request Phone Permission
+      }
+    });
+  ```
+
+#### Get first sim card number
+
+```Future<String> getMobileNumber() async {
+    final String mobileNumber = await MobileNumber.mobileNumber;
+    return mobileNumber;
+  }
+  ```
+
+#### Get List of sim cards for dual sim cards
+
+```Future<List<SimCard>> geSimCards() async {
+    final List<SimCard> simCards = await MobileNumber.getSimCards;
+    return simCards;
+  }
+  ```
+  
+
+![alt text](https://raw.githubusercontent.com/amorenew/Flutter-Mobile-Number-Plugin/master/sample1.png)

dialer/packages/mobile_number/android/build.gradle

@@ -0,0 +1,41 @@
+group 'com.amorenew.mobile_number'
+version '1.0-SNAPSHOT'
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.2.2'
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 33
+    namespace "com.amorenew.mobile_number"
+
+    defaultConfig {
+        targetSdkVersion 33
+        minSdkVersion 21
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+}
+
+dependencies {
+    implementation 'androidx.core:core:1.9.0'
+    // Other dependencies...
+}