@shaykec/app-agent 1.0.5 → 1.0.6

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/data/local/ServiceEntity.kt

@@ -0,0 +1,40 @@
+package com.appship.book.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.book.data.Service
+
+/**
+ * Room entity for Service persistence.
+ */
+@Entity(tableName = "services")
+data class ServiceEntity(
+    @PrimaryKey val id: String,
+    val name: String = "",
+    val description: String? = null,
+    val duration: Int = 0,
+    val price: Double = 0.0,
+    val categoryId: String? = null,
+    val providerId: String
+) {
+    fun toService(): Service = Service(
+        id = id,
+        name = name,
+        description = description,
+        duration = duration,
+        price = price,
+        categoryId = categoryId
+    )
+
+    companion object {
+        fun fromService(service: Service, providerId: String): ServiceEntity = ServiceEntity(
+            id = service.id,
+            name = service.name,
+            description = service.description,
+            duration = service.duration,
+            price = service.price,
+            categoryId = service.categoryId,
+            providerId = providerId
+        )
+    }
+}

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/features/bookings/BookingsScreen.kt

@@ -19,6 +19,8 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
+import com.appship.book.core.components.EmptyStateView
+import com.appship.book.core.components.EmptyStateConfig
 import com.appship.book.data.Booking
 import com.appship.book.data.BookingStatus
 import com.appship.book.data.DataSourceResolver
