@shaykec/app-agent 1.0.5 → 1.0.7

package/templates/android/TrackTemplate/app/src/main/kotlin/com/appship/track/data/local/LocalStorageProvider.kt

@@ -0,0 +1,182 @@
+package com.appship.track.data.local
+
+import android.content.Context
+import com.appship.track.data.*
+import com.appship.track.data.DataRepository
+import com.appship.track.mock.MockDataProvider
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.time.LocalDate
+
+/**
+ * Room-backed implementation of [DataRepository].
+ * Stores habit tracking data in a local SQLite database.
+ * Pre-seeds default data from MockDataProvider on first launch.
+ *
+ * Call [initialize] with an Android Context before using.
+ */
+class LocalStorageProvider private constructor(
+    private val dao: AppDao,
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+) : DataRepository {
+
+    private val _habits = MutableStateFlow<List<Habit>>(emptyList())
+    override val habits: StateFlow<List<Habit>> = _habits.asStateFlow()
+
+    private val _achievements = MutableStateFlow<List<Achievement>>(emptyList())
+    override val achievements: StateFlow<List<Achievement>> = _achievements.asStateFlow()
+
+    override val sampleHabits: List<Habit> get() = _habits.value
+    override val achievementsList: List<Achievement> get() = _achievements.value
+
+    fun loadData() {
+        scope.launch {
+            // Seed on first launch
+            if (dao.habitCount() == 0) {
+                seedDefaults()
+            }
+            refreshHabits()
+            refreshAchievements()
+        }
+    }
+
+    override fun createHabit(habit: Habit) {
+        scope.launch {
+            dao.insertHabit(HabitEntity.fromHabit(habit))
+            refreshHabits()
+        }
+    }
+
+    override fun updateHabit(habitId: String, update: (Habit) -> Habit) {
+        scope.launch {
+            val entity = dao.getHabitById(habitId) ?: return@launch
+            val habit = entity.toHabit()
+            val updated = update(habit)
+            dao.updateHabit(HabitEntity.fromHabit(updated))
+            refreshHabits()
+        }
+    }
+
+    override fun deleteHabit(habitId: String) {
+        scope.launch {
+            val entity = dao.getHabitById(habitId) ?: return@launch
+            dao.deleteHabit(entity)
+            dao.deleteEntriesByHabitId(habitId)
+            dao.deleteStreakByHabitId(habitId)
+            refreshHabits()
+        }
+    }
+
+    override fun archiveHabit(habitId: String, archived: Boolean) {
+        updateHabit(habitId) { it.copy(isArchived = archived) }
+    }
+
+    override fun toggleHabitCompletion(habitId: String, date: LocalDate, completed: Boolean) {
+        scope.launch {
+            val dateEpochDay = date.toEpochDay()
+            val existing = dao.getEntryByHabitIdAndDate(habitId, dateEpochDay)
+            if (existing != null) {
+                val entry = existing.toHabitEntry()
+                val updated = entry.copy(
+                    isCompleted = completed,
+                    completedAt = if (completed) java.time.LocalDateTime.now() else null
+                )
+                dao.updateEntry(HabitEntryEntity.fromHabitEntry(updated))
+            } else if (completed) {
+                val habit = dao.getHabitById(habitId)?.toHabit() ?: return@launch
+                val newEntry = HabitEntry(
+                    id = java.util.UUID.randomUUID().toString(),
+                    habitId = habitId,
+                    date = date,
+                    value = habit.targetValue,
+                    isCompleted = true,
+                    completedAt = java.time.LocalDateTime.now()
+                )
+                dao.insertEntry(HabitEntryEntity.fromHabitEntry(newEntry))
+            }
+        }
+    }
+
+    override fun updateAchievementProgress(achievementId: String, progress: Int, isUnlocked: Boolean) {
+        scope.launch {
+            val entity = dao.getAchievementById(achievementId) ?: return@launch
+            val achievement = entity.toAchievement()
+            val updated = achievement.copy(
+                progress = progress,
+                isUnlocked = isUnlocked || achievement.isUnlocked,
+                unlockedAt = if ((isUnlocked || achievement.isUnlocked) && achievement.unlockedAt == null) {
+                    java.time.LocalDateTime.now()
+                } else {
+                    achievement.unlockedAt
+                }
+            )
+            dao.updateAchievement(AchievementEntity.fromAchievement(updated))
+            refreshAchievements()
+        }
+    }
+
+    override fun reset() {
+        scope.launch {
+            // Clear all tables
+            dao.getAllHabits().forEach { dao.deleteHabit(it) }
+            dao.getAllAchievements().forEach { dao.deleteAchievement(it) }
+            dao.getAllHabits().forEach { habit ->
+                dao.deleteEntriesByHabitId(habit.id)
+                dao.deleteStreakByHabitId(habit.id)
+            }
+            
+            seedDefaults()
+            loadData()
+        }
+    }
+
+    // MARK: - Private helpers
+
+    private suspend fun refreshHabits() {
+        _habits.value = dao.getAllHabits().map { it.toHabit() }
+    }
+
+    private suspend fun refreshAchievements() {
+        _achievements.value = dao.getAllAchievements().map { it.toAchievement() }
+    }
+
+    private suspend fun seedDefaults() {
+        // Seed habits
+        dao.insertHabits(MockDataProvider.habits.value.map { HabitEntity.fromHabit(it) })
+
+        // Seed achievements
+        dao.insertAchievements(MockDataProvider.achievements.value.map { AchievementEntity.fromAchievement(it) })
+    }
+
+    companion object {
+        @Volatile
+        private var INSTANCE: LocalStorageProvider? = null
+
+        /**
+         * Initialize with Android context. Call from Application.onCreate().
+         */
+        fun initialize(context: Context) {
+            if (INSTANCE == null) {
+                synchronized(this) {
+                    if (INSTANCE == null) {
+                        val db = AppDatabase.getInstance(context)
+                        INSTANCE = LocalStorageProvider(db.appDao()).also {
+                            it.loadData()
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Returns the singleton instance. Must call [initialize] first.
+         */
+        fun getInstance(): LocalStorageProvider {
+            return INSTANCE ?: error(
+                "LocalStorageProvider not initialized. Call LocalStorageProvider.initialize(context) first."
+            )
+        }
+    }
+}

package/templates/android/TrackTemplate/app/src/main/kotlin/com/appship/track/data/local/StreakEntity.kt

@@ -0,0 +1,43 @@
+package com.appship.track.data.local
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.appship.track.data.Streak
+import java.time.LocalDate
+
+/**
+ * Room entity for Streak persistence.
+ */
+@Entity(tableName = "streaks")
+data class StreakEntity(
+    @PrimaryKey val habitId: String,
+    val currentStreak: Int = 0,
+    val longestStreak: Int = 0,
+    val lastCompletedDate: Long? = null, // LocalDate as epoch day
+    val freezesUsed: Int = 0,
+    val freezesAvailable: Int = 2
+) {
+    fun toStreak(): Streak {
+        return Streak(
+            habitId = habitId,
+            currentStreak = currentStreak,
+            longestStreak = longestStreak,
+            lastCompletedDate = lastCompletedDate?.let { LocalDate.ofEpochDay(it) },
+            freezesUsed = freezesUsed,
+            freezesAvailable = freezesAvailable
+        )
+    }
+
+    companion object {
+        fun fromStreak(streak: Streak): StreakEntity {
+            return StreakEntity(
+                habitId = streak.habitId,
+                currentStreak = streak.currentStreak,
+                longestStreak = streak.longestStreak,
+                lastCompletedDate = streak.lastCompletedDate?.toEpochDay(),
+                freezesUsed = streak.freezesUsed,
+                freezesAvailable = streak.freezesAvailable
+            )
+        }
+    }
+}

package/templates/android/TrackTemplate/app/src/main/kotlin/com/appship/track/features/dashboard/TodayScreen.kt

@@ -26,6 +26,8 @@ import com.appship.track.data.DailySummary
 import com.appship.track.data.Habit
 import com.appship.track.data.HabitEntry
 import com.appship.track.data.HabitWithEntry
+import com.appship.track.core.components.EmptyStateView
+import com.appship.track.core.components.EmptyStatePresets
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 
@@ -90,7 +92,13 @@ fun TodayScreen(
             // Habits List
             if (uiState.dailySummary.habits.isEmpty()) {
                 item {
-                    EmptyHabitsCard(onAddHabit = onAddHabit)
+                    EmptyStateView(
+                        config = EmptyStatePresets.noItems(
+                            message = "Start building better habits today",
+                            onAdd = onAddHabit
+                        ),
+                        modifier = Modifier.padding(horizontal = 16.dp)
+                    )
                 }
             } else {
                 items(uiState.dailySummary.habits, key = { it.habit.id }) { habitWithEntry ->
@@ -343,44 +351,7 @@ fun HabitRow(
     }
 }
 
-@Composable
-fun EmptyHabitsCard(onAddHabit: () -> Unit) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp),
-        shape = RoundedCornerShape(16.dp)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(32.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            Text(
-                "🌱",
-                style = MaterialTheme.typography.displayMedium
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            Text(
-                "No habits yet",
-                style = MaterialTheme.typography.titleMedium
-            )
-            Text(
-                "Start building better habits today",
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            Button(
-                onClick = onAddHabit,
-                modifier = Modifier.testTag("today_empty_state_button")
-            ) {
-                Text("Add Your First Habit")
-            }
-        }
-    }
-}
+// EmptyHabitsCard has been replaced with EmptyStateView
 
 @Composable
 fun CelebrationCard() {

package/templates/android/TrackTemplate/app/src/main/kotlin/com/appship/track/features/habits/HabitsListScreen.kt

@@ -23,6 +23,8 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.appship.track.AppConfig
 import com.appship.track.data.Habit
+import com.appship.track.core.components.EmptyStateView
+import com.appship.track.core.components.EmptyStatePresets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -70,7 +72,12 @@ fun HabitsListScreen(
             
             // Habits List
             if (uiState.habits.isEmpty()) {
-                EmptyHabitsView(onAddHabit = onAddHabit)
+                EmptyStateView(
+                    config = EmptyStatePresets.noItems(
+                        message = "Create your first habit to get started",
+                        onAdd = onAddHabit
+                    )
+                )
             } else {
                 LazyColumn(
                     contentPadding = PaddingValues(16.dp),
@@ -194,37 +201,3 @@ fun HabitCard(
         }
     }
 }
-
-@Composable
-fun EmptyHabitsView(onAddHabit: () -> Unit) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(32.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text(
-            text = "🌱",
-            style = MaterialTheme.typography.displayLarge
-        )
-        Spacer(modifier = Modifier.height(16.dp))
-        Text(
-            text = "No habits yet",
-            style = MaterialTheme.typography.titleLarge,
-            fontWeight = FontWeight.Bold
-        )
-        Text(
-            text = "Start building better habits today",
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Spacer(modifier = Modifier.height(24.dp))
-        Button(
-            onClick = onAddHabit,
-            modifier = Modifier.testTag("habits_add_button")
-        ) {
-            Text("Add Your First Habit")
-        }
-    }
-}

package/templates/android/TrackTemplate/app/src/main/kotlin/com/appship/track/mock/MockDataProvider.kt

@@ -170,7 +170,7 @@ object MockDataProvider : DataRepository {
         SyncManager.incrementPending()
     }
     
-    fun updateHabit(habitId: String, update: (Habit) -> Habit) {
+    override fun updateHabit(habitId: String, update: (Habit) -> Habit) {
         _habits.value = _habits.value.map { if (it.id == habitId) update(it) else it }
         SyncManager.incrementPending()
     }
@@ -180,7 +180,7 @@ object MockDataProvider : DataRepository {
         SyncManager.incrementPending()
     }
     
-    override fun archiveHabit(habitId: String, archived: Boolean = true) {
+    override fun archiveHabit(habitId: String, archived: Boolean) {
         updateHabit(habitId) { it.copy(isArchived = archived) }
     }
     
@@ -191,7 +191,7 @@ object MockDataProvider : DataRepository {
     }
     
     // CRUD Operations for Achievements
-    override fun updateAchievementProgress(achievementId: String, progress: Int, isUnlocked: Boolean = false) {
+    override fun updateAchievementProgress(achievementId: String, progress: Int, isUnlocked: Boolean) {
         _achievements.value = _achievements.value.map {
             if (it.id == achievementId) {
                 it.copy(

package/templates/android/TrackTemplate/app/src/test/kotlin/com/appship/track/DataRepositoryTest.kt

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

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

@@ -15,6 +15,8 @@ hilt = "2.50"
 hiltNavigationCompose = "1.1.0"
 coil = "2.5.0"
 coroutinesTest = "1.7.3"
+room = "2.6.1"
+gson = "2.10.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -38,6 +40,10 @@ 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" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

package/templates/android/TrackTemplate/tests/01_launch_today.yaml

@@ -1,14 +1,53 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      - "Today"
+      - "Habits"
+      - "Dashboard"
+      - "Profile"
+    timeout: 10000
+# Skip onboarding if present
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible: "Today"
-- assertVisible: ".*Morning Exercise.*"
-- assertVisible: ".*Read.*"
-- assertVisible: ".*Drink Water.*"
-- assertVisible: "Today's Habits"
+- tapOn:
+    text: "Continue"
+    optional: true
+# Verify we're on Today tab (default)
+- assertVisible:
+    text: "Today"
+# Verify today screen content
+- assertVisible:
+    id: "today_add_habit_button"
+- assertVisible:
+    id: "today_progress_ring"
+# Check for habits or empty state
+- assertVisible:
+    id: "today_empty_state"
+    optional: true
+# If habits exist, verify at least one habit card
+- assertVisible:
+    id: "today_habit_0_card"
+    optional: true
+- assertVisible:
+    id: "today_habit_0_toggle"
+    optional: true
+# Verify date selector buttons
+- assertVisible:
+    id: "today_date_0_button"
+    optional: true
+# Verify tab bar is visible
+- assertVisible:
+    text: "Today"
+- assertVisible:
+    text: "Habits"
+- assertVisible:
+    text: "Dashboard"
+- assertVisible:
+    text: "Profile"

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

@@ -1,25 +1,88 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      - "Today"
+      - "Habits"
+      - "Dashboard"
+    timeout: 10000
+# Skip onboarding
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible: "Today"
-- tapOn: "Dashboard"
-- waitForAnimationToEnd
-- assertVisible: "Dashboard"
-- tapOn: "Habits"
-- waitForAnimationToEnd
-- assertVisible: "Habits"
-- tapOn: "Achievements"
-- waitForAnimationToEnd
-- assertVisible: "Achievements"
-- tapOn: "Settings"
-- waitForAnimationToEnd
-- assertVisible: "Settings"
-- tapOn: "Today"
-- waitForAnimationToEnd
-- assertVisible: "Today"
+- tapOn:
+    text: "Continue"
+    optional: true
+# Test Today tab (default)
+- assertVisible:
+    text: "Today"
+- assertVisible:
+    id: "today_add_habit_button"
+- assertVisible:
+    id: "today_progress_ring"
+- assertVisible:
+    id: "today_habit_0_card"
+    optional: true
+- assertVisible:
+    id: "today_empty_state"
+    optional: true
+# Navigate to Habits tab
+- tapOn:
+    text: "Habits"
+- assertVisible:
+    text: "Habits"
+- assertVisible:
+    id: "habits_add_button"
+- assertVisible:
+    id: "habits_habit_0_card"
+    optional: true
+- assertVisible:
+    id: "habits_empty_state"
+    optional: true
+# Navigate to Dashboard tab
+- tapOn:
+    text: "Dashboard"
+- assertVisible:
+    text: "Dashboard"
+- assertVisible:
+    id: "dashboard_period_picker"
+- assertVisible:
+    id: "dashboard_chart_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_stat_0_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_stat_1_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_stat_2_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_stat_3_card"
+    optional: true
+- assertVisible:
+    id: "dashboard_empty_state"
+    optional: true
+# Navigate to Profile/Settings tab
+- tapOn:
+    text: "Profile"
+- assertVisible:
+    text: "Profile"
+- assertVisible:
+    id: "settings_dark_mode_toggle"
+- assertVisible:
+    id: "settings_preferences_card"
+    optional: true
+# Return to Today
+- tapOn:
+    text: "Today"
+- assertVisible:
+    text: "Today"
+- assertVisible:
+    id: "today_add_habit_button"

package/templates/android/TrackTemplate/tests/03_habit_toggle.yaml

@@ -1,13 +1,74 @@
 appId: ${APP_PACKAGE_NAME}
 ---
+- clearState
 - launchApp
+- extendedWaitUntil:
+    visible:
+      - "Today"
+    timeout: 10000
+# Skip onboarding
 - tapOn:
     text: "Skip"
     optional: true
 - tapOn:
     text: "Get Started"
     optional: true
-- assertVisible: "Today"
-- assertVisible: ".*Morning Exercise.*"
-- tapOn: ".*Morning Exercise.*"
-- waitForAnimationToEnd
+- tapOn:
+    text: "Continue"
+    optional: true
+# Ensure we're on Today tab
+- assertVisible:
+    text: "Today"
+# Wait for habits to load
+- extendedWaitUntil:
+    visible:
+      id: "today_habit_0_card"
+    timeout: 5000
+    optional: true
+# If no habits exist, create one first
+- tapOn:
+    id: "today_add_habit_button"
+    optional: true
+- assertVisible:
+    id: "add_habit_name_field"
+    optional: true
+- inputText:
+    id: "add_habit_name_field"
+    text: "Test Habit"
+    optional: true
+- tapOn:
+    id: "add_habit_save_button"
+    optional: true
+- extendedWaitUntil:
+    visible:
+      id: "today_habit_0_card"
+    timeout: 5000
+    optional: true
+# Verify habit card and toggle exist
+- assertVisible:
+    id: "today_habit_0_card"
+    optional: true
+- assertVisible:
+    id: "today_habit_0_toggle"
+    optional: true
+# Toggle habit completion
+- tapOn:
+    id: "today_habit_0_toggle"
+    optional: true
+# Verify progress ring updates
+- assertVisible:
+    id: "today_progress_ring"
+# Toggle again to uncomplete
+- tapOn:
+    id: "today_habit_0_toggle"
+    optional: true
+# Verify habit card still visible
+- assertVisible:
+    id: "today_habit_0_card"
+    optional: true
+# Test date navigation
+- tapOn:
+    id: "today_date_0_button"
+    optional: true
+- assertVisible:
+    text: "Today"