fix: search bar is non case sensitive and don't have delay (contact page) (#50)

Co-authored-by: stcb <21@stcb.cc>
Reviewed-on: #50
Co-authored-by: Florian Griffon <florian.griffon@epitech.eu>
Co-committed-by: Florian Griffon <florian.griffon@epitech.eu>

.gitea/workflows/apk.yaml

@@ -0,0 +1,31 @@
+on:
+  push:
+    paths:
+      - dialer/**
+
+jobs:
+  build:
+    runs-on: debian
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          subpath: dialer/
+      - uses: docker://git.gmoker.com/icing/flutter:main
+      - uses: actions/upload-artifact@v1
+        with:
+          name: icing-dialer-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk
+          path: build/app/outputs/flutter-apk/app-release.apk
+
+  build-stealth:
+    runs-on: debian
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          subpath: dialer/
+      - uses: docker://git.gmoker.com/icing/flutter:main
+        with:
+          args: "build apk --dart-define=STEALTH=true"
+      - uses: actions/upload-artifact@v1
+        with:
+          name: icing-dialer-stealth-${{ gitea.ref_name }}-${{ gitea.run_id }}.apk
+          path: build/app/outputs/flutter-apk/app-release.apk

.gitea/workflows/website.yaml

@@ -0,0 +1,35 @@
+on:
+  push:
+    paths:
+      - website/**
+
+jobs:
+  deploy:
+    runs-on: debian
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          subpath: website/
+      - 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 }}"
+
+      - uses: actions/k8sdeploy@v1
+        with:
+          kubeconfig: "${{ secrets.K8S }}"
+          registry_password: "${{ secrets.PKGRW }}"

.gitignore

@@ -181,4 +181,6 @@ app.*.symbols
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
-!.vscode/settings.json
+!.vscode/settings.json
+dialer/android/gradle.properties
+.gitignore

README.md

@@ -0,0 +1,21 @@
+# Icing
+
+## Encrypting phone calls on an analog audio level
+
+An Epitech Innovation Project
+
+*By*
+**Bartosz Michalak - Alexis Danlos - Florian Griffon - Ange Duhayon - Stéphane Corbière**
+
+---
+
+The **docs** folder contains documentation about:
+
+#### Epitech
+- The Beta Test Plan
+- The Delivrables
+
+#### Icing
+- 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

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

dialer/android/app/build.gradle

@@ -6,22 +6,22 @@ plugins {
 }
 
 android {
-    namespace = "com.example.dialer"
+    namespace = "com.icing.dialer"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.dialer"
+        applicationId = "com.icing.dialer"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

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

@@ -1,17 +1,25 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.icing.dialer">
+    <uses-feature android:name="android.hardware.telephony" android:required="true" />
+
     <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-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+
     <application
-        android:label="com.example.dialer"
+        android:label="Icing Dialer"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:enableOnBackInvokedCallback="true">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
@@ -31,7 +39,48 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- Dialer intent filters (required for default dialer eligibility) -->
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="tel" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CALL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tel" />
+            </intent-filter>
         </activity>
+        <service
+            android:name=".services.MyInCallService"
+            android:permission="android.permission.BIND_INCALL_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.InCallService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true" />
+        </service>
+        <!-- Custom ConnextionService, will be needed at some point when we implement our own protocol -->
+        <!-- <service
+            android:name=".services.CallConnectionService"
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService" />
+            </intent-filter>
+        </service> -->
+        
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

dialer/android/app/src/main/kotlin/com/example/dialer/MainActivity.kt

@@ -1,5 +0,0 @@
-package com.example.dialer
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity()

dialer/android/app/src/main/kotlin/com/icing/dialer/KeyDeleter.kt

@@ -0,0 +1,28 @@
+package com.icing.dialer
+
+import java.security.KeyStore
+
+object KeyDeleterHelper {
+
+    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
+
+    /**
+     * Deletes the key pair associated with the given alias from the Android Keystore.
+     *
+     * @param alias The alias of the key pair to delete.
+     * @throws Exception if deletion fails.
+     */
+    fun deleteKeyPair(alias: String) {
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            if (!keyStore.containsAlias(alias)) {
+                throw Exception("No key found with alias \"$alias\" to delete.")
+            }
+
+            keyStore.deleteEntry(alias)
+        } catch (e: Exception) {
+            throw Exception("Failed to delete key pair: ${e.message}", e)
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/KeyGenerator.kt

@@ -0,0 +1,47 @@
+package com.icing.dialer
+
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import java.security.KeyPairGenerator
+import java.security.KeyStore
+
+object KeyGeneratorHelper {
+
+    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
+
+    /**
+     * Generates an ECDSA P-256 key pair and stores it in the Android Keystore.
+     *
+     * @param alias Unique identifier for the key pair.
+     * @throws Exception if key generation fails.
+     */
+    fun generateECKeyPair(alias: String) {
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            // Check if the key already exists
+            if (keyStore.containsAlias(alias)) {
+                throw Exception("Key with alias \"$alias\" already exists.")
+            }
+
+            val keyPairGenerator = KeyPairGenerator.getInstance(
+                KeyProperties.KEY_ALGORITHM_EC,
+                ANDROID_KEYSTORE
+            )
+
+            val parameterSpec = KeyGenParameterSpec.Builder(
+                alias,
+                KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY
+            )
+                .setAlgorithmParameterSpec(java.security.spec.ECGenParameterSpec("secp256r1"))
+                .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA384, KeyProperties.DIGEST_SHA512)
+                .setUserAuthenticationRequired(false) // Set to true if you require user authentication
+                .build()
+
+            keyPairGenerator.initialize(parameterSpec)
+            keyPairGenerator.generateKeyPair()
+        } catch (e: Exception) {
+            throw Exception("Failed to generate EC key pair: ${e.message}", e)
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/KeystoreHelper.kt

@@ -0,0 +1,154 @@
+package com.icing.dialer
+
+import java.security.PrivateKey
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import android.util.Base64
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import java.security.KeyPairGenerator
+import java.security.KeyStore
+import java.security.Signature
+
+class KeystoreHelper(private val call: MethodCall, private val result: MethodChannel.Result) {
+
+    private val ANDROID_KEYSTORE = "AndroidKeyStore"
+
+    fun handleMethodCall() {
+        when (call.method) {
+            "generateKeyPair" -> generateECKeyPair()
+            "signData" -> signData()
+            "getPublicKey" -> getPublicKey()
+            "deleteKeyPair" -> deleteKeyPair()
+            "keyPairExists" -> keyPairExists()
+            else -> result.notImplemented()
+        }
+    }
+
+    private fun generateECKeyPair() {
+        val alias = call.argument<String>("alias")
+        if (alias == null) {
+            result.error("INVALID_ARGUMENT", "Alias is required", null)
+            return
+        }
+
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            if (keyStore.containsAlias(alias)) {
+                result.error("KEY_EXISTS", "Key with alias \"$alias\" already exists.", null)
+                return
+            }
+
+            val keyPairGenerator = KeyPairGenerator.getInstance(
+                KeyProperties.KEY_ALGORITHM_EC,
+                ANDROID_KEYSTORE
+            )
+
+            val parameterSpec = KeyGenParameterSpec.Builder(
+                alias,
+                KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY
+            )
+                .setAlgorithmParameterSpec(java.security.spec.ECGenParameterSpec("secp256r1"))
+                .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA384, KeyProperties.DIGEST_SHA512)
+                .setUserAuthenticationRequired(false)
+                .build()
+
+            keyPairGenerator.initialize(parameterSpec)
+            keyPairGenerator.generateKeyPair()
+
+            result.success(null)
+        } catch (e: Exception) {
+            result.error("KEY_GENERATION_FAILED", e.message, null)
+        }
+    }
+
+    private fun signData() {
+        val alias = call.argument<String>("alias")
+        val data = call.argument<String>("data")
+        if (alias == null || data == null) {
+            result.error("INVALID_ARGUMENT", "Alias and data are required", null)
+            return
+        }
+
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            val privateKey = keyStore.getKey(alias, null) as? PrivateKey ?: run {
+                result.error("KEY_NOT_FOUND", "Private key not found for alias \"$alias\".", null)
+                return
+            }
+
+            val signature = Signature.getInstance("SHA256withECDSA")
+            signature.initSign(privateKey)
+            signature.update(data.toByteArray())
+            val signedBytes = signature.sign()
+
+            val signatureBase64 = Base64.encodeToString(signedBytes, Base64.DEFAULT)
+            result.success(signatureBase64)
+        } catch (e: Exception) {
+            result.error("SIGNING_FAILED", e.message, null)
+        }
+    }
+
+    private fun getPublicKey() {
+        val alias = call.argument<String>("alias")
+        if (alias == null) {
+            result.error("INVALID_ARGUMENT", "Alias is required", null)
+            return
+        }
+
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            val certificate = keyStore.getCertificate(alias) ?: run {
+                result.error("CERTIFICATE_NOT_FOUND", "Certificate not found for alias \"$alias\".", null)
+                return
+            }
+
+            val publicKey = certificate.publicKey
+            val publicKeyBase64 = Base64.encodeToString(publicKey.encoded, Base64.DEFAULT)
+            result.success(publicKeyBase64)
+        } catch (e: Exception) {
+            result.error("PUBLIC_KEY_RETRIEVAL_FAILED", e.message, null)
+        }
+    }
+
+    private fun deleteKeyPair() {
+        val alias = call.argument<String>("alias")
+        if (alias == null) {
+            result.error("INVALID_ARGUMENT", "Alias is required", null)
+            return
+        }
+
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            if (!keyStore.containsAlias(alias)) {
+                result.error("KEY_NOT_FOUND", "No key found with alias \"$alias\" to delete.", null)
+                return
+            }
+
+            keyStore.deleteEntry(alias)
+            result.success(null)
+        } catch (e: Exception) {
+            result.error("KEY_DELETION_FAILED", e.message, null)
+        }
+    }
+
+    private fun keyPairExists() {
+        val alias = call.argument<String>("alias")
+        if (alias == null) {
+            result.error("INVALID_ARGUMENT", "Alias is required", null)
+            return
+        }
+
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+            val exists = keyStore.containsAlias(alias)
+            result.success(exists)
+        } catch (e: Exception) {
+            result.error("KEY_CHECK_FAILED", e.message, null)
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/PublicKeyRetriever.kt

@@ -0,0 +1,30 @@
+package com.icing.dialer
+
+import java.security.KeyStore
+import java.security.PublicKey
+import android.util.Base64
+
+object PublicKeyHelper {
+
+    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
+
+    /**
+     * Retrieves the public key associated with the given alias.
+     *
+     * @param alias The alias of the key pair.
+     * @return The public key as a Base64-encoded string.
+     * @throws Exception if retrieval fails.
+     */
+    fun getPublicKey(alias: String): String {
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            val certificate = keyStore.getCertificate(alias) ?: throw Exception("Certificate not found for alias \"$alias\".")
+            val publicKey: PublicKey = certificate.publicKey
+
+            return Base64.encodeToString(publicKey.encoded, Base64.DEFAULT)
+        } catch (e: Exception) {
+            throw Exception("Failed to retrieve public key: ${e.message}", e)
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/Signer.kt

@@ -0,0 +1,37 @@
+package com.icing.dialer
+
+import android.security.keystore.KeyProperties
+import java.security.KeyStore
+import java.security.Signature
+import android.util.Base64
+import java.security.PrivateKey
+
+object SignerHelper {
+
+    private const val ANDROID_KEYSTORE = "AndroidKeyStore"
+
+    /**
+     * Signs the provided data using the private key associated with the given alias.
+     *
+     * @param alias The alias of the key pair.
+     * @param data The data to sign.
+     * @return The signature as a Base64-encoded string.
+     * @throws Exception if signing fails.
+     */
+    fun signData(alias: String, data: ByteArray): String {
+        try {
+            val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+            val privateKey = keyStore.getKey(alias, null) as? PrivateKey?: throw Exception("Private key not found for alias \"$alias\".")
+
+            val signature = Signature.getInstance("SHA256withECDSA")
+            signature.initSign(privateKey)
+            signature.update(data)
+            val signedBytes = signature.sign()
+
+            return Base64.encodeToString(signedBytes, Base64.DEFAULT)
+        } catch (e: Exception) {
+            throw Exception("Failed to sign data: ${e.message}", e)
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/activities/MainActivity.kt

@@ -0,0 +1,174 @@
+package com.icing.dialer.activities
+
+import android.Manifest
+import android.app.role.RoleManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.database.Cursor
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.CallLog
+import android.telecom.TelecomManager
+import android.util.Log
+import androidx.core.content.ContextCompat
+import com.icing.dialer.KeystoreHelper
+import com.icing.dialer.services.CallService
+import com.icing.dialer.services.MyInCallService
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+
+class MainActivity : FlutterActivity() {
+    private val KEYSTORE_CHANNEL = "com.example.keystore"
+    private val CALLLOG_CHANNEL = "com.example.calllog"
+    private val CALL_CHANNEL = "call_service"
+    private val TAG = "MainActivity"
+    private val REQUEST_CODE_SET_DEFAULT_DIALER = 1001
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.d(TAG, "onCreate started")
+        Log.d(TAG, "Waiting for Flutter to signal permissions")
+    }
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        Log.d(TAG, "Configuring Flutter engine")
+
+        MyInCallService.channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "permissionsGranted" -> {
+                        Log.d(TAG, "Received permissionsGranted from Flutter")
+                        checkAndRequestDefaultDialer()
+                        result.success(true)
+                    }
+                    "makeGsmCall" -> {
+                        val phoneNumber = call.argument<String>("phoneNumber")
+                        if (phoneNumber != null) {
+                            val success = CallService.makeGsmCall(this, phoneNumber)
+                            if (success) {
+                                result.success(mapOf("status" to "calling", "phoneNumber" to phoneNumber))
+                            } else {
+                                result.error("CALL_FAILED", "Failed to initiate call", null)
+                            }
+                        } else {
+                            result.error("INVALID_PHONE_NUMBER", "Phone number is required", null)
+                        }
+                    }
+                    "hangUpCall" -> {
+                        val success = CallService.hangUpCall(this)
+                        if (success) {
+                            result.success(mapOf("status" to "ended"))
+                        } else {
+                            result.error("HANGUP_FAILED", "Failed to end call", null)
+                        }
+                    }
+                    "answerCall" -> {
+                        val success = MyInCallService.currentCall?.let {
+                            it.answer(0) // 0 for default video state (audio-only)
+                            Log.d(TAG, "Answered call")
+                            true
+                        } ?: false
+                        if (success) {
+                            result.success(mapOf("status" to "answered"))
+                        } else {
+                            result.error("ANSWER_FAILED", "No active call to answer", null)
+                        }
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, KEYSTORE_CHANNEL)
+            .setMethodCallHandler { call, result -> KeystoreHelper(call, result).handleMethodCall() }
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALLLOG_CHANNEL)
+            .setMethodCallHandler { call, result ->
+                if (call.method == "getCallLogs") {
+                    val callLogs = getCallLogs()
+                    result.success(callLogs)
+                } else {
+                    result.notImplemented()
+                }
+            }
+    }
+
+    private fun checkAndRequestDefaultDialer() {
+        val telecomManager = getSystemService(TELECOM_SERVICE) as TelecomManager
+        val currentDefault = telecomManager.defaultDialerPackage
+        Log.d(TAG, "Current default dialer: $currentDefault, My package: $packageName")
+
+        if (currentDefault != packageName) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                val roleManager = getSystemService(Context.ROLE_SERVICE) as RoleManager
+                if (roleManager.isRoleAvailable(RoleManager.ROLE_DIALER) && !roleManager.isRoleHeld(RoleManager.ROLE_DIALER)) {
+                    val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER)
+                    startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
+                    Log.d(TAG, "Launched RoleManager intent for default dialer on API 29+")
+                } else {
+                    Log.d(TAG, "RoleManager: Available=${roleManager.isRoleAvailable(RoleManager.ROLE_DIALER)}, Held=${roleManager.isRoleHeld(RoleManager.ROLE_DIALER)}")
+                }
+            } else {
+                val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER)
+                    .putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try {
+                    startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
+                    Log.d(TAG, "Launched TelecomManager intent for default dialer")
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to launch default dialer prompt: ${e.message}", e)
+                    launchDefaultAppsSettings()
+                }
+            }
+        } else {
+            Log.d(TAG, "Already the default dialer")
+        }
+    }
+
+    private fun launchDefaultAppsSettings() {
+        val settingsIntent = Intent(android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
+        startActivity(settingsIntent)
+        Log.d(TAG, "Opened default apps settings as fallback")
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        Log.d(TAG, "onActivityResult: requestCode=$requestCode, resultCode=$resultCode, data=$data")
+        if (requestCode == REQUEST_CODE_SET_DEFAULT_DIALER) {
+            if (resultCode == RESULT_OK) {
+                Log.d(TAG, "User accepted default dialer change")
+            } else {
+                Log.w(TAG, "Default dialer prompt canceled or failed (resultCode=$resultCode)")
+                launchDefaultAppsSettings()
+            }
+        }
+    }
+
+    private fun getCallLogs(): List<Map<String, Any?>> {
+        val logsList = mutableListOf<Map<String, Any?>>()
+        val cursor: Cursor? = contentResolver.query(
+            CallLog.Calls.CONTENT_URI, null, null, null, CallLog.Calls.DATE + " DESC"
+        )
+        cursor?.use {
+            while (it.moveToNext()) {
+                val number = it.getString(it.getColumnIndexOrThrow(CallLog.Calls.NUMBER))
+                val type = it.getInt(it.getColumnIndexOrThrow(CallLog.Calls.TYPE))
+                val date = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DATE))
+                val duration = it.getLong(it.getColumnIndexOrThrow(CallLog.Calls.DURATION))
+
+                val map = mutableMapOf<String, Any?>(
+                    "number" to number,
+                    "type" to type,
+                    "date" to date,
+                    "duration" to duration
+                )
+                logsList.add(map)
+            }
+        }
+        return logsList
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/services/CallConnectionService.kt

