Merge pull request #434 from joreilly/maestro

maestro updates

Author: joreilly

PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/project.pbxproj

@@ -514,7 +514,7 @@
 					"-framework",
 					common,
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.PeopleInSpaceSwiftUI;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.johnoreilly.peopleinspace;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -549,7 +549,7 @@
 					"-framework",
 					common,
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.PeopleInSpaceSwiftUI;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.johnoreilly.peopleinspace;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/Info.plist

@@ -2,7 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key><true/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -26,6 +27,8 @@
 		<key>UIApplicationSupportsMultipleScenes</key>
 		<false/>
 	</dict>
+	<key>UILaunchScreen</key>
+	<dict/>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -43,7 +46,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UILaunchScreen</key>
-	<dict/>
 </dict>
 </plist>

app/src/main/java/com/surrus/peopleinspace/personlist/PersonListScreen.kt

@@ -8,7 +8,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
@@ -41,6 +41,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -59,8 +60,7 @@ const val PersonListTag = "PersonList"
 
 
 @Composable
-fun PersonListRoute(
-navigateToPerson: (Assignment) -> Unit, ) {
+fun PersonListRoute(navigateToPerson: (Assignment) -> Unit, ) {
     val viewModel: PersonListViewModel = koinViewModel()
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
@@ -184,8 +184,8 @@ fun PersonListScreen(
                                 .fillMaxSize()
                         ) {
                             if (!refreshing) {
-                                items(uiState.result) { person ->
-                                    PersonView(person, navigateToPerson)
+                                itemsIndexed(uiState.result) { index, person ->
+                                    PersonView(index, person, navigateToPerson)
                                 }
                             }
                         }
@@ -199,7 +199,7 @@ fun PersonListScreen(
 }
 
 @Composable
-fun PersonView(person: Assignment, personSelected: (person: Assignment) -> Unit) {
+fun PersonView(index: Int, person: Assignment, personSelected: (person: Assignment) -> Unit) {
     Card(
         modifier = Modifier
             .fillMaxWidth()
@@ -246,7 +246,9 @@ fun PersonView(person: Assignment, personSelected: (person: Assignment) -> Unit)
                 Text(
                     text = person.name,
                     style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
+                    modifier = Modifier.testTag("person$index")
+                        .semantics { testTagsAsResourceId = true}
                 )
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
@@ -263,6 +265,6 @@ fun PersonView(person: Assignment, personSelected: (person: Assignment) -> Unit)
 @Composable
 fun PersonViewPreview(@PreviewParameter(PersonProvider::class) person: Assignment) {
     MaterialTheme {
-        PersonView(person, personSelected = {})
+        PersonView(0, person, personSelected = {})
     }
 }

common/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.skie)
-    id("io.github.luca992.multiplatform-swiftpackage") version "2.2.4"
+    id("io.github.luca992.multiplatform-swiftpackage") version "2.3.0"
 }
 
 android {

maestro/PeopleInSpace.flow

@@ -10,5 +10,7 @@ appId: dev.johnoreilly.peopleinspace
 
 - tapOn: "People"
 - assertVisible: "People in Space"
+- assertVisible:
+    id: "person0"
 
 - takeScreenshot: PeopleInSpace