@@ -65,7 +67,15 @@ fun BookingsScreen(
             val bookings = if (selectedTab == 0) upcomingBookings else pastBookings
             
             if (bookings.isEmpty()) {
-                EmptyBookingsView(isPast = selectedTab == 1)
+                EmptyStateView(
+                    config = EmptyStateConfig(
+                        title = if (selectedTab == 1) "No past bookings" else "No upcoming bookings",
+                        subtitle = if (selectedTab == 1) "Your completed bookings will appear here" else "Book a service to get started",
+                        icon = Icons.Default.DateRange,
+                        buttonTitle = "Browse Services",
+                        buttonAction = { }
+                    )
+                )
             } else {
                 LazyColumn(
                     contentPadding = PaddingValues(16.dp),
@@ -85,34 +95,6 @@ fun BookingsScreen(
     }
 }
 
-@Composable
-fun EmptyBookingsView(isPast: Boolean) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(32.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Icon(
-            Icons.Default.DateRange,
-            contentDescription = null,
-            modifier = Modifier.size(64.dp),
-            tint = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Spacer(modifier = Modifier.height(16.dp))
-        Text(
-            text = if (isPast) "No past bookings" else "No upcoming bookings",
-            style = MaterialTheme.typography.titleMedium
-        )
-        Text(
-            text = if (isPast) "Your completed bookings will appear here" 
-                   else "Book a service to get started",
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-    }
-}
 
 @Composable
 fun BookingCard(

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/features/discovery/ProviderDetailScreen.kt

@@ -29,8 +29,9 @@ fun ProviderDetailScreen(
     onBack: () -> Unit,
     onBook: (String?) -> Unit
 ) {
-    val provider = remember { MockDataProvider.providers.value.find { it.id == providerId } }
-    val reviews = remember { MockDataProvider.getReviews(providerId) }
+    val repository = remember { DataSourceResolver.repository }
+    val provider = remember { repository.providers.value.find { it.id == providerId } }
+    val reviews = remember { repository.getReviews(providerId) }
     var isFavorite by remember { mutableStateOf(false) }
     
     if (provider == null) {

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/features/discovery/SearchScreen.kt

@@ -18,6 +18,8 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.appship.book.AppConfig
+import com.appship.book.core.components.EmptyStateView
+import com.appship.book.core.components.EmptyStatePresets
 import com.appship.book.data.DataSourceResolver
 import com.appship.book.data.Provider
 
@@ -36,11 +38,13 @@ fun SearchScreen(
         focusRequester.requestFocus()
     }
     
+    val repository = remember { DataSourceResolver.repository }
+    
     LaunchedEffect(searchQuery) {
         searchResults = if (searchQuery.isBlank()) {
             emptyList()
         } else {
-            MockDataProvider.searchProviders(searchQuery)
+            repository.searchProviders(searchQuery)
         }
     }
     
@@ -164,27 +168,10 @@ fun SearchScreen(
                 // Search Results
                 if (searchResults.isEmpty()) {
                     item {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(32.dp),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-                            Text(
-                                text = "🔍",
-                                style = MaterialTheme.typography.displayMedium
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            Text(
-                                text = "No results for \"$searchQuery\"",
-                                style = MaterialTheme.typography.titleMedium
-                            )
-                            Text(
-                                text = "Try searching for something else",
-                                style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
-                            )
-                        }
+                        EmptyStateView(
+                            config = EmptyStatePresets.noResults(searchQuery),
+                            modifier = Modifier.fillMaxWidth()
+                        )
                     }
                 } else {
                     item {

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/features/profile/ProfileScreen.kt

@@ -20,6 +20,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.appship.book.AppConfig
+import com.appship.book.core.components.EmptyStateView
+import com.appship.book.core.components.EmptyStatePresets
 import com.appship.book.data.Provider
 import com.appship.book.data.DataSourceResolver
 
@@ -407,31 +409,12 @@ fun FavoritesScreen(
         }
     ) { padding ->
         if (favorites.isEmpty()) {
-            Column(
+            EmptyStateView(
+                config = EmptyStatePresets.noFavorites(),
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(padding)
-                    .padding(32.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
-            ) {
-                Icon(
-                    Icons.Default.FavoriteBorder,
-                    contentDescription = null,
-                    modifier = Modifier.size(64.dp),
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-                Text(
-                    text = "No favorites yet",
-                    style = MaterialTheme.typography.titleMedium
-                )
-                Text(
-                    text = "Save your favorite services here",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
+            )
         } else {
             LazyColumn(
                 modifier = Modifier

package/templates/android/BookTemplate/app/src/main/kotlin/com/appship/book/mock/MockDataProvider.kt

@@ -215,10 +215,10 @@ object MockDataProvider : DataRepository {
     )
     
     private val _upcomingBookings = MutableStateFlow(defaultUpcomingBookings)
-    val upcomingBookings: StateFlow<List<Booking>> = _upcomingBookings.asStateFlow()
+    override val upcomingBookings: StateFlow<List<Booking>> = _upcomingBookings.asStateFlow()
     
     private val _pastBookings = MutableStateFlow(defaultPastBookings)
-    val pastBookings: StateFlow<List<Booking>> = _pastBookings.asStateFlow()
+    override val pastBookings: StateFlow<List<Booking>> = _pastBookings.asStateFlow()
     
     // Legacy accessors for backward compatibility
     val upcomingBookingsList: List<Booking> get() = _upcomingBookings.value

package/templates/android/BookTemplate/app/src/test/kotlin/com/appship/book/DataRepositoryTest.kt

@@ -0,0 +1,40 @@
+package com.appship.book
+
+import com.appship.book.data.DataRepository
+import com.appship.book.data.DataSourceResolver
+import com.appship.book.mock.MockDataProvider
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * Tests that MockDataProvider implements DataRepository and that
+ * DataSourceResolver returns the correct implementation.
+ */
+class DataRepositoryTest {
+
+    private lateinit var repo: DataRepository
+
+    @Before
+    fun setUp() {
+        repo = MockDataProvider
+    }
+
+    // MARK: DataRepository Interface Conformance
+
+    @Test
+    fun testMockDataProviderImplementsDataRepository() {
+        assertTrue("MockDataProvider should implement DataRepository", MockDataProvider is DataRepository)
+    }
+
+    @Test
+    fun testRepositoryLoadData() {
+        assertTrue("providers should not be empty", repo.providers.value.isNotEmpty())
+    }
+
+    @Test
+    fun testDataSourceResolverReturnsMock() {
+        val resolved = DataSourceResolver.repository
+        assertNotNull("DataSourceResolver should return a non-null repository", resolved)
+    }
+}

package/templates/android/BookTemplate/gradle/libs.versions.toml

@@ -15,6 +15,7 @@ hilt = "2.50"
 hiltNavigationCompose = "1.1.0"
 coil = "2.5.0"
 coroutinesTest = "1.7.3"
+room = "2.6.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -38,6 +39,9 @@ hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.r
 androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" }
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

package/templates/android/BookTemplate/tests/01_launch_discover.yaml

@@ -1,16 +1,26 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
-- tapOn:
-    text: "Skip"
-    optional: true
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible: "Discover"
-- assertVisible: "Categories"
-- assertVisible: "Featured"
-- assertVisible: ".*Serenity Spa.*"
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Verify home screen content
+- assertVisible:
+    id: "discovery_search_field"
+- assertVisible:
+    id: "discovery_category_0_button"
+    optional: true
+- assertVisible:
+    id: "discovery_provider_0_card"
+    optional: true
+- assertVisible:
+    id: "discovery_featured_0_card"
+    optional: true

package/templates/android/BookTemplate/tests/02_tab_navigation.yaml

@@ -1,21 +1,40 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
-- tapOn:
-    text: "Skip"
-    optional: true
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible: ".*Discover.*"
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Verify Discover tab content
+- assertVisible:
+    id: "discovery_search_field"
+# Navigate to Near Me tab
+- tapOn: "Near Me"
+- waitForAnimationToEnd
+- assertVisible:
+    id: "map_list_toggle_button"
+# Navigate to Bookings tab
 - tapOn: "Bookings"
 - waitForAnimationToEnd
+- assertVisible:
+    id: "bookings_upcoming_tab"
+# Navigate to Favorites tab
 - tapOn: "Favorites"
 - waitForAnimationToEnd
+# Navigate to Profile tab
 - tapOn: "Profile"
 - waitForAnimationToEnd
+- assertVisible:
+    id: "profile_settings_button"
+# Return to Discover
 - tapOn: "Discover"
 - waitForAnimationToEnd
+- assertVisible:
+    id: "discovery_search_field"

package/templates/android/BookTemplate/tests/03_provider_detail.yaml

@@ -1,15 +1,46 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
-    text: "Skip"
+    text: "Get Started"
     optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_provider_0_card"
+    timeout: 10000
+# Open provider detail
 - tapOn:
-    text: "Get Started"
+    id: "discovery_provider_0_card"
+- extendedWaitUntil:
+    visible:
+      id: "provider_detail_favorite_button"
+    timeout: 5000
+# Verify detail screen elements
+- assertVisible:
+    id: "provider_detail_favorite_button"
+- assertVisible:
+    id: "provider_detail_share_button"
+- assertVisible:
+    id: "provider_detail_call_button"
+- assertVisible:
+    id: "provider_detail_directions_button"
+- assertVisible:
+    id: "provider_detail_book_now_button"
+- assertVisible:
+    id: "provider_detail_service_0_card"
     optional: true
-- assertVisible: "Featured"
-- tapOn: ".*Serenity Spa.*"
-- waitForAnimationToEnd
+# Toggle favorite
+- tapOn:
+    id: "provider_detail_favorite_button"
+# Navigate back
+- back
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 5000
+- assertVisible:
+    id: "discovery_search_field"

package/templates/android/BookTemplate/tests/04_booking_detail.yaml

@@ -0,0 +1,48 @@
+appId: ${APP_PACKAGE_NAME}
+---
+- clearState
+- launchApp
+- tapOn:
+    text: "Skip"
+    optional: true
+- tapOn:
+    text: "Get Started"
+    optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Navigate to Bookings tab
+- tapOn: "Bookings"
+- waitForAnimationToEnd
+- assertVisible:
+    id: "bookings_upcoming_tab"
+# Check for bookings or empty state
+- assertVisible:
+    id: "bookings_booking_0_card"
+    optional: true
+- assertVisible:
+    id: "bookings_empty_state"
+    optional: true
+# Open booking detail if available
+- tapOn:
+    id: "bookings_booking_0_card"
+    optional: true
+- assertVisible:
+    id: "booking_detail_reschedule_button"
+    optional: true
+- assertVisible:
+    id: "booking_detail_cancel_button"
+    optional: true
+# Go back
+- back
+# Navigate to Favorites tab
+- tapOn: "Favorites"
+- waitForAnimationToEnd
+# Check for favorites or empty state
+- assertVisible:
+    id: "favorites_provider_0_card"
+    optional: true
+- assertVisible:
+    id: "favorites_empty_state"
+    optional: true

package/templates/android/BookTemplate/tests/05_booking_create_flow.yaml

@@ -0,0 +1,42 @@
+appId: ${APP_PACKAGE_NAME}
+---
+- clearState
+- launchApp
+- tapOn:
+    text: "Skip"
+    optional: true
+- tapOn:
+    text: "Get Started"
+    optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_provider_0_card"
+    timeout: 10000
+# Open provider detail
+- tapOn:
+    id: "discovery_provider_0_card"
+- extendedWaitUntil:
+    visible:
+      id: "provider_detail_book_now_button"
+    timeout: 5000
+# Start booking flow
+- tapOn:
+    id: "provider_detail_book_now_button"
+- extendedWaitUntil:
+    visible:
+      id: "booking_service_0_card"
+    timeout: 5000
+# Verify booking flow elements
+- assertVisible:
+    id: "booking_service_0_card"
+# Select a service
+- tapOn:
+    id: "booking_service_0_card"
+# Navigate forward
+- tapOn:
+    id: "booking_next_button"
+    optional: true
+# Cancel/close booking
+- tapOn:
+    id: "booking_back_button"
+    optional: true

package/templates/android/BookTemplate/tests/06_search_filter.yaml

@@ -0,0 +1,48 @@
+appId: ${APP_PACKAGE_NAME}
+---
+- clearState
+- launchApp
+- tapOn:
+    text: "Skip"
+    optional: true
+- tapOn:
+    text: "Get Started"
+    optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Tap search field
+- tapOn:
+    id: "discovery_search_field"
+- extendedWaitUntil:
+    visible:
+      id: "search_input_field"
+    timeout: 5000
+# Type search query
+- tapOn:
+    id: "search_input_field"
+- inputText: "Spa"
+# Wait for results
+- extendedWaitUntil:
+    visible:
+      id: "search_result_0_card"
+    timeout: 5000
+    optional: true
+# Check for results or empty state
+- assertVisible:
+    id: "search_result_0_card"
+    optional: true
+# Cancel search
+- tapOn:
+    id: "search_cancel_button"
+    optional: true
+# Test category filtering
+- extendedWaitUntil:
+    visible:
+      id: "discovery_category_0_button"
+    timeout: 5000
+- tapOn:
+    id: "discovery_category_0_button"
+    optional: true
+- waitForAnimationToEnd

package/templates/android/BookTemplate/tests/07_profile_settings.yaml

@@ -0,0 +1,37 @@
+appId: ${APP_PACKAGE_NAME}
+---
+- clearState
+- launchApp
+- tapOn:
+    text: "Skip"
+    optional: true
+- tapOn:
+    text: "Get Started"
+    optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Navigate to Profile tab
+- tapOn: "Profile"
+- waitForAnimationToEnd
+# Verify profile elements
+- assertVisible:
+    id: "profile_settings_button"
+- assertVisible:
+    id: "profile_edit_button"
+    optional: true
+- assertVisible:
+    id: "profile_sign_in_button"
+    optional: true
+- assertVisible:
+    id: "profile_orders_card"
+    optional: true
+# Open settings
+- tapOn:
+    id: "profile_settings_button"
+- waitForAnimationToEnd
+# Close settings
+- tapOn:
+    text: "Done"
+    optional: true

package/templates/android/BookTemplate/tests/08_full_e2e.yaml

@@ -1,21 +1,75 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
-    text: "Skip"
+    text: "Get Started"
     optional: true
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 10000
+# Step 1: Verify Discover content
+- assertVisible:
+    id: "discovery_search_field"
+- assertVisible:
+    id: "discovery_provider_0_card"
+    optional: true
+# Step 2: Open provider detail
 - tapOn:
-    text: "Get Started"
+    id: "discovery_provider_0_card"
     optional: true
-- assertVisible: ".*Discover.*"
+- extendedWaitUntil:
+    visible:
+      id: "provider_detail_book_now_button"
+    timeout: 5000
+    optional: true
+# Step 3: Verify detail and favorite
+- assertVisible:
+    id: "provider_detail_favorite_button"
+    optional: true
+- tapOn:
+    id: "provider_detail_favorite_button"
+    optional: true
+- back
+# Step 4: Search
+- extendedWaitUntil:
+    visible:
+      id: "discovery_search_field"
+    timeout: 5000
+- tapOn:
+    id: "discovery_search_field"
+- extendedWaitUntil:
+    visible:
+      id: "search_input_field"
+    timeout: 3000
+- tapOn:
+    id: "search_input_field"
+- inputText: "Wellness"
+- tapOn:
+    id: "search_cancel_button"
+    optional: true
+# Step 5: Near Me tab
+- tapOn: "Near Me"
+- waitForAnimationToEnd
+- assertVisible:
+    id: "map_list_toggle_button"
+# Step 6: Bookings tab
 - tapOn: "Bookings"
 - waitForAnimationToEnd
+- assertVisible:
+    id: "bookings_upcoming_tab"
+# Step 7: Favorites tab
 - tapOn: "Favorites"
 - waitForAnimationToEnd
+# Step 8: Profile tab
 - tapOn: "Profile"
 - waitForAnimationToEnd
+- assertVisible:
+    id: "profile_settings_button"
+# Step 9: Back to Discover
 - tapOn: "Discover"
 - waitForAnimationToEnd