@@ -0,0 +1,82 @@
+// package com.icing.dialer.services
+
+// import android.telecom.Connection
+// import android.telecom.ConnectionService
+// import android.telecom.PhoneAccountHandle
+// import android.telecom.TelecomManager
+// import android.telecom.DisconnectCause
+// import android.util.Log
+// import io.flutter.plugin.common.MethodChannel
+
+// class CallConnectionService : ConnectionService() {
+//     companion object {
+//         var channel: MethodChannel? = null
+//         private const val TAG = "CallConnectionService"
+//     }
+
+//     init {
+//         Log.d(TAG, "CallConnectionService initialized")
+//     }
+
+//     override fun onCreate() {
+//         super.onCreate()
+//         Log.d(TAG, "Service created")
+//     }
+
+//     override fun onDestroy() {
+//         super.onDestroy()
+//         Log.d(TAG, "Service destroyed")
+//     }
+
+//     override fun onCreateOutgoingConnection(
+//         connectionManagerPhoneAccount: PhoneAccountHandle?,
+//         request: android.telecom.ConnectionRequest
+//     ): Connection {
+//         Log.d(TAG, "Creating outgoing connection for ${request.address}, account: $connectionManagerPhoneAccount")
+//         val connection = object : Connection() {
+//             override fun onStateChanged(state: Int) {
+//                 super.onStateChanged(state)
+//                 Log.d(TAG, "Connection state changed: $state")
+//                 val stateStr = when (state) {
+//                     STATE_DIALING -> "dialing"
+//                     STATE_ACTIVE -> "active"
+//                     STATE_DISCONNECTED -> "disconnected"
+//                     else -> "unknown"
+//                 }
+//                 channel?.invokeMethod("callStateChanged", mapOf("state" to stateStr, "phoneNumber" to request.address.toString()))
+//             }
+
+//             override fun onDisconnect() {
+//                 Log.d(TAG, "Connection disconnected")
+//                 setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
+//                 destroy()
+//             }
+//         }
+//         connection.setAddress(request.address, TelecomManager.PRESENTATION_ALLOWED)
+//         connection.setInitialized()
+//         connection.setDialing()
+//         return connection
+//     }
+
+//     override fun onCreateIncomingConnection(
+//         connectionManagerPhoneAccount: PhoneAccountHandle?,
+//         request: android.telecom.ConnectionRequest
+//     ): Connection {
+//         Log.d(TAG, "Creating incoming connection for ${request.address}, account: $connectionManagerPhoneAccount")
+//         val connection = object : Connection() {
+//             override fun onAnswer() {
+//                 Log.d(TAG, "Connection answered")
+//                 setActive()
+//             }
+
+//             override fun onDisconnect() {
+//                 Log.d(TAG, "Connection disconnected")
+//                 setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
+//                 destroy()
+//             }
+//         }
+//         connection.setAddress(request.address, TelecomManager.PRESENTATION_ALLOWED)
+//         connection.setRinging()
+//         return connection
+//     }
+// }

dialer/android/app/src/main/kotlin/com/icing/dialer/services/CallService.kt

@@ -0,0 +1,55 @@
+package com.icing.dialer.services
+
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.telecom.TelecomManager
+import android.util.Log
+import androidx.core.content.ContextCompat
+import android.content.pm.PackageManager
+import android.Manifest
+
+object CallService {
+    private val TAG = "CallService"
+
+    fun makeGsmCall(context: Context, phoneNumber: String): Boolean {
+        return try {
+            val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+            val uri = Uri.parse("tel:$phoneNumber")
+
+            if (ContextCompat.checkSelfPermission(context, Manifest.permission.CALL_PHONE) == PackageManager.PERMISSION_GRANTED) {
+                telecomManager.placeCall(uri, Bundle())
+                Log.d(TAG, "Initiated call to $phoneNumber")
+                true
+            } else {
+                Log.e(TAG, "CALL_PHONE permission not granted")
+                false
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error making GSM call: ${e.message}", e)
+            false
+        }
+    }
+
+    fun hangUpCall(context: Context): Boolean {
+        return try {
+            if (MyInCallService.currentCall != null) {
+                MyInCallService.currentCall?.disconnect()
+                Log.d(TAG, "Disconnected active call via MyInCallService")
+                true
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+                telecomManager.endCall()
+                Log.d(TAG, "Ended call via TelecomManager (no active call in MyInCallService)")
+                true
+            } else {
+                Log.e(TAG, "No active call and hangup not supported below Android P")
+                false
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error hanging up call: ${e.message}", e)
+            false
+        }
+    }
+}

dialer/android/app/src/main/kotlin/com/icing/dialer/services/MyInCallService.kt

@@ -0,0 +1,69 @@
+package com.icing.dialer.services
+
+import android.telecom.Call
+import android.telecom.InCallService
+import android.util.Log
+import io.flutter.plugin.common.MethodChannel
+
+class MyInCallService : InCallService() {
+    companion object {
+        var channel: MethodChannel? = null
+        var currentCall: Call? = null
+        private const val TAG = "MyInCallService"
+    }
+
+    private val callCallback = object : Call.Callback() {
+        override fun onStateChanged(call: Call, state: Int) {
+            super.onStateChanged(call, state)
+            val stateStr = when (state) {
+                Call.STATE_DIALING -> "dialing"
+                Call.STATE_ACTIVE -> "active"
+                Call.STATE_DISCONNECTED -> "disconnected"
+                Call.STATE_DISCONNECTING -> "disconnecting"
+                Call.STATE_RINGING -> "ringing"
+                else -> "unknown"
+            }
+            Log.d(TAG, "State changed: $stateStr for call ${call.details.handle}")
+            channel?.invokeMethod("callStateChanged", mapOf(
+                "callId" to call.details.handle.toString(),
+                "state" to stateStr
+            ))
+            if (state == Call.STATE_DISCONNECTED || state == Call.STATE_DISCONNECTING) {
+                Log.d(TAG, "Call ended: ${call.details.handle}")
+                channel?.invokeMethod("callEnded", mapOf("callId" to call.details.handle.toString()))
+                currentCall = null
+            }
+        }
+    }
+
+    override fun onCallAdded(call: Call) {
+        super.onCallAdded(call)
+        currentCall = call
+        val stateStr = when (call.state) {
+            Call.STATE_DIALING -> "dialing"
+            Call.STATE_ACTIVE -> "active"
+            Call.STATE_RINGING -> "ringing"
+            else -> "dialing" // Default for outgoing
+        }
+        Log.d(TAG, "Call added: ${call.details.handle}, state: $stateStr")
+        channel?.invokeMethod("callAdded", mapOf(
+            "callId" to call.details.handle.toString(),
+            "state" to stateStr
+        ))
+        call.registerCallback(callCallback)
+    }
+
+    override fun onCallRemoved(call: Call) {
+        super.onCallRemoved(call)
+        Log.d(TAG, "Call removed: ${call.details.handle}")
+        call.unregisterCallback(callCallback)
+        channel?.invokeMethod("callRemoved", mapOf("callId" to call.details.handle.toString()))
+        currentCall = null
+    }
+
+    override fun onCallAudioStateChanged(state: android.telecom.CallAudioState) {
+        super.onCallAudioStateChanged(state)
+        Log.d(TAG, "Audio state changed: route=${state.route}")
+        channel?.invokeMethod("audioStateChanged", mapOf("route" to state.route))
+    }
+}

dialer/android/gradle.properties

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

dialer/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

dialer/android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "8.3.2" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"

dialer/build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+IMG=git.gmoker.com/icing/flutter:main
+
+if [ "$1" == '-s' ]; then
+    OPT+=(--dart-define=STEALTH=true)
+fi
+
+set -x
+docker run --rm -v "$PWD:/app/" "$IMG" build apk "${OPT[@]}"

dialer/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

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/AppFrameworkInfo.plist

@@ -1,26 +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>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>12.0</string>
-</dict>
-</plist>

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.pbxproj

@@ -1,616 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 54;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
-			remoteInfo = Runner;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		331C8082294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C807B294A618700263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-				331C8082294A63A400263BE5 /* RunnerTests */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
-				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		331C8080294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				331C807D294A63A400263BE5 /* Sources */,
-				331C807F294A63A400263BE5 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C8086294A63A400263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					331C8080294A63A400263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 97C146ED1CF9000F007C117D;
-					};
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 1100;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-				331C8080294A63A400263BE5 /* RunnerTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		331C807F294A63A400263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		331C807D294A63A400263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 97C146ED1CF9000F007C117D /* Runner */;
-			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		249021D3217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				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_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				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_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Profile;
-		};
-		249021D4217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Profile;
-		};
-		331C8088294A63A400263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Debug;
-		};
-		331C8089294A63A400263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				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)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Release;
-		};
-		331C808A294A63A400263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				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)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Profile;
-		};
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				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_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				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_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				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_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				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_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				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_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.dialer;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C8088294A63A400263BE5 /* Debug */,
-				331C8089294A63A400263BE5 /* Release */,
-				331C808A294A63A400263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-				249021D3217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-				249021D4217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}

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/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.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 = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.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 = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C8080294A63A400263BE5"
-               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 = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.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 = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

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/Assets.xcassets/AppIcon.appiconset/Contents.json

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

dialer/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

dialer/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

dialer/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
-                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="LaunchImage" width="168" height="185"/>
-    </resources>
-</document>

dialer/ios/Runner/Base.lproj/Main.storyboard

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--Flutter View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>

dialer/ios/Runner/Info.plist

@@ -1,52 +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>CFBundleDisplayName</key>
-	<string>Dialer</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>dialer</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>NSContactsUsageDescription</key>
-    <string>Contacts for calls/string>
-
-</dict>
-</plist>

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/call/call_page.dart

