Rewrite Conversation screen with Kotlin and Compose

.editorconfig

@@ -14,9 +14,13 @@ ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
 ij_kotlin_packages_to_use_import_on_demand = unset
+ij_kotlin_line_break_after_multiline_when_entry = false
 ktlint_code_style = android_studio
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_filename = disabled
 ktlint_standard_function-expression-body = disabled
 ktlint_standard_function-signature = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
 max_line_length = 100

.gitignore

@@ -12,3 +12,7 @@ keystore.properties
 *.keystore
 local.properties
 /lib/build
+
+.kotlin
+
+*.log

AndroidManifest.xml

@@ -132,7 +132,7 @@
             android:allowEmbedded="true"
             android:resizeableActivity="true"
             android:windowSoftInputMode="stateHidden|adjustResize"
-            android:theme="@style/BugleTheme.ConversationActivity"
+            android:theme="@style/Theme.Compose"
             android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/build.gradle.kts

@@ -7,6 +7,8 @@ plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
 }
 
@@ -45,6 +47,7 @@ android {
         versionName = "13"
         minSdk = 35
         targetSdk = 35
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
             abiFilters.clear()
@@ -111,6 +114,14 @@ android {
             applicationIdSuffix = ".debug"
             resValue("string", "app_name", "Messaging d")
         }
+
+        create("perf") {
+            initWith(getByName("release"))
+            applicationIdSuffix = ".debug"
+            matchingFallbacks += listOf("release")
+            resValue("string", "app_name", "Messaging d")
+            signingConfig = signingConfigs.getByName("debug")
+        }
     }
 
     lint {
@@ -120,6 +131,13 @@ android {
 
 dependencies {
     implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.camera.camera2)
+    implementation(libs.androidx.camera.compose)
+    implementation(libs.androidx.camera.core)
+    implementation(libs.androidx.camera.lifecycle)
+    implementation(libs.androidx.camera.video)
+    implementation(libs.androidx.paging.compose)
+    implementation(libs.androidx.paging.runtime)
     implementation(libs.androidx.palette)
     implementation(libs.androidx.preference)
     implementation(libs.androidx.recyclerview)
@@ -132,13 +150,21 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)
 
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
+
+    implementation(libs.androidx.photo.picker)
 
     implementation(libs.coil.compose)
+    implementation(libs.coil.network.okhttp)
     implementation(libs.glide)
 
     implementation(libs.hilt.android)
@@ -147,7 +173,9 @@ dependencies {
     implementation(libs.guava)
     implementation(libs.jsr305)
 
+    implementation(libs.kotlinx.collections.immutable)
     implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.serialization.core)
 
     implementation(libs.libphonenumber)
 
@@ -168,6 +196,9 @@ dependencies {
 
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.runner)
 
     androidTestImplementation(libs.hilt.android.testing)
     kspAndroidTest(libs.hilt.compiler)

app/src/androidTest/java/com/android/messaging/ui/conversation/messages/ui/message/ConversationMessageLinkLongClickTest.kt

@@ -0,0 +1,173 @@
+package com.android.messaging.ui.conversation.messages.ui.message
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.longClick
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTouchInput
+import com.android.messaging.ui.conversation.messages.model.message.ConversationMessagePartUiModel
+import com.android.messaging.ui.conversation.messages.model.message.ConversationMessageUiModel
+import com.android.messaging.ui.core.AppTheme
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+
+private const val MESSAGE_ID = "message-id"
+private const val CONVERSATION_ID = "conversation-id"
+private const val LINK_ONLY_TEXT = "https://example.com"
+private const val PLAIN_TEXT = "plain outgoing message"
+private const val TIMESTAMP = 1_700_000_000_000L
+
+internal class ConversationMessageLinkLongClickTest {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun longClickOutgoingLinkOnlyMessageSelectsMessage() {
+        var externalUriClickCount = 0
+        var messageLongClickCount = 0
+
+        composeRule.setContent {
+            AppTheme {
+                ConversationMessage(
+                    message = outgoingMessage(text = LINK_ONLY_TEXT),
+                    onExternalUriClick = {
+                        externalUriClickCount += 1
+                    },
+                    onMessageLongClick = {
+                        messageLongClickCount += 1
+                    },
+                )
+            }
+        }
+
+        composeRule.waitForIdle()
+
+        composeRule
+            .onNodeWithText(text = LINK_ONLY_TEXT, useUnmergedTree = true)
+            .performClick()
+
+        composeRule.runOnIdle {
+            assertEquals(1, externalUriClickCount)
+        }
+
+        composeRule
+            .onNodeWithText(text = LINK_ONLY_TEXT, useUnmergedTree = true)
+            .performTouchInput {
+                longClick(position = center)
+            }
+
+        composeRule.runOnIdle {
+            assertEquals(1, externalUriClickCount)
+            assertEquals(1, messageLongClickCount)
+        }
+    }
+
+    @Test
+    fun longClickOutgoingLinkOnlyMessageStaysSelectedAfterRelease() {
+        var externalUriClickCount = 0
+        var messageClickCount = 0
+        var messageLongClickCount = 0
+        var isSelected by mutableStateOf(false)
+        var isSelectionMode by mutableStateOf(false)
+
+        composeRule.setContent {
+            AppTheme {
+                ConversationMessage(
+                    message = outgoingMessage(text = LINK_ONLY_TEXT),
+                    isSelected = isSelected,
+                    isSelectionMode = isSelectionMode,
+                    onExternalUriClick = {
+                        externalUriClickCount += 1
+                    },
+                    onMessageClick = {
+                        messageClickCount += 1
+                        isSelected = !isSelected
+                    },
+                    onMessageLongClick = {
+                        messageLongClickCount += 1
+                        isSelectionMode = true
+                        isSelected = true
+                    },
+                )
+            }
+        }
+
+        composeRule.waitForIdle()
+
+        composeRule
+            .onNodeWithText(text = LINK_ONLY_TEXT, useUnmergedTree = true)
+            .performTouchInput {
+                longClick(position = center)
+            }
+
+        composeRule.runOnIdle {
+            assertEquals(0, externalUriClickCount)
+            assertEquals(0, messageClickCount)
+            assertEquals(1, messageLongClickCount)
+            assertEquals(true, isSelected)
+            assertEquals(true, isSelectionMode)
+        }
+    }
+
+    @Test
+    fun longClickOutgoingPlainTextMessageSelectsMessageOnce() {
+        var messageLongClickCount = 0
+
+        composeRule.setContent {
+            AppTheme {
+                ConversationMessage(
+                    message = outgoingMessage(text = PLAIN_TEXT),
+                    onMessageLongClick = {
+                        messageLongClickCount += 1
+                    },
+                )
+            }
+        }
+
+        composeRule.waitForIdle()
+
+        composeRule
+            .onNodeWithText(text = PLAIN_TEXT, useUnmergedTree = true)
+            .performTouchInput {
+                longClick(position = center)
+            }
+
+        composeRule.runOnIdle {
+            assertEquals(1, messageLongClickCount)
+        }
+    }
+}
+
+private fun outgoingMessage(text: String): ConversationMessageUiModel {
+    return ConversationMessageUiModel(
+        messageId = MESSAGE_ID,
+        conversationId = CONVERSATION_ID,
+        text = text,
+        parts = listOf(
+            ConversationMessagePartUiModel.Text(
+                text = text,
+            ),
+        ),
+        sentTimestamp = TIMESTAMP,
+        receivedTimestamp = TIMESTAMP,
+        displayTimestamp = TIMESTAMP,
+        status = ConversationMessageUiModel.Status.Outgoing.Complete,
+        isIncoming = false,
+        senderDisplayName = null,
+        senderAvatarUri = null,
+        senderContactLookupKey = null,
+        canClusterWithPrevious = false,
+        canClusterWithNext = false,
+        canCopyMessageToClipboard = true,
+        canDownloadMessage = false,
+        canForwardMessage = true,
+        canResendMessage = false,
+        canSaveAttachments = false,
+        mmsSubject = null,
+        protocol = ConversationMessageUiModel.Protocol.SMS,
+    )
+}

app/src/test/java/com/android/messaging/data/conversation/store/ConversationDraftStoreTest.kt

@@ -0,0 +1,53 @@
+package com.android.messaging.data.conversation.store
+
+import com.android.messaging.datamodel.DataModel
+import com.android.messaging.datamodel.DatabaseWrapper
+import com.android.messaging.datamodel.data.ConversationListItemData
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import org.junit.After
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+
+internal class ConversationDraftStoreTest {
+
+    private val databaseWrapper = mockk<DatabaseWrapper>()
+    private val dataModel = mockk<DataModel>()
+
+    private val store = ConversationDraftStoreImpl()
+
+    @Before
+    fun setUp() {
+        mockkStatic(DataModel::class)
+        mockkStatic(ConversationListItemData::class)
+
+        every { DataModel.get() } returns dataModel
+        every { dataModel.database } returns databaseWrapper
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun getSelfParticipantIdReturnsNullWhenConversationSelfIdIsMissing() {
+        val conversation = ConversationListItemData()
+        every {
+            ConversationListItemData.getExistingConversation(databaseWrapper, CONVERSATION_ID)
+        } returns conversation
+
+        val selfParticipantId = store.getSelfParticipantId(
+            conversationId = CONVERSATION_ID,
+        )
+
+        assertNull(selfParticipantId)
+    }
+
+    private companion object {
+        private const val CONVERSATION_ID = "conversation-id"
+    }
+}

build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.kotlin.parcelize) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.ktlint)
 }

config/detekt/detekt.yml

@@ -6,6 +6,9 @@ complexity:
   LongParameterList:
     ignoreDefaultParameters: true
   TooManyFunctions:
+    allowedFunctionsPerClass: 60
+    allowedFunctionsPerFile: 15
+    allowedFunctionsPerInterface: 50
     ignoreAnnotatedFunctions:
       - Preview
 
@@ -15,9 +18,15 @@ naming:
       - Composable
 
 style:
+  ForbiddenComment:
+    active: false
+
   MagicNumber:
     ignoreCompanionObjectPropertyDeclaration: true
     ignorePropertyDeclaration: true
+    ignoreAnnotated:
+      - Composable
+
   UnusedPrivateFunction:
     ignoreAnnotated:
       - Preview