Settings Screen: Java/XML to Kotlin/Compose migration + tests

.editorconfig

@@ -14,6 +14,7 @@ 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
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
 ktlint_code_style = android_studio
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_function-expression-body = disabled

AndroidManifest.xml

@@ -164,46 +164,28 @@
         <!-- Settings -->
         <activity
             android:name=".ui.appsettings.SettingsActivity"
-            android:label="@string/settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
-            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.android.messaging.ui.conversationlist.ConversationListActivity" />
-        </activity>
-
-        <activity
-            android:name=".ui.appsettings.PerSubscriptionSettingsActivity"
-            android:label="@string/advanced_settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
+            android:allowEmbedded="true"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="user"
-            android:parentActivityName="com.android.messaging.ui.appsettings.SettingsActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.android.messaging.ui.appsettings.SettingsActivity" />
-        </activity>
-
-        <activity
-            android:name=".ui.appsettings.ApplicationSettingsActivity"
             android:exported="true"
-            android:label="@string/general_settings_activity_title"
-            android:theme="@style/BugleTheme.SettingsActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="@string/settings_activity_title"
+            android:parentActivityName="com.android.messaging.ui.conversationlist.ConversationListActivity"
+            android:resizeableActivity="true"
             android:screenOrientation="user"
-            android:parentActivityName="com.android.messaging.ui.appsettings.SettingsActivity">
+            android:theme="@style/Theme.Compose">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:exported="true"
-                android:value="com.android.messaging.ui.appsettings.SettingsActivity" />
+                android:value="com.android.messaging.ui.conversationlist.ConversationListActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
+        <activity-alias
+            android:name=".ui.appsettings.ApplicationSettingsActivity"
+            android:exported="true"
+            android:targetActivity=".ui.appsettings.SettingsActivity" />
+
         <!-- Handles sharing intent -->
         <activity
             android:name=".ui.conversationlist.ShareIntentActivity"

app/build.gradle.kts

@@ -168,6 +168,11 @@ dependencies {
 
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    androidTestImplementation(libs.androidx.test.espresso.contrib)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
 
     androidTestImplementation(libs.hilt.android.testing)
     kspAndroidTest(libs.hilt.compiler)

app/src/androidTest/java/com/android/common/test/helpers/ShellCommandHelper.kt

@@ -0,0 +1,24 @@
+package com.android.common.test.helpers
+
+import android.os.ParcelFileDescriptor
+import androidx.test.platform.app.InstrumentationRegistry
+
+object ShellCommandHelper {
+
+    fun setupSmsDefaultRole() {
+        val instrumentation = InstrumentationRegistry.getInstrumentation()
+        val packageName = instrumentation.targetContext.packageName
+        val command = "cmd role add-role-holder android.app.role.SMS $packageName"
+
+        executeShellCommand(command)
+    }
+
+    private fun executeShellCommand(command: String): String {
+        val instrumentation = InstrumentationRegistry.getInstrumentation()
+        val parcelFileDescriptor = instrumentation.uiAutomation.executeShellCommand(command)
+
+        return ParcelFileDescriptor.AutoCloseInputStream(parcelFileDescriptor).use { inputStream ->
+            String(inputStream.readBytes())
+        }
+    }
+}

app/src/androidTest/java/com/android/common/test/helpers/TestDataSeeder.kt

@@ -0,0 +1,12 @@
+package com.android.common.test.helpers
+
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.messaging.debug.seedTestData
+
+object TestDataSeeder {
+
+    fun seedTestData() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        seedTestData(context)
+    }
+}

app/src/androidTest/java/com/android/common/test/rules/AppTestRule.kt

@@ -0,0 +1,21 @@
+package com.android.common.test.rules
+
+import com.android.common.test.helpers.ShellCommandHelper
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+class AppTestRule : TestRule {
+
+    override fun apply(
+        base: Statement,
+        description: Description,
+    ): Statement {
+        return object : Statement() {
+            override fun evaluate() {
+                ShellCommandHelper.setupSmsDefaultRole()
+                base.evaluate()
+            }
+        }
+    }
+}

app/src/androidTest/java/com/android/common/test/rules/MessagingTestRule.kt

@@ -0,0 +1,21 @@
+package com.android.common.test.rules
+
+import com.android.common.test.helpers.TestDataSeeder
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+class MessagingTestRule : TestRule {
+
+    override fun apply(
+        base: Statement,
+        description: Description,
+    ): Statement {
+        return object : Statement() {
+            override fun evaluate() {
+                TestDataSeeder.seedTestData()
+                base.evaluate()
+            }
+        }
+    }
+}

app/src/androidTest/java/com/android/messaging/ui/appsettings/general/ui/AppSettingsScreenTest.kt