@@ -0,0 +1,324 @@
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:dialer/services/call_service.dart';
+import 'package:dialer/services/obfuscate_service.dart';
+import 'package:dialer/widgets/username_color_generator.dart';
+
+class CallPage extends StatefulWidget {
+  final String displayName;
+  final String phoneNumber;
+  final Uint8List? thumbnail;
+
+  const CallPage({
+    super.key,
+    required this.displayName,
+    required this.phoneNumber,
+    this.thumbnail,
+  });
+
+  @override
+  _CallPageState createState() => _CallPageState();
+}
+
+class _CallPageState extends State<CallPage> {
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+  bool isMuted = false;
+  bool isSpeakerOn = false;
+  bool isKeypadVisible = false;
+  bool icingProtocolOk = true;
+  String _typedDigits = "";
+
+  void _addDigit(String digit) {
+    setState(() {
+      _typedDigits += digit;
+    });
+  }
+
+  void _toggleMute() {
+    setState(() {
+      isMuted = !isMuted;
+    });
+  }
+
+  void _toggleSpeaker() {
+    setState(() {
+      isSpeakerOn = !isSpeakerOn;
+    });
+  }
+
+  void _toggleKeypad() {
+    setState(() {
+      isKeypadVisible = !isKeypadVisible;
+    });
+  }
+
+  void _toggleIcingProtocol() {
+    setState(() {
+      icingProtocolOk = !icingProtocolOk;
+    });
+  }
+
+  void _hangUp() async {
+    try {
+      await _callService.hangUpCall(context);
+    } catch (e) {
+      print("Error hanging up: $e");
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double avatarRadius = isKeypadVisible ? 45.0 : 45.0;
+    final double nameFontSize = isKeypadVisible ? 24.0 : 24.0;
+    final double statusFontSize = isKeypadVisible ? 16.0 : 16.0;
+
+    return Scaffold(
+      body: Container(
+        color: Colors.black,
+        child: SafeArea(
+          child: Column(
+            children: [
+              Container(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    SizedBox(height: 35),
+                    ObfuscatedAvatar(
+                      imageBytes: widget.thumbnail, // Uses thumbnail if provided
+                      radius: avatarRadius,
+                      backgroundColor: generateColorFromName(widget.displayName),
+                      fallbackInitial: widget.displayName,
+                    ),
+                    const SizedBox(height: 4),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          icingProtocolOk ? Icons.lock : Icons.lock_open,
+                          color: icingProtocolOk ? Colors.green : Colors.red,
+                          size: 16,
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          'Icing protocol: ${icingProtocolOk ? "ok" : "ko"}',
+                          style: TextStyle(
+                            color: icingProtocolOk ? Colors.green : Colors.red,
+                            fontSize: 12,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      _obfuscateService.obfuscateData(widget.displayName),
+                      style: TextStyle(
+                        fontSize: nameFontSize,
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    Text(
+                      widget.phoneNumber,
+                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
+                    ),
+                    Text(
+                      'Calling...',
+                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
+                    ),
+                  ],
+                ),
+              ),
+              Expanded(
+                child: Column(
+                  children: [
+                    if (isKeypadVisible) ...[
+                      const Spacer(flex: 2),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                              child: Text(
+                                _typedDigits,
+                                maxLines: 1,
+                                textAlign: TextAlign.right,
+                                overflow: TextOverflow.ellipsis,
+                                style: const TextStyle(
+                                  fontSize: 24,
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              padding: EdgeInsets.zero,
+                              onPressed: _toggleKeypad,
+                              icon: const Icon(Icons.close, color: Colors.white),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Container(
+                        height: MediaQuery.of(context).size.height * 0.35,
+                        margin: const EdgeInsets.symmetric(horizontal: 20),
+                        child: GridView.count(
+                          shrinkWrap: true,
+                          physics: const NeverScrollableScrollPhysics(),
+                          crossAxisCount: 3,
+                          childAspectRatio: 1.3,
+                          mainAxisSpacing: 8,
+                          crossAxisSpacing: 8,
+                          children: List.generate(12, (index) {
+                            String label;
+                            if (index < 9) {
+                              label = '${index + 1}';
+                            } else if (index == 9) {
+                              label = '*';
+                            } else if (index == 10) {
+                              label = '0';
+                            } else {
+                              label = '#';
+                            }
+                            return GestureDetector(
+                              onTap: () => _addDigit(label),
+                              child: Container(
+                                decoration: const BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  color: Colors.transparent,
+                                ),
+                                child: Center(
+                                  child: Text(
+                                    label,
+                                    style: const TextStyle(fontSize: 32, color: Colors.white),
+                                  ),
+                                ),
+                              ),
+                            );
+                          }),
+                        ),
+                      ),
+                      const Spacer(flex: 1),
+                    ] else ...[
+                      const Spacer(),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 32.0),
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                              children: [
+                                Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      onPressed: _toggleMute,
+                                      icon: Icon(
+                                        isMuted ? Icons.mic_off : Icons.mic,
+                                        color: Colors.white,
+                                        size: 32,
+                                      ),
+                                    ),
+                                    Text(
+                                      isMuted ? 'Unmute' : 'Mute',
+                                      style: const TextStyle(color: Colors.white, fontSize: 14),
+                                    ),
+                                  ],
+                                ),
+                                Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      onPressed: _toggleKeypad,
+                                      icon: const Icon(Icons.dialpad, color: Colors.white, size: 32),
+                                    ),
+                                    const Text(
+                                      'Keypad',
+                                      style: TextStyle(color: Colors.white, fontSize: 14),
+                                    ),
+                                  ],
+                                ),
+                                Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      onPressed: _toggleSpeaker,
+                                      icon: Icon(
+                                        isSpeakerOn ? Icons.volume_up : Icons.volume_off,
+                                        color: isSpeakerOn ? Colors.amber : Colors.white,
+                                        size: 32,
+                                      ),
+                                    ),
+                                    const Text(
+                                      'Speaker',
+                                      style: TextStyle(color: Colors.white, fontSize: 14),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 20),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                              children: [
+                                Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      onPressed: () {},
+                                      icon: const Icon(Icons.person_add, color: Colors.white, size: 32),
+                                    ),
+                                    const Text('Add Contact',
+                                        style: TextStyle(color: Colors.white, fontSize: 14)),
+                                  ],
+                                ),
+                                Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      onPressed: () {},
+                                      icon: const Icon(Icons.sim_card, color: Colors.white, size: 32),
+                                    ),
+                                    const Text('Change SIM',
+                                        style: TextStyle(color: Colors.white, fontSize: 14)),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ),
+                      const Spacer(flex: 3),
+                    ],
+                  ],
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.only(bottom: 16.0),
+                child: GestureDetector(
+                  onTap: _hangUp,
+                  child: Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: const BoxDecoration(
+                      color: Colors.red,
+                      shape: BoxShape.circle,
+                    ),
+                    child: const Icon(
+                      Icons.call_end,
+                      color: Colors.white,
+                      size: 32,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

dialer/lib/features/call/incoming_call_page.dart

@@ -0,0 +1,181 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:dialer/services/call_service.dart';
+import 'package:dialer/services/obfuscate_service.dart';
+import 'package:dialer/widgets/username_color_generator.dart';
+import 'package:dialer/features/call/call_page.dart';
+
+class IncomingCallPage extends StatefulWidget {
+  final String displayName;
+  final String phoneNumber;
+  final Uint8List? thumbnail;
+
+  const IncomingCallPage({
+    super.key,
+    required this.displayName,
+    required this.phoneNumber,
+    this.thumbnail,
+  });
+
+  @override
+  _IncomingCallPageState createState() => _IncomingCallPageState();
+}
+
+class _IncomingCallPageState extends State<IncomingCallPage> {
+  static const MethodChannel _channel = MethodChannel('call_service');
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+  bool icingProtocolOk = true;
+
+  void _toggleIcingProtocol() {
+    setState(() {
+      icingProtocolOk = !icingProtocolOk;
+    });
+  }
+
+  void _answerCall() async {
+    try {
+      final result = await _channel.invokeMethod('answerCall');
+      print('IncomingCallPage: Answer call result: $result');
+      if (result["status"] == "answered") {
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+            builder: (context) => CallPage(
+              displayName: widget.displayName,
+              phoneNumber: widget.phoneNumber,
+              thumbnail: widget.thumbnail,
+            ),
+          ),
+        );
+      }
+    } catch (e) {
+      print("IncomingCallPage: Error answering call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error answering call: $e")),
+      );
+    }
+  }
+
+  void _declineCall() async {
+    try {
+      await _callService.hangUpCall(context);
+    } catch (e) {
+      print("IncomingCallPage: Error declining call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error declining call: $e")),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    const double avatarRadius = 45.0;
+    const double nameFontSize = 24.0;
+    const double statusFontSize = 16.0;
+
+    return Scaffold(
+      body: Container(
+        color: Colors.black,
+        child: SafeArea(
+          child: Column(
+            children: [
+              Container(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const SizedBox(height: 35),
+                    ObfuscatedAvatar(
+                      imageBytes: widget.thumbnail,
+                      radius: avatarRadius,
+                      backgroundColor: generateColorFromName(widget.displayName),
+                      fallbackInitial: widget.displayName,
+                    ),
+                    const SizedBox(height: 4),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          icingProtocolOk ? Icons.lock : Icons.lock_open,
+                          color: icingProtocolOk ? Colors.green : Colors.red,
+                          size: 16,
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          'Icing protocol: ${icingProtocolOk ? "ok" : "ko"}',
+                          style: TextStyle(
+                            color: icingProtocolOk ? Colors.green : Colors.red,
+                            fontSize: 12,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      _obfuscateService.obfuscateData(widget.displayName),
+                      style: const TextStyle(
+                        fontSize: nameFontSize,
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    Text(
+                      widget.phoneNumber,
+                      style: const TextStyle(fontSize: statusFontSize, color: Colors.white70),
+                    ),
+                    const Text(
+                      'Incoming Call...',
+                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
+                    ),
+                  ],
+                ),
+              ),
+              const Spacer(),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 32.0, vertical: 16.0),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    GestureDetector(
+                      onTap: _declineCall,
+                      child: Container(
+                        padding: const EdgeInsets.all(12),
+                        decoration: const BoxDecoration(
+                          color: Colors.red,
+                          shape: BoxShape.circle,
+                        ),
+                        child: const Icon(
+                          Icons.call_end,
+                          color: Colors.white,
+                          size: 32,
+                        ),
+                      ),
+                    ),
+                    GestureDetector(
+                      onTap: _answerCall,
+                      child: Container(
+                        padding: const EdgeInsets.all(12),
+                        decoration: const BoxDecoration(
+                          color: Colors.green,
+                          shape: BoxShape.circle,
+                        ),
+                        child: const Icon(
+                          Icons.call,
+                          color: Colors.white,
+                          size: 32,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

dialer/lib/features/composition/composition.dart

@@ -1,8 +1,9 @@
 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';
+import '../../services/contact_service.dart';
+import '../../services/obfuscate_service.dart';
+import '../../services/call_service.dart';
 
 class CompositionPage extends StatefulWidget {
   const CompositionPage({super.key});
@@ -16,6 +17,8 @@ class _CompositionPageState extends State<CompositionPage> {
   List<Contact> _allContacts = [];
   List<Contact> _filteredContacts = [];
   final ContactService _contactService = ContactService();
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
 
   @override
   void initState() {
@@ -32,8 +35,13 @@ class _CompositionPageState extends State<CompositionPage> {
   void _filterContacts() {
     setState(() {
       _filteredContacts = _allContacts.where((contact) {
-        final phoneMatch = contact.phones.any((phone) =>
-            phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
+        bool phoneMatch = contact.phones.any((phone) {
+          final rawPhoneNumber = phone.number;
+          final strippedPhoneNumber = rawPhoneNumber.replaceAll(RegExp(r'\D'), '');
+          final strippedDialedNumber = dialedNumber.replaceAll(RegExp(r'\D'), '');
+          return rawPhoneNumber.contains(dialedNumber) ||
+                 strippedPhoneNumber.contains(strippedDialedNumber);
+        });
         final nameMatch = contact.displayName
             .toLowerCase()
             .contains(dialedNumber.toLowerCase());
@@ -49,6 +57,13 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
+  void _onPlusPress() {
+    setState(() {
+      dialedNumber += '+';
+      _filterContacts();
+    });
+  }
+
   void _onDeletePress() {
     setState(() {
       if (dialedNumber.isNotEmpty) {
@@ -65,17 +80,20 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
-  // 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');
+  void _makeCall(String phoneNumber) async {
+    try {
+      await _callService.makeGsmCall(context, phoneNumber: phoneNumber);
+      setState(() {
+        dialedNumber = phoneNumber;
+      });
+    } catch (e) {
+      debugPrint("Error making call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to make call: $e')),
+      );
     }
   }
 
-  // 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)) {
@@ -85,6 +103,20 @@ class _CompositionPageState extends State<CompositionPage> {
     }
   }
 
+  void _addContact() async {
+    if (await FlutterContacts.requestPermission()) {
+      final newContact = Contact()
+        ..phones = [Phone(dialedNumber.isNotEmpty ? dialedNumber : '')];
+      final updatedContact = await FlutterContacts.openExternalInsert(newContact);
+      if (updatedContact != null) {
+        _fetchContacts();
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Contact added successfully!')),
+        );
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -93,7 +125,6 @@ class _CompositionPageState extends State<CompositionPage> {
         children: [
           Column(
             children: [
-              // Top half: Display contacts matching dialed number
               Expanded(
                 flex: 2,
                 child: Container(
@@ -105,64 +136,51 @@ class _CompositionPageState extends State<CompositionPage> {
                     children: [
                       Expanded(
                         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),
+                          children: [
+                            ..._filteredContacts.map((contact) {
+                              final phoneNumber = contact.phones.isNotEmpty
+                                  ? contact.phones.first.number
+                                  : 'No phone number';
+                              return ListTile(
+                                title: Text(
+                                  _obfuscateService.obfuscateData(contact.displayName),
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                                subtitle: Text(
+                                  _obfuscateService.obfuscateData(phoneNumber),
+                                  style: const TextStyle(color: Colors.grey),
+                                ),
+                                trailing: Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    IconButton(
+                                      icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
+                                      onPressed: () => _makeCall(phoneNumber),
                                     ),
-                                    subtitle: Text(
-                                      phoneNumber,
-                                      style:
-                                          const TextStyle(color: Colors.grey),
+                                    IconButton(
+                                      icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
+                                      onPressed: () => _launchSms(phoneNumber),
                                     ),
-                                    trailing: Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        // Call button
-                                        IconButton(
-                                          icon: Icon(Icons.phone,
-                                              color: Colors.green[300],
-                                              size: 20),
-                                          onPressed: () {
-                                            _launchPhoneDialer(phoneNumber);
-                                          },
-                                        ),
-                                        // Message button
-                                        IconButton(
-                                          icon: Icon(Icons.message,
-                                              color: Colors.blue[300],
-                                              size: 20),
-                                          onPressed: () {
-                                            _launchSms(phoneNumber);
-                                          },
-                                        ),
-                                      ],
-                                    ),
-                                    onTap: () {
-                                      // Handle contact selection if needed
-                                    },
-                                  );
-                                }).toList()
-                              : [
-                                  Center(
-                                      child: Text('No contacts found',
-                                          style:
-                                              TextStyle(color: Colors.white)))
-                                ],
+                                  ],
+                                ),
+                                onTap: () {},
+                              );
+                            }).toList(),
+                            ListTile(
+                              title: const Text(
+                                'Add a contact',
+                                style: TextStyle(color: Colors.white),
+                              ),
+                              trailing: Icon(Icons.add, color: Colors.grey[600]),
+                              onTap: _addContact,
+                            ),
+                          ],
                         ),
                       ),
                     ],
                   ),
                 ),
               ),
-
-              // Bottom half: Dialpad and Dialed number display with erase button
               Expanded(
                 flex: 2,
                 child: Container(
@@ -170,7 +188,6 @@ class _CompositionPageState extends State<CompositionPage> {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
-                      // Display dialed number with erase button
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
@@ -179,61 +196,57 @@ 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),
+                          GestureDetector(
+                            onTap: _onDeletePress,
+                            onLongPress: _onClearPress,
+                            child: const Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Icon(Icons.backspace, color: Colors.white),
+                            ),
                           ),
                         ],
                       ),
                       const SizedBox(height: 10),
-
-                      // Dialpad
                       Expanded(
                         child: SingleChildScrollView(
                           child: Column(
                             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                             children: [
                               Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('1'),
-                                  _buildDialButton('2'),
-                                  _buildDialButton('3'),
+                                  _buildDialButton('1', Colors.white),
+                                  _buildDialButton('2', Colors.white),
+                                  _buildDialButton('3', Colors.white),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('4'),
-                                  _buildDialButton('5'),
-                                  _buildDialButton('6'),
+                                  _buildDialButton('4', Colors.white),
+                                  _buildDialButton('5', Colors.white),
+                                  _buildDialButton('6', Colors.white),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('7'),
-                                  _buildDialButton('8'),
-                                  _buildDialButton('9'),
+                                  _buildDialButton('7', Colors.white),
+                                  _buildDialButton('8', Colors.white),
+                                  _buildDialButton('9', Colors.white),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('*'),
-                                  _buildDialButton('0'),
-                                  _buildDialButton('#'),
+                                  _buildDialButton('*', const Color.fromRGBO(117, 117, 117, 1)),
+                                  _buildDialButtonWithPlus('0'),
+                                  _buildDialButton('#', const Color.fromRGBO(117, 117, 117, 1)),
                                 ],
                               ),
                             ],
@@ -246,26 +259,28 @@ class _CompositionPageState extends State<CompositionPage> {
               ),
             ],
           ),
-
-          // Add Contact Button
           Positioned(
             bottom: 20.0,
             left: 0,
             right: 0,
             child: Center(
-              child: AddContactButton(),
+              child: ElevatedButton(
+                onPressed: dialedNumber.isNotEmpty ? () => _makeCall(dialedNumber) : null,
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.green[700],
+                  shape: const CircleBorder(),
+                  padding: const EdgeInsets.all(20),
+                ),
+                child: const Icon(Icons.phone, color: Colors.white, size: 30),
+              ),
             ),
           ),
-
-          // Top Row with Back Arrow
           Positioned(
             top: 40.0,
             left: 16.0,
             child: IconButton(
               icon: const Icon(Icons.arrow_back, color: Colors.white),
-              onPressed: () {
-                Navigator.pop(context);
-              },
+              onPressed: () => Navigator.pop(context),
             ),
           ),
         ],
@@ -273,7 +288,7 @@ class _CompositionPageState extends State<CompositionPage> {
     );
   }
 
-  Widget _buildDialButton(String number) {
+  Widget _buildDialButton(String number, Color textColor) {
     return ElevatedButton(
       onPressed: () => _onNumberPress(number),
       style: ElevatedButton.styleFrom(
@@ -283,11 +298,38 @@ class _CompositionPageState extends State<CompositionPage> {
       ),
       child: Text(
         number,
-        style: const TextStyle(
-          fontSize: 24,
-          color: Colors.white,
-        ),
+        style: TextStyle(fontSize: 24, color: textColor),
       ),
     );
   }
-}
+
+  Widget _buildDialButtonWithPlus(String number) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        GestureDetector(
+          onLongPress: _onPlusPress,
+          child: ElevatedButton(
+            onPressed: () => _onNumberPress(number),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: Colors.black,
+              shape: const CircleBorder(),
+              padding: const EdgeInsets.all(16),
+            ),
+            child: Text(
+              number,
+              style: const TextStyle(fontSize: 24, color: Colors.white),
+            ),
+          ),
+        ),
+        Positioned(
+          bottom: 8,
+          child: Text(
+            '+',
+            style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+          ),
+        ),
+      ],
+    );
+  }
+}

dialer/lib/features/contacts/contact_state.dart

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

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

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

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

@@ -1,8 +1,8 @@
+import 'package:dialer/services/obfuscate_service.dart';
 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';
@@ -24,6 +24,8 @@ class AlphabetScrollPage extends StatefulWidget {
 class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
   late ScrollController _scrollController;
 
+  final ObfuscateService _obfuscateService = ObfuscateService();
+
   @override
   void initState() {
     super.initState();
@@ -124,7 +126,7 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
                           vertical: 8.0, horizontal: 16.0),
                       child: Text(
                         letter,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontSize: 28,
                           fontWeight: FontWeight.bold,
                           color: Colors.white,
@@ -134,31 +136,25 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
                     // Contact Entries
                     ...contactsForLetter.map((contact) {
                       String phoneNumber = contact.phones.isNotEmpty
-                          ? contact.phones.first.number
+                          ? _obfuscateService.obfuscateData(contact.phones.first.number)
                           : 'No phone number';
                       Color avatarColor =
-                          generateColorFromName(contact.displayName);
+                      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)),
+                        leading: ObfuscatedAvatar(
+                          imageBytes: contact.thumbnail,
+                          radius: 25,
+                          backgroundColor: avatarColor,
+                          fallbackInitial: contact.displayName,
+                        ),
+                        title: Text(
+                          _obfuscateService.obfuscateData(contact.displayName),
+                          style: const TextStyle(color: Colors.white),
+                        ),
+                        subtitle: Text(
+                          phoneNumber,
+                          style: const TextStyle(color: Colors.white70),
+                        ),
                         onTap: () {
                           showModalBottomSheet(
                             context: context,
@@ -170,8 +166,8 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
                                 onEdit: () async {
                                   if (await FlutterContacts.requestPermission()) {
                                     final updatedContact =
-                                        await FlutterContacts.openExternalEdit(
-                                            contact.id);
+                                    await FlutterContacts.openExternalEdit(
+                                        contact.id);
                                     if (updatedContact != null) {
                                       await _refreshContacts();
                                       Navigator.of(context).pop();
@@ -187,7 +183,7 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
                                           .showSnackBar(
                                         SnackBar(
                                           content:
-                                              Text('Edit canceled or failed.'),
+                                          Text('Edit canceled or failed.'),
                                         ),
                                       );
                                     }

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

@@ -1,8 +1,11 @@
+import 'package:dialer/services/obfuscate_service.dart';
 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';
+import '../../../services/block_service.dart';
+import '../../../services/contact_service.dart';
+import '../../../services/call_service.dart';
 
 class ContactModal extends StatefulWidget {
   final Contact contact;
@@ -25,6 +28,8 @@ class ContactModal extends StatefulWidget {
 class _ContactModalState extends State<ContactModal> {
   late String phoneNumber;
   bool isBlocked = false;
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
 
   @override
   void initState() {
@@ -94,50 +99,60 @@ class _ContactModalState extends State<ContactModal> {
     }
   }
 
-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'),
-        ),
-      ],
-    ),
-  );
+  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 ${_obfuscateService.obfuscateData(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);
+    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')),
-      );
+        // Show success message
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content: Text(
+                  '${_obfuscateService.obfuscateData(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')),
-      );
+        // 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')),
+        );
+      }
     }
   }
-}
+
+  void _shareContactAsQRCode() {
+    // Use the ContactService to show the QR code for the contact's vCard
+    ContactService().showContactQRCodeDialog(context, widget.contact);
+  }
 
   @override
   Widget build(BuildContext context) {
     String email = widget.contact.emails.isNotEmpty
-        ? widget.contact.emails.first.address
+        ? _obfuscateService.obfuscateData(widget.contact.emails.first.address)
         : 'No email';
 
     return GestureDetector(
@@ -183,7 +198,10 @@ void _deleteContact() async {
                             onSelected: (String choice) {
                               if (choice == 'delete') {
                                 _deleteContact();
+                              } else if (choice == 'share') {
+                                _shareContactAsQRCode();
                               }
+                              // Handle other choices if needed
                             },
                             itemBuilder: (BuildContext context) {
                               return [
@@ -220,49 +238,46 @@ void _deleteContact() async {
                     padding: const EdgeInsets.all(16.0),
                     child: Column(
                       children: [
-                        CircleAvatar(
+                        ObfuscatedAvatar(
+                          imageBytes: widget.contact.thumbnail,
                           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,
+                          fallbackInitial: widget.contact.displayName,
                         ),
                         const SizedBox(height: 10),
                         Text(
-                          widget.contact.displayName,
+                          _obfuscateService
+                              .obfuscateData(widget.contact.displayName),
                           style: const TextStyle(
-                              fontSize: 24, fontWeight: FontWeight.bold),
+                              fontSize: 24,
+                              fontWeight: FontWeight.bold,
+                              color: Colors.white),
                         ),
                       ],
                     ),
                   ),
-                  const Divider(),
+                  const Divider(color: Colors.grey),
                   // Contact Actions
                   ListTile(
                     leading: const Icon(Icons.phone, color: Colors.green),
-                    title: Text(phoneNumber),
-                    onTap: () {
+                    title: Text(
+                      _obfuscateService.obfuscateData(phoneNumber),
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                    onTap: () async {
                       if (widget.contact.phones.isNotEmpty) {
-                        _launchPhoneDialer(phoneNumber);
+                        await _callService.makeGsmCall(context,
+                            phoneNumber: phoneNumber);
                       }
                     },
                   ),
                   ListTile(
                     leading: const Icon(Icons.message, color: Colors.blue),
-                    title: Text(phoneNumber),
+                    title: Text(
+                      _obfuscateService.obfuscateData(phoneNumber),
+                      style: const TextStyle(color: Colors.white),
+                    ),
                     onTap: () {
                       if (widget.contact.phones.isNotEmpty) {
                         _launchSms(phoneNumber);
@@ -271,14 +286,17 @@ void _deleteContact() async {
                   ),
                   ListTile(
                     leading: const Icon(Icons.email, color: Colors.orange),
-                    title: Text(email),
+                    title: Text(
+                      email,
+                      style: const TextStyle(color: Colors.white),
+                    ),
                     onTap: () {
                       if (widget.contact.emails.isNotEmpty) {
                         _launchEmail(email);
                       }
                     },
                   ),
-                  const Divider(),
+                  const Divider(color: Colors.grey),
                   // Favorite, Edit, and Block/Unblock Buttons
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16.0),
@@ -286,8 +304,7 @@ void _deleteContact() async {
                       children: [
                         // Favorite button
                         SizedBox(
-                          width: double
-                              .infinity, // This makes the button take full width
+                          width: double.infinity,
                           child: ElevatedButton.icon(
                             onPressed: () {
                               Navigator.of(context).pop();
@@ -300,24 +317,20 @@ void _deleteContact() async {
                                 widget.isFavorite ? 'Unfavorite' : 'Favorite'),
                           ),
                         ),
-                        const SizedBox(height: 10), // Space between buttons
-
+                        const SizedBox(height: 10),
                         // Edit button
                         SizedBox(
-                          width: double
-                              .infinity, // This makes the button take full width
+                          width: double.infinity,
                           child: ElevatedButton.icon(
                             onPressed: () => widget.onEdit(),
                             icon: const Icon(Icons.edit),
                             label: const Text('Edit Contact'),
                           ),
                         ),
-                        const SizedBox(height: 10), // Space between buttons
-
+                        const SizedBox(height: 10),
                         // Block/Unblock button
                         SizedBox(
-                          width: double
-                              .infinity, // This makes the button take full width
+                          width: double.infinity,
                           child: ElevatedButton.icon(
                             onPressed: _toggleBlockState,
                             icon: Icon(
@@ -328,7 +341,6 @@ void _deleteContact() async {
                       ],
                     ),
                   ),
-
                   const SizedBox(height: 16),
                 ],
               ),

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

@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/contact.dart';
-import 'package:qr_flutter/qr_flutter.dart';
+import 'package:dialer/services/contact_service.dart';
 
 class QRCodeButton extends StatelessWidget {
   final List<Contact> contacts;
@@ -23,32 +23,13 @@ class QRCodeButton extends StatelessWidget {
 
   @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,
-                ),
-              ),
-            );
-          },
-        );
-      }
+              // Use the ContactService to show the QR code
+              ContactService().showContactQRCodeDialog(context, selfContact!);
+            }
           : null,
     );
   }

dialer/lib/features/history/history_page.dart

@@ -1,10 +1,17 @@
+import 'dart:async';
+import 'package:dialer/services/obfuscate_service.dart';
+import 'package:dialer/widgets/color_darkener.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:intl/intl.dart';
+import 'package:permission_handler/permission_handler.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';
+import '../../services/block_service.dart';
+import '../contacts/widgets/contact_modal.dart';
+import '../../services/call_service.dart';
 
 class History {
   final Contact contact;
@@ -14,12 +21,12 @@ class History {
   final int attempts;
 
   History(
-      this.contact,
-      this.date,
-      this.callType,
-      this.callStatus,
-      this.attempts,
-      );
+    this.contact,
+    this.date,
+    this.callType,
+    this.callStatus,
+    this.attempts,
+  );
 }
 
 class HistoryPage extends StatefulWidget {
@@ -29,23 +36,114 @@ class HistoryPage extends StatefulWidget {
   _HistoryPageState createState() => _HistoryPageState();
 }
 
-class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStateMixin {
+class _HistoryPageState extends State<HistoryPage>
+    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
   List<History> histories = [];
   bool loading = true;
   int? _expandedIndex;
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final CallService _callService = CallService();
+
+  // Create a MethodChannel instance.
+  static const MethodChannel _channel = MethodChannel('com.example.calllog');
+
+  @override
+  bool get wantKeepAlive => true; // Preserve state when switching pages
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (loading) {
+    if (loading && histories.isEmpty) {
       _buildHistories();
     }
   }
 
+  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 favorite status')));
+    }
+  }
+
+  /// Helper: Remove all non-digit characters for simple matching.
+  String sanitizeNumber(String number) {
+    return number.replaceAll(RegExp(r'\D'), '');
+  }
+
+  /// Helper: Find a contact from our list by matching phone numbers.
+  Contact? findContactForNumber(String number, List<Contact> contacts) {
+    final sanitized = sanitizeNumber(number);
+    for (var contact in contacts) {
+      for (var phone in contact.phones) {
+        if (sanitizeNumber(phone.number) == sanitized) {
+          return contact;
+        }
+      }
+    }
+    return null;
+  }
+
+  /// Request permission for reading call logs.
+  Future<bool> _requestCallLogPermission() async {
+    var status = await Permission.phone.status;
+    if (!status.isGranted) {
+      status = await Permission.phone.request();
+    }
+    return status.isGranted;
+  }
+
+  /// Build histories from the native call log using the method channel.
   Future<void> _buildHistories() async {
+    // Request permission.
+    bool hasPermission = await _requestCallLogPermission();
+    if (!hasPermission) {
+      ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Call log permission not granted')));
+      setState(() {
+        loading = false;
+      });
+      return;
+    }
+
+    // Retrieve call logs from native code.
+    List<dynamic> nativeLogs = [];
+    try {
+      nativeLogs = await _channel.invokeMethod('getCallLogs');
+    } on PlatformException catch (e) {
+      print("Error fetching call logs: ${e.message}");
+    }
+
+    // Ensure contacts are loaded.
     final contactState = ContactState.of(context);
     if (contactState.loading) {
-      // Wait for contacts to be loaded
       await Future.doWhile(() async {
         await Future.delayed(const Duration(milliseconds: 100));
         return contactState.loading;
@@ -53,30 +151,69 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
     }
     List<Contact> contacts = contactState.contacts;
 
-    if (contacts.isEmpty) {
-      setState(() {
-        loading = false;
-      });
-      return;
+    List<History> callHistories = [];
+    // Process each log entry with intermittent yields to avoid freezing.
+    for (int i = 0; i < nativeLogs.length; i++) {
+      final entry = nativeLogs[i];
+      final String number = entry['number'] ?? '';
+      if (number.isEmpty) continue;
+
+      // Convert timestamp to DateTime.
+      DateTime callDate =
+          DateTime.fromMillisecondsSinceEpoch(entry['date'] ?? 0);
+
+      int typeInt = entry['type'] ?? 0;
+      int duration = entry['duration'] ?? 0;
+      String callType;
+      String callStatus;
+
+      // Map integer values to call type/status.
+      // Commonly: 1 = incoming, 2 = outgoing, 3 = missed.
+      switch (typeInt) {
+        case 1:
+          callType = "incoming";
+          callStatus = (duration == 0) ? "missed" : "answered";
+          break;
+        case 2:
+          callType = "outgoing";
+          callStatus = "answered";
+          break;
+        case 3:
+          callType = "incoming";
+          callStatus = "missed";
+          break;
+        default:
+          callType = "unknown";
+          callStatus = "unknown";
+      }
+
+      // Try to find a matching contact.
+      Contact? matchedContact = findContactForNumber(number, contacts);
+      if (matchedContact == null) {
+        // Create a dummy contact if not found.
+        matchedContact = Contact(
+          id: "dummy-$number",
+          displayName: number,
+          phones: [Phone(number)],
+        );
+      }
+
+      callHistories
+          .add(History(matchedContact, callDate, callType, callStatus, 1));
+      // Yield every 10 iterations to avoid blocking the UI.
+      if (i % 10 == 0) await Future.delayed(Duration(milliseconds: 1));
     }
 
+    // Sort histories by most recent.
+    callHistories.sort((a, b) => b.date.compareTo(a.date));
+
     setState(() {
-      histories = List.generate(
-        contacts.length >= 10 ? 10 : contacts.length,
-            (index) => History(
-          contacts[index],
-          DateTime.now().subtract(Duration(hours: (index + 1) * 2)),
-          index % 2 == 0 ? 'outgoing' : 'incoming',
-          index % 3 == 0 ? 'missed' : 'answered',
-          index % 3 + 1,
-        ),
-      );
+      histories = callHistories;
       loading = false;
     });
   }
 
   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();
@@ -88,7 +225,8 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
     List<History> olderHistories = [];
 
     for (var history in historyList) {
-      final callDate = DateTime(history.date.year, history.date.month, history.date.day);
+      final callDate =
+          DateTime(history.date.year, history.date.month, history.date.day);
       if (callDate == today) {
         todayHistories.add(history);
       } else if (callDate == yesterday) {
@@ -98,7 +236,6 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
       }
     }
 
-    // Combine them with headers
     final items = <dynamic>[];
     if (todayHistories.isNotEmpty) {
       items.add('Today');
@@ -116,16 +253,37 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
     return items;
   }
 
+  /// Returns an icon reflecting call type and status.
+  Icon _getCallIcon(History history) {
+    IconData iconData;
+    Color iconColor;
+    if (history.callType == 'incoming') {
+      if (history.callStatus == 'missed') {
+        iconData = Icons.call_missed;
+        iconColor = Colors.red;
+      } else {
+        iconData = Icons.call_received;
+        iconColor = Colors.green;
+      }
+    } else if (history.callType == 'outgoing') {
+      iconData = Icons.call_made;
+      iconColor = Colors.green;
+    } else {
+      iconData = Icons.phone;
+      iconColor = Colors.white;
+    }
+    return Icon(iconData, color: iconColor);
+  }
+
   @override
   Widget build(BuildContext context) {
+    super.build(context); // required due to AutomaticKeepAliveClientMixin
     final contactState = ContactState.of(context);
 
     if (loading || contactState.loading) {
       return Scaffold(
         backgroundColor: Colors.black,
-        body: const Center(
-          child: CircularProgressIndicator(),
-        ),
+        body: const Center(child: CircularProgressIndicator()),
       );
     }
 
@@ -141,8 +299,8 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
       );
     }
 
-    // Filter missed calls
-    List<History> missedCalls = histories.where((h) => h.callStatus == 'missed').toList();
+    List<History> missedCalls =
+        histories.where((h) => h.callStatus == 'missed').toList();
 
     final allItems = _buildGroupedList(histories);
     final missedItems = _buildGroupedList(missedCalls);
@@ -166,9 +324,7 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
         ),
         body: TabBarView(
           children: [
-            // All Calls
             _buildListView(allItems),
-            // Missed Calls
             _buildListView(missedItems),
           ],
         ),
@@ -181,9 +337,7 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
       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],
@@ -199,37 +353,70 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
           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)),
+                leading: GestureDetector(
+                  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,
+                        );
+                      },
+                    );
+                  },
+                  child: ObfuscatedAvatar(
+                    imageBytes: contact.thumbnail,
+                    radius: 25,
+                    backgroundColor: avatarColor,
+                    fallbackInitial: contact.displayName,
                   ),
                 ),
                 title: Text(
-                  contact.displayName,
+                  _obfuscateService.obfuscateData(contact.displayName),
                   style: const TextStyle(color: Colors.white),
                 ),
                 subtitle: Text(
-                  '${history.callType} - ${history.callStatus} - ${DateFormat('MMM dd, hh:mm a').format(history.date)}',
+                  DateFormat('MMM dd, hh:mm a').format(history.date),
                   style: const TextStyle(color: Colors.grey),
                 ),
                 trailing: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
+                    _getCallIcon(history),
+                    const SizedBox(width: 8),
                     Text(
                       '${history.attempts}x',
                       style: const TextStyle(color: Colors.white),
@@ -238,18 +425,11 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
                       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')),
-                            );
-                          }
+                          _callService.makeGsmCall(context, phoneNumber: contact.phones.first.number);
                         } else {
                           ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(content: Text('Contact has no phone number')),
+                            const SnackBar(
+                                content: Text('Contact has no phone number')),
                           );
                         }
                       },
@@ -265,62 +445,100 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
               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')),
+                  child: FutureBuilder<bool>(
+                    future: BlockService().isNumberBlocked(
+                        contact.phones.isNotEmpty
+                            ? contact.phones.first.number
+                            : ''),
+                    builder: (context, snapshot) {
+                      final isBlocked = snapshot.data ?? false;
+                      return 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: () {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (_) =>
+                                      CallDetailsPage(history: history),
+                                ),
                               );
-                            }
-                          } 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)),
-                      ),
-                    ],
+                            },
+                            icon: const Icon(Icons.info, color: Colors.white),
+                            label: const Text('Details',
+                                style: TextStyle(color: Colors.white)),
+                          ),
+                          TextButton.icon(
+                            onPressed: () async {
+                              final phoneNumber = contact.phones.isNotEmpty
+                                  ? contact.phones.first.number
+                                  : null;
+                              if (phoneNumber == null) {
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  const SnackBar(
+                                      content:
+                                          Text('Contact has no phone number')),
+                                );
+                                return;
+                              }
+                              if (isBlocked) {
+                                await BlockService().unblockNumber(phoneNumber);
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                      content: Text('$phoneNumber unblocked')),
+                                );
+                              } else {
+                                await BlockService().blockNumber(phoneNumber);
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                      content: Text('$phoneNumber blocked')),
+                                );
+                              }
+                              setState(() {});
+                            },
+                            icon: Icon(
+                                isBlocked ? Icons.lock_open : Icons.block,
+                                color: Colors.white),
+                            label: Text(isBlocked ? 'Unblock' : 'Block',
+                                style: const TextStyle(color: Colors.white)),
+                          ),
+                        ],
+                      );
+                    },
                   ),
                 ),
             ],
           );
         }
