feat(settings): align config screens copy and order with iOS (#3144)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

app/src/androidTest/java/com/geeksville/mesh/compose/DebugFiltersTest.kt

@@ -17,51 +17,56 @@
 
 package com.geeksville.mesh.compose
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.unit.dp
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.geeksville.mesh.R
+import com.geeksville.mesh.ui.debug.FilterMode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import com.geeksville.mesh.ui.debug.FilterMode
 
 @RunWith(AndroidJUnit4::class)
 class DebugFiltersTest {
 
-    @get:Rule
-    val composeTestRule = createComposeRule()
+    @get:Rule val composeTestRule = createComposeRule()
 
     @Test
     fun debugFilterBar_showsFilterButtonAndMenu() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val filterLabel = context.getString(R.string.debug_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
+            var filterTexts by
+                androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
             var customFilterText by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf("") }
             val presetFilters = listOf("Error", "Warning", "Info")
-            val logs = listOf(
-                com.geeksville.mesh.model.DebugViewModel.UiMeshLog(
-                    uuid = "1",
-                    messageType = "Info",
-                    formattedReceivedDate = "2024-01-01 12:00:00",
-                    logMessage = "Sample log message"
+            val logs =
+                listOf(
+                    com.geeksville.mesh.model.DebugViewModel.UiMeshLog(
+                        uuid = "1",
+                        messageType = "Info",
+                        formattedReceivedDate = "2024-01-01 12:00:00",
+                        logMessage = "Sample log message",
+                    ),
                 )
-            )
             com.geeksville.mesh.ui.debug.DebugFilterBar(
                 filterTexts = filterTexts,
                 onFilterTextsChange = { filterTexts = it },
                 customFilterText = customFilterText,
                 onCustomFilterTextChange = { customFilterText = it },
                 presetFilters = presetFilters,
-                logs = logs
+                logs = logs,
             )
         }
         // The filter button should be visible
@@ -73,27 +78,32 @@ class DebugFiltersTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val activeFiltersLabel = context.getString(R.string.debug_active_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
+            var filterTexts by
+                androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
             var customFilterText by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf("") }
-            com.geeksville.mesh.ui.debug.DebugActiveFilters(
-                filterTexts = filterTexts,
-                onFilterTextsChange = { filterTexts = it }, 
-                filterMode = FilterMode.OR,
-                onFilterModeChange = {}
-            )
-            com.geeksville.mesh.ui.debug.DebugCustomFilterInput(
-                customFilterText = customFilterText,
-                onCustomFilterTextChange = { customFilterText = it },
-                filterTexts = filterTexts,
-                onFilterTextsChange = { filterTexts = it },
-            )
+            Column(modifier = Modifier.padding(16.dp)) {
+                com.geeksville.mesh.ui.debug.DebugActiveFilters(
+                    filterTexts = filterTexts,
+                    onFilterTextsChange = { filterTexts = it },
+                    filterMode = FilterMode.OR,
+                    onFilterModeChange = {},
+                )
+                com.geeksville.mesh.ui.debug.DebugCustomFilterInput(
+                    customFilterText = customFilterText,
+                    onCustomFilterTextChange = { customFilterText = it },
+                    filterTexts = filterTexts,
+                    onFilterTextsChange = { filterTexts = it },
+                )
+            }
+        }
+        with(composeTestRule) {
+            // Add a custom filter
+            onNodeWithText("Add custom filter").performTextInput("MyFilter")
+            onNodeWithContentDescription("Add filter").performClick()
+            // The active filters label and the filter chip should be visible
+            onNodeWithText(activeFiltersLabel).assertIsDisplayed()
+            onNodeWithText("MyFilter").assertIsDisplayed()
         }
-        // Add a custom filter
-        composeTestRule.onNodeWithText("Add custom filter").performTextInput("MyFilter")
-        composeTestRule.onNodeWithContentDescription("Add filter").performClick()
-        // The active filters label and the filter chip should be visible
-        composeTestRule.onNodeWithText(activeFiltersLabel).assertIsDisplayed()
-        composeTestRule.onNodeWithText("MyFilter").assertIsDisplayed()
     }
 
     @Test
