.gitea/workflows/apk.yaml

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

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

@@ -182,5 +182,3 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
-dialer/android/gradle.properties
-.gitignore

README.md

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

@@ -0,0 +1,5 @@
+# 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,10 +4,7 @@ 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.icing.dialer"
+    namespace = "com.example.dialer"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.icing.dialer"
+        applicationId = "com.example.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/debug/AndroidManifest.xml

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

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

@@ -1,27 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.icing.dialer">
-    <uses-feature android:name="android.hardware.telephony" android:required="true" />
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
-    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
-    <uses-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" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
     <application
-        android:label="Icing Dialer"
+        android:label="com.example.dialer"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:enableOnBackInvokedCallback="true">
+        android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".activities.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
@@ -41,48 +26,7 @@
                 <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

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

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

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

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

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

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

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

@@ -1,286 +0,0 @@
-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.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
-    private val REQUEST_CODE_CALL_LOG_PERMISSION = 1002
-    private var pendingIncomingCall: Pair<String?, Boolean>? = null
-    private var wasPhoneLocked: Boolean = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.d(TAG, "onCreate started")
-        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
-        Log.d(TAG, "Was phone locked at start: $wasPhoneLocked")
-        updateLockScreenFlags(intent)
-        handleIncomingCallIntent(intent)
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
-        Log.d(TAG, "onNewIntent, wasPhoneLocked: $wasPhoneLocked")
-        updateLockScreenFlags(intent)
-        handleIncomingCallIntent(intent)
-    }
-
-    private fun updateLockScreenFlags(intent: Intent?) {
-        val isIncomingCall = intent?.getBooleanExtra("isIncomingCall", false) ?: false
-        if (isIncomingCall && wasPhoneLocked) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                setShowWhenLocked(true)
-                setTurnScreenOn(true)
-            } else {
-                @Suppress("DEPRECATION")
-                window.addFlags(
-                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                )
-            }
-            Log.d(TAG, "Enabled showWhenLocked and turnScreenOn for incoming call")
-        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                setShowWhenLocked(false)
-                setTurnScreenOn(false)
-            } else {
-                @Suppress("DEPRECATION")
-                window.clearFlags(
-                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                )
-            }
-            Log.d(TAG, "Disabled showWhenLocked and turnScreenOn for normal usage")
-        }
-    }
-
-    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")
-                        pendingIncomingCall?.let { (phoneNumber, showScreen) ->
-                            if (showScreen) {
-                                MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
-                                    "phoneNumber" to phoneNumber,
-                                    "wasPhoneLocked" to wasPhoneLocked
-                                ))
-                                pendingIncomingCall = null
-                            }
-                        }
-                        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 = MyInCallService.currentCall?.let {
-                            it.disconnect()
-                            Log.d(TAG, "Call disconnected")
-                            MyInCallService.channel?.invokeMethod("callEnded", mapOf(
-                                "callId" to it.details.handle.toString(),
-                                "wasPhoneLocked" to wasPhoneLocked
-                            ))
-                            true
-                        } ?: false
-                        if (success) {
-                            result.success(mapOf("status" to "ended"))
-                            if (wasPhoneLocked) {
-                                Log.d(TAG, "Finishing and removing task after hangup, phone was locked")
-                                finishAndRemoveTask()
-                            }
-                        } else {
-                            Log.w(TAG, "No active call to hang up")
-                            result.error("HANGUP_FAILED", "No active call to hang up", null)
-                        }
-                    }
-                    "answerCall" -> {
-                        val success = MyInCallService.currentCall?.let {
-                            it.answer(0)
-                            Log.d(TAG, "Answered call")
-                            true
-                        } ?: false
-                        if (success) {
-                            result.success(mapOf("status" to "answered"))
-                        } else {
-                            Log.w(TAG, "No active call to answer")
-                            result.error("ANSWER_FAILED", "No active call to answer", null)
-                        }
-                    }
-                    "callEndedFromFlutter" -> {
-                        Log.d(TAG, "Call ended from Flutter, wasPhoneLocked: $wasPhoneLocked")
-                        if (wasPhoneLocked) {
-                            finishAndRemoveTask()
-                            Log.d(TAG, "Finishing and removing task after call ended, phone was locked")
-                        }
-                        result.success(true)
-                    }
-                    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") {
-                    if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED) {
-                        val callLogs = getCallLogs()
-                        result.success(callLogs)
-                    } else {
-                        requestPermissions(arrayOf(Manifest.permission.READ_CALL_LOG), REQUEST_CODE_CALL_LOG_PERMISSION)
-                        result.error("PERMISSION_DENIED", "Call log permission not granted", null)
-                    }
-                } 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 {
-                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()
-            }
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == REQUEST_CODE_CALL_LOG_PERMISSION) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.d(TAG, "Call log permission granted")
-                MyInCallService.channel?.invokeMethod("callLogPermissionGranted", null)
-            } else {
-                Log.w(TAG, "Call log permission denied")
-            }
-        }
-    }
-
-    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
-    }
-
-    private fun handleIncomingCallIntent(intent: Intent?) {
-        intent?.let {
-            if (it.getBooleanExtra("isIncomingCall", false)) {
-                val phoneNumber = it.getStringExtra("phoneNumber")
-                val showScreen = it.getBooleanExtra("showIncomingCallScreen", false)
-                Log.d(TAG, "Received incoming call intent for $phoneNumber, showScreen=$showScreen, wasPhoneLocked=$wasPhoneLocked")
-                if (showScreen) {
-                    if (MyInCallService.channel != null) {
-                        MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
-                            "phoneNumber" to phoneNumber,
-                            "wasPhoneLocked" to wasPhoneLocked
-                        ))
-                    } else {
-                        pendingIncomingCall = Pair(phoneNumber, true)
-                        Log.d(TAG, "Flutter channel not ready, storing pending call: $phoneNumber")
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,82 +0,0 @@
-// 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

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

@@ -1,156 +0,0 @@
-package com.icing.dialer.services
-
-import android.app.KeyguardManager
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.telecom.Call
-import android.telecom.InCallService
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import com.icing.dialer.activities.MainActivity
-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 const val NOTIFICATION_CHANNEL_ID = "incoming_call_channel"
-        private const val NOTIFICATION_ID = 1
-        var wasPhoneLocked: Boolean = false
-    }
-
-    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,
-                "wasPhoneLocked" to wasPhoneLocked
-            ))
-            if (state == Call.STATE_RINGING) {
-                val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-                wasPhoneLocked = keyguardManager.isKeyguardLocked
-                Log.d(TAG, "Phone locked at ringing: $wasPhoneLocked")
-                showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
-            } else if (state == Call.STATE_DISCONNECTED || state == Call.STATE_DISCONNECTING) {
-                Log.d(TAG, "Call ended: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
-                channel?.invokeMethod("callEnded", mapOf(
-                    "callId" to call.details.handle.toString(),
-                    "wasPhoneLocked" to wasPhoneLocked
-                ))
-                currentCall = null
-                cancelNotification()
-            }
-        }
-    }
-
-    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"
-        }
-        Log.d(TAG, "Call added: ${call.details.handle}, state: $stateStr")
-        channel?.invokeMethod("callAdded", mapOf(
-            "callId" to call.details.handle.toString(),
-            "state" to stateStr
-        ))
-        if (stateStr == "ringing") {
-            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-            wasPhoneLocked = keyguardManager.isKeyguardLocked
-            Log.d(TAG, "Phone locked at call added: $wasPhoneLocked")
-            showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
-        }
-        call.registerCallback(callCallback)
-    }
-
-    override fun onCallRemoved(call: Call) {
-        super.onCallRemoved(call)
-        Log.d(TAG, "Call removed: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
-        call.unregisterCallback(callCallback)
-        channel?.invokeMethod("callRemoved", mapOf(
-            "callId" to call.details.handle.toString(),
-            "wasPhoneLocked" to wasPhoneLocked
-        ))
-        currentCall = null
-        cancelNotification()
-    }
-
-    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))
-    }
-
-    private fun showIncomingCallScreen(phoneNumber: String) {
-        val intent = Intent(this, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-            putExtra("phoneNumber", phoneNumber)
-            putExtra("isIncomingCall", true)
-            putExtra("showIncomingCallScreen", true)
-            putExtra("wasPhoneLocked", wasPhoneLocked)
-        }
-
-        val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-        if (keyguardManager.isKeyguardLocked) {
-            startActivity(intent)
-            Log.d(TAG, "Launched MainActivity directly for locked screen, phoneNumber: $phoneNumber")
-        } else {
-            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val channel = NotificationChannel(
-                    NOTIFICATION_CHANNEL_ID,
-                    "Incoming Calls",
-                    NotificationManager.IMPORTANCE_HIGH
-                ).apply {
-                    description = "Notifications for incoming calls"
-                    enableVibration(true)
-                    setShowBadge(true)
-                }
-                notificationManager.createNotificationChannel(channel)
-            }
-
-            val pendingIntent = PendingIntent.getActivity(
-                this, 0, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
-            )
-
-            val notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-                .setSmallIcon(android.R.drawable.ic_dialog_alert)
-                .setContentTitle("Incoming Call")
-                .setContentText("Call from $phoneNumber")
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setFullScreenIntent(pendingIntent, true)
-                .setAutoCancel(true)
-                .setOngoing(true)
-                .build()
-
-            startActivity(intent)
-            notificationManager.notify(NOTIFICATION_ID, notification)
-            Log.d(TAG, "Launched MainActivity with notification for unlocked screen, phoneNumber: $phoneNumber")
-        }
-    }
-
-    private fun cancelNotification() {
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(NOTIFICATION_ID)
-        Log.d(TAG, "Notification canceled")
-    }
-}

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

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

