feat: Compose contact creation screen with M3 Expressive

AndroidManifest.xml

@@ -388,11 +388,12 @@
 
         </activity-alias>
 
-        <!-- Edit or create a contact with only the most important fields displayed initially. -->
+        <!-- Compose-based contact creation screen (replaces ACTION_INSERT from ContactEditorActivity) -->
         <activity
-            android:name=".activities.ContactEditorActivity"
+            android:name=".ui.contactcreation.ContactCreationActivity"
             android:exported="true"
-            android:theme="@style/EditorActivityTheme">
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Material.Light.NoActionBar">
 
             <intent-filter>
                 <action android:name="android.intent.action.INSERT"/>
@@ -404,6 +405,13 @@
             </intent-filter>
         </activity>
 
+        <!-- Edit a contact with only the most important fields displayed initially. -->
+        <activity
+            android:name=".activities.ContactEditorActivity"
+            android:exported="true"
+            android:theme="@style/EditorActivityTheme">
+        </activity>
+
         <!-- Keep support for apps that expect the Compact editor -->
         <activity-alias
             android:name="com.android.contacts.activities.CompactContactEditorActivity"

app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
 }
 
@@ -86,7 +87,10 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling.preview)
 
+    implementation(libs.coil.compose)
+
     implementation(libs.hilt.android)
+    implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.compiler)
 
     implementation(libs.guava)
@@ -104,13 +108,15 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
 
     testImplementation(libs.junit4)
+    testImplementation(kotlin("test"))
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockk)
     testImplementation(libs.mockk.agent)
     testImplementation(libs.mockk.android)
     testImplementation(libs.robolectric)
     testImplementation(libs.turbine)
 
+    androidTestImplementation(kotlin("test"))
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.test.espresso.core)

app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationEditorScreenTest.kt

@@ -0,0 +1,154 @@
+package com.android.contacts.ui.contactcreation
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import com.android.contacts.ui.contactcreation.model.ContactCreationAction
+import com.android.contacts.ui.contactcreation.model.ContactCreationUiState
+import com.android.contacts.ui.core.AppTheme
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class ContactCreationEditorScreenTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<ComponentActivity>()
+
+    private val capturedActions = mutableListOf<ContactCreationAction>()
+
+    @Before
+    fun setup() {
+        capturedActions.clear()
+    }
+
+    @Test
+    fun initialState_showsSaveTextButton() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).assertIsDisplayed()
+    }
+
+    @Test
+    fun initialState_showsCloseButton() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.CLOSE_BUTTON).assertIsDisplayed()
+    }
+
+    @Test
+    fun initialState_showsNameField() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).assertIsDisplayed()
+    }
+
+    @Test
+    fun initialState_showsPhoneField() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.phoneField(0)).assertIsDisplayed()
+    }
+
+    @Test
+    fun initialState_showsEmailField() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.emailField(0)).assertIsDisplayed()
+    }
+
+    @Test
+    fun tapSave_dispatchesSaveAction() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).performClick()
+        assertEquals(ContactCreationAction.Save, capturedActions.last())
+    }
+
+    @Test
+    fun tapClose_dispatchesNavigateBackAction() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.CLOSE_BUTTON).performClick()
+        assertEquals(ContactCreationAction.NavigateBack, capturedActions.last())
+    }
+
+    @Test
+    fun savingState_disablesSaveButton() {
+        setContent(state = ContactCreationUiState(isSaving = true))
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).assertIsNotEnabled()
+    }
+
+    @Test
+    fun notSavingState_enablesSaveButton() {
+        setContent(state = ContactCreationUiState(isSaving = false))
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).assertIsEnabled()
+    }
+
+    // --- Discard dialog ---
+
+    @Test
+    fun discardDialog_rendersWhenShowDiscardDialogTrue() {
+        setContent(state = ContactCreationUiState(showDiscardDialog = true))
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG).assertIsDisplayed()
+    }
+
+    @Test
+    fun discardDialog_notRenderedByDefault() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG).assertDoesNotExist()
+    }
+
+    @Test
+    fun discardDialog_confirmDispatchesConfirmDiscard() {
+        setContent(state = ContactCreationUiState(showDiscardDialog = true))
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG_CONFIRM).performClick()
+        assertEquals(ContactCreationAction.ConfirmDiscard, capturedActions.last())
+    }
+
+    @Test
+    fun discardDialog_dismissDispatchesDismissDiscardDialog() {
+        setContent(state = ContactCreationUiState(showDiscardDialog = true))
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG_DISMISS).performClick()
+        assertEquals(ContactCreationAction.DismissDiscardDialog, capturedActions.last())
+    }
+
+    // --- Add more info chip grid ---
+
+    @Test
+    fun addMoreInfoSection_showsWhenChipsAvailable() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.ADD_MORE_INFO_SECTION).assertIsDisplayed()
+    }
+
+    @Test
+    fun addMoreInfoSection_addressChipAddsAddress() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.addMoreInfoChip("address")).performClick()
+        assertEquals(ContactCreationAction.AddAddress, capturedActions.last())
+    }
+
+    @Test
+    fun addMoreInfoSection_orgChipShowsOrganization() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.addMoreInfoChip("organization")).performClick()
+        assertEquals(ContactCreationAction.ShowOrganization, capturedActions.last())
+    }
+
+    @Test
+    fun addMoreInfoSection_noteChipShowsNote() {
+        setContent()
+        composeTestRule.onNodeWithTag(TestTags.addMoreInfoChip("note")).performClick()
+        assertEquals(ContactCreationAction.ShowNote, capturedActions.last())
+    }
+
+    private fun setContent(state: ContactCreationUiState = ContactCreationUiState()) {
+        composeTestRule.setContent {
+            AppTheme {
+                ContactCreationEditorScreen(
+                    uiState = state,
+                    accounts = emptyList(),
+                    onAction = { capturedActions.add(it) },
+                )
+            }
+        }
+    }
+}

