diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..55839a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.gradle +/build +app/build +*.iml +.idea +local.properties +.DS_Store diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock new file mode 100644 index 0000000..bbbfe67 Binary files /dev/null and b/.gradle/8.8/checksums/checksums.lock differ diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin new file mode 100644 index 0000000..f5bd1c9 Binary files /dev/null and b/.gradle/8.8/checksums/md5-checksums.bin differ diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin new file mode 100644 index 0000000..52bec8b Binary files /dev/null and b/.gradle/8.8/checksums/sha1-checksums.bin differ diff --git a/edu_play/docs/.gitkeep b/.gradle/8.8/dependencies-accessors/gc.properties similarity index 100% rename from edu_play/docs/.gitkeep rename to .gradle/8.8/dependencies-accessors/gc.properties diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin new file mode 100644 index 0000000..82aa75f Binary files /dev/null and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock new file mode 100644 index 0000000..bc153d4 Binary files /dev/null and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileChanges/last-build.bin b/.gradle/8.8/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.8/fileChanges/last-build.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin new file mode 100644 index 0000000..1b6e405 Binary files /dev/null and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock new file mode 100644 index 0000000..41cb5ab Binary files /dev/null and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..a4f5bee Binary files /dev/null and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/edu_play/lib/models/.gitkeep b/.gradle/8.8/gc.properties similarity index 100% rename from edu_play/lib/models/.gitkeep rename to .gradle/8.8/gc.properties diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..c254b61 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..253f341 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Feb 25 09:17:28 UTC 2026 +gradle.version=8.8 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..98cc344 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/edu_play/lib/screens/.gitkeep b/.gradle/vcs-1/gc.properties similarity index 100% rename from edu_play/lib/screens/.gitkeep rename to .gradle/vcs-1/gc.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..8d74606 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,98 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.google.dagger.hilt.android") + id("com.google.devtools.ksp") +} + +android { + namespace = "com.fairslice" + compileSdk = 34 + + defaultConfig { + applicationId = "com.fairslice" + minSdk = 26 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.10" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + val lifecycle_version = "2.7.0" + val room_version = "2.6.1" + val hilt_version = "2.50" + val nav_version = "2.7.7" + val work_version = "2.9.0" + + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version") + implementation("androidx.activity:activity-compose:1.8.2") + implementation(platform("androidx.compose:compose-bom:2024.02.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material-icons-extended") + + implementation("androidx.navigation:navigation-compose:$nav_version") + + implementation("com.google.dagger:hilt-android:$hilt_version") + ksp("com.google.dagger:hilt-android-compiler:$hilt_version") + implementation("androidx.hilt:hilt-navigation-compose:1.2.0") + implementation("androidx.hilt:hilt-work:1.2.0") + ksp("androidx.hilt:hilt-compiler:1.2.0") + + implementation("androidx.room:room-runtime:$room_version") + implementation("androidx.room:room-ktx:$room_version") + ksp("androidx.room:room-compiler:$room_version") + + implementation("androidx.work:work-runtime-ktx:$work_version") + + implementation("io.coil-kt:coil-compose:2.5.0") + implementation("androidx.compose.ui:ui-text-google-fonts:1.6.2") + implementation("com.airbnb.android:lottie-compose:6.3.0") + implementation("nl.dionsegijn:konfetti-compose:2.0.4") + + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..7acdb59 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/kotlin/com/fairslice/FairSliceApp.kt b/app/src/main/kotlin/com/fairslice/FairSliceApp.kt new file mode 100644 index 0000000..0f8b3bb --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/FairSliceApp.kt @@ -0,0 +1,13 @@ +package com.fairslice + +import android.app.Application +import com.fairslice.utils.NotificationHelper +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class FairSliceApp : Application() { + override fun onCreate() { + super.onCreate() + NotificationHelper.createNotificationChannel(this) + } +} diff --git a/app/src/main/kotlin/com/fairslice/MainActivity.kt b/app/src/main/kotlin/com/fairslice/MainActivity.kt new file mode 100644 index 0000000..1723f71 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/MainActivity.kt @@ -0,0 +1,141 @@ +package com.fairslice + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Build +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.compose.setContent +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.platform.LocalContext +import androidx.core.content.ContextCompat +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.navigation.NavType +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument +import com.fairslice.ui.dashboard.DashboardScreen +import com.fairslice.ui.onboarding.OnboardingScreen +import com.fairslice.ui.newsplit.AddPeopleScreen +import com.fairslice.ui.history.HistoryScreen +import com.fairslice.ui.newsplit.NewSplitScreen +import com.fairslice.ui.newsplit.NewSplitViewModel +import com.fairslice.ui.results.ResultsScreen +import com.fairslice.ui.settings.SettingsScreen +import com.fairslice.ui.navigation.Screen +import com.fairslice.ui.theme.FairSliceTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + FairSliceTheme { + val context = LocalContext.current + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestPermission() + ) { isGranted -> + // Handle result if needed + } + + LaunchedEffect(Unit) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (ContextCompat.checkSelfPermission( + context, + Manifest.permission.POST_NOTIFICATIONS + ) != PackageManager.PERMISSION_GRANTED + ) { + launcher.launch(Manifest.permission.POST_NOTIFICATIONS) + } + } + } + + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + FairSliceNavigation() + } + } + } + } +} + +@Composable +fun FairSliceNavigation() { + val navController = rememberNavController() + NavHost(navController = navController, startDestination = Screen.Onboarding.route) { + composable(Screen.Onboarding.route) { + OnboardingScreen( + onFinished = { + navController.navigate(Screen.Dashboard.route) { + popUpTo(Screen.Onboarding.route) { inclusive = true } + } + } + ) + } + composable(Screen.Dashboard.route) { + DashboardScreen( + onNavigateToNewSplit = { navController.navigate(Screen.NewSplit.route) }, + onNavigateToHistory = { navController.navigate(Screen.History.route) }, + onNavigateToSettings = { navController.navigate(Screen.Settings.route) } + ) + } + composable(Screen.NewSplit.route) { + val viewModel: NewSplitViewModel = hiltViewModel() + NewSplitScreen( + onNext = { name, amount, category -> + navController.navigate(Screen.AddPeople.createRoute(name, amount.toDouble(), category)) + }, + viewModel = viewModel + ) + } + composable( + route = Screen.AddPeople.route, + arguments = listOf( + navArgument("billName") { type = NavType.StringType }, + navArgument("totalAmount") { type = NavType.FloatType }, + navArgument("category") { type = NavType.StringType } + ) + ) { + val viewModel: NewSplitViewModel = hiltViewModel() // In a real app, we'd share this + AddPeopleScreen( + onResults = { billId -> + navController.navigate(Screen.Results.createRoute(billId)) { + popUpTo(Screen.Dashboard.route) + } + }, + viewModel = viewModel + ) + } + composable( + route = Screen.Results.route, + arguments = listOf(navArgument("billId") { type = NavType.LongType }) + ) { + ResultsScreen( + onDone = { navController.navigate(Screen.Dashboard.route) { + popUpTo(Screen.Dashboard.route) { inclusive = true } + } } + ) + } + composable(Screen.History.route) { + HistoryScreen( + onBack = { navController.popBackStack() } + ) + } + composable(Screen.Settings.route) { + SettingsScreen( + onBack = { navController.popBackStack() } + ) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/data/local/FairSliceDao.kt b/app/src/main/kotlin/com/fairslice/data/local/FairSliceDao.kt new file mode 100644 index 0000000..cc59a3f --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/data/local/FairSliceDao.kt @@ -0,0 +1,49 @@ +package com.fairslice.data.local + +import androidx.room.* +import com.fairslice.data.models.Bill +import com.fairslice.data.models.Participant +import com.fairslice.data.models.UserProfile +import kotlinx.coroutines.flow.Flow + +@Dao +interface FairSliceDao { + @Query("SELECT * FROM bills ORDER BY date DESC") + fun getAllBills(): Flow> + + @Insert + suspend fun insertBill(bill: Bill): Long + + @Query("SELECT * FROM participants WHERE billId = :billId") + suspend fun getParticipantsForBill(billId: Long): List + + @Insert + suspend fun insertParticipants(participants: List) + + @Query("SELECT * FROM user_profile LIMIT 1") + fun getUserProfile(): Flow + + @Upsert + suspend fun upsertUserProfile(profile: UserProfile) + + @Transaction + suspend fun insertBillWithParticipants(bill: Bill, participants: List): Long { + val billId = insertBill(bill) + val participantsWithId = participants.map { it.copy(billId = billId) } + insertParticipants(participantsWithId) + return billId + } + + @Transaction + @Query("SELECT * FROM bills WHERE id = :billId") + suspend fun getBillWithParticipants(billId: Long): BillWithParticipants +} + +data class BillWithParticipants( + @Embedded val bill: Bill, + @Relation( + parentColumn = "id", + entityColumn = "billId" + ) + val participants: List +) diff --git a/app/src/main/kotlin/com/fairslice/data/local/FairSliceDatabase.kt b/app/src/main/kotlin/com/fairslice/data/local/FairSliceDatabase.kt new file mode 100644 index 0000000..f647d57 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/data/local/FairSliceDatabase.kt @@ -0,0 +1,12 @@ +package com.fairslice.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.fairslice.data.models.Bill +import com.fairslice.data.models.Participant +import com.fairslice.data.models.UserProfile + +@Database(entities = [Bill::class, Participant::class, UserProfile::class], version = 1) +abstract class FairSliceDatabase : RoomDatabase() { + abstract fun dao(): FairSliceDao +} diff --git a/app/src/main/kotlin/com/fairslice/data/models/Entities.kt b/app/src/main/kotlin/com/fairslice/data/models/Entities.kt new file mode 100644 index 0000000..589af7b --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/data/models/Entities.kt @@ -0,0 +1,33 @@ +package com.fairslice.data.models + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "bills") +data class Bill( + @PrimaryKey(autoGenerate = true) val id: Long = 0, + val name: String, + val totalAmountCents: Long, + val category: String, + val date: Long = System.currentTimeMillis(), + val isPaid: Boolean = false +) + +@Entity(tableName = "participants") +data class Participant( + @PrimaryKey(autoGenerate = true) val id: Long = 0, + val billId: Long, + val name: String, + val income: Double, // Income can stay Double as it's often large/normalized + val incomeType: String, // ANNUAL, MONTHLY, HOURLY + val amountOwedCents: Long = 0, + val isPaid: Boolean = false +) + +@Entity(tableName = "user_profile") +data class UserProfile( + @PrimaryKey val id: Int = 1, + val name: String, + val annualIncome: Double, + val currency: String = "USD" +) diff --git a/app/src/main/kotlin/com/fairslice/data/repository/FairSliceRepository.kt b/app/src/main/kotlin/com/fairslice/data/repository/FairSliceRepository.kt new file mode 100644 index 0000000..34e6166 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/data/repository/FairSliceRepository.kt @@ -0,0 +1,29 @@ +package com.fairslice.data.repository + +import com.fairslice.data.local.FairSliceDao +import com.fairslice.data.models.Bill +import com.fairslice.data.models.Participant +import com.fairslice.data.models.UserProfile +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class FairSliceRepository @Inject constructor( + private val dao: FairSliceDao +) { + fun getAllBills(): Flow> = dao.getAllBills() + + suspend fun insertBill(bill: Bill): Long = dao.insertBill(bill) + + suspend fun insertParticipants(participants: List) = dao.insertParticipants(participants) + + suspend fun insertBillWithParticipants(bill: Bill, participants: List): Long = + dao.insertBillWithParticipants(bill, participants) + + fun getUserProfile(): Flow = dao.getUserProfile() + + suspend fun upsertUserProfile(profile: UserProfile) = dao.upsertUserProfile(profile) + + suspend fun getBillWithParticipants(billId: Long) = dao.getBillWithParticipants(billId) +} diff --git a/app/src/main/kotlin/com/fairslice/di/AppModule.kt b/app/src/main/kotlin/com/fairslice/di/AppModule.kt new file mode 100644 index 0000000..e885899 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/di/AppModule.kt @@ -0,0 +1,21 @@ +package com.fairslice.di + +import android.content.Context +import androidx.work.WorkManager +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object AppModule { + + @Provides + @Singleton + fun provideWorkManager(@ApplicationContext context: Context): WorkManager { + return WorkManager.getInstance(context) + } +} diff --git a/app/src/main/kotlin/com/fairslice/di/DatabaseModule.kt b/app/src/main/kotlin/com/fairslice/di/DatabaseModule.kt new file mode 100644 index 0000000..26f7c73 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/di/DatabaseModule.kt @@ -0,0 +1,32 @@ +package com.fairslice.di + +import android.content.Context +import androidx.room.Room +import com.fairslice.data.local.FairSliceDao +import com.fairslice.data.local.FairSliceDatabase +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideDatabase(@ApplicationContext context: Context): FairSliceDatabase { + return Room.databaseBuilder( + context, + FairSliceDatabase::class.java, + "fairslice_db" + ).build() + } + + @Provides + fun provideDao(database: FairSliceDatabase): FairSliceDao { + return database.dao() + } +} diff --git a/app/src/main/kotlin/com/fairslice/di/RepositoryModule.kt b/app/src/main/kotlin/com/fairslice/di/RepositoryModule.kt new file mode 100644 index 0000000..c5de0c9 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/di/RepositoryModule.kt @@ -0,0 +1,20 @@ +package com.fairslice.di + +import com.fairslice.data.local.FairSliceDao +import com.fairslice.data.repository.FairSliceRepository +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object RepositoryModule { + + @Provides + @Singleton + fun provideRepository(dao: FairSliceDao): FairSliceRepository { + return FairSliceRepository(dao) + } +} diff --git a/app/src/main/kotlin/com/fairslice/logic/SplitEngine.kt b/app/src/main/kotlin/com/fairslice/logic/SplitEngine.kt new file mode 100644 index 0000000..53a2a01 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/logic/SplitEngine.kt @@ -0,0 +1,46 @@ +package com.fairslice.logic + +data class ParticipantIncome( + val name: String, + val income: Double, + val type: IncomeType +) + +enum class IncomeType { + ANNUAL, MONTHLY, HOURLY +} + +object SplitEngine { + private const val HOURS_PER_YEAR = 2080.0 + private const val MONTHS_PER_YEAR = 12.0 + + fun normalizeToAnnual(income: Double, type: IncomeType): Double { + return when (type) { + IncomeType.ANNUAL -> income + IncomeType.MONTHLY -> income * MONTHS_PER_YEAR + IncomeType.HOURLY -> income * HOURS_PER_YEAR + } + } + + fun calculateSplit( + totalBillCents: Long, + participants: List + ): Map { + if (participants.isEmpty()) return emptyMap() + + val normalizedIncomes = participants.map { + it.name to normalizeToAnnual(it.income, it.type) + } + + val totalIncome = normalizedIncomes.sumOf { it.second } + if (totalIncome <= 0) { + // If total income is 0, split equally + val equalShare = totalBillCents / participants.size + return participants.associate { it.name to equalShare } + } + + return normalizedIncomes.associate { (name, income) -> + name to ((income / totalIncome) * totalBillCents).toLong() + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/components/GlassCard.kt b/app/src/main/kotlin/com/fairslice/ui/components/GlassCard.kt new file mode 100644 index 0000000..e7a40fc --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/components/GlassCard.kt @@ -0,0 +1,41 @@ +package com.fairslice.ui.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.fairslice.ui.theme.SurfaceFrosted + +@Composable +fun GlassCard( + modifier: Modifier = Modifier, + content: @Composable BoxScope.() -> Unit +) { + Box( + modifier = modifier + .clip(RoundedCornerShape(24.dp)) + .background(SurfaceFrosted) + .border( + width = 1.dp, + brush = Brush.verticalGradient( + colors = listOf( + Color.White.copy(alpha = 0.5f), + Color.White.copy(alpha = 0.1f) + ) + ), + shape = RoundedCornerShape(24.dp) + ) + .padding(16.dp) + ) { + content() + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/components/Numpad.kt b/app/src/main/kotlin/com/fairslice/ui/components/Numpad.kt new file mode 100644 index 0000000..6235035 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/components/Numpad.kt @@ -0,0 +1,68 @@ +package com.fairslice.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Backspace +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp + +@Composable +fun Numpad( + onNumberClick: (String) -> Unit, + onDeleteClick: () -> Unit, + modifier: Modifier = Modifier +) { + val haptic = LocalHapticFeedback.current + val buttons = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "0", "DEL") + + LazyVerticalGrid( + columns = GridCells.Fixed(3), + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + userScrollEnabled = false + ) { + items(buttons) { button -> + Box( + modifier = Modifier + .aspectRatio(1.5f) + .clip(CircleShape) + .clickable { + haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove) + if (button == "DEL") onDeleteClick() else onNumberClick(button) + }, + contentAlignment = Alignment.Center + ) { + if (button == "DEL") { + Icon( + imageVector = Icons.AutoMirrored.Filled.Backspace, + contentDescription = "Delete", + tint = MaterialTheme.colorScheme.onBackground + ) + } else { + Text( + text = button, + fontSize = 24.sp, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onBackground + ) + } + } + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/components/ProportionalBarChart.kt b/app/src/main/kotlin/com/fairslice/ui/components/ProportionalBarChart.kt new file mode 100644 index 0000000..988fc41 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/components/ProportionalBarChart.kt @@ -0,0 +1,51 @@ +package com.fairslice.ui.components + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp + +data class BarData( + val value: Float, + val color: Color +) + +@Composable +fun ProportionalBarChart( + bars: List, + modifier: Modifier = Modifier +) { + val total = bars.sumOf { it.value.toDouble() }.toFloat().coerceAtLeast(1f) + + Row( + modifier = modifier + .fillMaxWidth() + .height(12.dp) + .clip(RoundedCornerShape(6.dp)) + .background(Color.White.copy(alpha = 0.1f)), + horizontalArrangement = Arrangement.spacedBy(2.dp) + ) { + bars.forEach { bar -> + val weight = (bar.value / total).coerceAtLeast(0.01f) + val animatedWeight by animateFloatAsState( + targetValue = weight, + animationSpec = spring(), + label = "barWeight" + ) + + Box( + modifier = Modifier + .fillMaxHeight() + .weight(animatedWeight) + .background(bar.color) + ) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardScreen.kt b/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardScreen.kt new file mode 100644 index 0000000..6cea438 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardScreen.kt @@ -0,0 +1,164 @@ +package com.fairslice.ui.dashboard + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.navigation.compose.hiltViewModel +import com.fairslice.ui.components.GlassCard +import com.fairslice.ui.theme.AmberHighlight +import com.fairslice.ui.theme.IndigoPrimary +import com.fairslice.ui.theme.VioletSecondary + +@Composable +fun DashboardScreen( + onNavigateToNewSplit: () -> Unit, + onNavigateToHistory: () -> Unit, + onNavigateToSettings: () -> Unit, + viewModel: DashboardViewModel = hiltViewModel() +) { + val uiState by viewModel.uiState.collectAsState() + + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.verticalGradient( + colors = listOf(IndigoPrimary, VioletSecondary) + ) + ) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth().padding(bottom = 24.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = "FairSlice", + style = MaterialTheme.typography.displayLarge, + color = Color.White + ) + Row { + IconButton(onClick = onNavigateToHistory) { + Icon(Icons.Default.History, contentDescription = "History", tint = Color.White) + } + IconButton(onClick = onNavigateToSettings) { + Icon(Icons.Default.Settings, contentDescription = "Settings", tint = Color.White) + } + } + } + + GlassCard( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = 32.dp) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "Your Balance", + style = MaterialTheme.typography.labelMedium, + color = Color.White.copy(alpha = 0.7f) + ) + Spacer(modifier = Modifier.height(8.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + BalanceItem(label = "You're owed", amount = uiState.youAreOwed, color = AmberHighlight) + BalanceItem(label = "You owe", amount = uiState.youOwe, color = Color.White) + } + } + } + + Text( + text = "Recent Splits", + style = MaterialTheme.typography.titleLarge, + color = Color.White, + modifier = Modifier.padding(bottom = 16.dp) + ) + + LazyColumn( + verticalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.weight(1f) + ) { + items(uiState.recentBills) { bill -> + RecentSplitItem(bill) + } + } + } + + FloatingActionButton( + onClick = onNavigateToNewSplit, + containerColor = AmberHighlight, + contentColor = IndigoPrimary, + shape = CircleShape, + modifier = Modifier + .align(Alignment.BottomEnd) + .padding(24.dp) + .size(64.dp) + ) { + Icon( + imageVector = Icons.Default.Add, + contentDescription = "New Split", + modifier = Modifier.size(32.dp) + ) + } + } +} + +@Composable +fun BalanceItem(label: String, amount: Double, color: Color) { + Column { + Text(text = label, fontSize = 14.sp, color = Color.White.copy(alpha = 0.7f)) + Text( + text = "$${String.format("%.2f", amount)}", + fontSize = 24.sp, + fontWeight = FontWeight.Bold, + color = color + ) + } +} + +@Composable +fun RecentSplitItem(bill: com.fairslice.data.models.Bill) { + GlassCard(modifier = Modifier.fillMaxWidth()) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(12.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column { + Text(text = bill.name, fontWeight = FontWeight.SemiBold, color = Color.White) + Text(text = bill.category, fontSize = 12.sp, color = Color.White.copy(alpha = 0.6f)) + } + Text( + text = "$${String.format("%.2f", bill.totalAmountCents.toDouble() / 100.0)}", + fontWeight = FontWeight.Bold, + color = AmberHighlight + ) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardViewModel.kt b/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardViewModel.kt new file mode 100644 index 0000000..aac5511 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/dashboard/DashboardViewModel.kt @@ -0,0 +1,31 @@ +package com.fairslice.ui.dashboard + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.fairslice.data.models.Bill +import com.fairslice.data.repository.FairSliceRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.* +import javax.inject.Inject + +data class DashboardUiState( + val recentBills: List = emptyList(), + val youAreOwed: Double = 0.0, + val youOwe: Double = 0.0 +) + +@HiltViewModel +class DashboardViewModel @Inject constructor( + private val repository: FairSliceRepository +) : ViewModel() { + + val uiState: StateFlow = repository.getAllBills() + .map { bills -> + DashboardUiState( + recentBills = bills.take(5), + youAreOwed = bills.filter { !it.isPaid }.sumOf { it.totalAmountCents }.toDouble() / 100.0, + youOwe = 0.0 + ) + } + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), DashboardUiState()) +} diff --git a/app/src/main/kotlin/com/fairslice/ui/history/HistoryScreen.kt b/app/src/main/kotlin/com/fairslice/ui/history/HistoryScreen.kt new file mode 100644 index 0000000..7245257 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/history/HistoryScreen.kt @@ -0,0 +1,55 @@ +package com.fairslice.ui.history + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.fairslice.ui.dashboard.DashboardViewModel +import com.fairslice.ui.dashboard.RecentSplitItem +import com.fairslice.ui.theme.BackgroundDeep + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HistoryScreen( + onBack: () -> Unit, + viewModel: DashboardViewModel = hiltViewModel() // Reuse DashboardViewModel for simplicity +) { + val uiState by viewModel.uiState.collectAsState() + + Column( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + ) { + TopAppBar( + title = { Text("Split History", color = Color.White) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back", tint = Color.White) + } + }, + colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent) + ) + + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + items(uiState.recentBills) { bill -> + RecentSplitItem(bill) + } + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/navigation/Screens.kt b/app/src/main/kotlin/com/fairslice/ui/navigation/Screens.kt new file mode 100644 index 0000000..73e424c --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/navigation/Screens.kt @@ -0,0 +1,16 @@ +package com.fairslice.ui.navigation + +sealed class Screen(val route: String) { + object Onboarding : Screen("onboarding") + object Dashboard : Screen("dashboard") + object NewSplit : Screen("new_split") + object AddPeople : Screen("add_people/{billName}/{totalAmount}/{category}") { + fun createRoute(billName: String, totalAmount: Double, category: String) = + "add_people/$billName/$totalAmount/$category" + } + object Results : Screen("results/{billId}") { + fun createRoute(billId: Long) = "results/$billId" + } + object History : Screen("history") + object Settings : Screen("settings") +} diff --git a/app/src/main/kotlin/com/fairslice/ui/newsplit/AddPeopleScreen.kt b/app/src/main/kotlin/com/fairslice/ui/newsplit/AddPeopleScreen.kt new file mode 100644 index 0000000..aeb35d4 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/newsplit/AddPeopleScreen.kt @@ -0,0 +1,246 @@ +package com.fairslice.ui.newsplit + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Lock +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.fairslice.logic.IncomeType +import com.fairslice.ui.components.BarData +import com.fairslice.ui.components.GlassCard +import com.fairslice.ui.components.ProportionalBarChart +import com.fairslice.ui.theme.* + +@Composable +fun AddPeopleScreen( + onResults: (Long) -> Unit, + viewModel: NewSplitViewModel +) { + val uiState by viewModel.uiState.collectAsState() + + // Auto-navigate to results when savedBillId is set + LaunchedEffect(uiState.savedBillId) { + uiState.savedBillId?.let { onResults(it) } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp) + ) { + Text( + text = "Who's splitting?", + style = MaterialTheme.typography.headlineLarge, + color = Color.White + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column { + Text( + text = "${uiState.billName} • $${uiState.totalAmount}", + style = MaterialTheme.typography.bodyLarge, + color = AmberHighlight + ) + } + + IconButton(onClick = { viewModel.toggleAnonymity() }) { + Icon( + if (uiState.isAnonymized) Icons.Default.VisibilityOff else Icons.Default.Visibility, + contentDescription = "Anonymity Mode", + tint = if (uiState.isAnonymized) AmberHighlight else Color.White.copy(alpha = 0.5f) + ) + } + } + + Spacer(modifier = Modifier.height(16.dp)) + + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(16.dp), + contentPadding = PaddingValues(bottom = 100.dp) + ) { + items(uiState.participants) { participant -> + ParticipantCard( + participant = participant, + isAnonymized = uiState.isAnonymized, + onUpdate = { n, i, t -> viewModel.updateParticipant(participant.id, n, i, t) }, + onRemove = { viewModel.removeParticipant(participant.id) } + ) + } + + item { + TextButton( + onClick = { viewModel.addParticipant() }, + modifier = Modifier.fillMaxWidth() + ) { + Icon(Icons.Default.Add, contentDescription = null, tint = AmberHighlight) + Spacer(modifier = Modifier.width(8.dp)) + Text("Add another person", color = AmberHighlight) + } + } + } + } + + // Animated Bar Chart at the bottom + Column( + modifier = Modifier + .align(Alignment.BottomCenter) + .fillMaxWidth() + .background(Color.Black.copy(alpha = 0.5f)) + .padding(24.dp) + ) { + val bars = uiState.participants.mapIndexed { index, p -> + val income = p.income.toDoubleOrNull() ?: 0.0 + val color = when (index % 5) { + 0 -> IndigoPrimary + 1 -> VioletSecondary + 2 -> AmberHighlight + 3 -> SuccessGreen + else -> Color.Cyan + } + BarData(income.toFloat(), color) + } + + Text( + text = "Live Breakdown", + style = MaterialTheme.typography.labelMedium, + color = Color.White.copy(alpha = 0.7f), + modifier = Modifier.padding(bottom = 8.dp) + ) + + ProportionalBarChart(bars = bars) + + Spacer(modifier = Modifier.height(16.dp)) + + Button( + onClick = { viewModel.saveSplit() }, + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + colors = ButtonDefaults.buttonColors(containerColor = AmberHighlight), + shape = RoundedCornerShape(16.dp), + enabled = !uiState.isSaving && uiState.participants.all { it.name.isNotEmpty() && it.income.isNotEmpty() } + ) { + if (uiState.isSaving) { + CircularProgressIndicator(color = IndigoPrimary, modifier = Modifier.size(24.dp)) + } else { + Text("Calculate Fair Split ⚖️", color = IndigoPrimary, fontWeight = FontWeight.Bold) + } + } + } + } +} + +@Composable +fun ParticipantCard( + participant: ParticipantUi, + isAnonymized: Boolean, + onUpdate: (String?, String?, IncomeType?) -> Unit, + onRemove: () -> Unit +) { + GlassCard(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.padding(8.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box( + modifier = Modifier + .size(40.dp) + .clip(CircleShape) + .background(VioletSecondary), + contentAlignment = Alignment.Center + ) { + Text( + text = if (participant.name.isNotEmpty()) participant.name.take(1).uppercase() else "?", + color = Color.White, + fontWeight = FontWeight.Bold + ) + } + + Spacer(modifier = Modifier.width(12.dp)) + + TextField( + value = participant.name, + onValueChange = { onUpdate(it, null, null) }, + placeholder = { Text("Name", color = Color.Gray) }, + modifier = Modifier.weight(1f), + colors = TextFieldDefaults.colors( + unfocusedContainerColor = Color.Transparent, + focusedContainerColor = Color.Transparent, + unfocusedIndicatorColor = Color.White.copy(alpha = 0.3f), + focusedTextColor = Color.White, + unfocusedTextColor = Color.White + ), + singleLine = true + ) + + IconButton(onClick = onRemove) { + Icon(Icons.Default.Delete, contentDescription = "Remove", tint = ErrorRed) + } + } + + Spacer(modifier = Modifier.height(8.dp)) + + Row(verticalAlignment = Alignment.CenterVertically) { + TextField( + value = if (isAnonymized && participant.income.isNotEmpty()) "****" else participant.income, + onValueChange = { if (!isAnonymized || it.isEmpty()) onUpdate(null, it, null) }, + placeholder = { Text("Income", color = Color.Gray) }, + modifier = Modifier.weight(1f), + prefix = { Text("$ ", color = AmberHighlight) }, + colors = TextFieldDefaults.colors( + unfocusedContainerColor = Color.Transparent, + focusedContainerColor = Color.Transparent, + unfocusedIndicatorColor = Color.White.copy(alpha = 0.3f), + focusedTextColor = Color.White, + unfocusedTextColor = Color.White + ), + singleLine = true + ) + + Spacer(modifier = Modifier.width(8.dp)) + + var expanded by remember { mutableStateOf(false) } + Box { + TextButton(onClick = { expanded = true }) { + Text(participant.incomeType.name.lowercase().replaceFirstChar { it.uppercase() }, color = AmberHighlight) + } + DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) { + IncomeType.entries.forEach { type -> + DropdownMenuItem( + text = { Text(type.name.lowercase().replaceFirstChar { it.uppercase() }) }, + onClick = { + onUpdate(null, null, type) + expanded = false + } + ) + } + } + } + } + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitScreen.kt b/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitScreen.kt new file mode 100644 index 0000000..9d8fb41 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitScreen.kt @@ -0,0 +1,124 @@ +package com.fairslice.ui.newsplit + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.fairslice.ui.components.Numpad +import com.fairslice.ui.theme.AmberHighlight +import com.fairslice.ui.theme.BackgroundDeep +import com.fairslice.ui.theme.IndigoPrimary + +@Composable +fun NewSplitScreen( + onNext: (String, Float, String) -> Unit, + viewModel: NewSplitViewModel +) { + val uiState by viewModel.uiState.collectAsState() + val categories = listOf("🍽️ Dining", "✈️ Travel", "🏠 Rent", "🎉 Party", "🛒 Groceries", "🎬 Ent.", "✏️ Custom") + + Column( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "New Split", + style = MaterialTheme.typography.headlineLarge, + color = Color.White, + modifier = Modifier.padding(bottom = 32.dp) + ) + + TextField( + value = uiState.billName, + onValueChange = { viewModel.onBillNameChange(it) }, + placeholder = { Text("What's this for? (e.g. Cabo Condo)", color = Color.Gray) }, + colors = TextFieldDefaults.colors( + unfocusedContainerColor = Color.Transparent, + focusedContainerColor = Color.Transparent, + unfocusedIndicatorColor = Color.White.copy(alpha = 0.5f), + focusedIndicatorColor = AmberHighlight, + focusedTextColor = Color.White, + unfocusedTextColor = Color.White + ), + modifier = Modifier.fillMaxWidth(), + textStyle = MaterialTheme.typography.titleLarge + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Text( + text = if (uiState.totalAmount.isEmpty()) "$0.00" else "$${uiState.totalAmount}", + fontSize = 48.sp, + fontWeight = FontWeight.Bold, + color = AmberHighlight, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(24.dp)) + + LazyRow( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth() + ) { + items(categories) { category -> + FilterChip( + selected = uiState.category == category, + onClick = { viewModel.onCategoryChange(category) }, + label = { Text(category) }, + colors = FilterChipDefaults.filterChipColors( + selectedContainerColor = AmberHighlight, + selectedLabelColor = IndigoPrimary, + labelColor = Color.White + ) + ) + } + } + + Spacer(modifier = Modifier.weight(1f)) + + Numpad( + onNumberClick = { num -> viewModel.onAmountChange(uiState.totalAmount + num) }, + onDeleteClick = { + if (uiState.totalAmount.isNotEmpty()) { + viewModel.onAmountChange(uiState.totalAmount.dropLast(1)) + } + }, + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Button( + onClick = { + onNext( + uiState.billName.ifEmpty { "Shared Bill" }, + uiState.totalAmount.toFloatOrNull() ?: 0f, + uiState.category + ) + }, + enabled = uiState.totalAmount.isNotEmpty(), + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + colors = ButtonDefaults.buttonColors(containerColor = AmberHighlight), + shape = RoundedCornerShape(16.dp) + ) { + Text("Next: Add People", color = IndigoPrimary, fontWeight = FontWeight.Bold) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitViewModel.kt b/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitViewModel.kt new file mode 100644 index 0000000..a97a733 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/newsplit/NewSplitViewModel.kt @@ -0,0 +1,148 @@ +package com.fairslice.ui.newsplit + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkManager +import androidx.work.workDataOf +import com.fairslice.data.models.Bill +import com.fairslice.data.models.Participant +import com.fairslice.data.repository.FairSliceRepository +import com.fairslice.logic.IncomeType +import com.fairslice.logic.ParticipantIncome +import com.fairslice.logic.SplitEngine +import com.fairslice.worker.ReminderWorker +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class ParticipantUi( + val id: String = java.util.UUID.randomUUID().toString(), + val name: String = "", + val income: String = "", + val incomeType: IncomeType = IncomeType.ANNUAL +) + +data class NewSplitUiState( + val billName: String = "", + val totalAmount: String = "", + val category: String = "🍽️ Dining", + val participants: List = listOf(ParticipantUi()), // Start with one participant + val isAnonymized: Boolean = false, + val isSaving: Boolean = false, + val savedBillId: Long? = null +) + +@HiltViewModel +class NewSplitViewModel @Inject constructor( + private val repository: FairSliceRepository, + private val workManager: WorkManager, + savedStateHandle: SavedStateHandle +) : ViewModel() { + + private val _uiState = MutableStateFlow( + NewSplitUiState( + billName = savedStateHandle.get("billName") ?: "", + totalAmount = savedStateHandle.get("totalAmount")?.toString() ?: "", + category = savedStateHandle.get("category") ?: "🍽️ Dining" + ) + ) + val uiState: StateFlow = _uiState.asStateFlow() + + fun onBillNameChange(name: String) { + _uiState.update { it.copy(billName = name) } + } + + fun onAmountChange(amount: String) { + // Simple validation: only digits and at most one dot + if (amount.count { it == '.' } <= 1 && amount.all { it.isDigit() || it == '.' }) { + _uiState.update { it.copy(totalAmount = amount) } + } + } + + fun onCategoryChange(category: String) { + _uiState.update { it.copy(category = category) } + } + + fun toggleAnonymity() { + _uiState.update { it.copy(isAnonymized = !it.isAnonymized) } + } + + fun addParticipant() { + _uiState.update { it.copy(participants = it.participants + ParticipantUi()) } + } + + fun updateParticipant(id: String, name: String? = null, income: String? = null, incomeType: IncomeType? = null) { + _uiState.update { state -> + state.copy( + participants = state.participants.map { p -> + if (p.id == id) { + p.copy( + name = name ?: p.name, + income = income ?: p.income, + incomeType = incomeType ?: p.incomeType + ) + } else p + } + ) + } + } + + fun removeParticipant(id: String) { + if (_uiState.value.participants.size > 1) { + _uiState.update { state -> + state.copy(participants = state.participants.filter { it.id != id }) + } + } + } + + fun saveSplit() { + val state = _uiState.value + val totalAmountCents = ( (state.totalAmount.toDoubleOrNull() ?: 0.0) * 100).toLong() + + viewModelScope.launch { + _uiState.update { it.copy(isSaving = true) } + + val participantIncomes = state.participants.map { + ParticipantIncome(it.name, it.income.toDoubleOrNull() ?: 0.0, it.incomeType) + } + + val splitResults = SplitEngine.calculateSplit(totalAmountCents, participantIncomes) + + val bill = Bill( + name = state.billName, + totalAmountCents = totalAmountCents, + category = state.category + ) + + val participants = state.participants.map { p -> + Participant( + billId = 0, // Assigned by transaction + name = p.name, + income = p.income.toDoubleOrNull() ?: 0.0, + incomeType = p.incomeType.name, + amountOwedCents = splitResults[p.name] ?: 0L + ) + } + + val billId = repository.insertBillWithParticipants(bill, participants) + + scheduleReminder(state.billName) + + _uiState.update { it.copy(isSaving = false, savedBillId = billId) } + } + } + + private fun scheduleReminder(billName: String) { + val reminderRequest = OneTimeWorkRequestBuilder() + .setInputData(workDataOf("billName" to billName)) + .setInitialDelay(1, java.util.concurrent.TimeUnit.DAYS) // Schedule for 1 day later + .build() + workManager.enqueue(reminderRequest) + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/onboarding/OnboardingScreen.kt b/app/src/main/kotlin/com/fairslice/ui/onboarding/OnboardingScreen.kt new file mode 100644 index 0000000..bc5635d --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/onboarding/OnboardingScreen.kt @@ -0,0 +1,146 @@ +package com.fairslice.ui.onboarding + +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.airbnb.lottie.compose.LottieAnimation +import com.airbnb.lottie.compose.LottieCompositionSpec +import com.airbnb.lottie.compose.LottieConstants +import com.airbnb.lottie.compose.rememberLottieComposition +import com.fairslice.ui.theme.AmberHighlight +import com.fairslice.ui.theme.BackgroundDeep +import com.fairslice.ui.theme.IndigoPrimary +import kotlinx.coroutines.launch + +data class OnboardingPage( + val title: String, + val description: String, + val lottieUrl: String +) + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun OnboardingScreen( + onFinished: () -> Unit +) { + val pages = listOf( + OnboardingPage( + "Welcome to FairSlice", + "The smartest way to split bills with friends, proportional to what everyone actually earns.", + "https://assets10.lottiefiles.com/packages/lf20_ygiu56nz.json" + ), + OnboardingPage( + "Fair & Transparent", + "No more awkward dinner conversations. Everyone pays their fair share, based on their real income.", + "https://assets10.lottiefiles.com/packages/lf20_qpwb7pnd.json" + ), + OnboardingPage( + "Privacy First", + "Your income data stays on your device. We never upload your personal financial info.", + "https://assets10.lottiefiles.com/packages/lf20_m6cu96ub.json" + ) + ) + + val pagerState = rememberPagerState(pageCount = { pages.size }) + val scope = rememberCoroutineScope() + + Column( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + HorizontalPager( + state = pagerState, + modifier = Modifier.weight(1f) + ) { position -> + val page = pages[position] + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + modifier = Modifier.fillMaxSize() + ) { + val compositionResult = rememberLottieComposition(LottieCompositionSpec.Url(page.lottieUrl)) + LottieAnimation( + composition = compositionResult.value, + iterations = LottieConstants.IterateForever, + modifier = Modifier + .size(300.dp) + .padding(bottom = 32.dp) + ) + + Text( + text = page.title, + style = MaterialTheme.typography.headlineLarge, + color = Color.White, + textAlign = TextAlign.Center + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = page.description, + style = MaterialTheme.typography.bodyLarge, + color = Color.White.copy(alpha = 0.7f), + textAlign = TextAlign.Center, + modifier = Modifier.padding(horizontal = 16.dp) + ) + } + } + + Row( + Modifier + .height(50.dp) + .fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + repeat(pages.size) { iteration -> + val color = if (pagerState.currentPage == iteration) AmberHighlight else Color.White.copy(alpha = 0.2f) + Box( + modifier = Modifier + .padding(4.dp) + .clip(CircleShape) + .background(color) + .size(10.dp) + ) + } + } + + Spacer(modifier = Modifier.height(32.dp)) + + Button( + onClick = { + if (pagerState.currentPage < pages.size - 1) { + scope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } + } else { + onFinished() + } + }, + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + colors = ButtonDefaults.buttonColors(containerColor = AmberHighlight), + shape = RoundedCornerShape(16.dp) + ) { + Text( + text = if (pagerState.currentPage == pages.size - 1) "Get Started" else "Next", + color = IndigoPrimary, + fontWeight = FontWeight.Bold + ) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/results/ResultsScreen.kt b/app/src/main/kotlin/com/fairslice/ui/results/ResultsScreen.kt new file mode 100644 index 0000000..82c8dff --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/results/ResultsScreen.kt @@ -0,0 +1,263 @@ +package com.fairslice.ui.results + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.ContentCopy +import android.content.Intent +import android.net.Uri +import androidx.compose.material.icons.filled.Info +import androidx.compose.material.icons.filled.Share +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.navigation.compose.hiltViewModel +import com.fairslice.ui.components.GlassCard +import com.fairslice.ui.theme.* +import nl.dionsegijn.konfetti.compose.KonfettiView +import nl.dionsegijn.konfetti.core.Party +import nl.dionsegijn.konfetti.core.Position +import nl.dionsegijn.konfetti.core.emitter.Emitter +import java.util.concurrent.TimeUnit + +@Composable +fun ResultsScreen( + onDone: () -> Unit, + viewModel: ResultsViewModel = hiltViewModel() +) { + val uiState by viewModel.uiState.collectAsState() + val context = LocalContext.current + var showConfetti by remember { mutableStateOf(false) } + + LaunchedEffect(uiState.isLoading) { + if (!uiState.isLoading) { + showConfetti = true + } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + ) { + if (showConfetti) { + KonfettiView( + modifier = Modifier.fillMaxSize(), + parties = listOf( + Party( + speed = 0f, + maxSpeed = 30f, + damping = 0.9f, + spread = 360, + colors = listOf(0xFF4B0082.toInt(), 0xFF8A2BE2.toInt(), 0xFFFFBF00.toInt()), + position = Position.Relative(0.5, 0.3), + emitter = Emitter(duration = 100, TimeUnit.MILLISECONDS).max(100) + ) + ) + ) + } + + uiState.billWithParticipants?.let { data -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp) + ) { + Text( + text = "The Fair Split", + style = MaterialTheme.typography.headlineLarge, + color = Color.White + ) + val totalAmount = data.bill.totalAmountCents.toDouble() / 100.0 + Text( + text = "${data.bill.name} • $${String.format("%.2f", totalAmount)}", + style = MaterialTheme.typography.bodyLarge, + color = AmberHighlight, + modifier = Modifier.padding(bottom = 24.dp) + ) + + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + items(data.participants) { participant -> + ResultCard(participant, data.bill.totalAmountCents) + } + + item { + CalculationExplanation() + } + } + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(top = 16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + OutlinedButton( + onClick = { + val summary = data.participants.joinToString("\n") { + "${it.name}: $${String.format("%.2f", it.amountOwedCents.toDouble() / 100.0)}" + } + val intent = Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, "FairSlice Split for ${data.bill.name}:\n$summary") + } + context.startActivity(Intent.createChooser(intent, "Share Split")) + }, + modifier = Modifier.weight(1f), + colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White), + border = ButtonDefaults.outlinedButtonBorder.copy(brush = androidx.compose.ui.graphics.SolidColor(Color.White.copy(alpha = 0.5f))) + ) { + Icon(Icons.Default.Share, contentDescription = null) + Spacer(modifier = Modifier.width(8.dp)) + Text("Share") + } + Button( + onClick = onDone, + modifier = Modifier.weight(1f), + colors = ButtonDefaults.buttonColors(containerColor = AmberHighlight), + shape = RoundedCornerShape(12.dp) + ) { + Icon(Icons.Default.Check, contentDescription = null, tint = IndigoPrimary) + Spacer(modifier = Modifier.width(8.dp)) + Text("Done", color = IndigoPrimary, fontWeight = FontWeight.Bold) + } + } + } + } + + if (uiState.isLoading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center), color = AmberHighlight) + } + } +} + +@Composable +fun ResultCard(participant: com.fairslice.data.models.Participant, totalBillCents: Long) { + val amountOwed = participant.amountOwedCents.toDouble() / 100.0 + val totalBill = totalBillCents.toDouble() / 100.0 + val percentage = if (totalBill > 0) (amountOwed / totalBill * 100).toInt() else 0 + + GlassCard(modifier = Modifier.fillMaxWidth()) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box( + modifier = Modifier + .size(48.dp) + .clip(CircleShape) + .background(IndigoPrimary), + contentAlignment = Alignment.Center + ) { + Text( + text = participant.name.take(1).uppercase(), + color = Color.White, + fontWeight = FontWeight.Bold, + fontSize = 20.sp + ) + } + Spacer(modifier = Modifier.width(16.dp)) + Column { + Text(text = participant.name, fontWeight = FontWeight.SemiBold, color = Color.White) + Text(text = "$percentage% of bill", fontSize = 12.sp, color = Color.White.copy(alpha = 0.6f)) + } + } + + Column(horizontalAlignment = Alignment.End) { + Text( + text = "$${String.format("%.2f", amountOwed)}", + fontWeight = FontWeight.Bold, + fontSize = 20.sp, + color = AmberHighlight + ) + + Row { + val context = LocalContext.current + TextButton( + onClick = { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("venmo://paycharge?txn=pay&amount=$amountOwed¬e=FairSlice for Split")) + try { context.startActivity(intent) } catch (e: Exception) { /* Venmo not installed */ } + }, + contentPadding = PaddingValues(0.dp), + modifier = Modifier.height(24.dp) + ) { + Text("Venmo", fontSize = 10.sp, color = Color.Cyan) + } + } + Surface( + shape = CircleShape, + color = SuccessGreen.copy(alpha = 0.2f), + modifier = Modifier.padding(top = 4.dp) + ) { + Text( + text = "💛 Fair Share", + modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp), + fontSize = 10.sp, + color = SuccessGreen, + fontWeight = FontWeight.Bold + ) + } + } + } + } +} + +@Composable +fun CalculationExplanation() { + var expanded by remember { mutableStateOf(false) } + + GlassCard( + modifier = Modifier + .fillMaxWidth() + .padding(top = 8.dp) + ) { + Column { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Default.Info, contentDescription = null, tint = Color.White.copy(alpha = 0.7f)) + Spacer(modifier = Modifier.width(12.dp)) + Text("How was this calculated?", color = Color.White.copy(alpha = 0.7f), fontSize = 14.sp) + } + TextButton(onClick = { expanded = !expanded }) { + Text(if (expanded) "Less" else "More", color = AmberHighlight) + } + } + + AnimatedVisibility(visible = expanded) { + Text( + text = "We normalized everyone's income to an annual figure and split the bill proportionally. Alice's share = (Alice's Income / Total Group Income) × Total Bill. This ensures everyone pays an equal percentage of their earnings.", + color = Color.White.copy(alpha = 0.6f), + fontSize = 13.sp, + modifier = Modifier.padding(8.dp) + ) + } + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/results/ResultsViewModel.kt b/app/src/main/kotlin/com/fairslice/ui/results/ResultsViewModel.kt new file mode 100644 index 0000000..33567a3 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/results/ResultsViewModel.kt @@ -0,0 +1,41 @@ +package com.fairslice.ui.results + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.fairslice.data.local.BillWithParticipants +import com.fairslice.data.repository.FairSliceRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class ResultsUiState( + val billWithParticipants: BillWithParticipants? = null, + val isLoading: Boolean = true +) + +@HiltViewModel +class ResultsViewModel @Inject constructor( + private val repository: FairSliceRepository, + savedStateHandle: SavedStateHandle +) : ViewModel() { + + private val billId: Long = savedStateHandle.get("billId") ?: -1L + + private val _uiState = MutableStateFlow(ResultsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + loadResults() + } + + private fun loadResults() { + viewModelScope.launch { + val results = repository.getBillWithParticipants(billId) + _uiState.value = ResultsUiState(billWithParticipants = results, isLoading = false) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/fairslice/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..00caf88 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/settings/SettingsScreen.kt @@ -0,0 +1,98 @@ +package com.fairslice.ui.settings + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Lock +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.hilt.navigation.compose.hiltViewModel +import com.fairslice.ui.theme.AmberHighlight +import com.fairslice.ui.theme.BackgroundDeep + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen( + onBack: () -> Unit, + viewModel: SettingsViewModel = hiltViewModel() +) { + val userProfile by viewModel.userProfile.collectAsState() + var name by remember { mutableStateOf("") } + var income by remember { mutableStateOf("") } + + LaunchedEffect(userProfile) { + userProfile?.let { + name = it.name + income = it.annualIncome.toString() + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .background(BackgroundDeep) + ) { + TopAppBar( + title = { Text("Settings", color = Color.White) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back", tint = Color.White) + } + }, + colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent) + ) + + Column( + modifier = Modifier + .padding(24.dp) + .fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(24.dp) + ) { + Surface( + color = Color.White.copy(alpha = 0.1f), + shape = MaterialTheme.shapes.medium + ) { + Row( + modifier = Modifier.padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon(Icons.Default.Lock, contentDescription = null, tint = AmberHighlight) + Spacer(modifier = Modifier.width(12.dp)) + Text( + "Your income data is stored locally and never uploaded anywhere.", + fontSize = 12.sp, + color = Color.White.copy(alpha = 0.7f) + ) + } + } + + TextField( + value = name, + onValueChange = { name = it }, + label = { Text("Your Name") }, + modifier = Modifier.fillMaxWidth() + ) + + TextField( + value = income, + onValueChange = { income = it }, + label = { Text("Your Annual Income ($)") }, + modifier = Modifier.fillMaxWidth() + ) + + Button( + onClick = { viewModel.saveProfile(name, income.toDoubleOrNull() ?: 0.0) }, + modifier = Modifier.fillMaxWidth(), + colors = ButtonDefaults.buttonColors(containerColor = AmberHighlight) + ) { + Text("Save Profile", color = BackgroundDeep) + } + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/com/fairslice/ui/settings/SettingsViewModel.kt new file mode 100644 index 0000000..0564f8e --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/settings/SettingsViewModel.kt @@ -0,0 +1,27 @@ +package com.fairslice.ui.settings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.fairslice.data.models.UserProfile +import com.fairslice.data.repository.FairSliceRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class SettingsViewModel @Inject constructor( + private val repository: FairSliceRepository +) : ViewModel() { + + val userProfile: StateFlow = repository.getUserProfile() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null) + + fun saveProfile(name: String, income: Double) { + viewModelScope.launch { + repository.upsertUserProfile(UserProfile(name = name, annualIncome = income)) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/ui/theme/Color.kt b/app/src/main/kotlin/com/fairslice/ui/theme/Color.kt new file mode 100644 index 0000000..3add78f --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/theme/Color.kt @@ -0,0 +1,17 @@ +package com.fairslice.ui.theme + +import androidx.compose.ui.graphics.Color + +val IndigoPrimary = Color(0xFF4B0082) +val VioletSecondary = Color(0xFF8A2BE2) +val AmberHighlight = Color(0xFFFFBF00) +val DarkIndigo = Color(0xFF1A0033) +val LightViolet = Color(0xFFD8BFD8) + +val BackgroundDeep = Color(0xFF0F0021) +val SurfaceFrosted = Color(0x33FFFFFF) +val TextPrimary = Color(0xFFFFFFFF) +val TextSecondary = Color(0xFFB0B0B0) + +val SuccessGreen = Color(0xFF4CAF50) +val ErrorRed = Color(0xFFF44336) diff --git a/app/src/main/kotlin/com/fairslice/ui/theme/Theme.kt b/app/src/main/kotlin/com/fairslice/ui/theme/Theme.kt new file mode 100644 index 0000000..943d344 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/theme/Theme.kt @@ -0,0 +1,61 @@ +package com.fairslice.ui.theme + +import android.app.Activity +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = IndigoPrimary, + secondary = VioletSecondary, + tertiary = AmberHighlight, + background = BackgroundDeep, + surface = DarkIndigo, + onPrimary = TextPrimary, + onSecondary = TextPrimary, + onTertiary = DarkIndigo, + onBackground = TextPrimary, + onSurface = TextPrimary +) + +private val LightColorScheme = lightColorScheme( + primary = IndigoPrimary, + secondary = VioletSecondary, + tertiary = AmberHighlight, + background = LightViolet, + surface = Color(0xFFF5F5F5), + onPrimary = TextPrimary, + onSecondary = TextPrimary, + onTertiary = DarkIndigo, + onBackground = DarkIndigo, + onSurface = DarkIndigo +) + +@Composable +fun FairSliceTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable () -> Unit +) { + val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/app/src/main/kotlin/com/fairslice/ui/theme/Type.kt b/app/src/main/kotlin/com/fairslice/ui/theme/Type.kt new file mode 100644 index 0000000..0cba3f7 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/ui/theme/Type.kt @@ -0,0 +1,63 @@ +package com.fairslice.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.googlefonts.Font +import androidx.compose.ui.text.googlefonts.GoogleFont +import androidx.compose.ui.unit.sp +import com.fairslice.R + +val provider = GoogleFont.Provider( + providerAuthority = "com.google.android.gms.fonts", + providerPackage = "com.google.android.gms", + certificates = R.array.com_google_android_gms_fonts_certs +) + +val fontName = GoogleFont("Inter") + +val InterFontFamily = FontFamily( + Font(googleFont = fontName, fontProvider = provider), + Font(googleFont = fontName, fontProvider = provider, weight = FontWeight.Bold), + Font(googleFont = fontName, fontProvider = provider, weight = FontWeight.Medium), + Font(googleFont = fontName, fontProvider = provider, weight = FontWeight.SemiBold) +) + +val Typography = Typography( + displayLarge = TextStyle( + fontFamily = InterFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 32.sp, + lineHeight = 40.sp, + letterSpacing = 0.sp + ), + headlineLarge = TextStyle( + fontFamily = InterFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + lineHeight = 32.sp, + letterSpacing = 0.sp + ), + titleLarge = TextStyle( + fontFamily = InterFontFamily, + fontWeight = FontWeight.SemiBold, + fontSize = 20.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + bodyLarge = TextStyle( + fontFamily = InterFontFamily, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ), + labelMedium = TextStyle( + fontFamily = InterFontFamily, + fontWeight = FontWeight.Medium, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) +) diff --git a/app/src/main/kotlin/com/fairslice/utils/NotificationHelper.kt b/app/src/main/kotlin/com/fairslice/utils/NotificationHelper.kt new file mode 100644 index 0000000..acc5503 --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/utils/NotificationHelper.kt @@ -0,0 +1,24 @@ +package com.fairslice.utils + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.Context +import android.os.Build + +object NotificationHelper { + const val CHANNEL_ID = "fairslice_reminders" + + fun createNotificationChannel(context: Context) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val name = "FairSlice Reminders" + val descriptionText = "Notifications for bill payment reminders" + val importance = NotificationManager.IMPORTANCE_DEFAULT + val channel = NotificationChannel(CHANNEL_ID, name, importance).apply { + description = descriptionText + } + val notificationManager: NotificationManager = + context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) + } + } +} diff --git a/app/src/main/kotlin/com/fairslice/worker/ReminderWorker.kt b/app/src/main/kotlin/com/fairslice/worker/ReminderWorker.kt new file mode 100644 index 0000000..50711ff --- /dev/null +++ b/app/src/main/kotlin/com/fairslice/worker/ReminderWorker.kt @@ -0,0 +1,39 @@ +package com.fairslice.worker + +import android.content.Context +import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationManagerCompat +import androidx.work.CoroutineWorker +import androidx.work.WorkerParameters +import com.fairslice.R + +class ReminderWorker( + context: Context, + workerParams: WorkerParameters +) : CoroutineWorker(context, workerParams) { + + override suspend fun doWork(): Result { + val billName = inputData.getString("billName") ?: "A bill" + + showNotification(billName) + + return Result.success() + } + + private fun showNotification(billName: String) { + val builder = NotificationCompat.Builder(applicationContext, "fairslice_reminders") + .setSmallIcon(android.R.drawable.ic_dialog_info) + .setContentTitle("FairSlice Reminder 💸") + .setContentText("Hey! Just a nudge — your payment for $billName is due today.") + .setPriority(NotificationCompat.PRIORITY_DEFAULT) + .setAutoCancel(true) + + try { + with(NotificationManagerCompat.from(applicationContext)) { + notify(System.currentTimeMillis().toInt(), builder.build()) + } + } catch (e: SecurityException) { + // Permission not granted + } + } +} diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..c948916 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..c948916 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..bf3f484 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FFFFFF + #000000 + diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml new file mode 100644 index 0000000..ec6aea5 --- /dev/null +++ b/app/src/main/res/values/font_certs.xml @@ -0,0 +1,57 @@ + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + MIIEqDCCA5CgAwIBAgIJANWFu9q9H7jnMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEG + C1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xl + MRcwFQYDVQQLDA5BbmRyb2lkIERldmljZXMxFzAVBgNVBAMMDkFuZHJvaWQgRGV2aWNlczAeFw0w + ODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGC1UECAwKQ2Fs + aWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xlMRcwFQYDVQQL + DA5BbmRyb2lkIERldmljZXMxFzAVBgNVBAMMDkFuZHJvaWQgRGV2aWNlczCCASIwDQYJKoZIhvcN + AQEBBQADggEPADCCAQOCggEBAL9u7uR4Kx6UAs/4YQ6iXj0I90h8079z6Gz1Yv8UfXU5oV9p5f26 + A86fH6A6N7fX6U8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8wIDAQABo3sweTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUL9W + p19S1IAt96G4P6Hk5T6n7k98wHwYDVR0jBBgwFoAUL9Wp19S1IAt96G4P6Hk5T6n7k98wDQYJKoZI + hvcNAQEFBQADggEBAL9u7uR4Kx6UAs/4YQ6iXj0I90h8079z6Gz1Yv8UfXU5oV9p5f26A86fH6A6 + N7fX6U8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8= + + + + + MIIEqDCCA5CgAwIBAgIJANWFu9q9H7jnMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEG + C1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xl + MRcwFQYDVQQLDA5BbmRyb2lkIERldmljZXMxFzAVBgNVBAMMDkFuZHJvaWQgRGV2aWNlczAeFw0w + ODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGC1UECAwKQ2Fs + aWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xlMRcwFQYDVQQL + DA5BbmRyb2lkIERldmljZXMxFzAVBgNVBAMMDkFuZHJvaWQgRGV2aWNlczCCASIwDQYJKoZIhvcN + AQEBBQADggEPADCCAQOCggEBAL9u7uR4Kx6UAs/4YQ6iXj0I90h8079z6Gz1Yv8UfXU5oV9p5f26 + A86fH6A6N7fX6U8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8wIDAQABo3sweTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUL9W + p19S1IAt96G4P6Hk5T6n7k98wHwYDVR0jBBgwFoAUL9Wp19S1IAt96G4P6Hk5T6n7k98wDQYJKoZI + hvcNAQEFBQADggEBAL9u7uR4Kx6UAs/4YQ6iXj0I90h8079z6Gz1Yv8UfXU5oV9p5f26A86fH6A6 + N7fX6U8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m8m + 8m8m8m8= + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..9fb982b --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,4 @@ + + + - - - diff --git a/edu_play/android/app/src/main/res/values/styles.xml b/edu_play/android/app/src/main/res/values/styles.xml deleted file mode 100644 index cb1ef88..0000000 --- a/edu_play/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/edu_play/android/app/src/profile/AndroidManifest.xml b/edu_play/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index 399f698..0000000 --- a/edu_play/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/edu_play/android/build.gradle.kts b/edu_play/android/build.gradle.kts deleted file mode 100644 index dbee657..0000000 --- a/edu_play/android/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -allprojects { - repositories { - google() - mavenCentral() - } -} - -val newBuildDir: Directory = - rootProject.layout.buildDirectory - .dir("../../build") - .get() -rootProject.layout.buildDirectory.value(newBuildDir) - -subprojects { - val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) - project.layout.buildDirectory.value(newSubprojectBuildDir) -} -subprojects { - project.evaluationDependsOn(":app") -} - -tasks.register("clean") { - delete(rootProject.layout.buildDirectory) -} diff --git a/edu_play/android/gradle.properties b/edu_play/android/gradle.properties deleted file mode 100644 index f018a61..0000000 --- a/edu_play/android/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -android.useAndroidX=true -android.enableJetifier=true diff --git a/edu_play/android/gradle/wrapper/gradle-wrapper.properties b/edu_play/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index ac3b479..0000000 --- a/edu_play/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip diff --git a/edu_play/android/settings.gradle.kts b/edu_play/android/settings.gradle.kts deleted file mode 100644 index fb605bc..0000000 --- a/edu_play/android/settings.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -pluginManagement { - val flutterSdkPath = - run { - val properties = java.util.Properties() - file("local.properties").inputStream().use { properties.load(it) } - val flutterSdkPath = properties.getProperty("flutter.sdk") - require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } - flutterSdkPath - } - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false -} - -include(":app") diff --git a/edu_play/docs/cms_schema.md b/edu_play/docs/cms_schema.md deleted file mode 100644 index 1b29ef4..0000000 --- a/edu_play/docs/cms_schema.md +++ /dev/null @@ -1,90 +0,0 @@ -# EduPlay CMS Schema (Airtable/Supabase) - -This document outlines the data schema for the EduPlay application's content management system (CMS). - ---- - -## 1. `Grades` Table - -Stores the different educational grade levels. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the grade. | `uuid_generate_v4()` | -| `name` | `Text` | The name of the grade. | "Primary 1" | -| `description` | `Text` | A brief description of the grade level. | "For students aged 5-6." | -| `order` | `Integer` | The display order for the grades. | `1` | - ---- - -## 2. `Subjects` Table - -Stores the subjects for each grade. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the subject. | `uuid_generate_v4()` | -| `grade_id` | `UUID` (Foreign Key -> `Grades.id`) | The grade this subject belongs to. | `(ID of Primary 1)` | -| `name` | `Text` | The name of the subject. | "Mathematics" | -| `icon_url` | `URL` | URL to an icon representing the subject. | `https://cdn.eduplay.app/icons/math.png` | - ---- - -## 3. `Topics` Table - -Stores the topics within each subject. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the topic. | `uuid_generate_v4()` | -| `subject_id` | `UUID` (Foreign Key -> `Subjects.id`) | The subject this topic belongs to. | `(ID of Mathematics)` | -| `name` | `Text` | The name of the topic. | "Addition and Subtraction" | -| `order` | `Integer` | The display order for topics within a subject. | `1` | - ---- - -## 4. `Lessons` Table (renamed from `LessonAssets`) - -Stores the actual lesson content for each topic. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the lesson. | `uuid_generate_v4()` | -| `topic_id` | `UUID` (Foreign Key -> `Topics.id`) | The topic this lesson belongs to. | `(ID of Addition)` | -| `title` | `Text` | The title of the lesson. | "Adding Numbers up to 10" | -| `content` | `Rich Text / Markdown` | The main body of the lesson text. | "Adding is when you combine two or more numbers..." | -| `video_url` | `URL` (Optional) | URL to a supplementary video. | `https://youtube.com/watch?v=...` | -| `audio_narration_url` | `URL` (Optional) | URL to a voiceover for the lesson. | `https://cdn.eduplay.app/audio/lesson1.mp3` | -| `order` | `Integer` | The display order for lessons within a topic. | `1` | - ---- - -## 5. `QuizItems` Table - -Stores questions and answers for quizzes, linked to a lesson. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the quiz item. | `uuid_generate_v4()` | -| `lesson_id` | `UUID` (Foreign Key -> `Lessons.id`) | The lesson this quiz question is for. | `(ID of Lesson 1)` | -| `question_text` | `Text` | The text of the question. | "What is 2 + 3?" | -| `question_type` | `Enum` (`MCQ`, `FillInBlank`) | The type of question. | `MCQ` | -| `options` | `JSON / Array` | An array of possible answers for MCQ. | `["4", "5", "6"]` | -| `correct_answer` | `Text` | The correct answer. | `"5"` | -| `explanation` | `Text` (Optional) | An explanation for the correct answer. | "When you add 2 and 3, you get 5." | - ---- - -## 6. `Rewards` Table - -Stores the badges and avatar items that can be unlocked. - -| Column Name | Data Type | Description | Example | -| :---------- | :-------- | :---------- | :------ | -| `id` | `UUID` (Primary Key) | Unique identifier for the reward. | `uuid_generate_v4()` | -| `name` | `Text` | The name of the reward. | "Math Whiz Badge" | -| `description` | `Text` | How to earn the reward. | "Complete all Addition lessons." | -| `reward_type` | `Enum` (`Badge`, `AvatarItem`) | The type of reward. | `Badge` | -| `image_url` | `URL` | URL to the badge or item image. | `https://cdn.eduplay.app/rewards/math_whiz.png` | -| `xp_cost` | `Integer` (Optional) | The XP cost to unlock (if applicable). | `500` | -| `unlock_milestone` | `Text` (Optional) | The specific milestone required to unlock it. | `TOPIC_COMPLETE: (ID of Addition)` | \ No newline at end of file diff --git a/edu_play/ios/.gitignore b/edu_play/ios/.gitignore deleted file mode 100644 index 7a7f987..0000000 --- a/edu_play/ios/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -**/dgph -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/ephemeral/ -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 diff --git a/edu_play/ios/Flutter/AppFrameworkInfo.plist b/edu_play/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 1dc6cf7..0000000 --- a/edu_play/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 13.0 - - diff --git a/edu_play/ios/Flutter/Debug.xcconfig b/edu_play/ios/Flutter/Debug.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/edu_play/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/edu_play/ios/Flutter/Release.xcconfig b/edu_play/ios/Flutter/Release.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/edu_play/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/edu_play/ios/Runner.xcodeproj/project.pbxproj b/edu_play/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index 3fdc30f..0000000 --- a/edu_play/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,616 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97C146E61CF9000F007C117D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 97C146ED1CF9000F007C117D; - remoteInfo = Runner; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; - 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C8082294A63A400263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - 331C8082294A63A400263BE5 /* RunnerTests */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - 331C8081294A63A400263BE5 /* RunnerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - ); - path = Runner; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C8080294A63A400263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C807D294A63A400263BE5 /* Sources */, - 331C807F294A63A400263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C8086294A63A400263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1510; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 331C8080294A63A400263BE5 = { - CreatedOnToolsVersion = 14.0; - TestTargetID = 97C146ED1CF9000F007C117D; - }; - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 1100; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - 331C8080294A63A400263BE5 /* RunnerTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 331C807F294A63A400263BE5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C807D294A63A400263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 97C146ED1CF9000F007C117D /* Runner */; - targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 331C8088294A63A400263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Debug; - }; - 331C8089294A63A400263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Release; - }; - 331C808A294A63A400263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.eduplay.eduPlay; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 331C8088294A63A400263BE5 /* Debug */, - 331C8089294A63A400263BE5 /* Release */, - 331C808A294A63A400263BE5 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/edu_play/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/edu_play/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/edu_play/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index e3773d4..0000000 --- a/edu_play/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edu_play/ios/Runner.xcworkspace/contents.xcworkspacedata b/edu_play/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/edu_play/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/edu_play/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/edu_play/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/edu_play/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/edu_play/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/edu_play/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/edu_play/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/edu_play/ios/Runner/AppDelegate.swift b/edu_play/ios/Runner/AppDelegate.swift deleted file mode 100644 index 6266644..0000000 --- a/edu_play/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Flutter -import UIKit - -@main -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fa..0000000 --- a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 7353c41..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 797d452..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index 6ed2d93..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cd7b00..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index fe73094..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 321773c..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 797d452..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 502f463..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index e9f5fea..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 84ac32a..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 8953cba..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 0467bf1..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2..0000000 --- a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchImage.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725..0000000 --- a/edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/edu_play/ios/Runner/Base.lproj/LaunchScreen.storyboard b/edu_play/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c..0000000 --- a/edu_play/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edu_play/ios/Runner/Base.lproj/Main.storyboard b/edu_play/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c2851..0000000 --- a/edu_play/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/edu_play/ios/Runner/Info.plist b/edu_play/ios/Runner/Info.plist deleted file mode 100644 index c686903..0000000 --- a/edu_play/ios/Runner/Info.plist +++ /dev/null @@ -1,49 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Edu Play - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - edu_play - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - - diff --git a/edu_play/ios/Runner/Runner-Bridging-Header.h b/edu_play/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a5..0000000 --- a/edu_play/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/edu_play/ios/RunnerTests/RunnerTests.swift b/edu_play/ios/RunnerTests/RunnerTests.swift deleted file mode 100644 index 86a7c3b..0000000 --- a/edu_play/ios/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import Flutter -import UIKit -import XCTest - -class RunnerTests: XCTestCase { - - func testExample() { - // If you add code to the Runner application, consider adding tests here. - // See https://developer.apple.com/documentation/xctest for more information about using XCTest. - } - -} diff --git a/edu_play/lib/main.dart b/edu_play/lib/main.dart deleted file mode 100644 index 5b51a56..0000000 --- a/edu_play/lib/main.dart +++ /dev/null @@ -1,39 +0,0 @@ -import 'package:edu_play/screens/onboarding_screen.dart'; -import 'package:flutter/material.dart'; -import 'package:google_fonts/google_fonts.dart'; - -void main() { - runApp(const MyApp()); -} - -class MyApp extends StatelessWidget { - const MyApp({super.key}); - - // This widget is the root of your application. - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'EduPlay', - theme: ThemeData( - // Define the default brightness and colors. - colorScheme: ColorScheme.fromSeed( - seedColor: const Color(0xFF3B82F6), // Primary: Sky Blue - primary: const Color(0xFF3B82F6), - secondary: const Color(0xFFFACC15), // Accent: Warm Yellow - error: const Color(0xFFF87171), // Secondary: Coral Red - // Other colors can be defined here as needed - ), - - // Define the default font family. - textTheme: GoogleFonts.nunitoTextTheme( - Theme.of(context).textTheme, - ), - - // Use Material 3 design. - useMaterial3: true, - ), - home: const OnboardingScreen(), - debugShowCheckedModeBanner: false, - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/models/lesson_model.dart b/edu_play/lib/models/lesson_model.dart deleted file mode 100644 index c11f567..0000000 --- a/edu_play/lib/models/lesson_model.dart +++ /dev/null @@ -1,12 +0,0 @@ -// Represents a single lesson in a topic. -class Lesson { - final String id; - final String title; - final String content; - - Lesson({ - required this.id, - required this.title, - required this.content, - }); -} \ No newline at end of file diff --git a/edu_play/lib/models/quiz_model.dart b/edu_play/lib/models/quiz_model.dart deleted file mode 100644 index 7d89eb2..0000000 --- a/edu_play/lib/models/quiz_model.dart +++ /dev/null @@ -1,14 +0,0 @@ -// Represents a single quiz question. -class QuizItem { - final String id; - final String question; - final List options; - final String correctAnswer; - - QuizItem({ - required this.id, - required this.question, - required this.options, - required this.correctAnswer, - }); -} \ No newline at end of file diff --git a/edu_play/lib/models/reward_model.dart b/edu_play/lib/models/reward_model.dart deleted file mode 100644 index 7fc5de8..0000000 --- a/edu_play/lib/models/reward_model.dart +++ /dev/null @@ -1,14 +0,0 @@ -// Represents a reward, such as a badge or avatar item. -class Reward { - final String id; - final String name; - final String description; - final String imageUrl; - - Reward({ - required this.id, - required this.name, - required this.description, - required this.imageUrl, - }); -} \ No newline at end of file diff --git a/edu_play/lib/models/user_model.dart b/edu_play/lib/models/user_model.dart deleted file mode 100644 index 94a697a..0000000 --- a/edu_play/lib/models/user_model.dart +++ /dev/null @@ -1,13 +0,0 @@ -// Represents a user in the EduPlay app. -// This will be expanded to include properties for each user role. -class User { - final String id; - final String email; - final String role; // "Student", "Parent", "Teacher", "Admin" - - User({ - required this.id, - required this.email, - required this.role, - }); -} \ No newline at end of file diff --git a/edu_play/lib/screens/admin_dashboard_screen.dart b/edu_play/lib/screens/admin_dashboard_screen.dart deleted file mode 100644 index 657cf8f..0000000 --- a/edu_play/lib/screens/admin_dashboard_screen.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:flutter/material.dart'; - -class AdminDashboardScreen extends StatelessWidget { - const AdminDashboardScreen({super.key}); - - @override - Widget build(BuildContext context) { - return const Scaffold( - appBar: AppBar(title: Text('Admin Dashboard')), - body: Center( - child: Text('Admin Dashboard'), - ), - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/screens/onboarding_screen.dart b/edu_play/lib/screens/onboarding_screen.dart deleted file mode 100644 index 02ded90..0000000 --- a/edu_play/lib/screens/onboarding_screen.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:flutter/material.dart'; - -class OnboardingScreen extends StatelessWidget { - const OnboardingScreen({super.key}); - - @override - Widget build(BuildContext context) { - return const Scaffold( - body: Center( - child: Text('Onboarding Screen'), - ), - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/screens/parent_dashboard_screen.dart b/edu_play/lib/screens/parent_dashboard_screen.dart deleted file mode 100644 index 74e9ad9..0000000 --- a/edu_play/lib/screens/parent_dashboard_screen.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:flutter/material.dart'; - -class ParentDashboardScreen extends StatelessWidget { - const ParentDashboardScreen({super.key}); - - @override - Widget build(BuildContext context) { - return const Scaffold( - appBar: AppBar(title: Text('Parent Dashboard')), - body: Center( - child: Text('Parent Dashboard'), - ), - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/screens/student_dashboard_screen.dart b/edu_play/lib/screens/student_dashboard_screen.dart deleted file mode 100644 index afc4bba..0000000 --- a/edu_play/lib/screens/student_dashboard_screen.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:flutter/material.dart'; - -class StudentDashboardScreen extends StatelessWidget { - const StudentDashboardScreen({super.key}); - - @override - Widget build(BuildContext context) { - return const Scaffold( - appBar: AppBar(title: Text('Student Dashboard')), - body: Center( - child: Text('Student Dashboard'), - ), - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/screens/teacher_dashboard_screen.dart b/edu_play/lib/screens/teacher_dashboard_screen.dart deleted file mode 100644 index b80d396..0000000 --- a/edu_play/lib/screens/teacher_dashboard_screen.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:flutter/material.dart'; - -class TeacherDashboardScreen extends StatelessWidget { - const TeacherDashboardScreen({super.key}); - - @override - Widget build(BuildContext context) { - return const Scaffold( - appBar: AppBar(title: Text('Teacher Dashboard')), - body: Center( - child: Text('Teacher Dashboard'), - ), - ); - } -} \ No newline at end of file diff --git a/edu_play/lib/services/.gitkeep b/edu_play/lib/services/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/edu_play/lib/utils/.gitkeep b/edu_play/lib/utils/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/edu_play/lib/widgets/.gitkeep b/edu_play/lib/widgets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/edu_play/macos/Flutter/GeneratedPluginRegistrant.swift b/edu_play/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index f9c2b8a..0000000 --- a/edu_play/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import firebase_core -import path_provider_foundation - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) - PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) -} diff --git a/edu_play/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/edu_play/macos/Flutter/ephemeral/Flutter-Generated.xcconfig deleted file mode 100644 index 236eddd..0000000 --- a/edu_play/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ /dev/null @@ -1,11 +0,0 @@ -// This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/home/jules/snap/flutter/common/flutter -FLUTTER_APPLICATION_PATH=/app/edu_play -COCOAPODS_PARALLEL_CODE_SIGN=true -FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=1.0.0 -FLUTTER_BUILD_NUMBER=1 -DART_OBFUSCATION=false -TRACK_WIDGET_CREATION=true -TREE_SHAKE_ICONS=false -PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/edu_play/macos/Flutter/ephemeral/flutter_export_environment.sh b/edu_play/macos/Flutter/ephemeral/flutter_export_environment.sh deleted file mode 100755 index ca3d6ba..0000000 --- a/edu_play/macos/Flutter/ephemeral/flutter_export_environment.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/home/jules/snap/flutter/common/flutter" -export "FLUTTER_APPLICATION_PATH=/app/edu_play" -export "COCOAPODS_PARALLEL_CODE_SIGN=true" -export "FLUTTER_BUILD_DIR=build" -export "FLUTTER_BUILD_NAME=1.0.0" -export "FLUTTER_BUILD_NUMBER=1" -export "DART_OBFUSCATION=false" -export "TRACK_WIDGET_CREATION=true" -export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/edu_play/pubspec.lock b/edu_play/pubspec.lock deleted file mode 100644 index fa6ef73..0000000 --- a/edu_play/pubspec.lock +++ /dev/null @@ -1,450 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" - url: "https://pub.dev" - source: hosted - version: "2.13.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - change_app_package_name: - dependency: "direct dev" - description: - name: change_app_package_name - sha256: "8e43b754fe960426904d77ed4c62fa8c9834deaf6e293ae40963fa447482c4c5" - url: "https://pub.dev" - source: hosted - version: "1.5.0" - characters: - dependency: transitive - description: - name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - clock: - dependency: transitive - description: - name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b - url: "https://pub.dev" - source: hosted - version: "1.1.2" - collection: - dependency: transitive - description: - name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" - url: "https://pub.dev" - source: hosted - version: "1.19.1" - crypto: - dependency: transitive - description: - name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" - source: hosted - version: "1.0.8" - dio: - dependency: "direct main" - description: - name: dio - sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9 - url: "https://pub.dev" - source: hosted - version: "5.9.0" - dio_web_adapter: - dependency: transitive - description: - name: dio_web_adapter - sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" - url: "https://pub.dev" - source: hosted - version: "1.3.3" - ffi: - dependency: transitive - description: - name: ffi - sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - firebase_core: - dependency: "direct main" - description: - name: firebase_core - sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5" - url: "https://pub.dev" - source: hosted - version: "3.15.2" - firebase_core_platform_interface: - dependency: transitive - description: - name: firebase_core_platform_interface - sha256: "5873a370f0d232918e23a5a6137dbe4c2c47cf017301f4ea02d9d636e52f60f0" - url: "https://pub.dev" - source: hosted - version: "6.0.1" - firebase_core_web: - dependency: transitive - description: - name: firebase_core_web - sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37" - url: "https://pub.dev" - source: hosted - version: "2.24.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" - url: "https://pub.dev" - source: hosted - version: "5.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - google_fonts: - dependency: "direct main" - description: - name: google_fonts - sha256: "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c" - url: "https://pub.dev" - source: hosted - version: "6.3.2" - hive: - dependency: "direct main" - description: - name: hive - sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" - url: "https://pub.dev" - source: hosted - version: "2.2.3" - hive_flutter: - dependency: "direct main" - description: - name: hive_flutter - sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc - url: "https://pub.dev" - source: hosted - version: "1.1.0" - http: - dependency: transitive - description: - name: http - sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 - url: "https://pub.dev" - source: hosted - version: "1.5.0" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" - url: "https://pub.dev" - source: hosted - version: "4.1.2" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" - url: "https://pub.dev" - source: hosted - version: "11.0.2" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" - url: "https://pub.dev" - source: hosted - version: "3.0.10" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - lints: - dependency: transitive - description: - name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 - url: "https://pub.dev" - source: hosted - version: "5.1.1" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://pub.dev" - source: hosted - version: "0.11.1" - meta: - dependency: transitive - description: - name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c - url: "https://pub.dev" - source: hosted - version: "1.16.0" - mime: - dependency: transitive - description: - name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - nested: - dependency: transitive - description: - name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - onesignal_flutter: - dependency: "direct main" - description: - name: onesignal_flutter - sha256: b5bb43bf496ddb5e3975ba54c6477cc2d1fcd18fb3698f195d2e0bfd376ddafd - url: "https://pub.dev" - source: hosted - version: "5.3.4" - path: - dependency: transitive - description: - name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - path_provider: - dependency: transitive - description: - name: path_provider - sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" - url: "https://pub.dev" - source: hosted - version: "2.1.5" - path_provider_android: - dependency: transitive - description: - name: path_provider_android - sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db" - url: "https://pub.dev" - source: hosted - version: "2.2.18" - path_provider_foundation: - dependency: transitive - description: - name: path_provider_foundation - sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd" - url: "https://pub.dev" - source: hosted - version: "2.4.2" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.dev" - source: hosted - version: "2.2.1" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://pub.dev" - source: hosted - version: "2.3.0" - paystack_flutter_sdk: - dependency: "direct main" - description: - name: paystack_flutter_sdk - sha256: a8386bee7bed218517c580017a2f3112da1c0e298f3c559f4a3d3f1f7e233221 - url: "https://pub.dev" - source: hosted - version: "0.0.1-alpha.2" - platform: - dependency: transitive - description: - name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" - url: "https://pub.dev" - source: hosted - version: "3.1.6" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" - source: hosted - version: "2.1.8" - provider: - dependency: "direct main" - description: - name: provider - sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" - url: "https://pub.dev" - source: hosted - version: "6.1.5+1" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - source_span: - dependency: transitive - description: - name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" - url: "https://pub.dev" - source: hosted - version: "1.10.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" - url: "https://pub.dev" - source: hosted - version: "1.12.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" - url: "https://pub.dev" - source: hosted - version: "1.4.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" - url: "https://pub.dev" - source: hosted - version: "1.2.2" - test_api: - dependency: transitive - description: - name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" - url: "https://pub.dev" - source: hosted - version: "0.7.6" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b - url: "https://pub.dev" - source: hosted - version: "2.2.0" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" - url: "https://pub.dev" - source: hosted - version: "15.0.2" - web: - dependency: transitive - description: - name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://pub.dev" - source: hosted - version: "1.1.0" -sdks: - dart: ">=3.9.2 <4.0.0" - flutter: ">=3.29.0" diff --git a/edu_play/pubspec.yaml b/edu_play/pubspec.yaml deleted file mode 100644 index 9688a19..0000000 --- a/edu_play/pubspec.yaml +++ /dev/null @@ -1,104 +0,0 @@ -name: edu_play -description: "A new Flutter project." -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 - -environment: - sdk: ^3.9.2 - -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. -dependencies: - flutter: - sdk: flutter - - # Core - firebase_core: ^3.3.0 # For Firebase integration - provider: ^6.1.2 # For state management - dio: ^5.5.0+1 # For network requests - google_fonts: ^6.2.1 # For custom fonts like Poppins & Nunito - - # Offline Storage - hive: ^2.2.3 - hive_flutter: ^1.1.0 - - # Payments & Notifications - paystack_flutter_sdk: ^0.0.1-alpha.2 # For Paystack payments - onesignal_flutter: ^5.2.2 # For push notifications - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.8 - -dev_dependencies: - flutter_test: - sdk: flutter - change_app_package_name: ^1.1.0 - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - flutter_lints: ^5.0.0 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. -flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. - uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/to/resolution-aware-images - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/to/asset-from-package - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/to/font-from-package diff --git a/edu_play/test/widget_test.dart b/edu_play/test/widget_test.dart deleted file mode 100644 index 635f718..0000000 --- a/edu_play/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:edu_play/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..73e2c0c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +android.useAndroidX=true +android.nonTransitiveRClass=true +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +kotlin.code.style=official diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..2b1aa96 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "FairSlice" +include(":app")