-
         return const SizedBox.shrink();
       },
     );
@@ -329,12 +547,15 @@ class _HistoryPageState extends State<HistoryPage> with SingleTickerProviderStat
 
 class CallDetailsPage extends StatelessWidget {
   final History history;
+  final ObfuscateService _obfuscateService = ObfuscateService();
 
-  const CallDetailsPage({Key? key, required this.history}) : super(key: key);
+  CallDetailsPage({super.key, required this.history});
 
   @override
   Widget build(BuildContext context) {
     final contact = history.contact;
+    final contactBg = generateColorFromName(contact.displayName);
+    final contactLetter = darken(contactBg);
 
     return Scaffold(
       backgroundColor: Colors.black,
@@ -346,36 +567,38 @@ class CallDetailsPage extends StatelessWidget {
         padding: const EdgeInsets.all(16.0),
         child: Column(
           children: [
-            // Display Contact Name and Thumbnail
+            // Display Contact Name and Thumbnail.
             Row(
               children: [
                 (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
-                    ? CircleAvatar(
-                  backgroundImage: MemoryImage(contact.thumbnail!),
-                  radius: 30,
-                )
+                    ? ObfuscatedAvatar(
+                        imageBytes: contact.thumbnail,
+                        radius: 30,
+                        backgroundColor: contactBg,
+                        fallbackInitial: contact.displayName,
+                      )
                     : CircleAvatar(
-                  backgroundColor: Colors.grey[700],
-                  radius: 30,
-                  child: Text(
-                    contact.displayName.isNotEmpty
-                        ? contact.displayName[0].toUpperCase()
-                        : '?',
-                    style: const TextStyle(color: Colors.white),
-                  ),
-                ),
+                        backgroundColor:
+                            generateColorFromName(contact.displayName),
+                        radius: 30,
+                        child: Text(
+                          contact.displayName.isNotEmpty
+                              ? contact.displayName[0].toUpperCase()
+                              : '?',
+                          style: TextStyle(color: contactLetter),
+                        ),
+                      ),
                 const SizedBox(width: 16),
                 Expanded(
                   child: Text(
-                    contact.displayName,
+                    _obfuscateService.obfuscateData(contact.displayName),
                     style: const TextStyle(color: Colors.white, fontSize: 24),
                   ),
                 ),
               ],
             ),
             const SizedBox(height: 24),
-
-            // Display call type, status, date, attempts
+            // Display call details.
             DetailRow(
               label: 'Call Type:',
               value: history.callType,
@@ -392,14 +615,12 @@ class CallDetailsPage extends StatelessWidget {
               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,
+                value: _obfuscateService
+                    .obfuscateData(contact.phones.first.number),
               ),
           ],
         ),
@@ -412,7 +633,8 @@ class DetailRow extends StatelessWidget {
   final String label;
   final String value;
 
-  const DetailRow({Key? key, required this.label, required this.value}) : super(key: key);
+  const DetailRow({Key? key, required this.label, required this.value})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -422,7 +644,8 @@ class DetailRow extends StatelessWidget {
         children: [
           Text(
             label,
-            style: const TextStyle(color: Colors.white70, fontWeight: FontWeight.bold),
+            style: const TextStyle(
+                color: Colors.white70, fontWeight: FontWeight.bold),
           ),
           const SizedBox(width: 8),
           Expanded(

dialer/lib/features/home/home_page.dart

@@ -1,3 +1,4 @@
+import 'package:dialer/services/obfuscate_service.dart';
 import 'package:flutter/material.dart';
 import 'package:dialer/features/contacts/contact_page.dart';
 import 'package:dialer/features/favorites/favorites_page.dart';
@@ -5,48 +6,86 @@ 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';
+import '../../services/contact_service.dart';
+import 'package:dialer/features/voicemail/voicemail_page.dart';
+import '../contacts/widgets/contact_modal.dart';
 
-class _MyHomePageState extends State<MyHomePage>
-    with SingleTickerProviderStateMixin {
+class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateMixin {
   late TabController _tabController;
   List<Contact> _allContacts = [];
   List<Contact> _contactSuggestions = [];
   final ContactService _contactService = ContactService();
-
+  final ObfuscateService _obfuscateService = ObfuscateService();
+  final TextEditingController _searchController = TextEditingController();
+  late SearchController _searchBarController;
+  String _rawSearchInput = '';
 
   @override
   void initState() {
     super.initState();
-    // Set the TabController length to 3
-    _tabController = TabController(length: 3, vsync: this, initialIndex: 1);
+    _tabController = TabController(length: 4, vsync: this, initialIndex: 2);
     _tabController.addListener(_handleTabIndex);
+    _searchBarController = SearchController();
+    _searchBarController.addListener(() {
+      if (_searchController.text != _searchBarController.text) {
+        _rawSearchInput = _searchBarController.text;
+        _searchController.text = _rawSearchInput;
+        _onSearchChanged(_searchBarController.text);
+      }
+    });
     _fetchContacts();
   }
 
   void _fetchContacts() async {
     _allContacts = await _contactService.fetchContacts();
-    setState(() {});
+    _contactSuggestions = List.from(_allContacts);
+    if (mounted) setState(() {});
+  }
+
+  void _clearSearch() {
+    _searchController.clear();
+    _searchBarController.clear();
+    _rawSearchInput = '';
+    _onSearchChanged('');
   }
 
   void _onSearchChanged(String query) {
-    print("Search query: $query");
-
     setState(() {
       if (query.isEmpty) {
         _contactSuggestions = List.from(_allContacts);
       } else {
+        final normalizedQuery = _normalizeString(query.toLowerCase());
         _contactSuggestions = _allContacts.where((contact) {
-          return contact.displayName
-              .toLowerCase()
-              .contains(query.toLowerCase());
+          final normalizedName = _normalizeString(contact.displayName.toLowerCase());
+          return normalizedName.contains(normalizedQuery);
         }).toList();
       }
     });
   }
 
+  String _normalizeString(String input) {
+    const accentMap = {
+      'àáâãäå': 'a',
+      'èéêë': 'e',
+      'ìíîï': 'i',
+      'òóôõö': 'o',
+      'ùúûü': 'u',
+      'ç': 'c',
+      'ñ': 'n',
+    };
+    String normalized = input;
+    accentMap.forEach((accents, base) {
+      for (var accent in accents.split('')) {
+        normalized = normalized.replaceAll(accent, base);
+      }
+    });
+    return normalized;
+  }
+
   @override
   void dispose() {
+    _searchController.dispose();
+    _searchBarController.dispose();
     _tabController.removeListener(_handleTabIndex);
     _tabController.dispose();
     super.dispose();
@@ -56,13 +95,39 @@ class _MyHomePageState extends State<MyHomePage>
     setState(() {});
   }
 
+  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);
+          _fetchContacts();
+        }
+      } 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) {
     return Scaffold(
       backgroundColor: Colors.black,
       body: Column(
         children: [
-          // Persistent Search Bar
           Padding(
             padding: const EdgeInsets.only(
               top: 24.0,
@@ -77,63 +142,102 @@ class _MyHomePageState extends State<MyHomePage>
                     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),
-                      ),
+                      border: Border.all(color: Colors.grey.shade800, width: 1),
                     ),
                     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,
-                            ),
-                          ),
+                      searchController: _searchBarController,
+                      builder: (BuildContext context, SearchController controller) {
+                        return GestureDetector(
                           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(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: const Color.fromARGB(255, 30, 30, 30),
                               borderRadius: BorderRadius.circular(12.0),
+                              border: Border.all(color: Colors.grey.shade800, width: 1),
+                            ),
+                            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 16.0),
+                            child: Row(
+                              children: [
+                                const Icon(Icons.search, color: Colors.grey, size: 24.0),
+                                const SizedBox(width: 8.0),
+                                Expanded(
+                                  child: Text(
+                                    _rawSearchInput.isEmpty
+                                        ? 'Search contacts'
+                                        : _rawSearchInput,
+                                    style: const TextStyle(color: Colors.grey, fontSize: 16.0),
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                ),
+                                if (_rawSearchInput.isNotEmpty)
+                                  GestureDetector(
+                                    onTap: _clearSearch,
+                                    child: const Icon(
+                                      Icons.clear,
+                                      color: Colors.grey,
+                                      size: 24.0,
+                                    ),
+                                  ),
+                              ],
                             ),
                           ),
                         );
                       },
                       viewOnChanged: (query) {
+
+                        if (_searchBarController.text != query) {
+                          _rawSearchInput = query;
+                          _searchBarController.text = query;
+                          _searchController.text = query;
+                        }
                         _onSearchChanged(query);
                       },
-                      suggestionsBuilder:
-                          (BuildContext context, SearchController controller) {
+                      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)),
+                            title: Text(
+                              _obfuscateService.obfuscateData(contact.displayName),
+                              style: const TextStyle(color: Colors.white),
+                            ),
                             onTap: () {
                               controller.closeView(contact.displayName);
+                              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) {
+                                          _fetchContacts();
+                                          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,
+                                  );
+                                },
+                              );
                             },
                           );
                         }).toList();