app/src/androidTest/java/com/android/contacts/ui/contactcreation/ContactCreationFlowTest.kt

@@ -0,0 +1,141 @@
+package com.android.contacts.ui.contactcreation
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
+import com.android.contacts.ui.contactcreation.model.ContactCreationAction
+import com.android.contacts.ui.contactcreation.model.ContactCreationUiState
+import com.android.contacts.ui.contactcreation.model.NameState
+import com.android.contacts.ui.contactcreation.model.PhoneFieldState
+import com.android.contacts.ui.core.AppTheme
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * End-to-end flow tests exercising the full [ContactCreationEditorScreen].
+ *
+ * Uses [createAndroidComposeRule] with [ComponentActivity] + the screen composable
+ * directly (avoids Hilt wiring for the Activity). Actions are captured via lambda
+ * to verify the full UI -> action pipeline.
+ */
+class ContactCreationFlowTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<ComponentActivity>()
+
+    private val capturedActions = mutableListOf<ContactCreationAction>()
+
+    @Before
+    fun setup() {
+        capturedActions.clear()
+    }
+
+    // --- 1. Basic save flow ---
+
+    @Test
+    fun createBasicContact_endToEnd() {
+        setContent()
+        // Type first name
+        composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).performTextInput("John")
+        assertTrue(
+            capturedActions.any { it is ContactCreationAction.UpdateFirstName },
+        )
+
+        // Type phone
+        composeTestRule.onNodeWithTag(TestTags.phoneField(0)).performTextInput("555-0100")
+        assertTrue(
+            capturedActions.any { it is ContactCreationAction.UpdatePhone },
+        )
+
+        // Tap save
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).performClick()
+        assertEquals(ContactCreationAction.Save, capturedActions.last())
+    }
+
+    // --- 2. All fields save flow ---
+
+    @Test
+    fun createWithAllFields_endToEnd() {
+        val state = TestFactory.fullState()
+        setContent(state = state)
+
+        // Verify core sections are rendered
+        composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).assertIsDisplayed()
+        composeTestRule.onNodeWithTag(TestTags.phoneField(0)).assertIsDisplayed()
+        composeTestRule.onNodeWithTag(TestTags.emailField(0)).assertIsDisplayed()
+
+        // Tap save
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).performClick()
+        assertEquals(ContactCreationAction.Save, capturedActions.last())
+    }
+
+    // --- 3. Cancel with discard flow ---
+
+    @Test
+    fun cancelWithDiscard_endToEnd() {
+        setContent(state = ContactCreationUiState(showDiscardDialog = true))
+
+        // Discard dialog should be visible
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG).assertIsDisplayed()
+
+        // Tap discard (confirm button)
+        composeTestRule.onNodeWithTag(TestTags.DISCARD_DIALOG_CONFIRM).performClick()
+        assertEquals(ContactCreationAction.ConfirmDiscard, capturedActions.last())
+    }
+
+    // --- 4. Intent extras pre-fill ---
+
+    @Test
+    fun intentExtras_preFill_endToEnd() {
+        // Simulate pre-filled state (as Activity.applyIntentExtras would produce)
+        val preFilled = ContactCreationUiState(
+            nameState = NameState(first = "Jane"),
+            phoneNumbers = listOf(PhoneFieldState(id = "p1", number = "555-1234")),
+        )
+        setContent(state = preFilled)
+
+        // Fields should be displayed with pre-filled data
+        composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).assertIsDisplayed()
+        composeTestRule.onNodeWithTag(TestTags.phoneField(0)).assertIsDisplayed()
+
+        // Save
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).performClick()
+        assertEquals(ContactCreationAction.Save, capturedActions.last())
+    }
+
+    // --- 5. Zero-account local contact ---
+
+    @Test
+    fun zeroAccount_localContact_endToEnd() {
+        val state = ContactCreationUiState(
+            selectedAccount = null,
+            accountName = null,
+        )
+        setContent(state = state)
+
+        // Type a name and save
+        composeTestRule.onNodeWithTag(TestTags.NAME_FIRST).performTextInput("Local")
+        composeTestRule.onNodeWithTag(TestTags.SAVE_TEXT_BUTTON).performClick()
+        assertEquals(ContactCreationAction.Save, capturedActions.last())
+    }
+
+    // --- Helper ---
+
+    private fun setContent(state: ContactCreationUiState = ContactCreationUiState()) {
+        composeTestRule.setContent {
+            AppTheme {
+                ContactCreationEditorScreen(
+                    uiState = state,
+                    accounts = emptyList(),
+                    onAction = { capturedActions.add(it) },
+                )
+            }
+        }
+    }
+}