dialer/android/build.gradle

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

dialer/android/gradle.properties

@@ -1,5 +1,4 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 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.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-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.3.2" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

dialer/build.sh

@@ -1,10 +0,0 @@
-#!/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

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

@@ -0,0 +1,34 @@
+**/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

@@ -0,0 +1,26 @@
+<?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

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

dialer/ios/Flutter/Release.xcconfig

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

dialer/ios/Runner.xcodeproj/project.pbxproj

@@ -0,0 +1,616 @@
+// !$*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

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

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

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

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

@@ -0,0 +1,8 @@
+<?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

@@ -0,0 +1,98 @@
+<?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/contents.xcworkspacedata

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

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

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

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

@@ -0,0 +1,8 @@
+<?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

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

@@ -0,0 +1,122 @@
+{
+  "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

@@ -0,0 +1,23 @@
+{
+  "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

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

@@ -0,0 +1,37 @@
+<?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

@@ -0,0 +1,26 @@
+<?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

@@ -0,0 +1,52 @@
+<?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

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

dialer/ios/RunnerTests/RunnerTests.swift

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

@@ -1,348 +0,0 @@
-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 {
-      final result = await _callService.hangUpCall(context);
-      print('CallPage: Hang up result: $result');
-      if (result["status"] == "ended" && mounted && Navigator.canPop(context)) {
-        Navigator.pop(context);
-      }
-    } catch (e) {
-      print("CallPage: Error hanging up: $e");
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text("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,
-                      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

@@ -1,181 +0,0 @@
-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,9 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
-import 'package:url_launcher/url_launcher.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,9 +12,6 @@ class _CompositionPageState extends State<CompositionPage> {
   String dialedNumber = "";
   List<Contact> _allContacts = [];
   List<Contact> _filteredContacts = [];
-  final ContactService _contactService = ContactService();
-  final ObfuscateService _obfuscateService = ObfuscateService();
-  final CallService _callService = CallService();
 
   @override
   void initState() {
@@ -27,21 +20,18 @@ class _CompositionPageState extends State<CompositionPage> {
   }
 
   Future<void> _fetchContacts() async {
-    _allContacts = await _contactService.fetchContacts();
+    if (await FlutterContacts.requestPermission()) {
+      _allContacts = await FlutterContacts.getContacts(withProperties: true);
       _filteredContacts = _allContacts;
       setState(() {});
     }
+  }
 
   void _filterContacts() {
     setState(() {
       _filteredContacts = _allContacts.where((contact) {
-        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 phoneMatch = contact.phones.any((phone) =>
+            phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
         final nameMatch = contact.displayName
             .toLowerCase()
             .contains(dialedNumber.toLowerCase());
@@ -57,13 +47,6 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
-  void _onPlusPress() {
-    setState(() {
-      dialedNumber += '+';
-      _filterContacts();
-    });
-  }
-
   void _onDeletePress() {
     setState(() {
       if (dialedNumber.isNotEmpty) {
@@ -80,41 +63,9 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
-  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')),
-      );
-    }
-  }
-
-  void _launchSms(String phoneNumber) async {
-    final uri = Uri(scheme: 'sms', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not send SMS to $phoneNumber');
-    }
-  }
-
-  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!')),
-        );
-      }
-    }
+  // Placeholder function for adding contact
+  void addContact(String number) {
+    // This function is empty for now
   }
 
   @override
@@ -125,62 +76,64 @@ class _CompositionPageState extends State<CompositionPage> {
         children: [
           Column(
             children: [
+              // Top half: Display contacts matching dialed number
               Expanded(
                 flex: 2,
-                child: Container(
-                  padding: const EdgeInsets.only(
-                      top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
+                child:
+                Container(
+                  padding: const EdgeInsets.only(top: 42.0, left: 16.0, right: 16.0, bottom: 16.0),
                   color: Colors.black,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Expanded(
                         child: ListView(
-                          children: [
-                            ..._filteredContacts.map((contact) {
-                              final phoneNumber = contact.phones.isNotEmpty
-                                  ? contact.phones.first.number
-                                  : 'No phone number';
+                          children: _filteredContacts.isNotEmpty
+                              ? _filteredContacts.map((contact) {
                                   return ListTile(
                                     title: Text(
-                                  _obfuscateService.obfuscateData(contact.displayName),
+                                      contact.displayName,
                                       style: const TextStyle(color: Colors.white),
                                     ),
-                                subtitle: Text(
-                                  _obfuscateService.obfuscateData(phoneNumber),
+                                    subtitle: contact.phones.isNotEmpty
+                                        ? Text(
+                                            contact.phones.first.number,
                                             style: const TextStyle(color: Colors.grey),
-                                ),
+                                          )
+                                        : null,
                                     trailing: Row(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
+                                        // Call button
                                         IconButton(
                                           icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
-                                      onPressed: () => _makeCall(phoneNumber),
+                                          onPressed: () {
+                                            print('Calling ${contact.displayName}');
+                                          },
                                         ),
+                                        // Text button
                                         IconButton(
                                           icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
-                                      onPressed: () => _launchSms(phoneNumber),
+                                          onPressed: () {
+                                            print('Texting ${contact.displayName}');
+                                          },
                                         ),
                                       ],
                                     ),
-                                onTap: () {},
+                                    onTap: () {
+                                      // Handle contact selection if needed
+                                    },
                                   );
-                            }).toList(),
-                            ListTile(
-                              title: const Text(
-                                'Add a contact',
-                                style: TextStyle(color: Colors.white),
-                              ),
-                              trailing: Icon(Icons.add, color: Colors.grey[600]),
-                              onTap: _addContact,
-                            ),
-                          ],
+                                }).toList()
+                              : [Center(child: Text('No contacts found', style: TextStyle(color: Colors.white)))],
                         ),
                       ),
                     ],
                   ),
                 ),
               ),
+
+              // Bottom half: Dialpad and Dialed number display with erase button
               Expanded(
                 flex: 2,
                 child: Container(
@@ -188,6 +141,7 @@ class _CompositionPageState extends State<CompositionPage> {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
+                      // Display dialed number with erase button
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
@@ -201,17 +155,15 @@ class _CompositionPageState extends State<CompositionPage> {
                               ),
                             ),
                           ),
-                          GestureDetector(
-                            onTap: _onDeletePress,
-                            onLongPress: _onClearPress,
-                            child: const Padding(
-                              padding: EdgeInsets.all(8.0),
-                              child: Icon(Icons.backspace, color: Colors.white),
-                            ),
+                          IconButton(
+                            onPressed: _onClearPress,
+                            icon: const Icon(Icons.backspace, color: Colors.white),
                           ),
                         ],
                       ),
                       const SizedBox(height: 10),
+
+                      // Dialpad
                       Expanded(
                         child: SingleChildScrollView(
                           child: Column(
@@ -220,33 +172,33 @@ class _CompositionPageState extends State<CompositionPage> {
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('1', Colors.white),
-                                  _buildDialButton('2', Colors.white),
-                                  _buildDialButton('3', Colors.white),
+                                  _buildDialButton('1'),
+                                  _buildDialButton('2'),
+                                  _buildDialButton('3'),
                                 ],
                               ),
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('4', Colors.white),
-                                  _buildDialButton('5', Colors.white),
-                                  _buildDialButton('6', Colors.white),
+                                  _buildDialButton('4'),
+                                  _buildDialButton('5'),
+                                  _buildDialButton('6'),
                                 ],
                               ),
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('7', Colors.white),
-                                  _buildDialButton('8', Colors.white),
-                                  _buildDialButton('9', Colors.white),
+                                  _buildDialButton('7'),
+                                  _buildDialButton('8'),
+                                  _buildDialButton('9'),
                                 ],
                               ),
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('*', const Color.fromRGBO(117, 117, 117, 1)),
-                                  _buildDialButtonWithPlus('0'),
-                                  _buildDialButton('#', const Color.fromRGBO(117, 117, 117, 1)),
+                                  _buildDialButton('*'),
+                                  _buildDialButton('0'),
+                                  _buildDialButton('#'),
                                 ],
                               ),
                             ],
@@ -257,30 +209,29 @@ class _CompositionPageState extends State<CompositionPage> {
                   ),
                 ),
               ),
+
+              // Add Contact Button with empty function call
+              Padding(
+                padding: const EdgeInsets.only(bottom: 20.0),
+                child: FloatingActionButton(
+                  backgroundColor: Colors.blue,
+                  onPressed: () {
+                    addContact(dialedNumber);
+                  },
+                  child: const Icon(Icons.person_add, color: Colors.white),
+                ),
+              ),
             ],
           ),
-          Positioned(
-            bottom: 20.0,
-            left: 0,
-            right: 0,
-            child: Center(
-              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);
+              },
             ),
           ),
         ],
