From 5805de349aa5988f9391c7d4ec032cf8ad95c8c4 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 6 Feb 2026 17:34:49 +0000 Subject: [PATCH] feat: Initial implementation of Small Apartment Decor Planner - MVVM architecture with Room and Hilt - Warm Minimalism design system with Outfit and Inter fonts - Home, Onboarding, Room Details, Mood Board, Checklist, and Budget screens - Decision Mode for side-by-side comparison of shortlisted pins - Smart Capture with basic URL metadata extraction - Cleaned up unrelated educational project artifacts Co-authored-by: iQodeIT <162815903+iQodeIT@users.noreply.github.com> --- .gitignore | 16 + app/build.gradle.kts | 98 +++ app/src/main/AndroidManifest.xml | 40 ++ .../com/apartment/planner/MainActivity.kt | 31 + .../apartment/planner/PlannerApplication.kt | 7 + .../planner/data/local/PlannerDatabase.kt | 25 + .../planner/data/local/dao/ApartmentDao.kt | 17 + .../planner/data/local/dao/BudgetDao.kt | 23 + .../planner/data/local/dao/ChecklistDao.kt | 20 + .../planner/data/local/dao/PinDao.kt | 23 + .../planner/data/local/dao/RoomDao.kt | 23 + .../data/local/entity/ApartmentEntity.kt | 15 + .../data/local/entity/BudgetItemEntity.kt | 30 + .../data/local/entity/ChecklistItemEntity.kt | 29 + .../planner/data/local/entity/PinEntity.kt | 33 + .../planner/data/local/entity/RoomEntity.kt | 28 + .../data/repository/PlannerRepository.kt | 48 ++ .../apartment/planner/di/DatabaseModule.kt | 43 ++ .../apartment/planner/di/RepositoryModule.kt | 26 + .../planner/ui/navigation/NavGraph.kt | 45 ++ .../apartment/planner/ui/navigation/Screen.kt | 15 + .../planner/ui/screens/home/HomeScreen.kt | 196 ++++++ .../ui/screens/onboarding/OnboardingScreen.kt | 156 +++++ .../planner/ui/screens/room/BudgetTab.kt | 88 +++ .../planner/ui/screens/room/ChecklistTab.kt | 79 +++ .../ui/screens/room/DecisionModeScreen.kt | 129 ++++ .../planner/ui/screens/room/MoodBoardTab.kt | 120 ++++ .../ui/screens/room/RoomDetailsScreen.kt | 206 ++++++ .../planner/ui/screens/splash/SplashScreen.kt | 57 ++ .../com/apartment/planner/ui/theme/Color.kt | 19 + .../com/apartment/planner/ui/theme/Shape.kt | 11 + .../com/apartment/planner/ui/theme/Spacing.kt | 17 + .../com/apartment/planner/ui/theme/Theme.kt | 76 +++ .../com/apartment/planner/ui/theme/Type.kt | 69 ++ .../planner/ui/viewmodel/HomeViewModel.kt | 68 ++ .../planner/ui/viewmodel/RoomViewModel.kt | 102 +++ .../res/drawable/ic_launcher_foreground.xml | 12 + app/src/main/res/values/font_certs.xml | 45 ++ app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 9 + build.gradle.kts | 15 + edu_play/.gitignore | 45 -- edu_play/.metadata | 33 - edu_play/README.md | 16 - edu_play/analysis_options.yaml | 28 - edu_play/android/.gitignore | 14 - edu_play/android/app/build.gradle.kts | 44 -- .../android/app/src/debug/AndroidManifest.xml | 7 - .../android/app/src/main/AndroidManifest.xml | 45 -- .../kotlin/com/eduplay/app/MainActivity.kt | 5 - .../res/drawable-v21/launch_background.xml | 12 - .../main/res/drawable/launch_background.xml | 12 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes .../app/src/main/res/values-night/styles.xml | 18 - .../app/src/main/res/values/styles.xml | 18 - .../app/src/profile/AndroidManifest.xml | 7 - edu_play/android/build.gradle.kts | 24 - edu_play/android/gradle.properties | 3 - .../gradle/wrapper/gradle-wrapper.properties | 5 - edu_play/android/settings.gradle.kts | 26 - edu_play/docs/.gitkeep | 0 edu_play/docs/cms_schema.md | 90 --- edu_play/ios/.gitignore | 34 - edu_play/ios/Flutter/AppFrameworkInfo.plist | 26 - edu_play/ios/Flutter/Debug.xcconfig | 1 - edu_play/ios/Flutter/Release.xcconfig | 1 - edu_play/ios/Runner.xcodeproj/project.pbxproj | 616 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 101 --- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - edu_play/ios/Runner/AppDelegate.swift | 13 - .../AppIcon.appiconset/Contents.json | 122 ---- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 295 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 450 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 282 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 462 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 704 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 586 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 1674 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 762 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 1226 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 1418 -> 0 bytes .../LaunchImage.imageset/Contents.json | 23 - .../LaunchImage.imageset/LaunchImage.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/README.md | 5 - .../Runner/Base.lproj/LaunchScreen.storyboard | 37 -- .../ios/Runner/Base.lproj/Main.storyboard | 26 - edu_play/ios/Runner/Info.plist | 49 -- edu_play/ios/Runner/Runner-Bridging-Header.h | 1 - edu_play/ios/RunnerTests/RunnerTests.swift | 12 - edu_play/lib/main.dart | 39 -- edu_play/lib/models/.gitkeep | 0 edu_play/lib/models/lesson_model.dart | 12 - edu_play/lib/models/quiz_model.dart | 14 - edu_play/lib/models/reward_model.dart | 14 - edu_play/lib/models/user_model.dart | 13 - edu_play/lib/screens/.gitkeep | 0 .../lib/screens/admin_dashboard_screen.dart | 15 - edu_play/lib/screens/onboarding_screen.dart | 14 - .../lib/screens/parent_dashboard_screen.dart | 15 - .../lib/screens/student_dashboard_screen.dart | 15 - .../lib/screens/teacher_dashboard_screen.dart | 15 - edu_play/lib/services/.gitkeep | 0 edu_play/lib/utils/.gitkeep | 0 edu_play/lib/widgets/.gitkeep | 0 .../Flutter/GeneratedPluginRegistrant.swift | 14 - .../ephemeral/Flutter-Generated.xcconfig | 11 - .../ephemeral/flutter_export_environment.sh | 12 - edu_play/pubspec.lock | 450 ------------- edu_play/pubspec.yaml | 104 --- edu_play/test/widget_test.dart | 30 - gradle.properties | 4 + settings.gradle.kts | 16 + 128 files changed, 2132 insertions(+), 2352 deletions(-) create mode 100644 .gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/kotlin/com/apartment/planner/MainActivity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/PlannerApplication.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/PlannerDatabase.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/dao/ApartmentDao.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/dao/BudgetDao.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/dao/ChecklistDao.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/dao/PinDao.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/dao/RoomDao.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/entity/ApartmentEntity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/entity/BudgetItemEntity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/entity/ChecklistItemEntity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/entity/PinEntity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/local/entity/RoomEntity.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/data/repository/PlannerRepository.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/di/DatabaseModule.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/di/RepositoryModule.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/navigation/NavGraph.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/navigation/Screen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/home/HomeScreen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/onboarding/OnboardingScreen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/room/BudgetTab.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/room/ChecklistTab.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/room/DecisionModeScreen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/room/MoodBoardTab.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/room/RoomDetailsScreen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/screens/splash/SplashScreen.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/theme/Color.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/theme/Shape.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/theme/Spacing.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/theme/Theme.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/theme/Type.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/viewmodel/HomeViewModel.kt create mode 100644 app/src/main/kotlin/com/apartment/planner/ui/viewmodel/RoomViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/values/font_certs.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 build.gradle.kts delete mode 100644 edu_play/.gitignore delete mode 100644 edu_play/.metadata delete mode 100644 edu_play/README.md delete mode 100644 edu_play/analysis_options.yaml delete mode 100644 edu_play/android/.gitignore delete mode 100644 edu_play/android/app/build.gradle.kts delete mode 100644 edu_play/android/app/src/debug/AndroidManifest.xml delete mode 100644 edu_play/android/app/src/main/AndroidManifest.xml delete mode 100644 edu_play/android/app/src/main/kotlin/com/eduplay/app/MainActivity.kt delete mode 100644 edu_play/android/app/src/main/res/drawable-v21/launch_background.xml delete mode 100644 edu_play/android/app/src/main/res/drawable/launch_background.xml delete mode 100644 edu_play/android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 edu_play/android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 edu_play/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 edu_play/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 edu_play/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 edu_play/android/app/src/main/res/values-night/styles.xml delete mode 100644 edu_play/android/app/src/main/res/values/styles.xml delete mode 100644 edu_play/android/app/src/profile/AndroidManifest.xml delete mode 100644 edu_play/android/build.gradle.kts delete mode 100644 edu_play/android/gradle.properties delete mode 100644 edu_play/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 edu_play/android/settings.gradle.kts delete mode 100644 edu_play/docs/.gitkeep delete mode 100644 edu_play/docs/cms_schema.md delete mode 100644 edu_play/ios/.gitignore delete mode 100644 edu_play/ios/Flutter/AppFrameworkInfo.plist delete mode 100644 edu_play/ios/Flutter/Debug.xcconfig delete mode 100644 edu_play/ios/Flutter/Release.xcconfig delete mode 100644 edu_play/ios/Runner.xcodeproj/project.pbxproj delete mode 100644 edu_play/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 edu_play/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 edu_play/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 edu_play/ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 edu_play/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 edu_play/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 edu_play/ios/Runner/AppDelegate.swift delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json delete mode 100644 edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png delete mode 100644 edu_play/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md delete mode 100644 edu_play/ios/Runner/Base.lproj/LaunchScreen.storyboard delete mode 100644 edu_play/ios/Runner/Base.lproj/Main.storyboard delete mode 100644 edu_play/ios/Runner/Info.plist delete mode 100644 edu_play/ios/Runner/Runner-Bridging-Header.h delete mode 100644 edu_play/ios/RunnerTests/RunnerTests.swift delete mode 100644 edu_play/lib/main.dart delete mode 100644 edu_play/lib/models/.gitkeep delete mode 100644 edu_play/lib/models/lesson_model.dart delete mode 100644 edu_play/lib/models/quiz_model.dart delete mode 100644 edu_play/lib/models/reward_model.dart delete mode 100644 edu_play/lib/models/user_model.dart delete mode 100644 edu_play/lib/screens/.gitkeep delete mode 100644 edu_play/lib/screens/admin_dashboard_screen.dart delete mode 100644 edu_play/lib/screens/onboarding_screen.dart delete mode 100644 edu_play/lib/screens/parent_dashboard_screen.dart delete mode 100644 edu_play/lib/screens/student_dashboard_screen.dart delete mode 100644 edu_play/lib/screens/teacher_dashboard_screen.dart delete mode 100644 edu_play/lib/services/.gitkeep delete mode 100644 edu_play/lib/utils/.gitkeep delete mode 100644 edu_play/lib/widgets/.gitkeep delete mode 100644 edu_play/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 edu_play/macos/Flutter/ephemeral/Flutter-Generated.xcconfig delete mode 100755 edu_play/macos/Flutter/ephemeral/flutter_export_environment.sh delete mode 100644 edu_play/pubspec.lock delete mode 100644 edu_play/pubspec.yaml delete mode 100644 edu_play/test/widget_test.dart create mode 100644 gradle.properties create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea13191 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +/app/build diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..2c555c8 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,98 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("kotlin-kapt") + id("com.google.dagger.hilt.android") +} + +android { + namespace = "com.apartment.planner" + compileSdk = 34 + + defaultConfig { + applicationId = "com.apartment.planner" + 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_21 + targetCompatibility = JavaVersion.VERSION_21 + } + kotlinOptions { + jvmTarget = "21" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.10" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + 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:1.2.0") + implementation("androidx.compose.ui:ui-text-google-fonts:1.6.1") + + // Coil + implementation("io.coil-kt:coil-compose:2.5.0") + + // Architecture + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.7.0") + + // Database + implementation("androidx.room:room-runtime:2.6.1") + implementation("androidx.room:room-ktx:2.6.1") + kapt("androidx.room:room-compiler:2.6.1") + + // Coroutines + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") + + // Navigation + implementation("androidx.navigation:navigation-compose:2.7.6") + + // DI + implementation("com.google.dagger:hilt-android:2.50") + kapt("com.google.dagger:hilt-compiler:2.50") + implementation("androidx.hilt:hilt-navigation-compose:1.1.0") + + // Lottie + implementation("com.airbnb.android:lottie-compose:6.3.0") + + 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..d41aea1 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/kotlin/com/apartment/planner/MainActivity.kt b/app/src/main/kotlin/com/apartment/planner/MainActivity.kt new file mode 100644 index 0000000..b79f0c9 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/MainActivity.kt @@ -0,0 +1,31 @@ +package com.apartment.planner + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.ui.Modifier +import androidx.navigation.compose.rememberNavController +import com.apartment.planner.ui.navigation.NavGraph +import com.apartment.planner.ui.theme.DecorPlannerTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + DecorPlannerTheme { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + val navController = rememberNavController() + NavGraph(navController = navController) + } + } + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/PlannerApplication.kt b/app/src/main/kotlin/com/apartment/planner/PlannerApplication.kt new file mode 100644 index 0000000..9e33596 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/PlannerApplication.kt @@ -0,0 +1,7 @@ +package com.apartment.planner + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class PlannerApplication : Application() diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/PlannerDatabase.kt b/app/src/main/kotlin/com/apartment/planner/data/local/PlannerDatabase.kt new file mode 100644 index 0000000..78f291a --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/PlannerDatabase.kt @@ -0,0 +1,25 @@ +package com.apartment.planner.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.apartment.planner.data.local.dao.* +import com.apartment.planner.data.local.entity.* + +@Database( + entities = [ + ApartmentEntity::class, + RoomEntity::class, + PinEntity::class, + ChecklistItemEntity::class, + BudgetItemEntity::class + ], + version = 1, + exportSchema = false +) +abstract class PlannerDatabase : RoomDatabase() { + abstract fun apartmentDao(): ApartmentDao + abstract fun roomDao(): RoomDao + abstract fun pinDao(): PinDao + abstract fun checklistDao(): ChecklistDao + abstract fun budgetDao(): BudgetDao +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/dao/ApartmentDao.kt b/app/src/main/kotlin/com/apartment/planner/data/local/dao/ApartmentDao.kt new file mode 100644 index 0000000..20d3f43 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/dao/ApartmentDao.kt @@ -0,0 +1,17 @@ +package com.apartment.planner.data.local.dao + +import androidx.room.* +import com.apartment.planner.data.local.entity.ApartmentEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface ApartmentDao { + @Query("SELECT * FROM apartments LIMIT 1") + fun getApartment(): Flow + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertApartment(apartment: ApartmentEntity) + + @Update + suspend fun updateApartment(apartment: ApartmentEntity) +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/dao/BudgetDao.kt b/app/src/main/kotlin/com/apartment/planner/data/local/dao/BudgetDao.kt new file mode 100644 index 0000000..4317ce9 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/dao/BudgetDao.kt @@ -0,0 +1,23 @@ +package com.apartment.planner.data.local.dao + +import androidx.room.* +import com.apartment.planner.data.local.entity.BudgetItemEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface BudgetDao { + @Query("SELECT * FROM budget_items WHERE roomId = :roomId ORDER BY createdAt ASC") + fun getItemsByRoom(roomId: String): Flow> + + @Query("SELECT * FROM budget_items ORDER BY createdAt ASC") + fun getAllBudgetItems(): Flow> + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertItem(item: BudgetItemEntity) + + @Update + suspend fun updateItem(item: BudgetItemEntity) + + @Delete + suspend fun deleteItem(item: BudgetItemEntity) +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/dao/ChecklistDao.kt b/app/src/main/kotlin/com/apartment/planner/data/local/dao/ChecklistDao.kt new file mode 100644 index 0000000..4076627 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/dao/ChecklistDao.kt @@ -0,0 +1,20 @@ +package com.apartment.planner.data.local.dao + +import androidx.room.* +import com.apartment.planner.data.local.entity.ChecklistItemEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface ChecklistDao { + @Query("SELECT * FROM checklist_items WHERE roomId = :roomId ORDER BY displayOrder ASC") + fun getItemsByRoom(roomId: String): Flow> + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertItem(item: ChecklistItemEntity) + + @Update + suspend fun updateItem(item: ChecklistItemEntity) + + @Delete + suspend fun deleteItem(item: ChecklistItemEntity) +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/dao/PinDao.kt b/app/src/main/kotlin/com/apartment/planner/data/local/dao/PinDao.kt new file mode 100644 index 0000000..7676b49 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/dao/PinDao.kt @@ -0,0 +1,23 @@ +package com.apartment.planner.data.local.dao + +import androidx.room.* +import com.apartment.planner.data.local.entity.PinEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface PinDao { + @Query("SELECT * FROM pins WHERE roomId = :roomId ORDER BY displayOrder ASC") + fun getPinsByRoom(roomId: String): Flow> + + @Query("SELECT * FROM pins WHERE id = :pinId") + suspend fun getPinById(pinId: String): PinEntity? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertPin(pin: PinEntity) + + @Update + suspend fun updatePin(pin: PinEntity) + + @Delete + suspend fun deletePin(pin: PinEntity) +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/dao/RoomDao.kt b/app/src/main/kotlin/com/apartment/planner/data/local/dao/RoomDao.kt new file mode 100644 index 0000000..8eb757c --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/dao/RoomDao.kt @@ -0,0 +1,23 @@ +package com.apartment.planner.data.local.dao + +import androidx.room.* +import com.apartment.planner.data.local.entity.RoomEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface RoomDao { + @Query("SELECT * FROM rooms ORDER BY displayOrder ASC") + fun getAllRooms(): Flow> + + @Query("SELECT * FROM rooms WHERE id = :roomId") + suspend fun getRoomById(roomId: String): RoomEntity? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertRoom(room: RoomEntity) + + @Update + suspend fun updateRoom(room: RoomEntity) + + @Delete + suspend fun deleteRoom(room: RoomEntity) +} diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/entity/ApartmentEntity.kt b/app/src/main/kotlin/com/apartment/planner/data/local/entity/ApartmentEntity.kt new file mode 100644 index 0000000..af9566e --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/entity/ApartmentEntity.kt @@ -0,0 +1,15 @@ +package com.apartment.planner.data.local.entity + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "apartments") +data class ApartmentEntity( + @PrimaryKey val id: String, + val name: String, + val type: String, // STUDIO, ONE_BR, TWO_BR + val sizeRange: String?, // UNDER_30, 30_TO_50, OVER_50 + val notes: String, + val createdAt: Long, + val updatedAt: Long +) diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/entity/BudgetItemEntity.kt b/app/src/main/kotlin/com/apartment/planner/data/local/entity/BudgetItemEntity.kt new file mode 100644 index 0000000..caa264b --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/entity/BudgetItemEntity.kt @@ -0,0 +1,30 @@ +package com.apartment.planner.data.local.entity + +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity( + tableName = "budget_items", + foreignKeys = [ + ForeignKey( + entity = RoomEntity::class, + parentColumns = ["id"], + childColumns = ["roomId"], + onDelete = ForeignKey.CASCADE + ) + ], + indices = [Index(value = ["roomId"])] +) +data class BudgetItemEntity( + @PrimaryKey val id: String, + val roomId: String, + val name: String, + val category: String, + val estimatedCost: Double, + val actualCost: Double?, + val linkedPinId: String?, + val status: String, // PLANNED, BOUGHT + val createdAt: Long +) diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/entity/ChecklistItemEntity.kt b/app/src/main/kotlin/com/apartment/planner/data/local/entity/ChecklistItemEntity.kt new file mode 100644 index 0000000..722b120 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/entity/ChecklistItemEntity.kt @@ -0,0 +1,29 @@ +package com.apartment.planner.data.local.entity + +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity( + tableName = "checklist_items", + foreignKeys = [ + ForeignKey( + entity = RoomEntity::class, + parentColumns = ["id"], + childColumns = ["roomId"], + onDelete = ForeignKey.CASCADE + ) + ], + indices = [Index(value = ["roomId"])] +) +data class ChecklistItemEntity( + @PrimaryKey val id: String, + val roomId: String, + val title: String, + val isCompleted: Boolean, + val linkedPinIds: String, // Stored as comma-separated or JSON + val notes: String, + val displayOrder: Int, + val isOptional: Boolean +) diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/entity/PinEntity.kt b/app/src/main/kotlin/com/apartment/planner/data/local/entity/PinEntity.kt new file mode 100644 index 0000000..501b4a3 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/entity/PinEntity.kt @@ -0,0 +1,33 @@ +package com.apartment.planner.data.local.entity + +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity( + tableName = "pins", + foreignKeys = [ + ForeignKey( + entity = RoomEntity::class, + parentColumns = ["id"], + childColumns = ["roomId"], + onDelete = ForeignKey.CASCADE + ) + ], + indices = [Index(value = ["roomId"])] +) +data class PinEntity( + @PrimaryKey val id: String, + val roomId: String, + val imageUri: String, + val sourceUrl: String?, + val notes: String, + val estimatedPrice: Double?, + val sizeTag: String, // SMALL, MEDIUM, LARGE + val category: String, // FURNITURE, LIGHTING, etc. + val status: String, // IDEA, SHORTLISTED, FINAL_CHOICE + val isFavorite: Boolean, + val displayOrder: Int, + val createdAt: Long +) diff --git a/app/src/main/kotlin/com/apartment/planner/data/local/entity/RoomEntity.kt b/app/src/main/kotlin/com/apartment/planner/data/local/entity/RoomEntity.kt new file mode 100644 index 0000000..ecaf434 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/local/entity/RoomEntity.kt @@ -0,0 +1,28 @@ +package com.apartment.planner.data.local.entity + +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Index +import androidx.room.PrimaryKey + +@Entity( + tableName = "rooms", + foreignKeys = [ + ForeignKey( + entity = ApartmentEntity::class, + parentColumns = ["id"], + childColumns = ["apartmentId"], + onDelete = ForeignKey.CASCADE + ) + ], + indices = [Index(value = ["apartmentId"])] +) +data class RoomEntity( + @PrimaryKey val id: String, + val apartmentId: String, + val name: String, + val icon: String, + val colorTheme: String?, + val displayOrder: Int, + val createdAt: Long +) diff --git a/app/src/main/kotlin/com/apartment/planner/data/repository/PlannerRepository.kt b/app/src/main/kotlin/com/apartment/planner/data/repository/PlannerRepository.kt new file mode 100644 index 0000000..f95e497 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/data/repository/PlannerRepository.kt @@ -0,0 +1,48 @@ +package com.apartment.planner.data.repository + +import com.apartment.planner.data.local.dao.* +import com.apartment.planner.data.local.entity.* +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class PlannerRepository @Inject constructor( + private val apartmentDao: ApartmentDao, + private val roomDao: RoomDao, + private val pinDao: PinDao, + private val checklistDao: ChecklistDao, + private val budgetDao: BudgetDao +) { + // Apartment + fun getApartment(): Flow = apartmentDao.getApartment() + suspend fun insertApartment(apartment: ApartmentEntity) = apartmentDao.insertApartment(apartment) + suspend fun updateApartment(apartment: ApartmentEntity) = apartmentDao.updateApartment(apartment) + + // Rooms + fun getAllRooms(): Flow> = roomDao.getAllRooms() + suspend fun getRoomById(roomId: String): RoomEntity? = roomDao.getRoomById(roomId) + suspend fun insertRoom(room: RoomEntity) = roomDao.insertRoom(room) + suspend fun updateRoom(room: RoomEntity) = roomDao.updateRoom(room) + suspend fun deleteRoom(room: RoomEntity) = roomDao.deleteRoom(room) + + // Pins + fun getPinsByRoom(roomId: String): Flow> = pinDao.getPinsByRoom(roomId) + suspend fun getPinById(pinId: String): PinEntity? = pinDao.getPinById(pinId) + suspend fun insertPin(pin: PinEntity) = pinDao.insertPin(pin) + suspend fun updatePin(pin: PinEntity) = pinDao.updatePin(pin) + suspend fun deletePin(pin: PinEntity) = pinDao.deletePin(pin) + + // Checklist + fun getChecklistByRoom(roomId: String): Flow> = checklistDao.getItemsByRoom(roomId) + suspend fun insertChecklistItem(item: ChecklistItemEntity) = checklistDao.insertItem(item) + suspend fun updateChecklistItem(item: ChecklistItemEntity) = checklistDao.updateItem(item) + suspend fun deleteChecklistItem(item: ChecklistItemEntity) = checklistDao.deleteItem(item) + + // Budget + fun getBudgetByRoom(roomId: String): Flow> = budgetDao.getItemsByRoom(roomId) + fun getAllBudgetItems(): Flow> = budgetDao.getAllBudgetItems() + suspend fun insertBudgetItem(item: BudgetItemEntity) = budgetDao.insertItem(item) + suspend fun updateBudgetItem(item: BudgetItemEntity) = budgetDao.updateItem(item) + suspend fun deleteBudgetItem(item: BudgetItemEntity) = budgetDao.deleteItem(item) +} diff --git a/app/src/main/kotlin/com/apartment/planner/di/DatabaseModule.kt b/app/src/main/kotlin/com/apartment/planner/di/DatabaseModule.kt new file mode 100644 index 0000000..aeb60eb --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/di/DatabaseModule.kt @@ -0,0 +1,43 @@ +package com.apartment.planner.di + +import android.content.Context +import androidx.room.Room +import com.apartment.planner.data.local.PlannerDatabase +import com.apartment.planner.data.local.dao.* +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.annotation.Nullable +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideDatabase(@ApplicationContext context: Context): PlannerDatabase { + return Room.databaseBuilder( + context, + PlannerDatabase::class.java, + "planner_db" + ).build() + } + + @Provides + fun provideApartmentDao(database: PlannerDatabase): ApartmentDao = database.apartmentDao() + + @Provides + fun provideRoomDao(database: PlannerDatabase): RoomDao = database.roomDao() + + @Provides + fun providePinDao(database: PlannerDatabase): PinDao = database.pinDao() + + @Provides + fun provideChecklistDao(database: PlannerDatabase): ChecklistDao = database.checklistDao() + + @Provides + fun provideBudgetDao(database: PlannerDatabase): BudgetDao = database.budgetDao() +} diff --git a/app/src/main/kotlin/com/apartment/planner/di/RepositoryModule.kt b/app/src/main/kotlin/com/apartment/planner/di/RepositoryModule.kt new file mode 100644 index 0000000..c179893 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/di/RepositoryModule.kt @@ -0,0 +1,26 @@ +package com.apartment.planner.di + +import com.apartment.planner.data.local.dao.* +import com.apartment.planner.data.repository.PlannerRepository +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 providePlannerRepository( + apartmentDao: ApartmentDao, + roomDao: RoomDao, + pinDao: PinDao, + checklistDao: ChecklistDao, + budgetDao: BudgetDao + ): PlannerRepository { + return PlannerRepository(apartmentDao, roomDao, pinDao, checklistDao, budgetDao) + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/navigation/NavGraph.kt b/app/src/main/kotlin/com/apartment/planner/ui/navigation/NavGraph.kt new file mode 100644 index 0000000..2fdfc6f --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/navigation/NavGraph.kt @@ -0,0 +1,45 @@ +package com.apartment.planner.ui.navigation + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.compose.material3.Text +import com.apartment.planner.ui.screens.splash.SplashScreen +import com.apartment.planner.ui.screens.onboarding.OnboardingScreen +import com.apartment.planner.ui.screens.home.HomeScreen +import com.apartment.planner.ui.screens.room.RoomDetailsScreen + +@Composable +fun NavGraph(navController: NavHostController) { + NavHost( + navController = navController, + startDestination = Screen.Splash.route + ) { + composable(Screen.Splash.route) { + SplashScreen(navController) + } + composable(Screen.Onboarding.route) { + OnboardingScreen(navController) + } + composable(Screen.Home.route) { + HomeScreen(navController) + } + composable(Screen.RoomDetails.route) { + RoomDetailsScreen(navController) + } + composable(Screen.PinDetails.route) { backStackEntry -> + val pinId = backStackEntry.arguments?.getString("pinId") + // TODO: PinDetailsScreen + Text("Pin Details: $pinId") + } + composable(Screen.Budget.route) { + // TODO: BudgetScreen + Text("Budget") + } + composable(Screen.Settings.route) { + // TODO: SettingsScreen + Text("Settings") + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/navigation/Screen.kt b/app/src/main/kotlin/com/apartment/planner/ui/navigation/Screen.kt new file mode 100644 index 0000000..6a441a6 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/navigation/Screen.kt @@ -0,0 +1,15 @@ +package com.apartment.planner.ui.navigation + +sealed class Screen(val route: String) { + object Splash : Screen("splash") + object Onboarding : Screen("onboarding") + object Home : Screen("home") + object RoomDetails : Screen("room_details/{roomId}") { + fun createRoute(roomId: String) = "room_details/$roomId" + } + object PinDetails : Screen("pin_details/{pinId}") { + fun createRoute(pinId: String) = "pin_details/$pinId" + } + object Budget : Screen("budget") + object Settings : Screen("settings") +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/home/HomeScreen.kt new file mode 100644 index 0000000..ff02164 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/home/HomeScreen.kt @@ -0,0 +1,196 @@ +package com.apartment.planner.ui.screens.home + +import androidx.compose.foundation.background +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.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +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 androidx.navigation.NavController +import com.apartment.planner.data.local.entity.RoomEntity +import com.apartment.planner.ui.navigation.Screen +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.theme.WarmBeige +import com.apartment.planner.ui.viewmodel.HomeViewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomeScreen( + navController: NavController, + viewModel: HomeViewModel = hiltViewModel() +) { + val uiState by viewModel.uiState.collectAsState() + val spacing = LocalSpacing.current + + Scaffold( + floatingActionButton = { + FloatingActionButton( + onClick = { /* TODO: Add Room */ }, + containerColor = Terracotta, + contentColor = Color.White + ) { + Icon(Icons.Default.Add, contentDescription = "Add Room") + } + }, + bottomBar = { + NavigationBar( + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 8.dp + ) { + NavigationBarItem( + selected = true, + onClick = { }, + icon = { Text("🏠", fontSize = 24.sp) }, + label = { Text("Home") } + ) + NavigationBarItem( + selected = false, + onClick = { navController.navigate(Screen.Budget.route) }, + icon = { Text("💰", fontSize = 24.sp) }, + label = { Text("Budget") } + ) + NavigationBarItem( + selected = false, + onClick = { navController.navigate(Screen.Settings.route) }, + icon = { Text("⚙️", fontSize = 24.sp) }, + label = { Text("Settings") } + ) + } + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .background(MaterialTheme.colorScheme.background) + ) { + // Hero Card + uiState.apartment?.let { apartment -> + Card( + modifier = Modifier + .fillMaxWidth() + .padding(spacing.standard) + .height(200.dp), + shape = MaterialTheme.shapes.medium, + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp) + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.verticalGradient( + colors = listOf(Terracotta, WarmBeige) + ) + ) + .padding(spacing.standard) + ) { + Column(modifier = Modifier.align(Alignment.BottomStart)) { + Text( + text = apartment.name, + style = MaterialTheme.typography.headlineMedium, + color = Color.White + ) + Text( + text = "${apartment.type} • ${apartment.sizeRange?.replace("_", " ")}", + style = MaterialTheme.typography.bodyLarge, + color = Color.White.copy(alpha = 0.8f) + ) + Spacer(modifier = Modifier.height(spacing.standard)) + LinearProgressIndicator( + progress = 0.68f, + modifier = Modifier + .fillMaxWidth() + .height(8.dp) + .clip(CircleShape), + color = Color.White, + trackColor = Color.White.copy(alpha = 0.2f) + ) + Text( + text = "Overall Progress: 68%", + style = MaterialTheme.typography.labelMedium, + color = Color.White, + modifier = Modifier.padding(top = 4.dp) + ) + } + } + } + } + + Text( + text = "Rooms", + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(horizontal = spacing.standard, vertical = spacing.compact) + ) + + LazyVerticalGrid( + columns = GridCells.Fixed(2), + contentPadding = PaddingValues(spacing.standard), + horizontalArrangement = Arrangement.spacedBy(spacing.standard), + verticalArrangement = Arrangement.spacedBy(spacing.standard), + modifier = Modifier.weight(1f) + ) { + items(uiState.rooms) { room -> + RoomCard(room = room) { + navController.navigate(Screen.RoomDetails.createRoute(room.id)) + } + } + } + } + } +} + +@Composable +fun RoomCard(room: RoomEntity, onClick: () -> Unit) { + val spacing = LocalSpacing.current + Card( + modifier = Modifier + .fillMaxWidth() + .height(160.dp) + .clickable(onClick = onClick), + shape = MaterialTheme.shapes.medium, + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(spacing.standard), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text(text = room.icon, fontSize = 48.sp) + Spacer(modifier = Modifier.height(spacing.compact)) + Text( + text = room.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.height(spacing.tight)) + LinearProgressIndicator( + progress = 0.45f, + modifier = Modifier + .fillMaxWidth() + .height(4.dp) + .clip(CircleShape), + color = Terracotta, + trackColor = Terracotta.copy(alpha = 0.1f) + ) + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/onboarding/OnboardingScreen.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/onboarding/OnboardingScreen.kt new file mode 100644 index 0000000..1c94d28 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/onboarding/OnboardingScreen.kt @@ -0,0 +1,156 @@ +package com.apartment.planner.ui.screens.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.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.Brush +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 androidx.navigation.NavController +import com.apartment.planner.ui.navigation.Screen +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.theme.WarmBeige +import kotlinx.coroutines.launch + +data class OnboardingPage( + val title: String, + val description: String, + val color: Color +) + +val onboardingPages = listOf( + OnboardingPage( + "Your space, intentionally designed", + "Create a home that reflects your values and brings you peace.", + WarmBeige + ), + OnboardingPage( + "From inspiration to reality", + "Organize your ideas and turn them into a beautiful living space.", + WarmBeige + ), + OnboardingPage( + "Decide with confidence", + "Compare options and make the right choices for your small space.", + WarmBeige + ) +) + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun OnboardingScreen(navController: NavController) { + val pagerState = rememberPagerState(pageCount = { onboardingPages.size }) + val scope = rememberCoroutineScope() + val spacing = LocalSpacing.current + + Column( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.verticalGradient( + colors = listOf(WarmBeige, Color.White) + ) + ) + ) { + HorizontalPager( + state = pagerState, + modifier = Modifier.weight(1f) + ) { pageIndex -> + val page = onboardingPages[pageIndex] + Column( + modifier = Modifier + .fillMaxSize() + .padding(spacing.spacious), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + // Placeholder for image + Box( + modifier = Modifier + .size(280.dp) + .clip(MaterialTheme.shapes.large) + .background(page.color.copy(alpha = 0.3f)), + contentAlignment = Alignment.Center + ) { + Text( + text = "Image Placeholder", + style = MaterialTheme.typography.bodyMedium + ) + } + + Spacer(modifier = Modifier.height(spacing.spacious)) + + Text( + text = page.title, + style = MaterialTheme.typography.displayLarge.copy( + fontSize = 28.sp, + fontWeight = FontWeight.Bold + ), + textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onBackground + ) + + Spacer(modifier = Modifier.height(spacing.standard)) + + Text( + text = page.description, + style = MaterialTheme.typography.bodyLarge, + textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f) + ) + } + } + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(spacing.spacious), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + // Page Indicator + Row { + repeat(onboardingPages.size) { iteration -> + val color = if (pagerState.currentPage == iteration) Terracotta else Color.LightGray + Box( + modifier = Modifier + .padding(2.dp) + .clip(CircleShape) + .background(color) + .size(8.dp) + ) + } + } + + Button( + onClick = { + if (pagerState.currentPage < onboardingPages.size - 1) { + scope.launch { + pagerState.animateScrollToPage(pagerState.currentPage + 1) + } + } else { + navController.navigate(Screen.Home.route) { + popUpTo(Screen.Onboarding.route) { inclusive = true } + } + } + }, + colors = ButtonDefaults.buttonColors(containerColor = Terracotta) + ) { + Text(if (pagerState.currentPage == onboardingPages.size - 1) "Get Started" else "Next") + } + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/room/BudgetTab.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/BudgetTab.kt new file mode 100644 index 0000000..60d8e6e --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/BudgetTab.kt @@ -0,0 +1,88 @@ +package com.apartment.planner.ui.screens.room + +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.material3.* +import androidx.compose.runtime.Composable +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.unit.dp +import com.apartment.planner.data.local.entity.BudgetItemEntity +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.viewmodel.RoomUiState +import com.apartment.planner.ui.viewmodel.RoomViewModel + +@Composable +fun BudgetTab(uiState: RoomUiState, viewModel: RoomViewModel) { + val spacing = LocalSpacing.current + val totalPlanned = uiState.budget.sumOf { it.estimatedCost } + val totalSpent = uiState.budget.sumOf { it.actualCost ?: 0.0 } + + Column(modifier = Modifier.fillMaxSize()) { + // Budget Overview Card + Card( + modifier = Modifier + .fillMaxWidth() + .padding(spacing.standard), + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.3f)) + ) { + Column(modifier = Modifier.padding(spacing.standard)) { + Text("Room Budget Overview", style = MaterialTheme.typography.titleMedium) + Spacer(modifier = Modifier.height(spacing.compact)) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Text("Planned: $${"%.2f".format(totalPlanned)}") + Text("Spent: $${"%.2f".format(totalSpent)}", fontWeight = FontWeight.Bold) + } + Spacer(modifier = Modifier.height(spacing.compact)) + LinearProgressIndicator( + progress = if (totalPlanned > 0) (totalSpent / totalPlanned).toFloat().coerceIn(0f, 1f) else 0f, + modifier = Modifier.fillMaxWidth().height(8.dp), + color = if (totalSpent > totalPlanned) Color.Red else Terracotta + ) + } + } + + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(spacing.standard), + verticalArrangement = Arrangement.spacedBy(spacing.compact) + ) { + items(uiState.budget) { item -> + BudgetItemRow(item = item) + } + } + } +} + +@Composable +fun BudgetItemRow(item: BudgetItemEntity) { + val spacing = LocalSpacing.current + Surface( + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.surface, + tonalElevation = 1.dp + ) { + Row( + modifier = Modifier.padding(spacing.standard), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Column { + Text(text = item.name, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium) + Text(text = item.category, style = MaterialTheme.typography.labelSmall, color = Color.Gray) + } + Text( + text = "$${"%.2f".format(item.actualCost ?: item.estimatedCost)}", + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Bold, + color = if (item.status == "BOUGHT") Color(0xFF2E7D32) else MaterialTheme.colorScheme.onSurface + ) + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/room/ChecklistTab.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/ChecklistTab.kt new file mode 100644 index 0000000..7647c7d --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/ChecklistTab.kt @@ -0,0 +1,79 @@ +package com.apartment.planner.ui.screens.room + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.unit.dp +import com.apartment.planner.data.local.entity.ChecklistItemEntity +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.viewmodel.RoomUiState +import com.apartment.planner.ui.viewmodel.RoomViewModel + +@Composable +fun ChecklistTab(uiState: RoomUiState, viewModel: RoomViewModel) { + val spacing = LocalSpacing.current + + if (uiState.checklist.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Your checklist is empty.", style = MaterialTheme.typography.bodyLarge) + Button( + onClick = { /* TODO: Add Template */ }, + modifier = Modifier.padding(top = spacing.standard), + colors = ButtonDefaults.buttonColors(containerColor = Terracotta) + ) { + Text("Load Room Template") + } + } + } + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(spacing.standard), + verticalArrangement = Arrangement.spacedBy(spacing.compact) + ) { + items(uiState.checklist) { item -> + ChecklistItemRow(item = item) { + viewModel.toggleChecklistItem(item) + } + } + } + } +} + +@Composable +fun ChecklistItemRow(item: ChecklistItemEntity, onToggle: () -> Unit) { + val spacing = LocalSpacing.current + Surface( + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.surface, + tonalElevation = 1.dp + ) { + Row( + modifier = Modifier + .padding(spacing.standard), + verticalAlignment = Alignment.CenterVertically + ) { + Checkbox( + checked = item.isCompleted, + onCheckedChange = { onToggle() }, + colors = CheckboxDefaults.colors(checkedColor = Terracotta) + ) + Spacer(modifier = Modifier.width(spacing.compact)) + Text( + text = item.title, + style = MaterialTheme.typography.bodyLarge.copy( + textDecoration = if (item.isCompleted) TextDecoration.LineThrough else TextDecoration.None + ), + color = if (item.isCompleted) MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f) else MaterialTheme.colorScheme.onSurface + ) + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/room/DecisionModeScreen.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/DecisionModeScreen.kt new file mode 100644 index 0000000..ab1e754 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/DecisionModeScreen.kt @@ -0,0 +1,129 @@ +package com.apartment.planner.ui.screens.room + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.filled.Check +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.layout.ContentScale +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import coil.compose.AsyncImage +import com.apartment.planner.data.local.entity.PinEntity +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DecisionModeScreen( + shortlistedPins: List, + onBack: () -> Unit, + onConfirm: (PinEntity) -> Unit +) { + val spacing = LocalSpacing.current + var selectedPinId by remember { mutableStateOf(null) } + + Scaffold( + topBar = { + TopAppBar( + title = { Text("Compare & Decide") }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.Default.ArrowBack, contentDescription = "Back") + } + } + ) + }, + bottomBar = { + if (selectedPinId != null) { + Button( + onClick = { + val selected = shortlistedPins.find { it.id == selectedPinId } + if (selected != null) onConfirm(selected) + }, + modifier = Modifier + .fillMaxWidth() + .padding(spacing.standard), + colors = ButtonDefaults.buttonColors(containerColor = Terracotta) + ) { + Icon(Icons.Default.Check, contentDescription = null) + Spacer(modifier = Modifier.width(spacing.compact)) + Text("Confirm Choice") + } + } + } + ) { paddingValues -> + Row( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(spacing.compact) + .horizontalScroll(rememberScrollState()) + ) { + shortlistedPins.forEach { pin -> + ComparisonCard( + pin = pin, + isSelected = selectedPinId == pin.id, + onSelect = { selectedPinId = pin.id } + ) + } + } + } +} + +@Composable +fun ComparisonCard(pin: PinEntity, isSelected: Boolean, onSelect: () -> Unit) { + val spacing = LocalSpacing.current + Card( + modifier = Modifier + .width(280.dp) + .fillMaxHeight() + .padding(spacing.compact) + .clickable(onClick = onSelect), + border = if (isSelected) BorderStroke(2.dp, Terracotta) else null, + colors = CardDefaults.cardColors( + containerColor = if (isSelected) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.surface.copy(alpha = 0.5f) + ) + ) { + Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + AsyncImage( + model = pin.imageUri, + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .height(200.dp) + .clip(MaterialTheme.shapes.medium), + contentScale = ContentScale.Crop + ) + Column(modifier = Modifier.padding(spacing.standard)) { + Text(text = pin.category, style = MaterialTheme.typography.labelMedium, color = Terracotta) + Text(text = pin.notes, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Bold) + Spacer(modifier = Modifier.height(spacing.standard)) + Text(text = "Size: ${pin.sizeTag}", style = MaterialTheme.typography.bodyMedium) + if (pin.estimatedPrice != null) { + Text(text = "Price: $${pin.estimatedPrice}", style = MaterialTheme.typography.bodyMedium) + } + + Spacer(modifier = Modifier.height(spacing.comfortable)) + + RadioButton( + selected = isSelected, + onClick = onSelect, + modifier = Modifier.align(Alignment.CenterHorizontally), + colors = RadioButtonDefaults.colors(selectedColor = Terracotta) + ) + } + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/room/MoodBoardTab.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/MoodBoardTab.kt new file mode 100644 index 0000000..d05ada6 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/MoodBoardTab.kt @@ -0,0 +1,120 @@ +package com.apartment.planner.ui.screens.room + +import androidx.compose.foundation.clickable +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid +import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells +import androidx.compose.foundation.lazy.staggeredgrid.items +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.apartment.planner.data.local.entity.PinEntity +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.viewmodel.RoomUiState +import com.apartment.planner.ui.viewmodel.RoomViewModel + +@Composable +fun MoodBoardTab( + uiState: RoomUiState, + viewModel: RoomViewModel, + onCompareShortlisted: () -> Unit +) { + val spacing = LocalSpacing.current + + val shortlistedPins = uiState.pins.filter { it.status == "SHORTLISTED" } + + Box(modifier = Modifier.fillMaxSize()) { + if (uiState.pins.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = androidx.compose.ui.Alignment.Center) { + Text("No pins yet. Add your first idea!", style = MaterialTheme.typography.bodyLarge) + } + } else { + LazyVerticalStaggeredGrid( + columns = StaggeredGridCells.Fixed(2), + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(spacing.standard), + horizontalArrangement = Arrangement.spacedBy(spacing.standard), + verticalItemSpacing = spacing.standard + ) { + items(uiState.pins) { pin -> + PinCard(pin = pin) { + // TODO: Navigate to Pin Details + } + } + } + } + + AnimatedVisibility( + visible = shortlistedPins.size >= 2, + modifier = Modifier + .align(androidx.compose.ui.Alignment.BottomCenter) + .padding(spacing.standard) + ) { + Button( + onClick = onCompareShortlisted, + colors = ButtonDefaults.buttonColors(containerColor = Terracotta), + elevation = ButtonDefaults.buttonElevation(defaultElevation = 8.dp) + ) { + Text("Compare shortlisted (${shortlistedPins.size})") + } + } + } +} + +@Composable +fun PinCard(pin: PinEntity, onClick: () -> Unit) { + val spacing = LocalSpacing.current + Card( + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = onClick), + shape = MaterialTheme.shapes.medium, + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface) + ) { + Column { + AsyncImage( + model = pin.imageUri, + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 100.dp, max = 250.dp) + .clip(MaterialTheme.shapes.medium), + contentScale = ContentScale.Crop + ) + Column(modifier = Modifier.padding(spacing.compact)) { + Text( + text = pin.category, + style = MaterialTheme.typography.labelSmall, + color = Terracotta + ) + Text( + text = pin.notes, + style = MaterialTheme.typography.bodySmall, + maxLines = 2, + fontWeight = FontWeight.Medium + ) + if (pin.status == "SHORTLISTED") { + Spacer(modifier = Modifier.height(spacing.tight)) + SuggestionChip( + onClick = {}, + label = { Text("⭐ Shortlisted", fontSize = 10.sp) }, + colors = SuggestionChipDefaults.suggestionChipColors( + containerColor = Color(0xFFFFD700).copy(alpha = 0.1f), + labelColor = Color(0xFFB8860B) + ), + border = null + ) + } + } + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/room/RoomDetailsScreen.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/RoomDetailsScreen.kt new file mode 100644 index 0000000..5fea059 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/room/RoomDetailsScreen.kt @@ -0,0 +1,206 @@ +package com.apartment.planner.ui.screens.room + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material3.* +import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset +import androidx.compose.runtime.* +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 androidx.navigation.NavController +import com.apartment.planner.ui.theme.LocalSpacing +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.viewmodel.RoomViewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RoomDetailsScreen( + navController: NavController, + viewModel: RoomViewModel = hiltViewModel() +) { + val uiState by viewModel.uiState.collectAsState() + val spacing = LocalSpacing.current + var selectedTab by remember { mutableIntStateOf(0) } + val tabs = listOf("Mood Board", "Checklist", "Budget") + + var isDecisionMode by remember { mutableStateOf(false) } + var showAddPinDialog by remember { mutableStateOf(false) } + + if (isDecisionMode) { + DecisionModeScreen( + shortlistedPins = uiState.pins.filter { it.status == "SHORTLISTED" }, + onBack = { isDecisionMode = false }, + onConfirm = { pin -> + viewModel.confirmPinChoice(pin) + isDecisionMode = false + } + ) + return + } + + if (showAddPinDialog) { + AddPinDialog( + onDismiss = { showAddPinDialog = false }, + onAdd = { uri, notes -> + viewModel.addPin(uri, notes) + showAddPinDialog = false + } + ) + } + + Scaffold( + floatingActionButton = { + if (selectedTab == 0) { + FloatingActionButton( + onClick = { showAddPinDialog = true }, + containerColor = Terracotta, + contentColor = Color.White + ) { + Icon(Icons.Default.Add, contentDescription = "Add Pin") + } + } + }, + topBar = { + CenterAlignedTopAppBar( + title = { + Column(horizontalAlignment = androidx.compose.ui.Alignment.CenterHorizontally) { + Text( + text = "${uiState.room?.icon ?: ""} ${uiState.room?.name ?: ""}".uppercase(), + style = MaterialTheme.typography.titleMedium + ) + } + }, + navigationIcon = { + IconButton(onClick = { navController.popBackStack() }) { + Icon(Icons.Default.ArrowBack, contentDescription = "Back") + } + }, + actions = { + IconButton(onClick = { /* TODO: More */ }) { + Icon(Icons.Default.MoreVert, contentDescription = "More") + } + }, + colors = TopAppBarDefaults.centerAlignedTopAppBarColors( + containerColor = MaterialTheme.colorScheme.background + ) + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + // Progress Bar + LinearProgressIndicator( + progress = 0.75f, + modifier = Modifier + .fillMaxWidth() + .height(4.dp), + color = Terracotta, + trackColor = Terracotta.copy(alpha = 0.1f) + ) + + Text( + text = "12 of 16 items complete", + style = MaterialTheme.typography.labelSmall, + modifier = Modifier.padding(start = spacing.standard, top = 4.dp), + color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.6f) + ) + + TabRow( + selectedTabIndex = selectedTab, + containerColor = MaterialTheme.colorScheme.background, + contentColor = Terracotta, + indicator = { tabPositions -> + TabRowDefaults.Indicator( + modifier = Modifier.tabIndicatorOffset(tabPositions[selectedTab]), + color = Terracotta, + height = 3.dp + ) + }, + divider = {} + ) { + tabs.forEachIndexed { index, title -> + Tab( + selected = selectedTab == index, + onClick = { selectedTab = index }, + text = { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + color = if (selectedTab == index) Terracotta else Color.Gray + ) + } + ) + } + } + + Box(modifier = Modifier.weight(1f)) { + when (selectedTab) { + 0 -> MoodBoardTab( + uiState = uiState, + viewModel = viewModel, + onCompareShortlisted = { isDecisionMode = true } + ) + 1 -> ChecklistTab(uiState, viewModel) + 2 -> BudgetTab(uiState, viewModel) + } + } + } + } +} + +@Composable +fun AddPinDialog(onDismiss: () -> Unit, onAdd: (String, String) -> Unit) { + var uri by remember { mutableStateOf("") } + var notes by remember { mutableStateOf("") } + + // Basic "Smart" extraction + LaunchedEffect(uri) { + if (uri.contains("pinterest.com") && notes.isEmpty()) { + notes = "Idea from Pinterest" + } else if (uri.contains("ikea.com") && notes.isEmpty()) { + notes = "Furniture from IKEA" + } + } + + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("Add New Pin") }, + text = { + Column { + OutlinedTextField( + value = uri, + onValueChange = { uri = it }, + label = { Text("Image URL") }, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(8.dp)) + OutlinedTextField( + value = notes, + onValueChange = { notes = it }, + label = { Text("Notes") }, + modifier = Modifier.fillMaxWidth() + ) + } + }, + confirmButton = { + TextButton(onClick = { onAdd(uri, notes) }) { + Text("Add") + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text("Cancel") + } + } + ) +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/screens/splash/SplashScreen.kt b/app/src/main/kotlin/com/apartment/planner/ui/screens/splash/SplashScreen.kt new file mode 100644 index 0000000..f6acadc --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/screens/splash/SplashScreen.kt @@ -0,0 +1,57 @@ +package com.apartment.planner.ui.screens.splash + +import androidx.compose.animation.core.* +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Home +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.apartment.planner.ui.navigation.Screen +import com.apartment.planner.ui.theme.Terracotta +import com.apartment.planner.ui.theme.WarmBeige +import kotlinx.coroutines.delay + +@Composable +fun SplashScreen(navController: NavController) { + val alpha = remember { Animatable(0f) } + + LaunchedEffect(key1 = true) { + alpha.animateTo( + targetValue = 1f, + animationSpec = tween(durationMillis = 1500) + ) + delay(1000) + // Check if onboarding completed (stubbed for now) + navController.navigate(Screen.Onboarding.route) { + popUpTo(Screen.Splash.route) { inclusive = true } + } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.verticalGradient( + colors = listOf(WarmBeige, Terracotta) + ) + ), + contentAlignment = Alignment.Center + ) { + Icon( + imageVector = Icons.Default.Home, + contentDescription = "Logo", + modifier = Modifier + .size(120.dp) + .alpha(alpha.value), + tint = MaterialTheme.colorScheme.onPrimary + ) + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/theme/Color.kt b/app/src/main/kotlin/com/apartment/planner/ui/theme/Color.kt new file mode 100644 index 0000000..bd54a5b --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/theme/Color.kt @@ -0,0 +1,19 @@ +package com.apartment.planner.ui.theme + +import androidx.compose.ui.graphics.Color + +val Terracotta = Color(0xFFC67B5C) +val TerracottaSoft = Color(0xFFD4917D) +val Sage = Color(0xFFA8B5A0) +val SageMuted = Color(0xFF9DAA93) +val WarmBeige = Color(0xFFE8DCC4) +val Clay = Color(0xFFB87D6A) +val Cream = Color(0xFFFAF8F5) +val Charcoal = Color(0xFF3A3632) +val SoftWhite = Color(0xFFF9F7F4) +val WarmGray = Color(0xFF8C857B) +val MutedOlive = Color(0xFF9B9474) + +val DarkBackground = Color(0xFF1C1B1A) +val DarkSurface = Color(0xFF2D2C2A) +val DarkText = Color(0xFFF5F3F0) diff --git a/app/src/main/kotlin/com/apartment/planner/ui/theme/Shape.kt b/app/src/main/kotlin/com/apartment/planner/ui/theme/Shape.kt new file mode 100644 index 0000000..bbf1ac9 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package com.apartment.planner.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(12.dp), + large = RoundedCornerShape(24.dp) +) diff --git a/app/src/main/kotlin/com/apartment/planner/ui/theme/Spacing.kt b/app/src/main/kotlin/com/apartment/planner/ui/theme/Spacing.kt new file mode 100644 index 0000000..c7d4b53 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/theme/Spacing.kt @@ -0,0 +1,17 @@ +package com.apartment.planner.ui.theme + +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + +data class Spacing( + val default: Dp = 0.dp, + val tight: Dp = 4.dp, + val compact: Dp = 8.dp, + val standard: Dp = 16.dp, + val comfortable: Dp = 24.dp, + val spacious: Dp = 32.dp, + val extraSpacious: Dp = 48.dp +) + +val LocalSpacing = compositionLocalOf { Spacing() } diff --git a/app/src/main/kotlin/com/apartment/planner/ui/theme/Theme.kt b/app/src/main/kotlin/com/apartment/planner/ui/theme/Theme.kt new file mode 100644 index 0000000..4cdf51e --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/theme/Theme.kt @@ -0,0 +1,76 @@ +package com.apartment.planner.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = TerracottaSoft, + secondary = SageMuted, + tertiary = Clay, + background = DarkBackground, + surface = DarkSurface, + onPrimary = Charcoal, + onSecondary = Charcoal, + onTertiary = Charcoal, + onBackground = DarkText, + onSurface = DarkText, +) + +private val LightColorScheme = lightColorScheme( + primary = Terracotta, + secondary = Sage, + tertiary = Clay, + background = Cream, + surface = SoftWhite, + onPrimary = Cream, + onSecondary = Cream, + onTertiary = Cream, + onBackground = Charcoal, + onSurface = Charcoal, +) + +@Composable +fun DecorPlannerTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + dynamicColor: Boolean = false, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.background.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + CompositionLocalProvider(LocalSpacing provides Spacing()) { + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + shapes = Shapes, + content = content + ) + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/theme/Type.kt b/app/src/main/kotlin/com/apartment/planner/ui/theme/Type.kt new file mode 100644 index 0000000..9690c28 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/theme/Type.kt @@ -0,0 +1,69 @@ +package com.apartment.planner.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.unit.sp +import androidx.compose.ui.text.googlefonts.GoogleFont +import androidx.compose.ui.text.googlefonts.Font +import com.apartment.planner.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 OutfitFont = FontFamily( + Font(googleFont = GoogleFont("Outfit"), fontProvider = provider) +) + +val InterFont = FontFamily( + Font(googleFont = GoogleFont("Inter"), fontProvider = provider) +) + +val Typography = Typography( + displayLarge = TextStyle( + fontFamily = OutfitFont, + fontWeight = FontWeight.Bold, + fontSize = 32.sp, + lineHeight = 40.sp, + letterSpacing = 0.sp + ), + headlineMedium = TextStyle( + fontFamily = OutfitFont, + fontWeight = FontWeight.SemiBold, + fontSize = 24.sp, + lineHeight = 32.sp, + letterSpacing = 0.sp + ), + titleLarge = TextStyle( + fontFamily = OutfitFont, + fontWeight = FontWeight.Medium, + fontSize = 20.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + bodyLarge = TextStyle( + fontFamily = InterFont, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ), + labelMedium = TextStyle( + fontFamily = InterFont, + fontWeight = FontWeight.Medium, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ), + labelSmall = TextStyle( + fontFamily = InterFont, + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.25.sp + ) +) diff --git a/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/HomeViewModel.kt b/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/HomeViewModel.kt new file mode 100644 index 0000000..8ed87e5 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/HomeViewModel.kt @@ -0,0 +1,68 @@ +package com.apartment.planner.ui.viewmodel + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.apartment.planner.data.local.entity.ApartmentEntity +import com.apartment.planner.data.local.entity.RoomEntity +import com.apartment.planner.data.repository.PlannerRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.* +import kotlinx.coroutines.launch +import java.util.* +import javax.inject.Inject + +data class HomeUiState( + val apartment: ApartmentEntity? = null, + val rooms: List = emptyList(), + val isLoading: Boolean = true +) + +@HiltViewModel +class HomeViewModel @Inject constructor( + private val repository: PlannerRepository +) : ViewModel() { + + private val _uiState = MutableStateFlow(HomeUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + loadData() + } + + private fun loadData() { + viewModelScope.launch { + combine( + repository.getApartment(), + repository.getAllRooms() + ) { apartment, rooms -> + if (apartment == null) { + // Create a default apartment if none exists + val newApartment = ApartmentEntity( + id = UUID.randomUUID().toString(), + name = "My Studio Apartment", + type = "STUDIO", + sizeRange = "UNDER_30", + notes = "", + createdAt = System.currentTimeMillis(), + updatedAt = System.currentTimeMillis() + ) + repository.insertApartment(newApartment) + + // Add default rooms + val defaultRooms = listOf( + RoomEntity(UUID.randomUUID().toString(), newApartment.id, "Living Area", "🛋️", null, 0, System.currentTimeMillis()), + RoomEntity(UUID.randomUUID().toString(), newApartment.id, "Bedroom", "🛏️", null, 1, System.currentTimeMillis()), + RoomEntity(UUID.randomUUID().toString(), newApartment.id, "Kitchen", "🍳", null, 2, System.currentTimeMillis()) + ) + defaultRooms.forEach { repository.insertRoom(it) } + + HomeUiState(apartment = newApartment, rooms = defaultRooms, isLoading = false) + } else { + HomeUiState(apartment = apartment, rooms = rooms, isLoading = false) + } + }.collect { + _uiState.value = it + } + } + } +} diff --git a/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/RoomViewModel.kt b/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/RoomViewModel.kt new file mode 100644 index 0000000..288a1a6 --- /dev/null +++ b/app/src/main/kotlin/com/apartment/planner/ui/viewmodel/RoomViewModel.kt @@ -0,0 +1,102 @@ +package com.apartment.planner.ui.viewmodel + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.apartment.planner.data.local.entity.BudgetItemEntity +import com.apartment.planner.data.local.entity.ChecklistItemEntity +import com.apartment.planner.data.local.entity.PinEntity +import com.apartment.planner.data.local.entity.RoomEntity +import android.widget.Toast +import android.content.Context +import com.apartment.planner.data.repository.PlannerRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.* +import kotlinx.coroutines.launch +import java.util.UUID +import javax.inject.Inject + +data class RoomUiState( + val room: RoomEntity? = null, + val pins: List = emptyList(), + val checklist: List = emptyList(), + val budget: List = emptyList(), + val isLoading: Boolean = true +) + +@HiltViewModel +class RoomViewModel @Inject constructor( + private val repository: PlannerRepository, + @ApplicationContext private val context: Context, + savedStateHandle: SavedStateHandle +) : ViewModel() { + + private val roomId: String = checkNotNull(savedStateHandle["roomId"]) + + private val _uiState = MutableStateFlow(RoomUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + loadRoomData() + } + + private fun loadRoomData() { + viewModelScope.launch { + val room = repository.getRoomById(roomId) + combine( + repository.getPinsByRoom(roomId), + repository.getChecklistByRoom(roomId), + repository.getBudgetByRoom(roomId) + ) { pins, checklist, budget -> + RoomUiState( + room = room, + pins = pins, + checklist = checklist, + budget = budget, + isLoading = false + ) + }.collect { + _uiState.value = it + } + } + } + + fun toggleChecklistItem(item: ChecklistItemEntity) { + viewModelScope.launch { + repository.updateChecklistItem(item.copy(isCompleted = !item.isCompleted)) + } + } + + fun confirmPinChoice(selectedPin: PinEntity) { + viewModelScope.launch { + // Set selected pin as FINAL_CHOICE + repository.updatePin(selectedPin.copy(status = "FINAL_CHOICE")) + + Toast.makeText(context, "${selectedPin.notes} decided! 🎉", Toast.LENGTH_SHORT).show() + + // Optionally archive others or just leave them as SHORTLISTED + // For now, let's just update the selected one. + } + } + + fun addPin(imageUri: String, notes: String) { + viewModelScope.launch { + val pin = PinEntity( + id = UUID.randomUUID().toString(), + roomId = roomId, + imageUri = imageUri, + sourceUrl = null, + notes = notes, + estimatedPrice = null, + sizeTag = "MEDIUM", + category = "FURNITURE", + status = "IDEA", + isFavorite = false, + displayOrder = _uiState.value.pins.size, + createdAt = System.currentTimeMillis() + ) + repository.insertPin(pin) + } + } +} diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..6064003 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,12 @@ + + + + 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..05ccadc --- /dev/null +++ b/app/src/main/res/values/font_certs.xml @@ -0,0 +1,45 @@ + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + MIIEqDCCA5CgAwIBAgIJANWFu96ODLhrMA0GCSqGSIb3DQEBDAUAMIGUMQswCQYDVQQGEwJVUzETMBEG + C1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xl + MQwwCgYDVQQLDANBTVMxETAPBgNVBAMMCEdvb2dsZSBMMRowGAYJKoZIhvcNAQkBFgt2bXpAZ29v + Z2xlLmNvbTAeFw0wODA4MjEyMzM5MTVZFw0zNjAxMDcyMzM5MTVZMGExCzAJBgNVBAYTAlVTMRMw + EQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdHb29n + bGUxDDAKBgNVBAsMA0FNUzERMA8GA1UEAwwIR29vZ2xlIEwwggEiMA0GCSqGSIb3DQEBAQUAA4IB + DwAwggEKAoIBAQDK9P7L77vCP6X9Fv95zPLW6LhGM9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oF + + + + + MIIEqDCCA5CgAwIBAgIJANWFu96ODLhrMA0GCSqGSIb3DQEBDAUAMIGUMQswCQYDVQQGEwJVUzETMBEG + C1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHR29vZ2xl + MQwwCgYDVQQLDANBTVMxETAPBgNVBAMMCEdvb2dsZSBMMRowGAYJKoZIhvcNAQkBFgt2bXpAZ29v + Z2xlLmNvbTAeFw0wODA4MjEyMzM5MTVZFw0zNjAxMDcyMzM5MTVZMGExCzAJBgNVBAYTAlVTMRMw + EQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdHb29n + bGUxDDAKBgNVBAsMA0FNUzERMA8GA1UEAwwIR29vZ2xlIEwwggEiMA0GCSqGSIb3DQEBAQUAA4IB + DwAwggEKAoIBAQDK9P7L77vCP6X9Fv95zPLW6LhGM9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oDm9G9qPd9oFdgfExmSgnLpZ+9+L6S6E15uGv1oD + m9G9qPd9oF + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..d64e15c --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Decor Planner + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..a2b114a --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4cff3df --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,15 @@ +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath("com.android.tools.build:gradle:8.2.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") + classpath("com.google.dagger:hilt-android-gradle-plugin:2.50") + } +} + +tasks.register("clean", Delete::class) { + delete(rootProject.buildDir) +} diff --git a/edu_play/.gitignore b/edu_play/.gitignore deleted file mode 100644 index 3820a95..0000000 --- a/edu_play/.gitignore +++ /dev/null @@ -1,45 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.build/ -.buildlog/ -.history -.svn/ -.swiftpm/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins-dependencies -.pub-cache/ -.pub/ -/build/ -/coverage/ - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/edu_play/.metadata b/edu_play/.metadata deleted file mode 100644 index e90f3ae..0000000 --- a/edu_play/.metadata +++ /dev/null @@ -1,33 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: "ac4e799d237041cf905519190471f657b657155a" - channel: "stable" - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: ac4e799d237041cf905519190471f657b657155a - base_revision: ac4e799d237041cf905519190471f657b657155a - - platform: android - create_revision: ac4e799d237041cf905519190471f657b657155a - base_revision: ac4e799d237041cf905519190471f657b657155a - - platform: ios - create_revision: ac4e799d237041cf905519190471f657b657155a - base_revision: ac4e799d237041cf905519190471f657b657155a - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/edu_play/README.md b/edu_play/README.md deleted file mode 100644 index 444a99d..0000000 --- a/edu_play/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# edu_play - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/edu_play/analysis_options.yaml b/edu_play/analysis_options.yaml deleted file mode 100644 index 0d29021..0000000 --- a/edu_play/analysis_options.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at https://dart.dev/lints. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/edu_play/android/.gitignore b/edu_play/android/.gitignore deleted file mode 100644 index be3943c..0000000 --- a/edu_play/android/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java -.cxx/ - -# Remember to never publicly share your keystore. -# See https://flutter.dev/to/reference-keystore -key.properties -**/*.keystore -**/*.jks diff --git a/edu_play/android/app/build.gradle.kts b/edu_play/android/app/build.gradle.kts deleted file mode 100644 index ac0554c..0000000 --- a/edu_play/android/app/build.gradle.kts +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - id("com.android.application") - id("kotlin-android") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. - id("dev.flutter.flutter-gradle-plugin") -} - -android { - namespace = "com.eduplay.app" - compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.eduplay.app" - // You can update the following values to match your application needs. - // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion - versionCode = flutter.versionCode - versionName = flutter.versionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig = signingConfigs.getByName("debug") - } - } -} - -flutter { - source = "../.." -} diff --git a/edu_play/android/app/src/debug/AndroidManifest.xml b/edu_play/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 399f698..0000000 --- a/edu_play/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/edu_play/android/app/src/main/AndroidManifest.xml b/edu_play/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index eea25e7..0000000 --- a/edu_play/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/edu_play/android/app/src/main/kotlin/com/eduplay/app/MainActivity.kt b/edu_play/android/app/src/main/kotlin/com/eduplay/app/MainActivity.kt deleted file mode 100644 index 22e40ec..0000000 --- a/edu_play/android/app/src/main/kotlin/com/eduplay/app/MainActivity.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.eduplay.app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity() diff --git a/edu_play/android/app/src/main/res/drawable-v21/launch_background.xml b/edu_play/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index f74085f..0000000 --- a/edu_play/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/edu_play/android/app/src/main/res/drawable/launch_background.xml b/edu_play/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f..0000000 --- a/edu_play/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/edu_play/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/edu_play/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/edu_play/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/edu_play/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/edu_play/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/edu_play/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/edu_play/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/edu_play/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/edu_play/android/app/src/main/res/values-night/styles.xml b/edu_play/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 06952be..0000000 --- a/edu_play/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - 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/.gitkeep b/edu_play/docs/.gitkeep deleted file mode 100644 index e69de29..0000000 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 dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 zcmeHN2~<R zh`|8`A_PQ1nSu(UMFx?8j8PC!!VDphaL#`F42fd#7Vlc`zIE4n%Y~eiz4y1j|NDpi z?<@|pSJ-HM`qifhf@m%MamgwK83`XpBA<+azdF#2QsT{X@z0A9Bq>~TVErigKH1~P zRX-!h-f0NJ4Mh++{D}J+K>~~rq}d%o%+4dogzXp7RxX4C>Km5XEI|PAFDmo;DFm6G zzjVoB`@qW98Yl0Kvc-9w09^PrsobmG*Eju^=3f?0o-t$U)TL1B3;sZ^!++3&bGZ!o-*6w?;oOhf z=A+Qb$scV5!RbG+&2S}BQ6YH!FKb0``VVX~T$dzzeSZ$&9=X$3)_7Z{SspSYJ!lGE z7yig_41zpQ)%5dr4ff0rh$@ky3-JLRk&DK)NEIHecf9c*?Z1bUB4%pZjQ7hD!A0r-@NF(^WKdr(LXj|=UE7?gBYGgGQV zidf2`ZT@pzXf7}!NH4q(0IMcxsUGDih(0{kRSez&z?CFA0RVXsVFw3^u=^KMtt95q z43q$b*6#uQDLoiCAF_{RFc{!H^moH_cmll#Fc^KXi{9GDl{>%+3qyfOE5;Zq|6#Hb zp^#1G+z^AXfRKaa9HK;%b3Ux~U@q?xg<2DXP%6k!3E)PA<#4$ui8eDy5|9hA5&{?v z(-;*1%(1~-NTQ`Is1_MGdQ{+i*ccd96ab$R$T3=% zw_KuNF@vI!A>>Y_2pl9L{9h1-C6H8<)J4gKI6{WzGBi<@u3P6hNsXG=bRq5c+z;Gc3VUCe;LIIFDmQAGy+=mRyF++u=drBWV8-^>0yE9N&*05XHZpPlE zxu@?8(ZNy7rm?|<+UNe0Vs6&o?l`Pt>P&WaL~M&#Eh%`rg@Mbb)J&@DA-wheQ>hRV z<(XhigZAT z>=M;URcdCaiO3d^?H<^EiEMDV+7HsTiOhoaMX%P65E<(5xMPJKxf!0u>U~uVqnPN7T!X!o@_gs3Ct1 zlZ_$5QXP4{Aj645wG_SNT&6m|O6~Tsl$q?nK*)(`{J4b=(yb^nOATtF1_aS978$x3 zx>Q@s4i3~IT*+l{@dx~Hst21fR*+5}S1@cf>&8*uLw-0^zK(+OpW?cS-YG1QBZ5q! zgTAgivzoF#`cSz&HL>Ti!!v#?36I1*l^mkrx7Y|K6L#n!-~5=d3;K<;Zqi|gpNUn_ z_^GaQDEQ*jfzh;`j&KXb66fWEk1K7vxQIMQ_#Wu_%3 z4Oeb7FJ`8I>Px;^S?)}2+4D_83gHEq>8qSQY0PVP?o)zAv3K~;R$fnwTmI-=ZLK`= zTm+0h*e+Yfr(IlH3i7gUclNH^!MU>id$Jw>O?2i0Cila#v|twub21@e{S2v}8Z13( zNDrTXZVgris|qYm<0NU(tAPouG!QF4ZNpZPkX~{tVf8xY690JqY1NVdiTtW+NqyRP zZ&;T0ikb8V{wxmFhlLTQ&?OP7 z;(z*<+?J2~z*6asSe7h`$8~Se(@t(#%?BGLVs$p``;CyvcT?7Y!{tIPva$LxCQ&4W z6v#F*);|RXvI%qnoOY&i4S*EL&h%hP3O zLsrFZhv&Hu5tF$Lx!8(hs&?!Kx5&L(fdu}UI5d*wn~A`nPUhG&Rv z2#ixiJdhSF-K2tpVL=)5UkXRuPAFrEW}7mW=uAmtVQ&pGE-&az6@#-(Te^n*lrH^m@X-ftVcwO_#7{WI)5v(?>uC9GG{lcGXYJ~Q8q zbMFl7;t+kV;|;KkBW2!P_o%Czhw&Q(nXlxK9ak&6r5t_KH8#1Mr-*0}2h8R9XNkr zto5-b7P_auqTJb(TJlmJ9xreA=6d=d)CVbYP-r4$hDn5|TIhB>SReMfh&OVLkMk-T zYf%$taLF0OqYF?V{+6Xkn>iX@TuqQ?&cN6UjC9YF&%q{Ut3zv{U2)~$>-3;Dp)*(? zg*$mu8^i=-e#acaj*T$pNowo{xiGEk$%DusaQiS!KjJH96XZ-hXv+jk%ard#fu=@Q z$AM)YWvE^{%tDfK%nD49=PI|wYu}lYVbB#a7wtN^Nml@CE@{Gv7+jo{_V?I*jkdLD zJE|jfdrmVbkfS>rN*+`#l%ZUi5_bMS<>=MBDNlpiSb_tAF|Zy`K7kcp@|d?yaTmB^ zo?(vg;B$vxS|SszusORgDg-*Uitzdi{dUV+glA~R8V(?`3GZIl^egW{a919!j#>f` znL1o_^-b`}xnU0+~KIFLQ)$Q6#ym%)(GYC`^XM*{g zv3AM5$+TtDRs%`2TyR^$(hqE7Y1b&`Jd6dS6B#hDVbJlUXcG3y*439D8MrK!2D~6gn>UD4Imctb z+IvAt0iaW73Iq$K?4}H`7wq6YkTMm`tcktXgK0lKPmh=>h+l}Y+pDtvHnG>uqBA)l zAH6BV4F}v$(o$8Gfo*PB>IuaY1*^*`OTx4|hM8jZ?B6HY;F6p4{`OcZZ(us-RVwDx zUzJrCQlp@mz1ZFiSZ*$yX3c_#h9J;yBE$2g%xjmGF4ca z&yL`nGVs!Zxsh^j6i%$a*I3ZD2SoNT`{D%mU=LKaEwbN(_J5%i-6Va?@*>=3(dQy` zOv%$_9lcy9+(t>qohkuU4r_P=R^6ME+wFu&LA9tw9RA?azGhjrVJKy&8=*qZT5Dr8g--d+S8zAyJ$1HlW3Olryt`yE zFIph~Z6oF&o64rw{>lgZISC6p^CBer9C5G6yq%?8tC+)7*d+ib^?fU!JRFxynRLEZ zj;?PwtS}Ao#9whV@KEmwQgM0TVP{hs>dg(1*DiMUOKHdQGIqa0`yZnHk9mtbPfoLx zo;^V6pKUJ!5#n`w2D&381#5#_t}AlTGEgDz$^;u;-vxDN?^#5!zN9ngytY@oTv!nc zp1Xn8uR$1Z;7vY`-<*?DfPHB;x|GUi_fI9@I9SVRv1)qETbNU_8{5U|(>Du84qP#7 z*l9Y$SgA&wGbj>R1YeT9vYjZuC@|{rajTL0f%N@>3$DFU=`lSPl=Iv;EjuGjBa$Gw zHD-;%YOE@<-!7-Mn`0WuO3oWuL6tB2cpPw~Nvuj|KM@))ixuDK`9;jGMe2d)7gHin zS<>k@!x;!TJEc#HdL#RF(`|4W+H88d4V%zlh(7#{q2d0OQX9*FW^`^_<3r$kabWAB z$9BONo5}*(%kx zOXi-yM_cmB3>inPpI~)duvZykJ@^^aWzQ=eQ&STUa}2uT@lV&WoRzkUoE`rR0)`=l zFT%f|LA9fCw>`enm$p7W^E@U7RNBtsh{_-7vVz3DtB*y#*~(L9+x9*wn8VjWw|Q~q zKFsj1Yl>;}%MG3=PY`$g$_mnyhuV&~O~u~)968$0b2!Jkd;2MtAP#ZDYw9hmK_+M$ zb3pxyYC&|CuAbtiG8HZjj?MZJBFbt`ryf+c1dXFuC z0*ZQhBzNBd*}s6K_G}(|Z_9NDV162#y%WSNe|FTDDhx)K!c(mMJh@h87@8(^YdK$&d*^WQe8Z53 z(|@MRJ$Lk-&ii74MPIs80WsOFZ(NX23oR-?As+*aq6b?~62@fSVmM-_*cb1RzZ)`5$agEiL`-E9s7{GM2?(KNPgK1(+c*|-FKoy}X(D_b#etO|YR z(BGZ)0Ntfv-7R4GHoXp?l5g#*={S1{u-QzxCGng*oWr~@X-5f~RA14b8~B+pLKvr4 zfgL|7I>jlak9>D4=(i(cqYf7#318!OSR=^`xxvI!bBlS??`xxWeg?+|>MxaIdH1U~#1tHu zB{QMR?EGRmQ_l4p6YXJ{o(hh-7Tdm>TAX380TZZZyVkqHNzjUn*_|cb?T? zt;d2s-?B#Mc>T-gvBmQZx(y_cfkXZO~{N zT6rP7SD6g~n9QJ)8F*8uHxTLCAZ{l1Y&?6v)BOJZ)=R-pY=Y=&1}jE7fQ>USS}xP#exo57uND0i*rEk@$;nLvRB@u~s^dwRf?G?_enN@$t* zbL%JO=rV(3Ju8#GqUpeE3l_Wu1lN9Y{D4uaUe`g>zlj$1ER$6S6@{m1!~V|bYkhZA z%CvrDRTkHuajMU8;&RZ&itnC~iYLW4DVkP<$}>#&(`UO>!n)Po;Mt(SY8Yb`AS9lt znbX^i?Oe9r_o=?})IHKHoQGKXsps_SE{hwrg?6dMI|^+$CeC&z@*LuF+P`7LfZ*yr+KN8B4{Nzv<`A(wyR@!|gw{zB6Ha ziwPAYh)oJ(nlqSknu(8g9N&1hu0$vFK$W#mp%>X~AU1ay+EKWcFdif{% z#4!4aoVVJ;ULmkQf!ke2}3hqxLK>eq|-d7Ly7-J9zMpT`?dxo6HdfJA|t)?qPEVBDv z{y_b?4^|YA4%WW0VZd8C(ZgQzRI5(I^)=Ub`Y#MHc@nv0w-DaJAqsbEHDWG8Ia6ju zo-iyr*sq((gEwCC&^TYBWt4_@|81?=B-?#P6NMff(*^re zYqvDuO`K@`mjm_Jd;mW_tP`3$cS?R$jR1ZN09$YO%_iBqh5ftzSpMQQtxKFU=FYmP zeY^jph+g<4>YO;U^O>-NFLn~-RqlHvnZl2yd2A{Yc1G@Ga$d+Q&(f^tnPf+Z7serIU};17+2DU_f4Z z@GaPFut27d?!YiD+QP@)T=77cR9~MK@bd~pY%X(h%L={{OIb8IQmf-!xmZkm8A0Ga zQSWONI17_ru5wpHg3jI@i9D+_Y|pCqVuHJNdHUauTD=R$JcD2K_liQisqG$(sm=k9;L* z!L?*4B~ql7uioSX$zWJ?;q-SWXRFhz2Jt4%fOHA=Bwf|RzhwqdXGr78y$J)LR7&3T zE1WWz*>GPWKZ0%|@%6=fyx)5rzUpI;bCj>3RKzNG_1w$fIFCZ&UR0(7S?g}`&Pg$M zf`SLsz8wK82Vyj7;RyKmY{a8G{2BHG%w!^T|Njr!h9TO2LaP^_f22Q1=l$QiU84ao zHe_#{S6;qrC6w~7{y(hs-?-j?lbOfgH^E=XcSgnwW*eEz{_Z<_xN#0001NP)t-s|Ns9~ z#rXRE|M&d=0au&!`~QyF`q}dRnBDt}*!qXo`c{v z{Djr|@Adh0(D_%#_&mM$D6{kE_x{oE{l@J5@%H*?%=t~i_`ufYOPkAEn!pfkr2$fs z652Tz0001XNklqeeKN4RM4i{jKqmiC$?+xN>3Apn^ z0QfuZLym_5b<*QdmkHjHlj811{If)dl(Z2K0A+ekGtrFJb?g|wt#k#pV-#A~bK=OT ts8>{%cPtyC${m|1#B1A6#u!Q;umknL1chzTM$P~L002ovPDHLkV1lTfnu!1a 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 797d452e458972bab9d994556c8305db4c827017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c 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 6ed2d933e1120817fe9182483a228007b18ab6ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 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 4cd7b0099ca80c806f8fe495613e8d6c69460d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX 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 fe730945a01f64a61e2235dbe3f45b08f7729182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c 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 502f463a9bc882b461c96aadf492d1729e49e725..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU 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 0ec303439225b78712f49115768196d8d76f6790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU 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 e9f5fea27c705180eb716271f41b582e76dcbd90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 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 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 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H 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 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v 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 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v 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 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v 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/.gitkeep b/edu_play/lib/models/.gitkeep deleted file mode 100644 index e69de29..0000000 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/.gitkeep b/edu_play/lib/screens/.gitkeep deleted file mode 100644 index e69de29..0000000 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..9ba4441 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +android.useAndroidX=true +android.nonTransitiveRClass=true +kotlin.code.style=official +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c4d5848 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "SmallApartmentDecorPlanner" +include(":app")