@shaykec/app-agent 1.0.4 → 1.0.6

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/data/local/WorkoutEntity.kt

@@ -0,0 +1,58 @@
+package com.appship.health.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.health.data.Exercise
+import com.appship.health.data.Workout
+import com.appship.health.data.WorkoutCategory
+import com.appship.health.data.WorkoutDifficulty
+import com.google.gson.Gson
+
+/**
+ * Room entity for Workout persistence.
+ */
+@Entity(tableName = "workouts")
+data class WorkoutEntity(
+    @PrimaryKey val id: String,
+    val title: String = "",
+    val description: String = "",
+    val category: String = "",
+    val exercisesJSON: String = "[]",
+    val duration: Int = 0,
+    val calories: Int = 0,
+    val difficulty: String = "",
+    val imageURL: String? = null
+) {
+    fun toWorkout(): Workout {
+        val exercises = try {
+            Gson().fromJson(exercisesJSON, Array<Exercise>::class.java).toList()
+        } catch (e: Exception) {
+            emptyList()
+        }
+        return Workout(
+            id = id,
+            title = title,
+            description = description,
+            category = WorkoutCategory.values().find { it.name == category } ?: WorkoutCategory.STRENGTH,
+            exercises = exercises,
+            duration = duration,
+            calories = calories,
+            difficulty = WorkoutDifficulty.values().find { it.name == difficulty } ?: WorkoutDifficulty.BEGINNER,
+            imageURL = imageURL
+        )
+    }
+
+    companion object {
+        fun fromWorkout(workout: Workout): WorkoutEntity = WorkoutEntity(
+            id = workout.id,
+            title = workout.title,
+            description = workout.description,
+            category = workout.category.name,
+            exercisesJSON = Gson().toJson(workout.exercises),
+            duration = workout.duration,
+            calories = workout.calories,
+            difficulty = workout.difficulty.name,
+            imageURL = workout.imageURL
+        )
+    }
+}

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/data/local/WorkoutSessionEntity.kt

@@ -0,0 +1,51 @@
+package com.appship.health.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.health.data.WorkoutSession
+import com.google.gson.Gson
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+
+/**
+ * Room entity for WorkoutSession persistence.
+ */
+@Entity(tableName = "workout_sessions")
+data class WorkoutSessionEntity(
+    @PrimaryKey val id: String,
+    val workoutId: String = "",
+    val startTime: Long = System.currentTimeMillis(),
+    val endTime: Long? = null,
+    val exercisesCompletedJSON: String = "[]",
+    val totalCalories: Int = 0,
+    val notes: String? = null
+) {
+    fun toWorkoutSession(): WorkoutSession {
+        val exercisesCompleted = try {
+            Gson().fromJson(exercisesCompletedJSON, Array<String>::class.java).toList()
+        } catch (e: Exception) {
+            emptyList()
+        }
+        return WorkoutSession(
+            id = id,
+            workoutId = workoutId,
+            startTime = LocalDateTime.ofEpochSecond(startTime / 1000, 0, ZoneOffset.UTC),
+            endTime = endTime?.let { LocalDateTime.ofEpochSecond(it / 1000, 0, ZoneOffset.UTC) },
+            exercisesCompleted = exercisesCompleted,
+            totalCalories = totalCalories,
+            notes = notes
+        )
+    }
+
+    companion object {
+        fun fromWorkoutSession(session: WorkoutSession): WorkoutSessionEntity = WorkoutSessionEntity(
+            id = session.id,
+            workoutId = session.workoutId,
+            startTime = session.startTime.toEpochSecond(ZoneOffset.UTC) * 1000,
+            endTime = session.endTime?.toEpochSecond(ZoneOffset.UTC)?.let { it * 1000 },
+            exercisesCompletedJSON = Gson().toJson(session.exercisesCompleted),
+            totalCalories = session.totalCalories,
+            notes = session.notes
+        )
+    }
+}

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/features/dashboard/DashboardScreen.kt