@@ -101,12 +111,13 @@ class DebugFiltersTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val activeFiltersLabel = context.getString(R.string.debug_active_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf("A", "B")) }
+            var filterTexts by
+                androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf("A", "B")) }
             com.geeksville.mesh.ui.debug.DebugActiveFilters(
                 filterTexts = filterTexts,
                 onFilterTextsChange = { filterTexts = it },
                 filterMode = FilterMode.OR,
-                onFilterModeChange = {}
+                onFilterModeChange = {},
             )
         }
         // The active filters label and chips should be visible
@@ -119,4 +130,4 @@ class DebugFiltersTest {
         composeTestRule.onNodeWithText("A").assertDoesNotExist()
         composeTestRule.onNodeWithText("B").assertDoesNotExist()
     }
-} 
+}

app/src/androidTest/java/com/geeksville/mesh/compose/DebugSearchTest.kt

@@ -17,34 +17,33 @@
 
 package com.geeksville.mesh.compose
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
-import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
-import androidx.compose.ui.test.performTouchInput
-import androidx.compose.ui.test.printToLog
-import androidx.compose.ui.test.printToString
+import androidx.compose.ui.unit.dp
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.geeksville.mesh.R
 import com.geeksville.mesh.model.LogSearchManager.SearchState
 import com.geeksville.mesh.ui.debug.DebugSearchBar
+import com.geeksville.mesh.ui.debug.FilterMode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import com.geeksville.mesh.ui.debug.FilterMode
-import com.geeksville.mesh.ui.debug.DebugActiveFilters
 
 @RunWith(AndroidJUnit4::class)
 class DebugSearchTest {
 
-    @get:Rule
-    val composeTestRule = createComposeRule()
+    @get:Rule val composeTestRule = createComposeRule()
 
     @Test
     fun debugSearchBar_showsPlaceholder() {
@@ -56,7 +55,7 @@ class DebugSearchTest {
                 onSearchTextChange = {},
                 onNextMatch = {},
                 onPreviousMatch = {},
-                onClearSearch = {}
+                onClearSearch = {},
             )
         }
         composeTestRule.onNodeWithText(placeholder).assertIsDisplayed()
@@ -67,17 +66,16 @@ class DebugSearchTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val placeholder = context.getString(R.string.debug_default_search)
         composeTestRule.setContent {
-            var searchText by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf("test") }
+            var searchText by androidx.compose.runtime.remember { mutableStateOf("test") }
             DebugSearchBar(
                 searchState = SearchState(searchText = searchText),
                 onSearchTextChange = { searchText = it },
                 onNextMatch = {},
                 onPreviousMatch = {},
-                onClearSearch = { searchText = "" }
+                onClearSearch = { searchText = "" },
             )
         }
-        composeTestRule.onNodeWithContentDescription("Clear search").assertIsDisplayed()
-            .performClick()
+        composeTestRule.onNodeWithContentDescription("Clear search").assertIsDisplayed().performClick()
         composeTestRule.onNodeWithText(placeholder).assertIsDisplayed()
     }
 