@@ -141,7 +245,6 @@ class _MyHomePageState extends State<MyHomePage>
                     ),
                   ),
                 ),
-                // 3-dot menu
                 PopupMenuButton<String>(
                   icon: const Icon(Icons.more_vert, color: Colors.white),
                   itemBuilder: (BuildContext context) => [
@@ -154,8 +257,7 @@ class _MyHomePageState extends State<MyHomePage>
                     if (value == 'settings') {
                       Navigator.push(
                         context,
-                        MaterialPageRoute(
-                            builder: (context) => const SettingsPage()),
+                        MaterialPageRoute(builder: (context) => const SettingsPage()),
                       );
                     }
                   },
@@ -163,7 +265,6 @@ class _MyHomePageState extends State<MyHomePage>
               ],
             ),
           ),
-          // Main content with TabBarView
           Expanded(
             child: Stack(
               children: [
@@ -173,6 +274,7 @@ class _MyHomePageState extends State<MyHomePage>
                     FavoritesPage(),
                     HistoryPage(),
                     ContactPage(),
+                    VoicemailPage(),
                   ],
                 ),
                 Positioned(
@@ -216,6 +318,11 @@ class _MyHomePageState extends State<MyHomePage>
                 icon: Icon(_tabController.index == 2
                     ? Icons.contacts
                     : Icons.contacts_outlined)),
+            Tab(
+              icon: Icon(_tabController.index == 3
+                  ? Icons.voicemail
+                  : Icons.voicemail_outlined),
+            ),
           ],
           labelColor: Colors.white,
           unselectedLabelColor: const Color.fromARGB(255, 158, 158, 158),