@@ -11,12 +11,15 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.appship.health.AppConfig
 import com.appship.health.data.DailyGoalType
-import com.appship.health.mock.MockDataProvider
+import com.appship.health.data.DataSourceResolver
+import com.appship.health.core.components.EmptyStateView
+import com.appship.health.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -24,7 +27,8 @@ fun DashboardScreen(
     onWorkoutClick: (String) -> Unit = {},
     onProgressClick: () -> Unit = {}
 ) {
-    val goals by MockDataProvider.dailyGoals.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val goals by repository.dailyGoals.collectAsState()
     
     Scaffold(
         topBar = {
@@ -51,7 +55,7 @@ fun DashboardScreen(
                     horizontalArrangement = Arrangement.spacedBy(12.dp),
                     verticalArrangement = Arrangement.spacedBy(12.dp)
                 ) {
-                    itemsIndexed(goals) { index, goal ->
+                    itemsIndexed(items = goals as List<com.appship.health.data.DailyGoal>) { index, goal ->
                         MetricCard(
                             goal = goal,
                             modifier = Modifier.testTag("dashboard_metric_${goal.type.name.lowercase()}_card")

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/features/profile/ProfileScreen.kt

@@ -7,9 +7,10 @@ import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.TrendingUp
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.appship.health.mock.MockDataProvider
+import com.appship.health.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -17,7 +18,8 @@ fun ProfileScreen(
     onSettingsClick: () -> Unit = {},
     onProgressClick: () -> Unit = {}
 ) {
-    val profile = MockDataProvider.userProfile
+    val repository = remember { DataSourceResolver.repository }
+    val profile = repository.userProfile
     
     Scaffold(
         topBar = {
@@ -55,11 +57,11 @@ fun ProfileScreen(
                         profile.name,
                         style = MaterialTheme.typography.titleLarge
                     )
-                    profile.age?.let {
-                        Text("Age: $it", style = MaterialTheme.typography.bodyMedium)
+                    if (profile.age != null) {
+                        Text("Age: ${profile.age}", style = MaterialTheme.typography.bodyMedium)
                     }
-                    profile.formattedBMI?.let {
-                        Text("BMI: $it", style = MaterialTheme.typography.bodyMedium)
+                    if (profile.formattedBMI != null) {
+                        Text("BMI: ${profile.formattedBMI}", style = MaterialTheme.typography.bodyMedium)
                     }
                 }
             }

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/features/workouts/WorkoutListScreen.kt

@@ -9,17 +9,21 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import com.appship.health.mock.MockDataProvider
+import com.appship.health.data.DataSourceResolver
+import com.appship.health.core.components.EmptyStateView
+import com.appship.health.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun WorkoutListScreen(
     onWorkoutClick: (String) -> Unit
 ) {
-    val workouts by MockDataProvider.workouts.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val workouts by repository.workouts.collectAsState()
     
     Scaffold(
         topBar = {
@@ -44,12 +48,20 @@ fun WorkoutListScreen(
                 )
             }
             
-            itemsIndexed(workouts) { index, workout ->
+            if (workouts.isEmpty()) {
+                item {
+                    EmptyStateView(
+                        config = EmptyStatePresets.noItems(message = "No workouts available yet.")
+                    )
+                }
+            } else {
+                itemsIndexed(workouts) { index, workout ->
                 WorkoutCard(
                     workout = workout,
                     onClick = { onWorkoutClick(workout.id) },
                     modifier = Modifier.testTag("workout_list_workout_${index}_card")
                 )
+                }
             }
         }
     }

package/templates/android/HealthTemplate/app/src/main/kotlin/com/appship/health/mock/MockDataProvider.kt

@@ -10,9 +10,9 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.UUID
 
-object MockDataProvider {
+object MockDataProvider : DataRepository {
     
-    private val defaultExercises = listOf(
+    internal val defaultExercises = listOf(
         Exercise(
             id = "e1",
             name = "Push-ups",
@@ -121,7 +121,7 @@ object MockDataProvider {
         )
     )
     
-    private val defaultWorkouts = listOf(
+    internal val defaultWorkouts = listOf(
         Workout(
             id = "w1",
             title = "Full Body Strength",
@@ -205,27 +205,27 @@ object MockDataProvider {
     )
     
     private val _workouts = MutableStateFlow(defaultWorkouts)
-    val workouts: StateFlow<List<Workout>> = _workouts.asStateFlow()
+    override val workouts: StateFlow<List<Workout>> = _workouts.asStateFlow()
     
     private val _exercises = MutableStateFlow(defaultExercises)
-    val exercises: StateFlow<List<Exercise>> = _exercises.asStateFlow()
+    override val exercises: StateFlow<List<Exercise>> = _exercises.asStateFlow()
     
     private val _workoutSessions = MutableStateFlow<List<WorkoutSession>>(emptyList())
-    val workoutSessions: StateFlow<List<WorkoutSession>> = _workoutSessions.asStateFlow()
+    override val workoutSessions: StateFlow<List<WorkoutSession>> = _workoutSessions.asStateFlow()
     
     private val _meals = MutableStateFlow<List<Meal>>(emptyList())
-    val meals: StateFlow<List<Meal>> = _meals.asStateFlow()
+    override val meals: StateFlow<List<Meal>> = _meals.asStateFlow()
     
     private val _healthMetrics = MutableStateFlow<List<HealthMetric>>(emptyList())
-    val healthMetrics: StateFlow<List<HealthMetric>> = _healthMetrics.asStateFlow()
+    override val healthMetrics: StateFlow<List<HealthMetric>> = _healthMetrics.asStateFlow()
     
     private val _waterEntries = MutableStateFlow<List<WaterEntry>>(emptyList())
-    val waterEntries: StateFlow<List<WaterEntry>> = _waterEntries.asStateFlow()
+    override val waterEntries: StateFlow<List<WaterEntry>> = _waterEntries.asStateFlow()
     
     private val _dailyGoals = MutableStateFlow<List<DailyGoal>>(makeDefaultDailyGoals())
-    val dailyGoals: StateFlow<List<DailyGoal>> = _dailyGoals.asStateFlow()
+    override val dailyGoals: StateFlow<List<DailyGoal>> = _dailyGoals.asStateFlow()
     
-    val userProfile = UserProfile(
+    internal val defaultUserProfile = UserProfile(
         id = "user1",
         name = "John Doe",
         age = 30,
@@ -235,6 +235,8 @@ object MockDataProvider {
         goals = listOf("Lose Weight", "Build Muscle", "Improve Cardio")
     )
     
+    override val userProfile = defaultUserProfile
+    
     init {
         _meals.value = makeDefaultMeals()
         _healthMetrics.value = makeDefaultMetrics()
@@ -243,40 +245,40 @@ object MockDataProvider {
     }
     
     // CRUD Operations
-    fun getWorkouts(): List<Workout> = _workouts.value
+    override fun getWorkouts(): List<Workout> = _workouts.value
     
-    fun getWorkout(id: String): Workout? = _workouts.value.firstOrNull { it.id == id }
+    override fun getWorkout(id: String): Workout? = _workouts.value.firstOrNull { it.id == id }
     
-    fun getExercises(workoutId: String): List<Exercise> {
+    override fun getExercises(workoutId: String): List<Exercise> {
         return getWorkout(workoutId)?.exercises ?: emptyList()
     }
     
-    fun logMeal(meal: Meal) {
+    override fun logMeal(meal: Meal) {
         _meals.value = listOf(meal) + _meals.value
         updateGoalProgress(DailyGoalType.CALORIES, meal.totalCalories.toDouble())
         SyncManager.incrementPending()
     }
     
-    fun logWater(entry: WaterEntry) {
+    override fun logWater(entry: WaterEntry) {
         _waterEntries.value = listOf(entry) + _waterEntries.value
         updateGoalProgress(DailyGoalType.WATER, entry.amount)
         SyncManager.incrementPending()
     }
     
-    fun getMetrics(type: HealthMetricType, dateRange: ClosedRange<LocalDateTime>): List<HealthMetric> {
+    override fun getMetrics(type: HealthMetricType, dateRange: ClosedRange<LocalDateTime>): List<HealthMetric> {
         return _healthMetrics.value.filter { it.type == type && it.timestamp in dateRange }
     }
     
-    fun getDailyGoals(): List<DailyGoal> = _dailyGoals.value
+    override fun getDailyGoals(): List<DailyGoal> = _dailyGoals.value
     
-    fun updateGoalProgress(type: DailyGoalType, value: Double) {
+    override fun updateGoalProgress(type: DailyGoalType, value: Double) {
         _dailyGoals.value = _dailyGoals.value.map {
             if (it.type == type) it.copy(current = it.current + value) else it
         }
         SyncManager.incrementPending()
     }
     
-    fun startWorkoutSession(workoutId: String): WorkoutSession {
+    override fun startWorkoutSession(workoutId: String): WorkoutSession {
         val session = WorkoutSession(
             id = UUID.randomUUID().toString(),
             workoutId = workoutId,
@@ -286,7 +288,7 @@ object MockDataProvider {
         return session
     }
     
-    fun completeWorkoutSession(sessionId: String, calories: Int, exercisesCompleted: List<String>, notes: String?) {
+    override fun completeWorkoutSession(sessionId: String, calories: Int, exercisesCompleted: List<String>, notes: String?) {
         _workoutSessions.value = _workoutSessions.value.map {
             if (it.id == sessionId) {
                 val duration = it.duration ?: 0
@@ -409,7 +411,7 @@ object MockDataProvider {
         }.sortedByDescending { it.startTime }
     }
     
-    private fun makeDefaultDailyGoals(): List<DailyGoal> {
+    internal fun makeDefaultDailyGoals(): List<DailyGoal> {
         return listOf(
             DailyGoal("dg1", DailyGoalType.CALORIES, AppConfig.Business.CALORIE_GOAL.toDouble(), 0.0, "kcal"),
             DailyGoal("dg2", DailyGoalType.WATER, AppConfig.Business.WATER_GOAL.toDouble(), 0.0, "ml"),

package/templates/android/HealthTemplate/app/src/test/kotlin/com/appship/health/DataRepositoryTest.kt

@@ -0,0 +1,41 @@
+package com.appship.health
+
+import com.appship.health.data.DataRepository
+import com.appship.health.data.DataSourceResolver
+import com.appship.health.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("workouts should not be empty", repo.workouts.value.isNotEmpty())
+        assertTrue("exercises should not be empty", repo.exercises.value.isNotEmpty())
+    }
+
+    @Test
+    fun testDataSourceResolverReturnsMock() {
+        val resolved = DataSourceResolver.repository
+        assertNotNull("DataSourceResolver should return a non-null repository", resolved)
+    }
+}

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

@@ -16,6 +16,7 @@ ksp = "1.9.22-1.0.17"
 coil = "2.5.0"
 gson = "2.10.1"
 coroutinesTest = "1.7.3"
+room = "2.6.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -42,6 +43,9 @@ hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.r
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 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/HealthTemplate/tests/01_launch_dashboard.yaml

@@ -1,14 +1,32 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      id: "dashboard_metric_calories_card"
+    timeout: 10000
+- tapOn:
+    text: "Skip"
+    optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible:
-    id: "tab_bar_dashboard"
+# Verify dashboard content
+- assertVisible: "Dashboard"
 - assertVisible:
     id: "dashboard_metric_calories_card"
 - assertVisible:
     id: "dashboard_metric_water_card"
+- assertVisible:
+    id: "dashboard_metric_steps_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_metric_workout_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_water_add_button"
+    optional: true
 - assertVisible:
     id: "dashboard_workout_start_button"
+    optional: true

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

@@ -1,18 +1,45 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      id: "dashboard_metric_calories_card"
+    timeout: 10000
 - tapOn:
-    text: "Get Started"
+    text: "Skip"
     optional: true
 - tapOn:
-    id: "tab_bar_workouts"
+    text: "Get Started"
+    optional: true
+# Dashboard tab (default)
+- assertVisible: "Dashboard"
+- assertVisible:
+    id: "dashboard_metric_calories_card"
+- assertVisible: "Today's Goals"
+# Workouts tab
+- tapOn: "Workouts"
+- waitForAnimationToEnd
 - assertVisible: "Workouts"
-- tapOn:
-    id: "tab_bar_nutrition"
+- assertVisible:
+    id: "workout_list_workout_0_card"
+    optional: true
+# Nutrition tab
+- tapOn: "Nutrition"
+- waitForAnimationToEnd
 - assertVisible: "Nutrition"
-- tapOn:
-    id: "tab_bar_profile"
+- assertVisible: "Calories"
+- assertVisible:
+    id: "nutrition_meal_0_card"
+    optional: true
+# Profile tab
+- tapOn: "Profile"
+- waitForAnimationToEnd
 - assertVisible: "Profile"
-- tapOn:
-    id: "tab_bar_dashboard"
+- assertVisible: "Settings"
+# Back to Dashboard
+- tapOn: "Dashboard"
+- waitForAnimationToEnd
 - assertVisible: "Dashboard"
+- assertVisible:
+    id: "dashboard_metric_calories_card"

package/templates/android/HealthTemplate/tests/03_workout_browse.yaml

@@ -1,16 +1,56 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      id: "dashboard_metric_calories_card"
+    timeout: 10000
 - tapOn:
-    text: "Get Started"
+    text: "Skip"
     optional: true
 - tapOn:
-    id: "tab_bar_workouts"
+    text: "Get Started"
+    optional: true
+# Navigate to Workouts
+- tapOn: "Workouts"
+- waitForAnimationToEnd
 - assertVisible: "Workouts"
+# Verify workout list elements
 - assertVisible:
     id: "workout_list_search_field"
+    optional: true
 - assertVisible:
     id: "workout_list_workout_0_card"
+    optional: true
+# Test search
+- tapOn:
+    id: "workout_list_search_field"
+    optional: true
+- inputText: "Yoga"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+- eraseText
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Tap first workout
 - tapOn:
     id: "workout_list_workout_0_card"
-- assertVisible: ".*Full Body.*"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Verify workout detail
+- assertVisible: ".*Workout.*"
+    optional: true
+- assertVisible: ".*Duration.*"
+    optional: true
+# Navigate back
+- pressKey: [Back]
+    optional: true
+- waitForAnimationToEnd
+# Verify empty state if no workouts
+- assertVisible:
+    id: "workout_list_empty_state"
+    optional: true

package/templates/android/HealthTemplate/tests/04_workout_player.yaml

@@ -1,18 +1,60 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      id: "dashboard_metric_calories_card"
+    timeout: 10000
 - tapOn:
-    text: "Get Started"
+    text: "Skip"
     optional: true
 - tapOn:
-    id: "tab_bar_workouts"
+    text: "Get Started"
+    optional: true
+# Navigate to Workouts
+- tapOn: "Workouts"
+- waitForAnimationToEnd
+- assertVisible: "Workouts"
+# Start a workout
 - tapOn:
     id: "workout_list_workout_0_card"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Tap start/play button
+- tapOn: "Start"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Verify workout player elements
 - assertVisible:
     id: "workout_player_exercise_0_card"
+    optional: true
 - assertVisible:
+    id: "workout_player_timer_text"
+    optional: true
+- assertVisible:
+    id: "workout_player_next_button"
+    optional: true
+# Advance through exercises
+- tapOn:
     id: "workout_player_next_button"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
 - tapOn:
     id: "workout_player_next_button"
-- assertVisible:
-    id: "workout_player_exercise_1_card"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Complete workout
+- tapOn:
+    text: "Complete"
+    optional: true
+- waitForAnimationToEnd
+    optional: true
+# Navigate back
+- pressKey: [Back]
+    optional: true
+- waitForAnimationToEnd