@@ -89,16 +87,20 @@ class DebugSearchTest {
 
         composeTestRule.setContent {
             DebugSearchBar(
-                searchState = SearchState(
+                searchState =
+                SearchState(
                     searchText = searchText,
                     currentMatchIndex = currentMatchIndex,
-                    allMatches = List(matchCount) { com.geeksville.mesh.model.LogSearchManager.SearchMatch(it, 0, 6, "Packet") },
-                    hasMatches = true
+                    allMatches =
+                    List(matchCount) {
+                        com.geeksville.mesh.model.LogSearchManager.SearchMatch(it, 0, 6, "Packet")
+                    },
+                    hasMatches = true,
                 ),
                 onSearchTextChange = {},
                 onNextMatch = {},
                 onPreviousMatch = {},
-                onClearSearch = {}
+                onClearSearch = {},
             )
         }
         // Check the match count display (e.g., '2/3')
@@ -115,24 +117,25 @@ class DebugSearchTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val filterLabel = context.getString(R.string.debug_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
-            var customFilterText by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf("") }
+            var filterTexts by androidx.compose.runtime.remember { mutableStateOf(listOf<String>()) }
+            var customFilterText by androidx.compose.runtime.remember { mutableStateOf("") }
             val presetFilters = listOf("Error", "Warning", "Info")
-            val logs = listOf(
-                com.geeksville.mesh.model.DebugViewModel.UiMeshLog(
-                    uuid = "1",
-                    messageType = "Info",
-                    formattedReceivedDate = "2024-01-01 12:00:00",
-                    logMessage = "Sample log message"
+            val logs =
+                listOf(
+                    com.geeksville.mesh.model.DebugViewModel.UiMeshLog(
+                        uuid = "1",
+                        messageType = "Info",
+                        formattedReceivedDate = "2024-01-01 12:00:00",
+                        logMessage = "Sample log message",
+                    ),
                 )
-            )
             com.geeksville.mesh.ui.debug.DebugFilterBar(
                 filterTexts = filterTexts,
                 onFilterTextsChange = { filterTexts = it },
                 customFilterText = customFilterText,
                 onCustomFilterTextChange = { customFilterText = it },
                 presetFilters = presetFilters,
-                logs = logs
+                logs = logs,
             )
         }
         // The filter button should be visible
@@ -144,27 +147,29 @@ class DebugSearchTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val activeFiltersLabel = context.getString(R.string.debug_active_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf<String>()) }
-            var customFilterText by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf("") }
-            com.geeksville.mesh.ui.debug.DebugActiveFilters(
-                filterTexts = filterTexts,
-                onFilterTextsChange = { filterTexts = it },
-                filterMode = FilterMode.OR,
-                onFilterModeChange = {}
-            )
-            com.geeksville.mesh.ui.debug.DebugCustomFilterInput(
-                customFilterText = customFilterText,
-                onCustomFilterTextChange = { customFilterText = it },
-                filterTexts = filterTexts,
-                onFilterTextsChange = { filterTexts = it }
-            )
+            var filterTexts by androidx.compose.runtime.remember { mutableStateOf(listOf<String>()) }
+            var customFilterText by androidx.compose.runtime.remember { mutableStateOf("") }
+            Column(modifier = Modifier.padding(16.dp)) {
+                com.geeksville.mesh.ui.debug.DebugActiveFilters(
+                    filterTexts = filterTexts,
+                    onFilterTextsChange = { filterTexts = it },
+                    filterMode = FilterMode.OR,
+                    onFilterModeChange = {},
+                )
+                com.geeksville.mesh.ui.debug.DebugCustomFilterInput(
+                    customFilterText = customFilterText,
+                    onCustomFilterTextChange = { customFilterText = it },
+                    filterTexts = filterTexts,
+                    onFilterTextsChange = { filterTexts = it },
+                )
+            }
+        }
+        with(composeTestRule) {
+            onNodeWithText("Add custom filter").performTextInput("MyFilter")
+            onNodeWithContentDescription("Add filter").performClick()
+            onNodeWithText(activeFiltersLabel).assertIsDisplayed()
+            onNodeWithText("MyFilter").assertIsDisplayed()
         }
-        // Add a custom filter
-        composeTestRule.onNodeWithText("Add custom filter").performTextInput("MyFilter")
-        composeTestRule.onNodeWithContentDescription("Add filter").performClick()
-        // The active filters label and the filter chip should be visible
-        composeTestRule.onNodeWithText(activeFiltersLabel).assertIsDisplayed()
-        composeTestRule.onNodeWithText("MyFilter").assertIsDisplayed()
     }
 
     @Test
@@ -172,12 +177,12 @@ class DebugSearchTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val activeFiltersLabel = context.getString(R.string.debug_active_filters)
         composeTestRule.setContent {
-            var filterTexts by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(listOf("A", "B")) }
+            var filterTexts by androidx.compose.runtime.remember { mutableStateOf(listOf("A", "B")) }
             com.geeksville.mesh.ui.debug.DebugActiveFilters(
                 filterTexts = filterTexts,
                 onFilterTextsChange = { filterTexts = it },
                 filterMode = FilterMode.OR,
-                onFilterModeChange = {}
+                onFilterModeChange = {},
             )
         }
         // The active filters label and chips should be visible
@@ -190,4 +195,4 @@ class DebugSearchTest {
         composeTestRule.onNodeWithText("A").assertDoesNotExist()
         composeTestRule.onNodeWithText("B").assertDoesNotExist()
     }
-} 
+}