@@ -232,4 +339,4 @@ class MyHomePage extends StatefulWidget {
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
-}
+}

dialer/lib/features/settings/cryptography/key_management.dart

@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:dialer/services/cryptography/asymmetric_crypto_service.dart';
+
+class ManageKeysPage extends StatefulWidget {
+  const ManageKeysPage({Key? key}) : super(key: key);
+
+  @override
+  _ManageKeysPageState createState() => _ManageKeysPageState();
+}
+
+class _ManageKeysPageState extends State<ManageKeysPage> {
+  final AsymmetricCryptoService _cryptoService = AsymmetricCryptoService();
+  List<Map<String, dynamic>> _keys = [];
+  bool _isLoading = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadKeys();
+  }
+
+  Future<void> _loadKeys() async {
+    setState(() {
+      _isLoading = true;
+    });
+    try {
+      List<Map<String, dynamic>> keys = await _cryptoService.getAllKeys();
+      setState(() {
+        _keys = keys;
+      });
+    } catch (e) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(SnackBar(content: Text('Error loading keys: $e')));
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _generateKey() async {
+    setState(() {
+      _isLoading = true;
+    });
+    try {
+      await _cryptoService.generateKeyPair();
+      await _loadKeys();
+      ScaffoldMessenger.of(context)
+          .showSnackBar(const SnackBar(content: Text('Key generated successfully')));
+    } catch (e) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(SnackBar(content: Text('Error generating key: $e')));
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _deleteKey(String alias) async {
+    setState(() {
+      _isLoading = true;
+    });
+    try {
+      await _cryptoService.deleteKeyPair(alias);
+      await _loadKeys();
+      ScaffoldMessenger.of(context)
+          .showSnackBar(const SnackBar(content: Text('Key deleted successfully')));
+    } catch (e) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(SnackBar(content: Text('Error deleting key: $e')));
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _viewPublicKey(String alias) async {
+    try {
+      final publicKey = await _cryptoService.getPublicKey(alias);
+      showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+          title: const Text('Public Key'),
+          content: SingleChildScrollView(child: Text(publicKey)),
+          actions: [
+            TextButton(
+              child: const Text('Close'),
+              onPressed: () {
+                Navigator.pop(context);
+              },
+            )
+          ],
+        ),
+      );
+    } catch (e) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(SnackBar(content: Text('Error retrieving public key: $e')));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Manage Keys'),
+      ),
+      body: _isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : _keys.isEmpty
+              ? const Center(child: Text('No keys found'))
+              : ListView.builder(
+                  itemCount: _keys.length,
+                  itemBuilder: (context, index) {
+                    final keyData = _keys[index];
+                    return ListTile(
+                      title: Text(keyData['label'] ?? 'No label'),
+                      subtitle: Text(keyData['alias'] ?? ''),
+                      trailing: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          IconButton(
+                            icon: const Icon(Icons.visibility),
+                            tooltip: 'View Public Key',
+                            onPressed: () => _viewPublicKey(keyData['alias']),
+                          ),
+                          IconButton(
+                            icon: const Icon(Icons.delete),
+                            tooltip: 'Delete Key',
+                            onPressed: () => _deleteKey(keyData['alias']),
+                          ),
+                        ],
+                      ),
+                    );
+                  },
+                ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: _generateKey,
+        child: const Icon(Icons.add),
+        tooltip: 'Generate New Key',
+      ),
+    );
+  }
+}

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

@@ -1,65 +0,0 @@
-import 'package:flutter/material.dart';
-import 'key_storage.dart';
-
-class DeleteKeyPairPage extends StatelessWidget {
-  const DeleteKeyPairPage({super.key});
-
-  Future<void> _deleteKeyPair(BuildContext context) async {
-    final keyStorage = KeyStorage();
-    await keyStorage.deleteKeys();
-
-    ScaffoldMessenger.of(context).showSnackBar(
-      const SnackBar(
-        content: Text('The key pair has been deleted.'),
-      ),
-    );
-
-    Navigator.pop(context);
-  }
-
-  void _showConfirmationDialog(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('Confirm Deletion'),
-          content: const Text(
-              'Are you sure you want to delete the key pair? This action is irreversible.'),
-          actions: [
-            TextButton(
-              child: const Text('Cancel'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            TextButton(
-              child: const Text('Delete'),
-              onPressed: () {
-                Navigator.of(context).pop();
-                _deleteKeyPair(context);
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Delete a Key Pair'),
-      ),
-      body: Center(
-        child: ElevatedButton(
-          onPressed: () {
-            _showConfirmationDialog(context);
-          },
-          child: const Text('Delete Key Pair'),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,138 +0,0 @@
-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 ExportPrivateKeyPage extends StatefulWidget {
-  const ExportPrivateKeyPage({super.key});
-
-  @override
-  _ExportPrivateKeyPageState createState() => _ExportPrivateKeyPageState();
-}
-
-class _ExportPrivateKeyPageState extends State<ExportPrivateKeyPage> {
-  final TextEditingController _passwordController = TextEditingController();
-
-  Future<void> _exportPrivateKey() async {
-    final keyStorage = KeyStorage();
-    final privateKeyPem = await keyStorage.getPrivateKey();
-
-    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;
-    }
-
-    final encryptedData = _encryptPrivateKey(privateKeyPem, password);
-
-    final outputFile = await FilePicker.platform.saveFile(
-      dialogTitle: 'Save encrypted private key',
-      fileName: 'private_key_encrypted.aes',
-    );
-
-    if (outputFile != null) {
-      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) {
-    // Derive a key from the password using PBKDF2
-    final derivator = crypto.PBKDF2KeyDerivator(
-      crypto.HMac(crypto.SHA256Digest(), 64),
-    );
-
-    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);
-
-    final input = Uint8List.fromList(utf8.encode(privateKey));
-    final output = cipher.process(input);
-
-    return output;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Export Private Key'),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          children: [
-            const Text(
-              'Enter a password to encrypt the private key:',
-              style: TextStyle(color: Colors.white),
-            ),
-            TextField(
-              controller: _passwordController,
-              obscureText: true,
-              style: const TextStyle(color: Colors.white),
-              decoration: const InputDecoration(
-                hintText: 'Password',
-                hintStyle: TextStyle(color: Colors.grey),
-              ),
-            ),
-            const SizedBox(height: 20),
-            ElevatedButton(
-              onPressed: _exportPrivateKey,
-              child: const Text('Export Encrypted Private Key'),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,122 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:pointycastle/export.dart' as crypto;
-import 'dart:math';
-import 'dart:convert';
-import 'dart:typed_data';
-import 'package:asn1lib/asn1lib.dart';
-import 'key_storage.dart';
-
-class GenerateNewKeyPairPage extends StatelessWidget {
-  const GenerateNewKeyPairPage({super.key});
-
-  Future<Map<String, String>> _generateKeyPair() async {
-    final keyParams = crypto.RSAKeyGeneratorParameters(
-      BigInt.parse('65537'),
-      2048,
-      64,
-    );
-
-    final secureRandom = crypto.FortunaRandom();
-    final random = Random.secure();
-    final seeds = List<int>.generate(32, (_) => random.nextInt(256));
-    secureRandom.seed(crypto.KeyParameter(Uint8List.fromList(seeds)));
-
-    final rngParams = crypto.ParametersWithRandom(keyParams, secureRandom);
-    final keyGenerator = crypto.RSAKeyGenerator();
-    keyGenerator.init(rngParams);
-
-    final pair = keyGenerator.generateKeyPair();
-    final publicKey = pair.publicKey as crypto.RSAPublicKey;
-    final privateKey = pair.privateKey as crypto.RSAPrivateKey;
-
-    final publicKeyPem = _encodePublicKeyToPemPKCS1(publicKey);
-    final privateKeyPem = _encodePrivateKeyToPemPKCS1(privateKey);
-
-    // Save keys securely
-    final keyStorage = KeyStorage();
-    await keyStorage.saveKeys(publicKey: publicKeyPem, privateKey: privateKeyPem);
-
-    return {'publicKey': publicKeyPem, 'privateKey': privateKeyPem};
-  }
-
-  String _encodePublicKeyToPemPKCS1(crypto.RSAPublicKey publicKey) {
-    final bytes = _encodePublicKeyToDer(publicKey);
-    return _formatPem(bytes, 'RSA PUBLIC KEY');
-  }
-
-  String _encodePrivateKeyToPemPKCS1(crypto.RSAPrivateKey privateKey) {
-    final bytes = _encodePrivateKeyToDer(privateKey);
-    return _formatPem(bytes, 'RSA PRIVATE KEY');
-  }
-
-  Uint8List _encodePublicKeyToDer(crypto.RSAPublicKey publicKey) {
-    final algorithmSeq = ASN1Sequence();
-    // Create the OID directly with the arcs
-    algorithmSeq.add(ASN1ObjectIdentifier([1, 2, 840, 113549, 1, 1, 1]));
-    algorithmSeq.add(ASN1Null());
-
-    final publicKeySeq = ASN1Sequence();
-    publicKeySeq.add(ASN1Integer(publicKey.modulus!));
-    publicKeySeq.add(ASN1Integer(publicKey.exponent!));
-
-    final publicKeyBitString = ASN1BitString(Uint8List.fromList(publicKeySeq.encodedBytes));
-
-    final topLevelSeq = ASN1Sequence();
-    topLevelSeq.add(algorithmSeq);
-    topLevelSeq.add(publicKeyBitString);
-
-    return Uint8List.fromList(topLevelSeq.encodedBytes);
-  }
-
-  Uint8List _encodePrivateKeyToDer(crypto.RSAPrivateKey privateKey) {
-    final privateKeySeq = ASN1Sequence();
-    privateKeySeq.add(ASN1Integer(BigInt.from(0))); // Version
-    privateKeySeq.add(ASN1Integer(privateKey.n!));
-    privateKeySeq.add(ASN1Integer(privateKey.exponent!));
-    privateKeySeq.add(ASN1Integer(privateKey.d!));
-    privateKeySeq.add(ASN1Integer(privateKey.p!));
-    privateKeySeq.add(ASN1Integer(privateKey.q!));
-    privateKeySeq.add(ASN1Integer(privateKey.d! % (privateKey.p! - BigInt.one)));
-    privateKeySeq.add(ASN1Integer(privateKey.d! % (privateKey.q! - BigInt.one)));
-    privateKeySeq.add(ASN1Integer(privateKey.q!.modInverse(privateKey.p!)));
-
-    return Uint8List.fromList(privateKeySeq.encodedBytes);
-  }
-
-  String _formatPem(Uint8List bytes, String label) {
-    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-----';
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Generate a New Key Pair'),
-      ),
-      body: Center(
-        child: ElevatedButton(
-          onPressed: () async {
-            await _generateKeyPair();
-            showDialog(
-              context: context,
-              builder: (context) => AlertDialog(
-                title: const Text('Keys Generated'),
-                content: const Text('The new key pair has been generated and stored securely.'),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.pop(context),
-                    child: const Text('OK'),
-                  ),
-                ],
-              ),
-            );
-          },
-          child: const Text('Generate a New Key Pair'),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,28 +0,0 @@
-// 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,80 +0,0 @@
-import 'package:flutter/material.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 KeyManagementPage extends StatelessWidget {
-  const KeyManagementPage({super.key});
-
-  void _navigateToOption(BuildContext context, String option) {
-    switch (option) {
-      case 'Display public key as text':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const DisplayPublicKeyTextPage()),
-        );
-        break;
-      case 'Display public key as QR code':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const DisplayPublicKeyQRCodePage()),
-        );
-        break;
-      case 'Generate a new key pair':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const GenerateNewKeyPairPage()),
-        );
-        break;
-      case 'Export private key to password-encrypted file (AES 256)':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const ExportPrivateKeyPage()),
-        );
-        break;
-      case 'Delete a key pair':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const DeleteKeyPairPage()),
-        );
-        break;
-      default:
-        break;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final keyManagementOptions = [
-      '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('Key Management'),
-      ),
-      body: ListView.builder(
-        itemCount: keyManagementOptions.length,
-        itemBuilder: (context, index) {
-          return ListTile(
-            title: Text(
-              keyManagementOptions[index],
-              style: const TextStyle(color: Colors.white),
-            ),
-            trailing: const Icon(Icons.arrow_forward_ios, color: Colors.white),
-            onTap: () {
-              _navigateToOption(context, keyManagementOptions[index]);
-            },
-          );
-        },
-      ),
-    );
-  }
-}

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