@@ -288,7 +239,7 @@ class _CompositionPageState extends State<CompositionPage> {
     );
   }
 
-  Widget _buildDialButton(String number, Color textColor) {
+  Widget _buildDialButton(String number) {
     return ElevatedButton(
       onPressed: () => _onNumberPress(number),
       style: ElevatedButton.styleFrom(
@@ -298,38 +249,11 @@ class _CompositionPageState extends State<CompositionPage> {
       ),
       child: Text(
         number,
-        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),
+        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_page.dart

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

dialer/lib/features/contacts/contact_service.dart

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

dialer/lib/features/contacts/contact_state.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
-import '../../services/contact_service.dart';
+import 'contact_service.dart';
 
 class ContactState extends StatefulWidget {
   final Widget child;
@@ -8,9 +8,7 @@ class ContactState extends StatefulWidget {
   const ContactState({super.key, required this.child});
 
   static _ContactStateState of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<_InheritedContactState>()!
-        .data;
+    return context.dependOnInheritedWidgetOfExactType<_InheritedContactState>()!.data;
   }
 
   @override
@@ -19,81 +17,39 @@ class ContactState extends StatefulWidget {
 
 class _ContactStateState extends State<ContactState> {
   final ContactService _contactService = ContactService();
-  List<Contact> _allContacts = [];
-  List<Contact> _favoriteContacts = [];
+  List<Contact> _contacts = [];
   bool _loading = true;
   double _scrollOffset = 0.0;
-  Contact? _selfContact = Contact();
 
-  // Getters for all contacts and favorites
-  List<Contact> get contacts => _allContacts;
-  List<Contact> get favoriteContacts => _favoriteContacts;
+  List<Contact> get contacts => _contacts;
   bool get loading => _loading;
   double get scrollOffset => _scrollOffset;
-  Contact? get selfContact => _selfContact;
 
   @override
   void initState() {
     super.initState();
-    fetchContacts(); // Fetch all contacts by default
-    FlutterContacts.addListener(_onContactChange);
+    _fetchContacts();
   }
 
-  void _onContactChange() => fetchContacts();
-
-  @override
-  void dispose() {
-    FlutterContacts.removeListener(_onContactChange);
-    super.dispose();
-  }
-
-  // Fetch all contacts
-  Future<void> fetchContacts() async {
-    setState(() => _loading = true);
-    try {
+  Future<void> _fetchContacts() async {
     List<Contact> contacts = await _contactService.fetchContacts();
-      _processContacts(contacts);
-    } finally {
-      setState(() => _loading = false);
-    }
-  }
-
-  // Fetch only favorite contacts
-  Future<void> fetchFavoriteContacts() async {
-    setState(() => _loading = true);
-    try {
-      List<Contact> contacts = await _contactService.fetchFavoriteContacts();
-      setState(() => _favoriteContacts = contacts);
-    } finally {
-      setState(() => _loading = false);
-    }
-  }
-
-  void _processContacts(List<Contact> contacts) {
-    _selfContact = contacts.firstWhere(
-      (contact) => contact.displayName.toLowerCase() == "user",
-      orElse: () => Contact(),
-    );
-
-    if (_selfContact!.phones.isEmpty) {
-      debugPrint("Self contact has no phone numbers");
-      _selfContact = null;
-    }
-
     contacts = contacts.where((contact) => contact.phones.isNotEmpty).toList();
     contacts.sort((a, b) => a.displayName.compareTo(b.displayName));
-
+    // contacts.sort((a, b) {
+      // String aName = a.displayName.isNotEmpty ? a.displayName : '􏿿';
+      // String bName = b.displayName.isNotEmpty ? b.displayName : '􏿿';
+      // return aName.compareTo(bName);
+    // });
     setState(() {
-      _allContacts = contacts;
-      _favoriteContacts =
-          contacts.where((contact) => contact.isStarred).toList();
-      _selfContact = _selfContact;
+      _contacts = contacts;
+      _loading = false;
     });
   }
 
+
   Future<void> addNewContact(Contact contact) async {
     await _contactService.addNewContact(contact);
-    await fetchContacts();
+    await _fetchContacts();
   }
 
   void setScrollOffset(double offset) {
@@ -102,25 +58,6 @@ class _ContactStateState extends State<ContactState> {
     });
   }
 
-  bool doesContactExist(Contact contact) {
-    // Example: consider it "existing" if there's a matching phone number
-    for (final existing in _allContacts) {
-      if (existing.toVCard() == contact.toVCard()) {
-        return true;
-      }
-      // for (final phone in existing.phones) {
-      //   for (final newPhone in contact.phones) {
-      //     // Simple exact match; you can do more advanced logic
-      //     if (phone.normalizedNumber == newPhone.normalizedNumber) {
-      //       return true;
-      //     }
-      //   }
-      // }  We might switch to finer and smarter logic later, ex: remove trailing spaces, capitals
-    }
-    return false;
-  }
-
-
   @override
   Widget build(BuildContext context) {
     return _InheritedContactState(
@@ -130,7 +67,6 @@ class _ContactStateState extends State<ContactState> {
   }
 }
 
-
 class _InheritedContactState extends InheritedWidget {
   final _ContactStateState data;
 

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

@@ -1,63 +0,0 @@
-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});
-
-  @override
-  Widget build(BuildContext context) {
-    return IconButton(
-      icon: const Icon(Icons.add, color: Colors.blue),
-      onPressed: () {
-        showDialog(
-          context: context,
-          barrierDismissible: true, // Allows dismissal by tapping outside
-          builder: (BuildContext context) {
-            return AlertDialog(
-              backgroundColor: Colors.black,
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  TextButton(
-                    onPressed: () 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 {
-                      Navigator.of(context).pop();
-                      // Create a blank contact entry
-                      await FlutterContacts.openExternalInsert();
-                    },
-                    child: const Text(
-                      "Create new contact",
-                      style: TextStyle(color: Colors.white),
-                    ),
-                  ),
-                ],
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}

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

@@ -1,21 +1,13 @@
-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 'add_contact_button.dart';
-import 'contact_modal.dart';
-import 'share_own_qr.dart';
 
 class AlphabetScrollPage extends StatefulWidget {
-  final double scrollOffset;
   final List<Contact> contacts;
+  final double scrollOffset;
 
-  const AlphabetScrollPage({
-    super.key,
-    required this.scrollOffset,
-    required this.contacts,
-  });
+  const AlphabetScrollPage({super.key, required this.contacts, required this.scrollOffset});
 
   @override
   _AlphabetScrollPageState createState() => _AlphabetScrollPageState();
@@ -24,8 +16,6 @@ class AlphabetScrollPage extends StatefulWidget {
 class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
   late ScrollController _scrollController;
 
-  final ObfuscateService _obfuscateService = ObfuscateService();
-
   @override
   void initState() {
     super.initState();
@@ -38,53 +28,11 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
     contactState.setScrollOffset(_scrollController.offset);
   }
 
-  Future<void> _refreshContacts() async {
-    final contactState = ContactState.of(context);
-    try {
-      await contactState.fetchContacts();
-    } catch (e) {
-      print('Error refreshing contacts: $e');
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to refresh contacts')),
-      );
-    }
-  }
-
-  void _toggleFavorite(Contact contact) async {
-    try {
-      if (await FlutterContacts.requestPermission()) {
-        Contact? fullContact = await FlutterContacts.getContact(contact.id,
-            withProperties: true,
-            withAccounts: true,
-            withPhoto: true,
-            withThumbnail: true);
-
-        if (fullContact != null) {
-          fullContact.isStarred = !fullContact.isStarred;
-          await FlutterContacts.updateContact(fullContact);
-        }
-        await _refreshContacts();
-      } else {
-        print("Could not fetch contact details");
-      }
-    } catch (e) {
-      print("Error updating favorite status: $e");
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to update contact favorite status')),
-      );
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    final contacts = widget.contacts;
-    final selfContact = ContactState.of(context).selfContact;
-
     Map<String, List<Contact>> alphabetizedContacts = {};
-    for (var contact in contacts) {
-      String firstLetter = contact.displayName.isNotEmpty
-          ? contact.displayName[0].toUpperCase()
-          : '#';
+    for (var contact in widget.contacts) {
+      String firstLetter = contact.displayName.isNotEmpty ? contact.displayName[0].toUpperCase() : '#';
       if (!alphabetizedContacts.containsKey(firstLetter)) {
         alphabetizedContacts[firstLetter] = [];
       }
@@ -93,119 +41,50 @@ class _AlphabetScrollPageState extends State<AlphabetScrollPage> {
 
     List<String> alphabetKeys = alphabetizedContacts.keys.toList()..sort();
 
-    return Scaffold(
-      backgroundColor: Colors.black,
-      body: Column(
-        children: [
-          // Top buttons row
-          Container(
-            color: Colors.black,
-            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                AddContactButton(),
-                QRCodeButton(contacts: contacts, selfContact: selfContact),
-              ],
-            ),
-          ),
-          // Contact List
-          Expanded(
-            child: ListView.builder(
+    return ListView.builder(
       controller: _scrollController,
       itemCount: alphabetKeys.length,
       itemBuilder: (context, index) {
         String letter = alphabetKeys[index];
-                List<Contact> contactsForLetter = alphabetizedContacts[letter]!;
+        List<Contact> contacts = alphabetizedContacts[letter]!;
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-                    // Alphabet Letter Header
             Padding(
-                      padding: const EdgeInsets.symmetric(
-                          vertical: 8.0, horizontal: 16.0),
+              padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
               child: Text(
                 letter,
-                        style: const TextStyle(
+                style: TextStyle(
                   fontSize: 28,
                   fontWeight: FontWeight.bold,
-                          color: Colors.white,
                 ),
               ),
             ),
-                    // Contact Entries
-                    ...contactsForLetter.map((contact) {
-                      String phoneNumber = contact.phones.isNotEmpty
-                          ? _obfuscateService.obfuscateData(contact.phones.first.number)
-                          : 'No phone number';
-                      Color avatarColor =
-                      generateColorFromName(contact.displayName);
+            ...contacts.map((contact) {
+              String phoneNumber = contact.phones.isNotEmpty ? contact.phones.first.number : 'No phone number';
+              Color avatarColor = generateColorFromName(contact.displayName);
               return ListTile(
-                        leading: ObfuscatedAvatar(
-                          imageBytes: contact.thumbnail,
-                          radius: 25,
+                leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
+                    ? CircleAvatar(
+                        backgroundImage: MemoryImage(contact.thumbnail!),
+                      )
+                    : CircleAvatar(
                         backgroundColor: avatarColor,
-                          fallbackInitial: contact.displayName,
+                        child: Text(
+                          contact.displayName.isNotEmpty ? contact.displayName[0].toUpperCase() : '?',
+                          style: TextStyle(color: Colors.white),
                         ),
-                        title: Text(
-                          _obfuscateService.obfuscateData(contact.displayName),
-                          style: const TextStyle(color: Colors.white),
-                        ),
-                        subtitle: Text(
-                          phoneNumber,
-                          style: const TextStyle(color: Colors.white70),
                       ),
+                title: Text(contact.displayName),
+                subtitle: Text(phoneNumber),
                 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,
-                              );
-                            },
-                          );
+                  // Handle contact tap
                 },
               );
             }),
           ],
         );
       },
-            ),
-          ),
-        ],
-      ),
     );
   }
 

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

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

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

@@ -1,353 +0,0 @@
-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 '../../../services/block_service.dart';
-import '../../../services/contact_service.dart';
-import '../../../services/call_service.dart';
-
-class ContactModal extends StatefulWidget {
-  final Contact contact;
-  final Function onEdit;
-  final Function onToggleFavorite;
-  final bool isFavorite;
-
-  const ContactModal({
-    super.key,
-    required this.contact,
-    required this.onEdit,
-    required this.onToggleFavorite,
-    required this.isFavorite,
-  });
-
-  @override
-  _ContactModalState createState() => _ContactModalState();
-}
-
-class _ContactModalState extends State<ContactModal> {
-  late String phoneNumber;
-  bool isBlocked = false;
-  final ObfuscateService _obfuscateService = ObfuscateService();
-  final CallService _callService = CallService();
-
-  @override
-  void initState() {
-    super.initState();
-    phoneNumber = widget.contact.phones.isNotEmpty
-        ? widget.contact.phones.first.number
-        : 'No phone number';
-    _checkIfBlocked();
-  }
-
-  Future<void> _checkIfBlocked() async {
-    if (phoneNumber != 'No phone number') {
-      bool blocked = await BlockService().isNumberBlocked(phoneNumber);
-      setState(() {
-        isBlocked = blocked;
-      });
-    }
-  }
-
-  Future<void> _toggleBlockState() async {
-    if (phoneNumber == 'No phone number') {
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('No phone number to block or unblock')),
-      );
-    } else if (isBlocked) {
-      await BlockService().unblockNumber(phoneNumber);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('$phoneNumber has been unblocked')),
-      );
-    } else {
-      await BlockService().blockNumber(phoneNumber);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('$phoneNumber has been blocked')),
-      );
-    }
-
-    if (phoneNumber != 'No phone number') {
-      _checkIfBlocked();
-    }
-    Navigator.of(context).pop();
-  }
-
-  void _launchPhoneDialer(String phoneNumber) async {
-    final uri = Uri(scheme: 'tel', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch $phoneNumber');
-    }
-  }
-
-  void _launchSms(String phoneNumber) async {
-    final uri = Uri(scheme: 'sms', path: phoneNumber);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch SMS to $phoneNumber');
-    }
-  }
-
-  void _launchEmail(String email) async {
-    final uri = Uri(scheme: 'mailto', path: email);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      debugPrint('Could not launch email to $email');
-    }
-  }
-
-  void _deleteContact() async {
-    final bool shouldDelete = await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Contact'),
-        content: Text(
-            'Are you sure you want to delete ${_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);
-
-        // 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')),
-        );
-      }
-    }
-  }
-
-  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
-        ? _obfuscateService.obfuscateData(widget.contact.emails.first.address)
-        : 'No email';
-
-    return GestureDetector(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.black.withOpacity(0.5),
-        child: GestureDetector(
-          onTap: () {},
-          child: FractionallySizedBox(
-            child: Container(
-              decoration: BoxDecoration(
-                color: Colors.grey[900],
-                borderRadius:
-                    const BorderRadius.vertical(top: Radius.circular(20)),
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Modal Handle and Three-Dot Menu
-                  Stack(
-                    children: [
-                      Align(
-                        alignment: Alignment.center,
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 10),
-                          child: Container(
-                            width: 50,
-                            height: 5,
-                            decoration: BoxDecoration(
-                              color: Colors.grey.shade300,
-                              borderRadius: BorderRadius.circular(5),
-                            ),
-                          ),
-                        ),
-                      ),
-                      Align(
-                        alignment: Alignment.topRight,
-                        child: Padding(
-                          padding: const EdgeInsets.only(top: 10, right: 10),
-                          child: PopupMenuButton<String>(
-                            icon: const Icon(Icons.more_vert,
-                                color: Colors.white),
-                            onSelected: (String choice) {
-                              if (choice == 'delete') {
-                                _deleteContact();
-                              } else if (choice == 'share') {
-                                _shareContactAsQRCode();
-                              }
-                              // Handle other choices if needed
-                            },
-                            itemBuilder: (BuildContext context) {
-                              return [
-                                const PopupMenuItem<String>(
-                                  value: 'show_associated_contacts',
-                                  child: Text('Show associated contacts'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'delete',
-                                  child: Text('Delete'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'share',
-                                  child: Text('Share (via QR code)'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'create_shortcut',
-                                  child:
-                                      Text('Create shortcut (to home screen)'),
-                                ),
-                                const PopupMenuItem<String>(
-                                  value: 'set_ringtone',
-                                  child: Text('Set ringtone'),
-                                ),
-                              ];
-                            },
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  // Contact Profile
-                  Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      children: [
-                        ObfuscatedAvatar(
-                          imageBytes: widget.contact.thumbnail,
-                          radius: 50,
-                          backgroundColor:
-                              generateColorFromName(widget.contact.displayName),
-                          fallbackInitial: widget.contact.displayName,
-                        ),
-                        const SizedBox(height: 10),
-                        Text(
-                          _obfuscateService
-                              .obfuscateData(widget.contact.displayName),
-                          style: const TextStyle(
-                              fontSize: 24,
-                              fontWeight: FontWeight.bold,
-                              color: Colors.white),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const Divider(color: Colors.grey),
-                  // Contact Actions
-                  ListTile(
-                    leading: const Icon(Icons.phone, color: Colors.green),
-                    title: Text(
-                      _obfuscateService.obfuscateData(phoneNumber),
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () async {
-                      if (widget.contact.phones.isNotEmpty) {
-                        await _callService.makeGsmCall(context,
-                            phoneNumber: phoneNumber);
-                      }
-                    },
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.message, color: Colors.blue),
-                    title: Text(
-                      _obfuscateService.obfuscateData(phoneNumber),
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () {
-                      if (widget.contact.phones.isNotEmpty) {
-                        _launchSms(phoneNumber);
-                      }
-                    },
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.email, color: Colors.orange),
-                    title: Text(
-                      email,
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () {
-                      if (widget.contact.emails.isNotEmpty) {
-                        _launchEmail(email);
-                      }
-                    },
-                  ),
-                  const Divider(color: Colors.grey),
-                  // Favorite, Edit, and Block/Unblock Buttons
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                    child: Column(
-                      children: [
-                        // Favorite button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: () {
-                              Navigator.of(context).pop();
-                              widget.onToggleFavorite();
-                            },
-                            icon: Icon(widget.isFavorite
-                                ? Icons.star
-                                : Icons.star_border),
-                            label: Text(
-                                widget.isFavorite ? 'Unfavorite' : 'Favorite'),
-                          ),
-                        ),
-                        const SizedBox(height: 10),
-                        // Edit button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: () => widget.onEdit(),
-                            icon: const Icon(Icons.edit),
-                            label: const Text('Edit Contact'),
-                          ),
-                        ),
-                        const SizedBox(height: 10),
-                        // Block/Unblock button
-                        SizedBox(
-                          width: double.infinity,
-                          child: ElevatedButton.icon(
-                            onPressed: _toggleBlockState,
-                            icon: Icon(
-                                isBlocked ? Icons.block : Icons.block_flipped),
-                            label: Text(isBlocked ? 'Unblock' : 'Block'),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,36 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_contacts/contact.dart';
-import 'package:dialer/services/contact_service.dart';
-
-class QRCodeButton extends StatelessWidget {
-  final List<Contact> contacts;
-  final Contact? selfContact;
-
-  const QRCodeButton({super.key, required this.contacts, this.selfContact});
-
-  Contact? getSelfContact() {
-    if (kDebugMode) {
-      debugPrint("Checking for self contact");
-    }
-    for (var contact in contacts) {
-      if (contact.groups.any((group) => group.name.toLowerCase() == "user")) {
-        return contact;
-      }
-    }
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return IconButton(
-      icon: Icon(Icons.qr_code, color: selfContact != null ? Colors.blue : Colors.grey),
-      onPressed: selfContact != null
-          ? () {
-              // Use the ContactService to show the QR code
-              ContactService().showContactQRCodeDialog(context, selfContact!);
-            }
-          : null,
-    );
-  }
-}

dialer/lib/features/favorites/favorites_page.dart

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

dialer/lib/features/history/history_page.dart

@@ -1,17 +1,9 @@
-import 'dart:async';
-import 'package:dialer/services/obfuscate_service.dart';
-import 'package:dialer/widgets/color_darkener.dart';
+// history_page.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:intl/intl.dart'; // For date formatting
 import 'package:dialer/features/contacts/contact_state.dart';
-import 'package:dialer/widgets/username_color_generator.dart';
-import '../../services/block_service.dart';
-import '../contacts/widgets/contact_modal.dart';
-import '../../services/call_service.dart';
 
 class History {
   final Contact contact;
@@ -36,114 +28,22 @@ class HistoryPage extends StatefulWidget {
   _HistoryPageState createState() => _HistoryPageState();
 }
 
-class _HistoryPageState extends State<HistoryPage>
-    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
+class _HistoryPageState extends State<HistoryPage> {
   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 && histories.isEmpty) {
+    if (loading) {
       _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;
@@ -151,145 +51,52 @@ class _HistoryPageState extends State<HistoryPage>
     }
     List<Contact> contacts = contactState.contacts;
 
-    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));
-
+    // Ensure there are enough contacts
+    if (contacts.isEmpty) {
       setState(() {
-      histories = callHistories;
+        loading = false;
+      });
+      return;
+    }
+
+    // Build histories using the contacts
+    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,
+        ),
+      );
       loading = false;
     });
   }
 
-  List _buildGroupedList(List<History> historyList) {
-    historyList.sort((a, b) => b.date.compareTo(a.date));
-
-    final now = DateTime.now();
-    final today = DateTime(now.year, now.month, now.day);
-    final yesterday = today.subtract(const Duration(days: 1));
-
-    List<History> todayHistories = [];
-    List<History> yesterdayHistories = [];
-    List<History> olderHistories = [];
-
-    for (var history in historyList) {
-      final callDate =
-          DateTime(history.date.year, history.date.month, history.date.day);
-      if (callDate == today) {
-        todayHistories.add(history);
-      } else if (callDate == yesterday) {
-        yesterdayHistories.add(history);
-      } else {
-        olderHistories.add(history);
-      }
-    }
-
-    final items = <dynamic>[];
-    if (todayHistories.isNotEmpty) {
-      items.add('Today');
-      items.addAll(todayHistories);
-    }
-    if (yesterdayHistories.isNotEmpty) {
-      items.add('Yesterday');
-      items.addAll(yesterdayHistories);
-    }
-    if (olderHistories.isNotEmpty) {
-      items.add('Older');
-      items.addAll(olderHistories);
-    }
-
-    return items;
-  }
-
-  /// 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()),
+        appBar: AppBar(
+          title: const Text('History'),
+        ),
+        body: const Center(
+          child: CircularProgressIndicator(),
+        ),
       );
     }
 
     if (histories.isEmpty) {
       return Scaffold(
         backgroundColor: Colors.black,
+        appBar: AppBar(
+          title: const Text('History'),
+        ),
         body: const Center(
           child: Text(
             'No call history available.',
@@ -299,363 +106,46 @@ class _HistoryPageState extends State<HistoryPage>
       );
     }
 
-    List<History> missedCalls =
-        histories.where((h) => h.callStatus == 'missed').toList();
-
-    final allItems = _buildGroupedList(histories);
-    final missedItems = _buildGroupedList(missedCalls);
-
-    return DefaultTabController(
-      length: 2,
-      child: Scaffold(
-        backgroundColor: Colors.black,
-        appBar: PreferredSize(
-          preferredSize: const Size.fromHeight(kToolbarHeight),
-          child: Container(
-            color: Colors.black,
-            child: const TabBar(
-              tabs: [
-                Tab(text: 'All Calls'),
-                Tab(text: 'Missed Calls'),
-              ],
-              indicatorColor: Colors.white,
-            ),
-          ),
-        ),
-        body: TabBarView(
-          children: [
-            _buildListView(allItems),
-            _buildListView(missedItems),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildListView(List items) {
-    return ListView.builder(
-      itemCount: items.length,
-      itemBuilder: (context, index) {
-        final item = items[index];
-        if (item is String) {
-          return Container(
-            padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-            color: Colors.grey[900],
-            child: Text(
-              item,
-              style: const TextStyle(
-                color: Colors.white70,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          );
-        } else if (item is History) {
-          final history = item;
-          final contact = history.contact;
-          final isExpanded = _expandedIndex == index;
-          Color avatarColor = generateColorFromName(contact.displayName);
-          return Column(
-            children: [
-              ListTile(
-                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(
-                  _obfuscateService.obfuscateData(contact.displayName),
-                  style: const TextStyle(color: Colors.white),
-                ),
-                subtitle: Text(
-                  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),
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.phone, color: Colors.green),
-                      onPressed: () async {
-                        if (contact.phones.isNotEmpty) {
-                          _callService.makeGsmCall(context, phoneNumber: contact.phones.first.number);
-                        } else {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                                content: Text('Contact has no phone number')),
-                          );
-                        }
-                      },
-                    ),
-                  ],
-                ),
-                onTap: () {
-                  setState(() {
-                    _expandedIndex = isExpanded ? null : index;
-                  });
-                },
-              ),
-              if (isExpanded)
-                Container(
-                  color: Colors.grey[850],
-                  child: 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),
-                                ),
-                              );
-                            },
-                            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();
-      },
-    );
-  }
-}
-
-class CallDetailsPage extends StatelessWidget {
-  final History history;
-  final ObfuscateService _obfuscateService = ObfuscateService();
-
-  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,
       appBar: AppBar(
-        title: const Text('Call Details'),
-        backgroundColor: Colors.black,
+        title: const Text('History'),
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          children: [
-            // Display Contact Name and Thumbnail.
-            Row(
-              children: [
-                (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
-                    ? ObfuscatedAvatar(
-                        imageBytes: contact.thumbnail,
-                        radius: 30,
-                        backgroundColor: contactBg,
-                        fallbackInitial: contact.displayName,
+      body: ListView.builder(
+        itemCount: histories.length,
+        itemBuilder: (context, index) {
+          final history = histories[index];
+          final contact = history.contact;
+
+          return ListTile(
+            leading: (contact.thumbnail != null && contact.thumbnail!.isNotEmpty)
+                ? CircleAvatar(
+              backgroundImage: MemoryImage(contact.thumbnail!),
             )
                 : CircleAvatar(
-                        backgroundColor:
-                            generateColorFromName(contact.displayName),
-                        radius: 30,
               child: Text(
                 contact.displayName.isNotEmpty
-                              ? contact.displayName[0].toUpperCase()
+                    ? contact.displayName[0]
                     : '?',
-                          style: TextStyle(color: contactLetter),
               ),
             ),
-                const SizedBox(width: 16),
-                Expanded(
-                  child: Text(
-                    _obfuscateService.obfuscateData(contact.displayName),
-                    style: const TextStyle(color: Colors.white, fontSize: 24),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 24),
-            // Display call details.
-            DetailRow(
-              label: 'Call Type:',
-              value: history.callType,
-            ),
-            DetailRow(
-              label: 'Call Status:',
-              value: history.callStatus,
-            ),
-            DetailRow(
-              label: 'Date:',
-              value: DateFormat('MMM dd, yyyy - hh:mm a').format(history.date),
-            ),
-            DetailRow(
-              label: 'Attempts:',
-              value: '${history.attempts}',
-            ),
-            const SizedBox(height: 24),
-            if (contact.phones.isNotEmpty)
-              DetailRow(
-                label: 'Number:',
-                value: _obfuscateService
-                    .obfuscateData(contact.phones.first.number),
-              ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class DetailRow extends StatelessWidget {
-  final String label;
-  final String value;
-
-  const DetailRow({Key? key, required this.label, required this.value})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: Row(
-        children: [
-          Text(
-            label,
-            style: const TextStyle(
-                color: Colors.white70, fontWeight: FontWeight.bold),
-          ),
-          const SizedBox(width: 8),
-          Expanded(
-            child: Text(
-              value,
+            title: Text(
+              contact.displayName,
               style: const TextStyle(color: Colors.white),
-              textAlign: TextAlign.right,
             ),
+            subtitle: Text(
+              '${history.callType} - ${history.callStatus} - ${DateFormat('MMM dd, hh:mm a').format(history.date)}',
+              style: const TextStyle(color: Colors.grey),
             ),
-        ],
+            trailing: Text(
+              '${history.attempts}x',
+              style: const TextStyle(color: Colors.white),
+            ),
+            onTap: () {
+              // Handle tap event if needed
+            },
+          );
+        },
       ),
     );
   }

dialer/lib/features/home/home_page.dart

@@ -1,4 +1,3 @@
-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';
@@ -6,86 +5,46 @@ 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 '../../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();
-    _tabController = TabController(length: 4, vsync: this, initialIndex: 2);
+    _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
     _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();
-    _contactSuggestions = List.from(_allContacts);
-    if (mounted) setState(() {});
+    if (await FlutterContacts.requestPermission()) {
+      _allContacts = await FlutterContacts.getContacts(withProperties: true);
+      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) {
-          final normalizedName = _normalizeString(contact.displayName.toLowerCase());
-          return normalizedName.contains(normalizedQuery);
+          return contact.displayName
+              .toLowerCase()
+              .contains(query.toLowerCase());
         }).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();
@@ -95,39 +54,13 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
     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,
@@ -135,109 +68,63 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
               left: 16.0,
               right: 16.0,
             ),
-            child: Row(
-              children: [
-                Expanded(
             child: Container(
               decoration: BoxDecoration(
                 color: const Color.fromARGB(255, 30, 30, 30),
                 borderRadius: BorderRadius.circular(12.0),
-                      border: Border.all(color: Colors.grey.shade800, width: 1),
+                border: Border(
+                  top: BorderSide(color: Colors.grey.shade800, width: 1),
+                  left: BorderSide(color: Colors.grey.shade800, width: 1),
+                  right: BorderSide(color: Colors.grey.shade800, width: 1),
+                  bottom: BorderSide(color: Colors.grey.shade800, width: 2),
+                ),
               ),
               child: SearchAnchor(
-                      searchController: _searchBarController,
                 builder: (BuildContext context, SearchController controller) {
-                        return GestureDetector(
+                  return SearchBar(
+                    controller: controller,
+                    padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
+                      const EdgeInsets.only(
+                        top: 6.0,
+                        bottom: 6.0,
+                        left: 16.0,
+                        right: 16.0,
+                      ),
+                    ),
                     onTap: () {
                       controller.openView();
+                      _onSearchChanged('');
                     },
-                          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),
+                    backgroundColor: MaterialStateProperty.all(
+                        const Color.fromARGB(255, 30, 30, 30)),
+                    hintText: 'Search contacts',
+                    hintStyle: MaterialStateProperty.all(
+                      const TextStyle(color: Colors.grey, fontSize: 16.0),
                     ),
-                            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,
+                    leading: const Icon(
+                      Icons.search,
                       color: Colors.grey,
                       size: 24.0,
                     ),
-                                  ),
-                              ],
+                    shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                      RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12.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(
-                              _obfuscateService.obfuscateData(contact.displayName),
-                              style: const TextStyle(color: Colors.white),
-                            ),
+                      title: Text(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();
@@ -245,36 +132,17 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
               ),
             ),
           ),
-                PopupMenuButton<String>(
-                  icon: const Icon(Icons.more_vert, color: Colors.white),
-                  itemBuilder: (BuildContext context) => [
-                    const PopupMenuItem<String>(
-                      value: 'settings',
-                      child: Text('Settings'),
-                    ),
-                  ],
-                  onSelected: (String value) {
-                    if (value == 'settings') {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(builder: (context) => const SettingsPage()),
-                      );
-                    }
-                  },
-                ),
-              ],
-            ),
-          ),
+          // Main content with TabBarView
           Expanded(
             child: Stack(
               children: [
                 TabBarView(
                   controller: _tabController,
                   children: const [
-                    FavoritesPage(),
+                    FavoritePage(),
                     HistoryPage(),
                     ContactPage(),
-                    VoicemailPage(),
+                    SettingsPage(), // Add your SettingsPage here
                   ],
                 ),
                 Positioned(
@@ -319,10 +187,9 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                     ? Icons.contacts
                     : Icons.contacts_outlined)),
             Tab(
-              icon: Icon(_tabController.index == 3
-                  ? Icons.voicemail
-                  : Icons.voicemail_outlined),
-            ),
+                icon: Icon(_tabController.index == 3 // Corrected index
+                    ? Icons.settings
+                    : Icons.settings_outlined)),
           ],
           labelColor: Colors.white,
           unselectedLabelColor: const Color.fromARGB(255, 158, 158, 158),

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

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

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

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

@@ -0,0 +1,68 @@
+// delete_key_pair.dart
+
+import 'package:flutter/material.dart';
+
+class SuppressionPaireClesPage extends StatelessWidget {
+  const SuppressionPaireClesPage({super.key});
+
+  void _deleteKeyPair(BuildContext context) {
+    // key deletion logic (not implemented here)
+    // ...
+
+    // Show confirmation message
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text('La paire de clés a été supprimée.'),
+      ),
+    );
+
+    // Navigate back or update the UI as needed
+    Navigator.pop(context);
+  }
+
+  void _showConfirmationDialog(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Confirmer la Suppression'),
+          content: const Text(
+              'Êtes-vous sûr de vouloir supprimer la paire de clés ? Cette action est irréversible.'),
+          actions: [
+            TextButton(
+              child: const Text('Annuler'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            TextButton(
+              child: const Text('Supprimer'),
+              onPressed: () {
+                Navigator.of(context).pop();
+                _deleteKeyPair(context);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Suppression d\'une Paire de Clés'),
+      ),
+      body: Center(
+        child: ElevatedButton(
+          onPressed: () {
+            _showConfirmationDialog(context);
+          },
+          child: const Text('Supprimer la Paire de Clés'),
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,112 @@
+// export_private_key.dart
+
+import 'package:flutter/material.dart';
+import 'dart:typed_data';
+import 'dart:convert';
+import 'package:pointycastle/export.dart' as crypto;
+import 'package:file_picker/file_picker.dart';
+
+class ExportationClePriveePage extends StatefulWidget {
+  const ExportationClePriveePage({super.key});
+
+  @override
+  _ExportationClePriveePageState createState() => _ExportationClePriveePageState();
+}
+
+class _ExportationClePriveePageState extends State<ExportationClePriveePage> {
+  final TextEditingController _passwordController = TextEditingController();
+
+  Future<void> _exportPrivateKey() async {
+    // Replace with your actual private key retrieval logic
+    final String privateKeyPem = 'Votre clé privée ici';
+
+    // Get the password from the user input
+    final password = _passwordController.text;
+    if (password.isEmpty) {
+      // Show error message
+      return;
+    }
+
+    // Encrypt the private key using AES-256
+    final encryptedData = _encryptPrivateKey(privateKeyPem, password);
+
+    // Let the user pick a file location
+    final outputFile = await FilePicker.platform.saveFile(
+      dialogTitle: 'Enregistrer la clé privée chiffrée',
+      fileName: 'private_key_encrypted.aes',
+    );
+
+    if (outputFile != null) {
+      // Write the encrypted data to the file
+      // Use appropriate file I/O methods (not shown here)
+      // ...
+      // Show a confirmation dialog or message
+      showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: const Text('Clé Exportée'),
+          content: const Text('La clé privée chiffrée a été exportée avec succès.'),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text('OK'),
+            ),
+          ],
+        ),
+      );
+    }
+  }
+
+  Uint8List _encryptPrivateKey(String privateKey, String password) {
+    // Encryption logic using AES-256
+    final key = crypto.PBKDF2KeyDerivator(crypto.HMac(crypto.SHA256Digest(), 64))
+        .process(Uint8List.fromList(utf8.encode(password)));
+
+    final params = crypto.PaddedBlockCipherParameters(
+      crypto.ParametersWithIV(crypto.KeyParameter(key), Uint8List(16)), // Initialization Vector
+      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('Exportation de la Clé Privée'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            const Text(
+              'Entrez un mot de passe pour chiffrer la clé privée:',
+              style: TextStyle(color: Colors.white),
+            ),
+            TextField(
+              controller: _passwordController,
+              obscureText: true,
+              style: const TextStyle(color: Colors.white),
+              decoration: const InputDecoration(
+                hintText: 'Mot de passe',
+                hintStyle: TextStyle(color: Colors.grey),
+              ),
+            ),
+            const SizedBox(height: 20),
+            ElevatedButton(
+              onPressed: _exportPrivateKey,
+              child: const Text('Exporter la Clé Privée Chiffrée'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,123 @@
+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';
+
+class GenerationNouvellePaireClesPage extends StatelessWidget {
+  const GenerationNouvellePaireClesPage({super.key});
+
+  Future<Map<String, String>> _generateKeyPair() async {
+    // key generation logic using pointycastle
+    final keyParams = crypto.RSAKeyGeneratorParameters(
+      BigInt.parse('65537'),
+      2048,
+      64,
+    );
+
+    final secureRandom = crypto.FortunaRandom();
+
+    // Seed the random number generator
+    final random = Random.secure();
+    final seeds = List<int>.generate(32, (_) => random.nextInt(256));
+    secureRandom.seed(crypto.KeyParameter(Uint8List.fromList(seeds)));
+
+    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;
+
+    // Convert keys to PEM format
+    final publicKeyPem = _encodePublicKeyToPemPKCS1(publicKey);
+    final privateKeyPem = _encodePrivateKeyToPemPKCS1(privateKey);
+
+    // Save keys securely (not implemented here)
+
+    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();
+    algorithmSeq.add(ASN1ObjectIdentifier.fromName('rsaEncryption'));
+    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 base64 = base64Encode(bytes);
+    final chunks = RegExp('.{1,64}').allMatches(base64).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('Génération d\'une Nouvelle Paire de Clés'),
+      ),
+      body: Center(
+        child: ElevatedButton(
+          onPressed: () async {
+            final keys = await _generateKeyPair();
+            // Display a confirmation dialog or message
+            showDialog(
+              context: context,
+              builder: (context) => AlertDialog(
+                title: const Text('Clés Générées'),
+                content: const Text('La nouvelle paire de clés a été générée avec succès.'),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.pop(context),
+                    child: const Text('OK'),
+                  ),
+                ],
+              ),
+            );
+          },
+          child: const Text('Générer une Nouvelle Paire de Clés'),
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,83 @@
+// manage_keys_page.dart
+
+import 'package:flutter/material.dart';
+import 'package:dialer/features/settings/key/show_public_key_text.dart';
+import 'package:dialer/features/settings/key/show_public_key_qr.dart';
+import 'package:dialer/features/settings/key/generate_new_key_pair.dart';
+import 'package:dialer/features/settings/key/export_private_key.dart';
+import 'package:dialer/features/settings/key/delete_key_pair.dart';
+
+class GestionDeClesPage extends StatelessWidget {
+  const GestionDeClesPage({super.key});
+
+  void _navigateToOption(BuildContext context, String option) {
+    switch (option) {
+      case 'Affichage de la clé publique en texte':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const AffichageClePubliqueTextePage()),
+        );
+        break;
+      case 'Affichage de la clé publique en QR code':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const AffichageClePubliqueQRCodePage()),
+        );
+        break;
+      case 'Génération d\'une nouvelle paire de clés':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const GenerationNouvellePaireClesPage()),
+        );
+        break;
+      case 'Exportation de la clé privée en fichier chiffré par mot de passe (AES 256)':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const ExportationClePriveePage()),
+        );
+        break;
+      case 'Suppression d\'une paire de clés, POPUP d\'avertissement':
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const SuppressionPaireClesPage()),
+        );
+        break;
+      default:
+      // Handle default or unknown options
+        break;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final keyManagementOptions = [
+      'Affichage de la clé publique en texte',
+      'Affichage de la clé publique en QR code',
+      'Génération d\'une nouvelle paire de clés',
+      'Exportation de la clé privée en fichier chiffré par mot de passe (AES 256)',
+      'Suppression d\'une paire de clés, POPUP d\'avertissement',
+    ];
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Gestion de clés'),
+      ),
+      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

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:pretty_qr_code/pretty_qr_code.dart';
+
+class AffichageClePubliqueQRCodePage extends StatelessWidget {
+  const AffichageClePubliqueQRCodePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    // Replace with your actual public key retrieval logic
+    final String publicKey = 'Votre clé publique ici';
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Clé Publique en QR Code'),
+      ),
+      body: Center(
+        child: PrettyQr(
+          data: publicKey,
+          size: 250,
+          roundEdges: true,
+          elementColor: Colors.white,
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,30 @@
+// show_public_key_text.dart
+
+import 'package:flutter/material.dart';
+
+class AffichageClePubliqueTextePage extends StatelessWidget {
+  const AffichageClePubliqueTextePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    // Replace with your actual public key retrieval logic
+    final String publicKey = 'Votre clé publique ici';
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Clé Publique en Texte'),
+      ),
+      body: 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,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:dialer/features/settings/call/settingsCall.dart';
-// import 'package:dialer/features/settings/cryptography/';
-import 'package:dialer/features/settings/blocked/settings_blocked.dart';
-import 'cryptography/key_management.dart';
+import 'package:dialer/features/settings/sim/settings_accounts.dart';
+import 'package:dialer/features/settings/key/manage_keys_page.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key});
@@ -17,16 +16,16 @@ class SettingsPage extends StatelessWidget {
           MaterialPageRoute(builder: (context) => const SettingsCallPage()),
         );
         break;
-      case 'Key management':
+      case 'Page des comptes téléphoniques':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => ManageKeysPage()),
+          MaterialPageRoute(builder: (context) => const SettingsAccountsPage()),
         );
         break;
-      case 'Blocked numbers':
+      case 'Gestion de clés':
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) => const BlockedNumbersPage()),
+          MaterialPageRoute(builder: (context) => const GestionDeClesPage()),
         );
         break;
     // Add more cases for other settings pages
@@ -40,14 +39,14 @@ class SettingsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final settingsOptions = [
       'Calling settings',
-      'Key management',
-      'Blocked numbers'
+      'Page des comptes téléphoniques',
+      'Gestion de clés', // Add the new option here
     ];
 
     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

@@ -0,0 +1,87 @@
+// choose_sim.dart
+
+import 'package:flutter/material.dart';
+import 'package:sim_data/sim_data.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class ChooseSimPage extends StatefulWidget {
+  const ChooseSimPage({super.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 {
+    if (await Permission.phone.request().isGranted) {
+      try {
+        final simData = await SimDataPlugin.getSimData();
+        setState(() {
+          _simCards = simData.cards;
+          _selectedSimIndex = 0;
+        });
+      } catch (e) {
+        // Handle error
+        print('Error fetching SIM data: $e');
+      }
+    } else {
+      // Permission denied
+      print('Phone permission denied');
+    }
+  }
+
+  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('Choisir la SIM'),
+      ),
+      body: _simCards.isEmpty
+          ? const Center(
+        child: Text(
+          'Aucune carte SIM trouvée',
+          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(
+              'Opérateur: ${sim.carrierName}',
+              style: const TextStyle(color: Colors.grey),
+            ),
+            trailing: Radio<int>(
+              value: index,
+              groupValue: _selectedSimIndex,
+              onChanged: _onSimSelected,
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,59 @@
+// settings_accounts.dart
+
+import 'package:flutter/material.dart';
+import 'package:dialer/features/settings/sim/choose_sim.dart';
+import 'package:dialer/features/settings/sim/sim_parameters.dart';
+
+class SettingsAccountsPage extends StatelessWidget {
+  const SettingsAccountsPage({super.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;
+    // Handle more options if needed
+      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

@@ -0,0 +1,85 @@
+// sim_parameters.dart
+
+import 'package:flutter/material.dart';
+import 'package:sim_data/sim_data.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class SimParametersPage extends StatefulWidget {
+  const SimParametersPage({super.key});
+
+  @override
+  _SimParametersPageState createState() => _SimParametersPageState();
+}
+
+class _SimParametersPageState extends State<SimParametersPage> {
+  List<SimCard> _simCards = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchSimParameters();
+  }
+
+  Future<void> _fetchSimParameters() async {
+    if (await Permission.phone.request().isGranted) {
+      try {
+        final simData = await SimDataPlugin.getSimData();
+        setState(() {
+          _simCards = simData.cards;
+        });
+      } catch (e) {
+        // Handle error
+        print('Error fetching SIM data: $e');
+      }
+    } else {
+      // Permission denied
+      print('Phone permission denied');
+    }
+  }
+
+  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(
+          '''
+Opérateur: ${sim.carrierName}
+Pays: ${sim.countryCode ?? 'N/A'}
+MCC: ${sim.mcc ?? 'N/A'}
+MNC: ${sim.mnc ?? 'N/A'}
+Slot Index: ${sim.slotIndex ?? 'N/A'}
+Display Name: ${sim.displayName ?? 'N/A'}
+          ''',
+          style: const TextStyle(color: Colors.grey),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        title: const Text('Paramètre SIM'),
+      ),
+      body: _simCards.isEmpty
+          ? const Center(
+        child: Text(
+          'Aucune carte SIM trouvée',
+          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

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

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

dialer/lib/main.dart

@@ -1,66 +1,25 @@
+// This is DEV
+
 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() 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(),
-    ),
-  );
+void main() {
+  runApp(const MyApp());
 }
 
-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});
+class MyApp extends StatelessWidget {
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
     return ContactState(
       child: MaterialApp(
-        navigatorKey: CallService.navigatorKey,
         theme: ThemeData(
-          brightness: Brightness.dark,
-        ),
-        home: SafeArea(child: MyHomePage()),
+          brightness: Brightness.dark
         ),
+        home: const MyHomePage(),
+      )
     );
   }
 }

dialer/lib/services/block_service.dart

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