@shaykec/app-agent 1.0.4 → 1.0.5

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/chores/ChoreBoardScreen.kt

@@ -11,12 +11,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.appship.family.data.Chore
-import com.appship.family.mock.MockDataProvider
+import com.appship.family.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ChoreBoardScreen() {
-    val dataProvider = MockDataProvider.shared
+    val repository = remember { DataSourceResolver.repository }
     val chores by dataProvider.chores.collectAsState()
     val members by dataProvider.members.collectAsState()
     var showingAddChore by remember { mutableStateOf(false) }
@@ -63,7 +63,7 @@ fun ChoreBoardScreen() {
         AddChoreDialog(
             onDismiss = { showingAddChore = false },
             onSave = { chore ->
-                dataProvider.createChore(chore)
+                repository.createChore(chore)
                 showingAddChore = false
             }
         )

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/familyhub/FamilyHubScreen.kt

@@ -13,15 +13,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.appship.family.data.DataSourceResolver
 import com.appship.family.data.FamilyMember
-import com.appship.family.mock.MockDataProvider
 import com.appship.family.features.members.MemberProfileScreen
 
 @Composable
 fun FamilyHubScreen(navController: NavController) {
-    val dataProvider = MockDataProvider.shared
-    val members by dataProvider.members.collectAsState()
-    val chores by dataProvider.chores.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val members by repository.members.collectAsState()
+    val chores by repository.chores.collectAsState()
     var selectedMember by remember { mutableStateOf<FamilyMember?>(null) }
     
     Column(

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/gallery/GalleryScreen.kt

@@ -11,14 +11,14 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
+import com.appship.family.data.DataSourceResolver
 import com.appship.family.data.Photo
-import com.appship.family.mock.MockDataProvider
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GalleryScreen() {
-    val dataProvider = MockDataProvider.shared
-    val photos by dataProvider.photos.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val photos by repository.photos.collectAsState()
     var showingAddPhoto by remember { mutableStateOf(false) }
     
     Scaffold(

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/members/MembersListScreen.kt

@@ -10,14 +10,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.appship.family.data.DataSourceResolver
 import com.appship.family.data.FamilyMember
-import com.appship.family.mock.MockDataProvider
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MembersListScreen(navController: NavController) {
-    val dataProvider = MockDataProvider.shared
-    val members by dataProvider.members.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val members by repository.members.collectAsState()
     var selectedMember by remember { mutableStateOf<FamilyMember?>(null) }
     
     Scaffold(
@@ -68,8 +68,8 @@ fun MemberRow(member: FamilyMember, onClick: () -> Unit) {
 
 @Composable
 fun MemberProfileScreen(member: FamilyMember, onDismiss: () -> Unit) {
-    val dataProvider = MockDataProvider.shared
-    val chores = dataProvider.choresForMember(member.id)
+    val repository = remember { DataSourceResolver.repository }
+    val chores = repository.choresForMember(member.id)
     
     AlertDialog(
         onDismissRequest = onDismiss,

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/rewards/RewardsScreen.kt

@@ -9,16 +9,16 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
+import com.appship.family.data.DataSourceResolver
 import com.appship.family.data.Reward
-import com.appship.family.mock.MockDataProvider
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun RewardsScreen() {
-    val dataProvider = MockDataProvider.shared
-    val allRewards by dataProvider.rewards.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val allRewards by repository.rewards.collectAsState()
     val rewards = allRewards.filter { !it.isRedeemed }
-    val members by dataProvider.members.collectAsState()
+    val members by repository.members.collectAsState()
     val currentMember = members.firstOrNull()
     
     Scaffold(
@@ -62,7 +62,7 @@ fun RewardsScreen() {
                         canAfford = currentMember?.points ?: 0 >= reward.pointsCost,
                         onRedeem = {
                             currentMember?.let {
-                                dataProvider.redeemReward(reward, it.id)
+                                repository.redeemReward(reward, it.id)
                             }
                         },
                         modifier = Modifier.testTag("reward_${index}_card")

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/features/settings/SettingsScreen.kt

@@ -9,12 +9,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.appship.family.AppConfig
-import com.appship.family.mock.MockDataProvider
+import com.appship.family.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SettingsScreen(navController: NavController) {
-    val dataProvider = MockDataProvider.shared
+    val repository = remember { DataSourceResolver.repository }
     var isChildMode by remember { mutableStateOf(false) }
     var showingResetAlert by remember { mutableStateOf(false) }
     
@@ -121,7 +121,7 @@ fun SettingsScreen(navController: NavController) {
             confirmButton = {
                 TextButton(
                     onClick = {
-                        dataProvider.reset()
+                        repository.reset()
                         showingResetAlert = false
                     }
                 ) {

package/templates/android/FamilyTemplate/app/src/main/java/com/appship/family/mock/MockDataProvider.kt

@@ -1,20 +1,17 @@
 package com.appship.family.mock
 
 import com.appship.family.data.*
+import com.appship.family.data.DataRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import java.util.*
 
 // CUSTOMIZE:API - Replace mock data with real data source
-class MockDataProvider {
-    companion object {
-        val shared = MockDataProvider()
-    }
-    
+object MockDataProvider : DataRepository {
     // MARK: - State Flows
     private val _members = MutableStateFlow<List<FamilyMember>>(emptyList())
-    val members: StateFlow<List<FamilyMember>> = _members.asStateFlow()
+    override val members: StateFlow<List<FamilyMember>> = _members.asStateFlow()
     
     private val _chores = MutableStateFlow<List<Chore>>(emptyList())
     val chores: StateFlow<List<Chore>> = _chores.asStateFlow()
@@ -53,32 +50,32 @@ class MockDataProvider {
         _members.value = _members.value + member
     }
     
-    fun updateMember(member: FamilyMember) {
+    override fun updateMember(member: FamilyMember) {
         _members.value = _members.value.map { if (it.id == member.id) member else it }
     }
     
-    fun deleteMember(member: FamilyMember) {
+    override fun deleteMember(member: FamilyMember) {
         _members.value = _members.value.filter { it.id != member.id }
     }
     
-    fun memberById(id: String): FamilyMember? {
+    override fun memberById(id: String): FamilyMember? {
         return _members.value.firstOrNull { it.id == id }
     }
     
     // MARK: - CRUD Operations - Chores
-    fun createChore(chore: Chore) {
+    override fun createChore(chore: Chore) {
         _chores.value = _chores.value + chore
     }
     
-    fun updateChore(chore: Chore) {
+    override fun updateChore(chore: Chore) {
         _chores.value = _chores.value.map { if (it.id == chore.id) chore else it }
     }
     
-    fun deleteChore(chore: Chore) {
+    override fun deleteChore(chore: Chore) {
         _chores.value = _chores.value.filter { it.id != chore.id }
     }
     
-    fun completeChore(chore: Chore, memberId: String) {
+    override fun completeChore(chore: Chore, memberId: String) {
         val updated = chore.copy(
             isCompleted = true,
             completedAt = Date(),
@@ -92,28 +89,28 @@ class MockDataProvider {
         }
     }
     
-    fun choresForMember(memberId: String): List<Chore> {
+    override fun choresForMember(memberId: String): List<Chore> {
         return _chores.value.filter { it.assignedTo == memberId }
     }
     
-    fun pendingChores(): List<Chore> {
+    override fun pendingChores(): List<Chore> {
         return _chores.value.filter { !it.isCompleted }
     }
     
     // MARK: - CRUD Operations - Rewards
-    fun createReward(reward: Reward) {
+    override fun createReward(reward: Reward) {
         _rewards.value = _rewards.value + reward
     }
     
-    fun updateReward(reward: Reward) {
+    override fun updateReward(reward: Reward) {
         _rewards.value = _rewards.value.map { if (it.id == reward.id) reward else it }
     }
     
-    fun deleteReward(reward: Reward) {
+    override fun deleteReward(reward: Reward) {
         _rewards.value = _rewards.value.filter { it.id != reward.id }
     }
     
-    fun redeemReward(reward: Reward, memberId: String): Boolean {
+    override fun redeemReward(reward: Reward, memberId: String): Boolean {
         val member = memberById(memberId) ?: return false
         if (member.points < reward.pointsCost || reward.isRedeemed) return false
         
@@ -128,24 +125,24 @@ class MockDataProvider {
         return true
     }
     
-    fun availableRewards(): List<Reward> {
+    override fun availableRewards(): List<Reward> {
         return _rewards.value.filter { !it.isRedeemed }
     }
     
     // MARK: - CRUD Operations - Calendar Events
-    fun createEvent(event: CalendarEvent) {
+    override fun createEvent(event: CalendarEvent) {
         _calendarEvents.value = _calendarEvents.value + event
     }
     
-    fun updateEvent(event: CalendarEvent) {
+    override fun updateEvent(event: CalendarEvent) {
         _calendarEvents.value = _calendarEvents.value.map { if (it.id == event.id) event else it }
     }
     
-    fun deleteEvent(event: CalendarEvent) {
+    override fun deleteEvent(event: CalendarEvent) {
         _calendarEvents.value = _calendarEvents.value.filter { it.id != event.id }
     }
     
-    fun eventsForDate(date: Date): List<CalendarEvent> {
+    override fun eventsForDate(date: Date): List<CalendarEvent> {
         val calendar = Calendar.getInstance()
         calendar.time = date
         val dayOfYear = calendar.get(Calendar.DAY_OF_YEAR)
@@ -160,37 +157,37 @@ class MockDataProvider {
     }
     
     // MARK: - CRUD Operations - Milestones
-    fun createMilestone(milestone: Milestone) {
+    override fun createMilestone(milestone: Milestone) {
         _milestones.value = _milestones.value + milestone
     }
     
-    fun updateMilestone(milestone: Milestone) {
+    override fun updateMilestone(milestone: Milestone) {
         _milestones.value = _milestones.value.map { if (it.id == milestone.id) milestone else it }
     }
     
-    fun deleteMilestone(milestone: Milestone) {
+    override fun deleteMilestone(milestone: Milestone) {
         _milestones.value = _milestones.value.filter { it.id != milestone.id }
     }
     
-    fun milestonesForMember(memberId: String): List<Milestone> {
+    override fun milestonesForMember(memberId: String): List<Milestone> {
         return _milestones.value.filter { it.memberId == memberId }
     }
     
     // MARK: - CRUD Operations - Photos
-    fun createPhoto(photo: Photo) {
+    override fun createPhoto(photo: Photo) {
         _photos.value = _photos.value + photo
     }
     
-    fun updatePhoto(photo: Photo) {
+    override fun updatePhoto(photo: Photo) {
         _photos.value = _photos.value.map { if (it.id == photo.id) photo else it }
     }
     
-    fun deletePhoto(photo: Photo) {
+    override fun deletePhoto(photo: Photo) {
         _photos.value = _photos.value.filter { it.id != photo.id }
     }
     
     // MARK: - Reset
-    fun reset() {
+    override fun reset() {
         loadData()
     }
     

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/AppConfig.kt

@@ -41,6 +41,15 @@ object AppConfig {
         const val TERMS_URL = "https://example.com/terms"
     }
     
+    // CUSTOMIZE:DATASOURCE - Data source configuration
+    object DataSource {
+        enum class SourceType {
+            LOCAL_STORAGE,  // Room — real local database (DEFAULT)
+            MOCK            // In-memory seed data — for development/testing only
+        }
+        val active: SourceType = SourceType.MOCK
+    }
+    
     // CUSTOMIZE:THEME — colors are defined in core/theme/Theme.kt
     object Theme {
         val primaryColor get() = Primary

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/data/DataRepository.kt

@@ -0,0 +1,70 @@
+package com.appship.finance.data
+
+import kotlinx.coroutines.flow.StateFlow
+import java.util.Date
+
+/**
+ * Abstracts the data layer. Both MockDataProvider and LocalStorageProvider
+ * implement this, allowing the app to swap data sources via AppConfig.DataSource.active.
+ *
+ * Screens and ViewModels depend on this interface rather than on a concrete implementation.
+ * Use [DataSourceResolver.repository] to get the active provider.
+ */
+interface DataRepository {
+    // Observable state
+    val accounts: StateFlow<List<Account>>
+    val transactions: StateFlow<List<Transaction>>
+    val budgets: StateFlow<List<Budget>>
+    val goals: StateFlow<List<Goal>>
+    val categories: StateFlow<List<Category>>
+    val bills: StateFlow<List<Bill>>
+    val insights: StateFlow<List<SpendingInsight>>
+
+    // Computed properties
+    val totalBalance: Double
+    val monthlyIncome: Double
+    val monthlyExpenses: Double
+
+    // Account operations
+    fun getAccounts(): List<Account>
+    fun getAccount(id: String): Account?
+
+    // Transaction operations
+    fun getTransactions(): List<Transaction>
+    fun getTransactions(accountId: String): List<Transaction>
+    fun createTransaction(transaction: Transaction)
+    fun updateTransaction(transaction: Transaction)
+    fun deleteTransaction(id: String)
+
+    // Budget operations
+    fun getBudgets(): List<Budget>
+    fun getBudget(id: String): Budget?
+    fun createBudget(budget: Budget)
+    fun updateBudget(budget: Budget)
+    fun deleteBudget(id: String)
+
+    // Goal operations
+    fun getGoals(): List<Goal>
+    fun getGoal(id: String): Goal?
+    fun createGoal(goal: Goal)
+    fun updateGoal(goal: Goal)
+    fun deleteGoal(id: String)
+
+    // Category operations
+    fun getCategories(): List<Category>
+    fun getCategory(id: String): Category?
+
+    // Query operations
+    fun getTransactionsByCategory(categoryId: String): List<Transaction>
+    fun getTransactionsByDateRange(start: Date, end: Date): List<Transaction>
+
+    // Analytics operations
+    fun getBalance(): Double
+    fun getTotalIncome(): Double
+    fun getTotalExpenses(): Double
+    fun getBudgetProgress(budgetId: String): Double
+    fun getGoalProgress(goalId: String): Double
+
+    // Reset
+    fun reset()
+}

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/data/DataSourceResolver.kt

@@ -0,0 +1,23 @@
+package com.appship.finance.data
+
+import com.appship.finance.AppConfig
+import com.appship.finance.mock.MockDataProvider
+
+/**
+ * Resolves the active [DataRepository] implementation based on [AppConfig.DataSource.active].
+ * Screens use this to obtain the correct data source without knowing the concrete type.
+ *
+ * Usage:
+ *   val repository = DataSourceResolver.repository
+ *   val accounts by repository.accounts.collectAsState()
+ */
+object DataSourceResolver {
+    val repository: DataRepository
+        get() = when (AppConfig.DataSource.active) {
+            AppConfig.DataSource.SourceType.LOCAL_STORAGE -> {
+                // TODO: Return LocalStorageProvider once implemented
+                MockDataProvider
+            }
+            AppConfig.DataSource.SourceType.MOCK -> MockDataProvider
+        }
+}

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/features/budgets/BudgetsScreen.kt

@@ -23,12 +23,13 @@ import androidx.compose.ui.unit.sp
 import com.appship.finance.AppConfig
 import com.appship.finance.data.Budget
 import com.appship.finance.features.home.formatCurrency
-import com.appship.finance.mock.MockDataProvider
+import com.appship.finance.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BudgetsScreen() {
-    val budgets by MockDataProvider.budgets.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val budgets by repository.budgets.collectAsState()
     val totalBudget = budgets.sumOf { it.limit }
     val totalSpent = budgets.sumOf { it.spent }
     

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/features/goals/GoalsScreen.kt

@@ -25,12 +25,13 @@ import androidx.compose.ui.unit.sp
 import com.appship.finance.AppConfig
 import com.appship.finance.data.Goal
 import com.appship.finance.features.home.formatCurrency
-import com.appship.finance.mock.MockDataProvider
+import com.appship.finance.data.DataSourceResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GoalsScreen(onGoalClick: (String) -> Unit) {
-    val goals by MockDataProvider.goals.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val goals by repository.goals.collectAsState()
     val totalSaved = goals.sumOf { it.currentAmount }
     val totalTarget = goals.sumOf { it.targetAmount }
     
@@ -220,7 +221,8 @@ fun GoalCard(goal: Goal, onClick: () -> Unit, testTag: String) {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GoalDetailScreen(goalId: String, onBack: () -> Unit) {
-    val goals by MockDataProvider.goals.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val goals by repository.goals.collectAsState()
     val goal = goals.find { it.id == goalId } ?: return
     var addAmount by remember { mutableStateOf("") }
     

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/features/home/HomeScreen.kt

@@ -30,7 +30,7 @@ import com.appship.finance.data.Account
 import com.appship.finance.data.SpendingInsight
 import com.appship.finance.data.Transaction
 import com.appship.finance.data.TransactionType
-import com.appship.finance.mock.MockDataProvider
+import com.appship.finance.data.DataSourceResolver
 import java.text.NumberFormat
 import java.util.Locale
 
@@ -40,9 +40,10 @@ fun HomeScreen(
     onAddTransaction: () -> Unit,
     onViewAllTransactions: () -> Unit
 ) {
-    val accounts = remember { MockDataProvider.accounts }
-    val transactions by MockDataProvider.transactions.collectAsState()
-    val insights = remember { MockDataProvider.insights }
+    val repository = remember { DataSourceResolver.repository }
+    val accounts by repository.accounts.collectAsState()
+    val transactions by repository.transactions.collectAsState()
+    val insights by repository.insights.collectAsState()
     
     Scaffold(
         topBar = {
@@ -69,9 +70,9 @@ fun HomeScreen(
             // Balance Card
             item {
                 TotalBalanceCard(
-                    balance = MockDataProvider.totalBalance,
-                    income = MockDataProvider.monthlyIncome,
-                    expenses = MockDataProvider.monthlyExpenses
+                    balance = repository.totalBalance,
+                    income = repository.monthlyIncome,
+                    expenses = repository.monthlyExpenses
                 )
             }
             

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/features/settings/SettingsScreen.kt

@@ -23,7 +23,6 @@ import com.appship.finance.AppConfig
 import com.appship.finance.core.theme.*
 import com.appship.finance.data.Bill
 import com.appship.finance.features.home.formatCurrency
-import com.appship.finance.mock.MockDataProvider
 import java.time.format.DateTimeFormatter
 
 @OptIn(ExperimentalMaterial3Api::class)

package/templates/android/FinanceTemplate/app/src/main/kotlin/com/appship/finance/features/transactions/TransactionsScreen.kt

@@ -27,13 +27,14 @@ import com.appship.finance.data.Transaction
 import com.appship.finance.data.TransactionType
 import com.appship.finance.features.home.TransactionRow
 import com.appship.finance.features.home.formatCurrency
-import com.appship.finance.mock.MockDataProvider
+import com.appship.finance.data.DataSourceResolver
 import java.time.format.DateTimeFormatter
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TransactionsScreen(onAddTransaction: () -> Unit) {
-    val transactionsFlow by MockDataProvider.transactions.collectAsState()
+    val repository = remember { DataSourceResolver.repository }
+    val transactionsFlow by repository.transactions.collectAsState()
     val transactions = remember(transactionsFlow) { transactionsFlow.toMutableStateList() }
     var searchText by remember { mutableStateOf("") }
     var selectedFilter by remember { mutableStateOf<TransactionType?>(null) }
@@ -141,7 +142,11 @@ fun AddTransactionScreen(
     var amount by remember { mutableStateOf("") }
     var type by remember { mutableStateOf(TransactionType.EXPENSE) }
     var selectedCategory by remember { mutableStateOf(AppConfig.expenseCategories[0]) }
-    var selectedAccount by remember { mutableStateOf(MockDataProvider.accounts[0]) }
+    val repository = remember { DataSourceResolver.repository }
+    val accounts by repository.accounts.collectAsState()
+    var selectedAccount by remember(accounts) { 
+        mutableStateOf(accounts.firstOrNull() ?: throw IllegalStateException("No accounts available"))
+    }
     var notes by remember { mutableStateOf("") }
     
     val categories = if (type == TransactionType.EXPENSE) AppConfig.expenseCategories else AppConfig.incomeCategories
@@ -242,7 +247,7 @@ fun AddTransactionScreen(
             // Account
             Text("Account", fontWeight = FontWeight.Medium)
             LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                itemsIndexed(MockDataProvider.accounts) { index, account ->
+                itemsIndexed(accounts) { index, account ->
                     FilterChip(
                         selected = selectedAccount.id == account.id,
                         onClick = { selectedAccount = account },