@@ -1,49 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:pretty_qr_code/pretty_qr_code.dart';
-import 'key_storage.dart';
-
-class DisplayPublicKeyQRCodePage extends StatelessWidget {
-  const DisplayPublicKeyQRCodePage({super.key});
-
-  Future<String?> _loadPublicKey() async {
-    final keyStorage = KeyStorage();
-    return keyStorage.getPublicKey();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Public Key in QR Code'),
-      ),
-      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,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'key_storage.dart';
-
-class DisplayPublicKeyTextPage extends StatelessWidget {
-  const DisplayPublicKeyTextPage({super.key});
-
-  Future<String?> _loadPublicKey() async {
-    final keyStorage = KeyStorage();
-    return await keyStorage.getPublicKey();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Public Key as Text'),
-      ),
-      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

@@ -2,9 +2,9 @@
 
 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/cryptography/';
 import 'package:dialer/features/settings/blocked/settings_blocked.dart';
+import 'cryptography/key_management.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key});
@@ -17,16 +17,10 @@ class SettingsPage extends StatelessWidget {
           MaterialPageRoute(builder: (context) => const SettingsCallPage()),
         );
         break;
-      case 'Page of telephone accounts':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const SettingsAccountsPage()),
-        );
-        break;
       case 'Key management':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const KeyManagementPage()),
+          MaterialPageRoute(builder: (context) => ManageKeysPage()),
         );
         break;
       case 'Blocked numbers':
@@ -46,7 +40,6 @@ class SettingsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final settingsOptions = [
       'Calling settings',
-      'Page of telephone accounts',
       'Key management',
       'Blocked numbers'
     ];
