DROID-17_Add Auto-Scroll Switch to Settings Bottom Sheet

app/build.gradle.kts

@@ -291,6 +291,8 @@ dependencies {
 
     // Instrumented Test Libraries
     androidTestImplementation(composeBom)
+    androidTestImplementation(libs.compose.ui.test.junit4)
+    debugImplementation(libs.compose.ui.test.manifest)
     androidTestImplementation(libs.coroutines.test)
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.test.ext.junit)

app/src/androidTest/java/org/kabiri/android/usbterminal/ui/setting/SettingContentAndroidTest.kt

@@ -0,0 +1,76 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+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.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.flowOf
+import org.hamcrest.CoreMatchers.notNullValue
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+@RunWith(AndroidJUnit4::class)
+class SettingContentAndroidTest {
+    @get:Rule
+    val composeRule = createAndroidComposeRule<ComponentActivity>()
+
+    private fun showContet(viewModel: SettingViewModel) {
+        composeRule.setContent {
+            UsbTerminalTheme {
+                SettingContent(
+                    settingViewModel = viewModel,
+                    onDismiss = {},
+                )
+            }
+        }
+    }
+
+    @Test
+    fun settingContent_displaysExpectedTexts() {
+        // arrange
+        val context = composeRule.activity
+        assertThat(context, notNullValue())
+        val viewModel = mockk<SettingViewModel>(relaxed = true)
+        every { viewModel.currentBaudRate } returns flowOf(9600)
+        every { viewModel.currentAutoScroll } returns flowOf(true)
+
+        // act
+        showContet(viewModel)
+
+        // assert
+        composeRule.onNodeWithText(context.getString(R.string.settings_title)).assertIsDisplayed()
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_subtitle))
+            .assertIsDisplayed()
+
+        // Baud rate label (ensure unmerged tree so label is found)
+        composeRule
+            .onNodeWithText(
+                context.getString(R.string.settings_label_baud_rate),
+                useUnmergedTree = true,
+            ).assertIsDisplayed()
+
+        // Buttons and bottom text
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_bt_reset_default))
+            .assertIsDisplayed()
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_bt_dismiss_sheet))
+            .assertIsDisplayed()
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_bottom_text))
+            .assertIsDisplayed()
+
+        // Auto-scroll label
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_label_auto_scroll))
+            .assertIsDisplayed()
+    }
+}

app/src/androidTest/java/org/kabiri/android/usbterminal/ui/setting/SettingSwitchItemAndroidTest.kt

@@ -0,0 +1,85 @@
+package org.kabiri.android.usbterminal.ui.setting
+
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsOff
+import androidx.compose.ui.test.assertIsOn
+import androidx.compose.ui.test.hasAnySibling
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.isToggleable
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.kabiri.android.usbterminal.R
+import org.kabiri.android.usbterminal.ui.theme.UsbTerminalTheme
+
+@RunWith(AndroidJUnit4::class)
+class SettingSwitchItemAndroidTest {
+    @get:Rule
+    val composeRule = createAndroidComposeRule<ComponentActivity>()
+
+    private fun showContet(enabled: Boolean = true) {
+        composeRule.setContent {
+            UsbTerminalTheme {
+                SettingSwitchItem(
+                    enabled = enabled,
+                    onToggle = {},
+                    modifier = Modifier.fillMaxSize(),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun autoScrollSwitch_displaysLabel() {
+        // arrange
+        val context = composeRule.activity
+
+        // act
+        showContet()
+
+        // assert
+        composeRule
+            .onNodeWithText(context.getString(R.string.settings_label_auto_scroll))
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun autoScrollSwitch_isOn_whenEnabledTrue() {
+        // arrange
+        val context = composeRule.activity
+
+        // act
+        showContet(enabled = true)
+
+        // assert
+        composeRule
+            .onNode(
+                hasAnySibling(
+                    hasText(context.getString(R.string.settings_label_auto_scroll)),
+                ).and(isToggleable()),
+            ).assertIsOn()
+    }
+
+    @Test
+    fun autoScrollSwitch_isOff_whenEnabledFalse() {
+        // arrange
+        val context = composeRule.activity
+
+        // act
+        showContet(enabled = false)
+
+        // assert
+        composeRule
+            .onNode(
+                hasAnySibling(
+                    hasText(context.getString(R.string.settings_label_auto_scroll)),
+                ).and(isToggleable()),
+            ).assertIsOff()
+    }
+}

app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt

@@ -52,12 +52,19 @@ class MainActivity : AppCompatActivity() {
         // make the text view scrollable:
         tvOutput.movementMethod = ScrollingMovementMethod()
 
+        var autoScrollEnabled = true
+        lifecycleScope.launch {
+            settingViewModel.currentAutoScroll.collect { enabled ->
+                autoScrollEnabled = enabled
+            }
+        }
+
         lifecycleScope.launch {
             viewModel.getLiveOutput()
             viewModel.output.collect {
                 tvOutput.apply {
                     text = it
-                    scrollToLastLine()
+                    if (autoScrollEnabled) scrollToLastLine()
                 }
             }
         }

app/src/main/java/org/kabiri/android/usbterminal/data/repository/ArduinoRepository.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.R
 import org.kabiri.android.usbterminal.domain.IGetCustomBaudRateUseCase
-import org.kabiri.android.usbterminal.model.defaultBaudRate
+import org.kabiri.android.usbterminal.model.DEFAULT_BAUD_RATE
 import javax.inject.Inject
 
 /**
@@ -44,7 +44,7 @@ internal class ArduinoRepository
     private val getBaudRate: IGetCustomBaudRateUseCase,
 ): IArduinoRepository {
 
-    private var currentBaudRate = defaultBaudRate // Default value
+    private var currentBaudRate = DEFAULT_BAUD_RATE // Default value
 
     private val _messageFlow = MutableStateFlow("")
     override val messageFlow: Flow<String>