@@ -0,0 +1,224 @@
+package com.android.messaging.ui.appsettings.general.ui
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import com.android.messaging.R
+import com.android.messaging.ui.appsettings.general.model.AppSettingsUiState
+import com.android.messaging.ui.appsettings.screen.SettingsScreenModel
+import com.android.messaging.ui.appsettings.screen.model.SettingsAction as Action
+import com.android.messaging.ui.core.AppTheme
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class AppSettingsScreenTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<ComponentActivity>()
+
+    private lateinit var screenModel: SettingsScreenModel
+
+    @Before
+    fun setup() {
+        screenModel = mockk(relaxed = true)
+    }
+
+    @Test
+    fun defaultSmsAppItem_displaysLabel() {
+        val appSettings = AppSettingsUiState(
+            isDefaultSmsApp = true,
+            defaultSmsAppLabel = "Messaging",
+        )
+
+        setContent(appSettings = appSettings)
+
+        composeTestRule.onNodeWithText("Messaging").assertIsDisplayed()
+    }
+
+    @Test
+    fun defaultSmsAppClick_delegatesToScreenModel() {
+        val appSettings = AppSettingsUiState(
+            isDefaultSmsApp = true,
+            defaultSmsAppLabel = "Messaging",
+        )
+
+        setContent(appSettings = appSettings)
+
+        val title = composeTestRule.activity.getString(R.string.sms_disabled_pref_title)
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.DefaultSmsAppClicked(true))
+        }
+    }
+
+    @Test
+    fun notificationsClick_delegatesToScreenModel() {
+        setContent()
+
+        val title = composeTestRule.activity.getString(
+            R.string.notifications_enabled_conversation_pref_title,
+        )
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.NotificationsClicked)
+        }
+    }
+
+    @Test
+    fun sendSoundToggle_delegatesToScreenModel() {
+        val appSettings = AppSettingsUiState(sendSoundEnabled = true)
+
+        setContent(appSettings = appSettings)
+
+        val title = composeTestRule.activity.getString(R.string.send_sound_pref_title)
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.SendSoundChanged(false))
+        }
+    }
+
+    @Test
+    fun debugSection_hiddenWhenDebugDisabled() {
+        val appSettings = AppSettingsUiState(isDebugEnabled = false)
+
+        setContent(appSettings = appSettings)
+
+        val debugTitle = composeTestRule.activity.getString(R.string.debug_category_pref_title)
+        composeTestRule.onNodeWithText(debugTitle).assertDoesNotExist()
+
+        val dumpSmsTitle = composeTestRule.activity.getString(R.string.dump_sms_pref_title)
+        composeTestRule.onNodeWithText(dumpSmsTitle).assertDoesNotExist()
+    }
+
+    @Test
+    fun debugSection_shownWhenDebugEnabled() {
+        val appSettings = AppSettingsUiState(
+            isDebugEnabled = true,
+            dumpSmsEnabled = false,
+            dumpMmsEnabled = false,
+        )
+
+        setContent(appSettings = appSettings)
+
+        val debugTitle = composeTestRule.activity.getString(R.string.debug_category_pref_title)
+        composeTestRule.onNodeWithText(debugTitle).assertIsDisplayed()
+
+        val dumpSmsTitle = composeTestRule.activity.getString(R.string.dump_sms_pref_title)
+        composeTestRule.onNodeWithText(dumpSmsTitle).assertIsDisplayed()
+
+        val dumpMmsTitle = composeTestRule.activity.getString(R.string.dump_mms_pref_title)
+        composeTestRule.onNodeWithText(dumpMmsTitle).assertIsDisplayed()
+    }
+
+    @Test
+    fun dumpSmsToggle_delegatesToScreenModel() {
+        val appSettings = AppSettingsUiState(
+            isDebugEnabled = true,
+            dumpSmsEnabled = false,
+        )
+
+        setContent(appSettings = appSettings)
+
+        val title = composeTestRule.activity.getString(R.string.dump_sms_pref_title)
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.DumpSmsChanged(true))
+        }
+    }
+
+    @Test
+    fun dumpMmsToggle_delegatesToScreenModel() {
+        val appSettings = AppSettingsUiState(
+            isDebugEnabled = true,
+            dumpMmsEnabled = false,
+        )
+
+        setContent(appSettings = appSettings)
+
+        val title = composeTestRule.activity.getString(R.string.dump_mms_pref_title)
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.DumpMmsChanged(true))
+        }
+    }
+
+    @Test
+    fun licensesClick_delegatesToScreenModel() {
+        setContent()
+
+        val title = composeTestRule.activity.getString(R.string.menu_license)
+        composeTestRule.onNodeWithText(title).performClick()
+
+        verify(exactly = 1) {
+            screenModel.onAction(Action.LicensesClicked)
+        }
+    }
+
+    @Test
+    fun advancedSettings_shownWhenTopLevel() {
+        var advancedClicks = 0
+
+        composeTestRule.setContent {
+            AppTheme {
+                AppSettingsScreen(
+                    appSettings = AppSettingsUiState(),
+                    screenModel = screenModel,
+                    onNavigateBack = {},
+                    isTopLevel = true,
+                    onAdvancedClick = { advancedClicks += 1 },
+                )
+            }
+        }
+
+        val advancedTitle = composeTestRule.activity.getString(R.string.advanced_settings)
+        composeTestRule.onNodeWithText(advancedTitle).assertIsDisplayed()
+        composeTestRule.onNodeWithText(advancedTitle).performClick()
+
+        composeTestRule.runOnIdle {
+            assertEquals(1, advancedClicks)
+        }
+    }
+
+    @Test
+    fun advancedSettings_hiddenWhenNotTopLevel() {
+        composeTestRule.setContent {
+            AppTheme {
+                AppSettingsScreen(
+                    appSettings = AppSettingsUiState(),
+                    screenModel = screenModel,
+                    onNavigateBack = {},
+                    isTopLevel = false,
+                    onAdvancedClick = null,
+                )
+            }
+        }
+
+        val advancedTitle = composeTestRule.activity.getString(R.string.advanced_settings)
+        composeTestRule.onNodeWithText(advancedTitle).assertDoesNotExist()
+    }
+
+    private fun setContent(
+        appSettings: AppSettingsUiState = AppSettingsUiState(),
+    ) {
+        composeTestRule.setContent {
+            AppTheme {
+                AppSettingsScreen(
+                    appSettings = appSettings,
+                    screenModel = screenModel,
+                    onNavigateBack = {},
+                )
+            }
+        }
+    }
+}