@@ -54,7 +47,7 @@ class SettingsPage extends StatelessWidget {
     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,91 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mobile_number/mobile_number.dart';
-
-class ChooseSimPage extends StatefulWidget {
-  const ChooseSimPage({Key? key}) : super(key: key);
-
-  @override
-  _ChooseSimPageState createState() => _ChooseSimPageState();
-}
-
-class _ChooseSimPageState extends State<ChooseSimPage> {
-  List<SimCard> _simCards = [];
-  int? _selectedSimIndex;
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchSimCards();
-  }
-
-  Future<void> _fetchSimCards() async {
-    try {
-      bool permissionsGranted = await MobileNumber.hasPhonePermission;
-      if (!permissionsGranted) {
-        await MobileNumber.requestPhonePermission;
-        permissionsGranted = await MobileNumber.hasPhonePermission;
-      }
-      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');
-    }
-  }
-
-  void _onSimSelected(int? index) {
-    if (index != null) {
-      setState(() {
-        _selectedSimIndex = index;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Choose SIM'),
-      ),
-      body: _simCards.isEmpty
-          ? const Center(
-        child: Text(
-          'No SIM cards found',
-          style: TextStyle(color: Colors.white),
-        ),
-      )
-          : ListView.builder(
-        itemCount: _simCards.length,
-        itemBuilder: (context, index) {
-          final sim = _simCards[index];
-          return ListTile(
-            title: Text(
-              'SIM ${index + 1}',
-              style: const TextStyle(color: Colors.white),
-            ),
-            subtitle: Text(
-              'Operator: ${sim.carrierName ?? 'N/A'}',
-              style: const TextStyle(color: Colors.grey),
-            ),
-            trailing: Radio<int>(
-              value: index,
-              groupValue: _selectedSimIndex,
-              onChanged: _onSimSelected,
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

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

@@ -1,57 +0,0 @@
-import 'package:flutter/material.dart';
-import 'choose_sim.dart';
-import 'sim_parameters.dart';
-
-class SettingsAccountsPage extends StatelessWidget {
-  const SettingsAccountsPage({Key? key}) : super(key: key);
-
-  void _navigateToAccountOption(BuildContext context, String option) {
-    switch (option) {
-      case 'Choisir la SIM':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const ChooseSimPage()),
-        );
-        break;
-      case 'Paramètre SIM':
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const SimParametersPage()),
-        );
-        break;
-      default:
-        break;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final accountOptions = [
-      'Choisir la SIM',
-      'Paramètre SIM',
-    ];
-
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('Page des comptes téléphoniques'),
-      ),
-      body: ListView.builder(
-        itemCount: accountOptions.length,
-        itemBuilder: (context, index) {
-          return ListTile(
-            title: Text(
-              accountOptions[index],
-              style: const TextStyle(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,89 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mobile_number/mobile_number.dart';
-
-class SimParametersPage extends StatefulWidget {
-  const SimParametersPage({Key? key}) : super(key: key);
-
-  @override
-  _SimParametersPageState createState() => _SimParametersPageState();
-}
-
-class _SimParametersPageState extends State<SimParametersPage> {
-  List<SimCard> _simCards = [];
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchSimParameters();
-  }
-
-  Future<void> _fetchSimParameters() async {
-    try {
-      bool permissionsGranted = await MobileNumber.hasPhonePermission;
-      if (!permissionsGranted) {
-        await MobileNumber.requestPhonePermission;
-        // Check again if permission is granted
-        permissionsGranted = await MobileNumber.hasPhonePermission;
-      }
-      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');
-    }
-  }
-
-  Widget _buildSimInfo(SimCard sim, int index) {
-    return Card(
-      color: Colors.grey[850],
-      child: ListTile(
-        title: Text(
-          'SIM ${index + 1}',
-          style: const TextStyle(color: Colors.white),
-        ),
-        subtitle: Text(
-          '''
-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),
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      appBar: AppBar(
-        title: const Text('SIM Parameters'),
-      ),
-      body: _simCards.isEmpty
-          ? const Center(
-        child: Text(
-          'No SIM cards found',
-          style: TextStyle(color: Colors.white),
-        ),
-      )
-          : ListView.builder(
-        itemCount: _simCards.length,
-        itemBuilder: (context, index) {
-          return _buildSimInfo(_simCards[index], index);
-        },
-      ),
-    );
-  }
-}

dialer/lib/features/voicemail/voicemail_page.dart

@@ -0,0 +1,209 @@
+import 'package:flutter/material.dart';
+import 'package:audioplayers/audioplayers.dart';
+
+class VoicemailPage extends StatefulWidget {
+  const VoicemailPage({Key? key}) : super(key: key);
+
+  @override
+  State<VoicemailPage> createState() => _VoicemailPageState();
+}
+
+class _VoicemailPageState extends State<VoicemailPage> {
+  bool _expanded = false;
+  bool _isPlaying = false;
+  Duration _duration = Duration.zero;
+  Duration _position = Duration.zero;
+  late AudioPlayer _audioPlayer;
+
+  @override
+  void initState() {
+    super.initState();
+    _audioPlayer = AudioPlayer();
+    _audioPlayer.onDurationChanged.listen((Duration d) {
+      setState(() => _duration = d);
+    });
+    _audioPlayer.onPositionChanged.listen((Duration p) {
+      setState(() => _position = p);
+    });
+    _audioPlayer.onPlayerComplete.listen((event) {
+      setState(() {
+        _isPlaying = false;
+        _position = Duration.zero;
+      });
+    });
+  }
+
+  Future<void> _togglePlayPause() async {
+    if (_isPlaying) {
+      await _audioPlayer.pause();
+    } else {
+      await _audioPlayer.play(UrlSource('voicemail.mp3'));
+    }
+    setState(() => _isPlaying = !_isPlaying);
+  }
+
+  @override
+  void dispose() {
+    _audioPlayer.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      // appBar: AppBar(
+      //   // title: const Text('Voicemail'),
+      //   backgroundColor: Colors.black,
+      // ),
+      body: ListView(
+        children: [
+          GestureDetector(
+            onTap: () {
+              setState(() {
+                _expanded = !_expanded;
+              });
+            },
+            child: AnimatedContainer(
+              duration: const Duration(milliseconds: 300),
+              margin: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: const Color.fromARGB(255, 30, 30, 30),
+                borderRadius: BorderRadius.circular(12.0),
+              ),
+              padding: const EdgeInsets.all(16),
+              child: _expanded
+                  ? Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            const CircleAvatar(
+                              radius: 28,
+                                backgroundColor: Colors.amber,
+                                child: Text(
+                                  "JD",
+                                  style: TextStyle(
+                                    color: Colors.deepOrange,
+                                    fontSize: 28,
+                                  ),
+                                ),
+                            ),
+                            const SizedBox(width: 12),
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: const [
+                                Text(
+                                  'John Doe',
+                                  style: TextStyle(color: Colors.white),
+                                ),
+                                Text(
+                                  'Wed 3:00 PM - 1:20 min',
+                                  style: TextStyle(color: Colors.grey),
+                                ),
+                              ],
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            IconButton(
+                              icon: Icon(
+                                _isPlaying ? Icons.pause : Icons.play_arrow,
+                                color: Colors.white,
+                              ),
+                              onPressed: _togglePlayPause,
+                            ),
+                            SizedBox(
+                              width: 200,
+                              child: Slider(
+                                min: 0,
+                                max: _duration.inSeconds.toDouble(),
+                                value: _position.inSeconds.toDouble(),
+                                onChanged: (value) async {
+                                  final newPos = Duration(seconds: value.toInt());
+                                  await _audioPlayer.seek(newPos);
+                                },
+                                activeColor: Colors.blue,
+                                inactiveColor: Colors.grey,
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 16),
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              children: const [
+                                Icon(Icons.call, color: Colors.green),
+                                SizedBox(width: 8),
+                                Text('Call', style: TextStyle(color: Colors.white)),
+                              ],
+                            ),
+                            const SizedBox(height: 12),
+                            Row(
+                              children: const [
+                                Icon(Icons.message, color: Colors.blue),
+                                SizedBox(width: 8),
+                                Text('Text', style: TextStyle(color: Colors.white)),
+                              ],
+                            ),
+                            const SizedBox(height: 12),
+                            Row(
+                              children: const [
+                                Icon(Icons.block, color: Colors.red),
+                                SizedBox(width: 8),
+                                Text('Block', style: TextStyle(color: Colors.white)),
+                              ],
+                            ),
+                            const SizedBox(height: 12),
+                            Row(
+                              children: const [
+                                Icon(Icons.share, color: Colors.white),
+                                SizedBox(width: 8),
+                                Text('Share', style: TextStyle(color: Colors.white)),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ],
+                    )
+                  : Row(
+                      children: [
+                        const CircleAvatar(
+                          radius: 28,
+                          backgroundColor: Colors.amber,
+                          child: Text(
+                            "JD",
+                            style: TextStyle(
+                              color: Colors.deepOrange,
+                              fontSize: 28,
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: const [
+                            Text(
+                              'John Doe',
+                              style: TextStyle(color: Colors.white),
+                            ),
+                            Text(
+                              'Wed 3:00 PM - 1:20 min',
+                              style: TextStyle(color: Colors.grey),
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

dialer/lib/globals.dart

@@ -0,0 +1 @@
+bool isStealthMode = false;

dialer/lib/main.dart

@@ -1,23 +1,66 @@
 import 'package:dialer/features/home/home_page.dart';
 import 'package:flutter/material.dart';
 import 'package:dialer/features/contacts/contact_state.dart';
+import 'package:dialer/services/call_service.dart';
+import 'package:flutter/services.dart';
+import 'globals.dart' as globals;
+import 'package:dialer/services/cryptography/asymmetric_crypto_service.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:provider/provider.dart';
 
-void main() {
-  runApp(const MyApp());
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  const stealthFlag = String.fromEnvironment('STEALTH', defaultValue: 'false');
+  globals.isStealthMode = stealthFlag.toLowerCase() == 'true';
+
+  final AsymmetricCryptoService cryptoService = AsymmetricCryptoService();
+  await cryptoService.initializeDefaultKeyPair();
+
+  // Request permissions before running the app
+  await _requestPermissions();
+
+  CallService();
+
+  runApp(
+    MultiProvider(
+      providers: [
+        Provider<AsymmetricCryptoService>(
+          create: (_) => cryptoService,
+        ),
+      ],
+      child: Dialer(),
+    ),
+  );
 }
 
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
+Future<void> _requestPermissions() async {
+  Map<Permission, PermissionStatus> statuses = await [
+    Permission.phone,
+    Permission.contacts,
+    Permission.microphone,
+  ].request();
+  if (statuses.values.every((status) => status.isGranted)) {
+    print("All required permissions granted");
+    const channel = MethodChannel('call_service');
+    await channel.invokeMethod('permissionsGranted');
+  } else {
+    print("Permissions denied: ${statuses.entries.where((e) => !e.value.isGranted).map((e) => e.key).join(', ')}");
+  }
+}
+
+class Dialer extends StatelessWidget {
+  const Dialer({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ContactState(
       child: MaterialApp(
+        navigatorKey: CallService.navigatorKey,
         theme: ThemeData(
-          brightness: Brightness.dark
+          brightness: Brightness.dark,
         ),
         home: SafeArea(child: MyHomePage()),
-      )
+      ),
     );
   }
-}
+}

dialer/lib/services/call_service.dart

@@ -0,0 +1,154 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import '../features/call/call_page.dart';
+import '../features/call/incoming_call_page.dart'; // Import the new page
+
+class CallService {
+  static const MethodChannel _channel = MethodChannel('call_service');
+  static String? currentPhoneNumber;
+  static bool _isCallPageVisible = false;
+
+  static final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+
+  CallService() {
+    _channel.setMethodCallHandler((call) async {
+      final context = navigatorKey.currentContext;
+      print('CallService: Received method ${call.method} with args ${call.arguments}');
+      if (context == null) {
+        print('CallService: Navigator context is null, cannot navigate');
+        return;
+      }
+
+      switch (call.method) {
+        case "callAdded":
+          final phoneNumber = call.arguments["callId"] as String;
+          final state = call.arguments["state"] as String;
+          currentPhoneNumber = phoneNumber.replaceFirst('tel:', '');
+          print('CallService: Call added, number: $currentPhoneNumber, state: $state');
+          if (state == "ringing") {
+            _navigateToIncomingCallPage(context);
+          } else {
+            _navigateToCallPage(context);
+          }
+          break;
+        case "callStateChanged":
+          final state = call.arguments["state"] as String;
+          print('CallService: State changed to $state');
+          if (state == "disconnected" || state == "disconnecting") {
+            _closeCallPage(context);
+          } else if (state == "active" || state == "dialing") {
+            _navigateToCallPage(context);
+          } else if (state == "ringing") {
+            _navigateToIncomingCallPage(context);
+          }
+          break;
+        case "callEnded":
+        case "callRemoved":
+          print('CallService: Call ended/removed');
+          _closeCallPage(context);
+          currentPhoneNumber = null;
+          break;
+      }
+    });
+  }
+
+  void _navigateToCallPage(BuildContext context) {
+    if (_isCallPageVisible && ModalRoute.of(context)?.settings.name == '/call') {
+      print('CallService: CallPage already visible, skipping navigation');
+      return;
+    }
+    print('CallService: Navigating to CallPage');
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(
+        settings: const RouteSettings(name: '/call'),
+        builder: (context) => CallPage(
+          displayName: currentPhoneNumber!,
+          phoneNumber: currentPhoneNumber!,
+          thumbnail: null,
+        ),
+      ),
+    ).then((_) {
+      _isCallPageVisible = false;
+    });
+    _isCallPageVisible = true;
+  }
+
+  void _navigateToIncomingCallPage(BuildContext context) {
+    if (_isCallPageVisible && ModalRoute.of(context)?.settings.name == '/incoming_call') {
+      print('CallService: IncomingCallPage already visible, skipping navigation');
+      return;
+    }
+    print('CallService: Navigating to IncomingCallPage');
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        settings: const RouteSettings(name: '/incoming_call'),
+        builder: (context) => IncomingCallPage(
+          displayName: currentPhoneNumber!,
+          phoneNumber: currentPhoneNumber!,
+          thumbnail: null,
+        ),
+      ),
+    ).then((_) {
+      _isCallPageVisible = false;
+    });
+    _isCallPageVisible = true;
+  }
+
+  void _closeCallPage(BuildContext context) {
+    if (!_isCallPageVisible) {
+      print('CallService: CallPage not visible, skipping pop');
+      return;
+    }
+    if (Navigator.canPop(context)) {
+      print('CallService: Popping CallPage');
+      Navigator.pop(context);
+      _isCallPageVisible = false;
+    }
+  }
+
+  Future<void> makeGsmCall(
+    BuildContext context, {
+    required String phoneNumber,
+    String? displayName,
+    Uint8List? thumbnail,
+  }) async {
+    try {
+      currentPhoneNumber = phoneNumber;
+      print('CallService: Making GSM call to $phoneNumber');
+      final result = await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber});
+      print('CallService: makeGsmCall result: $result');
+      if (result["status"] != "calling") {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text("Failed to initiate call")),
+        );
+      }
+    } catch (e) {
+      print("CallService: Error making call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error making call: $e")),
+      );
+      rethrow;
+    }
+  }
+
+  Future<void> hangUpCall(BuildContext context) async {
+    try {
+      print('CallService: Hanging up call');
+      final result = await _channel.invokeMethod('hangUpCall');
+      print('CallService: hangUpCall result: $result');
+      if (result["status"] != "ended") {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text("Failed to end call")),
+        );
+      }
+    } catch (e) {
+      print("CallService: Error hanging up call: $e");
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text("Error hanging up call: $e")),
+      );
+      rethrow;
+    }
+  }
+}

dialer/lib/services/contact_service.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:qr_flutter/qr_flutter.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 {
+    List<Contact> contacts = await fetchContacts();
+    return contacts.where((contact) => contact.isStarred).toList();
+  }
+
+  Future<void> addNewContact(Contact contact) async {
+    await FlutterContacts.insertContact(contact);
+  }
+
+  // Function to show an AlertDialog with a QR code for the contact's vCard
+  void showContactQRCodeDialog(BuildContext context, Contact contact) {
+    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: contact.toVCard(), // Generate vCard QR code
+              version: QrVersions.auto,
+              backgroundColor: Colors.white, // Make sure QR code is visible on black background
+              size: 200.0,
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

dialer/lib/services/cryptography/asymmetric_crypto_service.dart

@@ -0,0 +1,170 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/services.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:uuid/uuid.dart';
+
+class AsymmetricCryptoService {
+  static const MethodChannel _channel = MethodChannel('com.example.keystore');
+  final FlutterSecureStorage _secureStorage = FlutterSecureStorage();
+  final String _aliasPrefix = 'icing_';
+  final Uuid _uuid = Uuid();
+
+  /// Generates an ECDSA P-256 key pair with a unique alias and stores its metadata.
+  Future<String> generateKeyPair({String? label}) async {
+    try {
+      // Generate a unique identifier for the key
+      final String uuid = _uuid.v4();
+      final String alias = '$_aliasPrefix$uuid';
+
+      // Invoke native method to generate the key pair
+      await _channel.invokeMethod('generateKeyPair', {'alias': alias});
+
+      // Store key metadata securely
+      final Map<String, dynamic> keyMetadata = {
+        'alias': alias,
+        'label': label ?? 'Key $uuid',
+        'created_at': DateTime.now().toIso8601String(),
+      };
+
+      // Retrieve existing keys
+      final String? existingKeys = await _secureStorage.read(key: 'keys');
+      List<dynamic> keysList = existingKeys != null ? jsonDecode(existingKeys) : [];
+
+      // Add the new key
+      keysList.add(keyMetadata);
+
+      // Save updated keys list
+      await _secureStorage.write(key: 'keys', value: jsonEncode(keysList));
+
+      return alias;
+    } on PlatformException catch (e) {
+      throw Exception("Failed to generate key pair: ${e.message}");
+    }
+  }
+
+  /// Signs data using the specified key alias.
+  Future<String> signData(String alias, String data) async {
+    try {
+      final String signature = await _channel.invokeMethod('signData', {
+        'alias': alias,
+        'data': data,
+      });
+      return signature;
+    } on PlatformException catch (e) {
+      throw Exception("Failed to sign data with alias '$alias': ${e.message}");
+    }
+  }
+
+  /// Retrieves the public key for the specified alias.
+  Future<String> getPublicKey(String alias) async {
+    try {
+      final String publicKey = await _channel.invokeMethod('getPublicKey', {
+        'alias': alias,
+      });
+      return publicKey;
+    } on PlatformException catch (e) {
+      throw Exception("Failed to retrieve public key: ${e.message}");
+    }
+  }
+
+  /// Deletes the key pair associated with the specified alias and removes its metadata.
+  Future<void> deleteKeyPair(String alias) async {
+    try {
+      await _channel.invokeMethod('deleteKeyPair', {'alias': alias});
+      
+      final String? existingKeys = await _secureStorage.read(key: 'keys');
+      if (existingKeys != null) {
+        List<dynamic> keysList = jsonDecode(existingKeys);
+        keysList.removeWhere((key) => key['alias'] == alias);
+        await _secureStorage.write(key: 'keys', value: jsonEncode(keysList));
+      }
+    } on PlatformException catch (e) {
+      throw Exception("Failed to delete key pair: ${e.message}");
+    }
+  }
+
+  /// Retrieves all stored key metadata.
+  Future<List<Map<String, dynamic>>> getAllKeys() async {
+    try {
+      final String? existingKeys = await _secureStorage.read(key: 'keys');
+      if (existingKeys == null) {
+        print("No keys found");
+        return [];
+      }
+      List<dynamic> keysList = jsonDecode(existingKeys);
+      return keysList.cast<Map<String, dynamic>>();
+    } catch (e) {
+      throw Exception("Failed to retrieve keys: $e");
+    }
+  }
+
+  /// Checks if a key pair exists for the given alias.
+  Future<bool> keyPairExists(String alias) async {
+    try {
+      final bool exists = await _channel.invokeMethod('keyPairExists', {'alias': alias});
+      return exists;
+    } on PlatformException catch (e) {
+      throw Exception("Failed to check key pair existence: ${e.message}");
+    }
+  }
+
+  /// Initializes the default key pair if it doesn't exist.
+  Future<void> initializeDefaultKeyPair() async {
+    const String defaultAlias = 'icing_default';
+    final List<Map<String, dynamic>> keys = await getAllKeys();
+    
+    // Check if the key exists in metadata
+    final bool defaultKeyExists = keys.any((key) => key['alias'] == defaultAlias);
+    
+    if (!defaultKeyExists) {
+      await _channel.invokeMethod('generateKeyPair', {'alias': defaultAlias});
+      
+      final Map<String, dynamic> keyMetadata = {
+        'alias': defaultAlias,
+        'label': 'Default Key',
+        'created_at': DateTime.now().toIso8601String(),
+      };
+      
+      keys.add(keyMetadata);
+      await _secureStorage.write(key: 'keys', value: jsonEncode(keys));
+    }
+  }
+
+  /// Updates the label of a key with the specified alias.
+  ///
+  /// [alias]: The unique alias of the key to update.
+  /// [newLabel]: The new label to assign to the key.
+  ///
+  /// Throws an exception if the key is not found or the update fails.
+  Future<void> updateKeyLabel(String alias, String newLabel) async {
+    try {
+      // Retrieve existing keys
+      final String? existingKeys = await _secureStorage.read(key: 'keys');
+      if (existingKeys == null) {
+        throw Exception("No keys found to update.");
+      }
+
+      List<dynamic> keysList = jsonDecode(existingKeys);
+
+      // Find the key with the specified alias
+      bool keyFound = false;
+      for (var key in keysList) {
+        if (key['alias'] == alias) {
+          key['label'] = newLabel;
+          keyFound = true;
+          break;
+        }
+      }
+
+      if (!keyFound) {
+        throw Exception("Key with alias \"$alias\" not found.");
+      }
+
+      // Save the updated keys list
+      await _secureStorage.write(key: 'keys', value: jsonEncode(keysList));
+    } catch (e) {
+      throw Exception("Failed to update key label: $e");
+    }
+  }
+}

dialer/lib/services/obfuscate_service.dart

@@ -0,0 +1,91 @@
+// lib/services/obfuscate_service.dart
+import 'package:dialer/widgets/color_darkener.dart';
+
+import '../../globals.dart' as globals;
+import 'dart:ui';
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+
+class ObfuscateService {
+  // Private constructor
+  ObfuscateService._privateConstructor();
+
+  // Singleton instance
+  static final ObfuscateService _instance = ObfuscateService._privateConstructor();
+
+  // Factory constructor to return the same instance
+  factory ObfuscateService() {
+    return _instance;
+  }
+
+  // Public method to obfuscate data
+  String obfuscateData(String data) {
+    if (globals.isStealthMode) {
+      return _obfuscateData(data);
+    } else {
+      return data;
+    }
+  }
+
+  // Private helper method for obfuscation logic
+  String _obfuscateData(String data) {
+    if (data.isNotEmpty) {
+      // Ensure the string has at least two characters to obfuscate
+      if (data.length == 1) {
+        return '${data[0]}';
+      } else {
+        return '${data[0]}...${data[data.length - 1]}';
+      }
+    }
+    return '';
+  }
+}
+
+
+class ObfuscatedAvatar extends StatelessWidget {
+  final Uint8List? imageBytes;
+  final double radius;
+  final Color backgroundColor;
+  final String? fallbackInitial;
+
+  const ObfuscatedAvatar({
+    Key? key,
+    required this.imageBytes,
+    this.radius = 25,
+    this.backgroundColor = Colors.grey,
+    this.fallbackInitial,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (imageBytes != null && imageBytes!.isNotEmpty) {
+      return ClipOval(
+        child: ImageFiltered(
+          imageFilter: globals.isStealthMode
+              ? ImageFilter.blur(sigmaX: 10, sigmaY: 10)
+              : ImageFilter.blur(sigmaX: 0, sigmaY: 0),
+          child: Image.memory(
+            imageBytes!,
+            fit: BoxFit.cover,
+            width: radius * 2,
+            height: radius * 2,
+          ),
+        ),
+      );
+    } else {
+      return CircleAvatar(
+        radius: radius,
+        backgroundColor: backgroundColor,
+        child: Text(
+          fallbackInitial != null && fallbackInitial!.isNotEmpty
+              ? fallbackInitial![0].toUpperCase()
+              : '?',
+          style: TextStyle(
+            color: darken(backgroundColor),
+            fontSize: radius,
+          ),
+        ),
+      );
+    }
+  }
+}

dialer/lib/widgets/contact_service.dart

@@ -1,31 +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,
-          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

@@ -1,6 +1,5 @@
 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);
@@ -10,8 +9,7 @@ class QRCodeScannerScreen extends StatefulWidget {
 }
 
 class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
-  MobileScannerController cameraController = MobileScannerController();
-
+  final MobileScannerController cameraController = MobileScannerController();
   bool isScanning = true;
 
   @override
@@ -20,104 +18,22 @@ class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
     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.'),
+        title: const Text('Invalid QR Code'),
+        content:
+        const Text('The scanned QR code does not contain valid vCard data.'),
         actions: [
           TextButton(
             onPressed: () {
               Navigator.of(context).pop(); // Close dialog
-              isScanning = true; // Resume scanning
+              setState(() {
+                isScanning = true; // Resume scanning
+              });
             },
-            child: Text('Try Again'),
+            child: const Text('Try Again'),
           ),
         ],
       ),
@@ -128,32 +44,27 @@ class _QRCodeScannerScreenState extends State<QRCodeScannerScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Scan Contact QR Code'),
+        title: const Text('Scan Contact QR Code'),
       ),
       body: MobileScanner(
         controller: cameraController,
+        // allowDuplicates: false, // or true, depending on your preference
         onDetect: (capture) {
           if (!isScanning) return;
+          isScanning = false; // Stop multiple triggers
 
-          isScanning = false; // Prevent multiple scans
           final List<Barcode> barcodes = capture.barcodes;
-
           for (final barcode in barcodes) {
             final String? code = barcode.rawValue;
+            // If the QR code contains 'BEGIN:VCARD', let's assume it's a valid vCard
             if (code != null && code.contains('BEGIN:VCARD')) {
-              // Handle valid vCard QR code
-              _createContactFromVCard(code);
-              _showContactAddedDialog(); // TODO: Be a confirmation button "do you want to add XXX to your contacts?"
-              break;
+              Navigator.pop(context, code); // pop back with the full vCard text
+              return;
             }
           }
 
-          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
-          }
+          // If no valid vCard was found in any of the barcodes
+          _showInvalidQRDialog();
         },
       ),
     );

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.xcworkspace/contents.xcworkspacedata

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

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/packages/mobile_number/CHANGELOG.md

@@ -1,59 +0,0 @@
-## 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.