Skip to content

CATROID-1664, CATROID-1666 First AI tutor integration steps #5218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spipau wants to merge 41 commits into
base: dev-ai-tutor
Choose a base branch
from
+2,078 −67
Open

CATROID-1664, CATROID-1666 First AI tutor integration steps #5218

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
63c6f74
Add formula visualization and string representation helpers
harissabil May 18, 2026
3c93046
Add methods to retrieve project structure as string and JSON
harissabil May 18, 2026
ea35481
Add AiAssistFragment and layout
harissabil May 18, 2026
e39a8a4
Add methods to retrieve detailed project, scene, and sprite summaries…
harissabil May 18, 2026
8f8f70a
Add method to serialize Sprite objects to XML string
harissabil May 18, 2026
cccc003
Implement AI Assist format selection and project serialization
harissabil May 18, 2026
980f645
Add Jetpack Compose support and AI Tutor dependency
harissabil May 18, 2026
326ea8c
Add AiTutorView integration to AiAssistFragment
harissabil May 18, 2026
e8a2630
Update OkHttp and Okio calls to use Kotlin properties and extension f…
harissabil May 18, 2026
dfcd0c1
Update to use LifecycleRegistry and update LiveData extension (requir…
harissabil May 18, 2026
fd61a2e
Improve project structure logging and JSON serialization
harissabil May 20, 2026
e939111
Enable AI Assist feature in build configuration and add Compose found…
harissabil Jun 1, 2026
a504893
Update ScriptFragment layout and strings for AI Tutor preview
harissabil Jun 1, 2026
5f53533
Add AI Tutor diff screen and related data classes for script comparison
harissabil Jun 1, 2026
e9c1c0d
Add method to parse Sprite from XML string in XstreamSerializer
harissabil Jun 1, 2026
14af472
Add method to parse Sprite from XML string in XstreamSerializer
harissabil Jun 1, 2026
0a72d64
Hide AI Assist button in BottomBar when navigating to Looks or Sounds…
harissabil Jun 1, 2026
9dce406
Refactor AI Assist button handling to directly pass current sprite XM…
harissabil Jun 1, 2026
e875f68
Comment out AI Assist button handler in ProjectActivity
harissabil Jun 1, 2026
24c038c
Refactor AI Tutor integration and remove dedicated AiAssistFragment
harissabil Jun 2, 2026
489342c
Add method to retrieve Sprite from XML string with exception handling
harissabil Jun 2, 2026
8618d74
Implement AI Assist overlay flow and communication callbacks
harissabil Jun 2, 2026
f8a2fd2
Add AiTutorErrorDialog composable for error handling in AI responses
harissabil Jun 2, 2026
c5c547d
Add AiTutorSpriteValidator for validating AI-generated sprites
harissabil Jun 2, 2026
ab970c6
Enhance AI Tutor diff screen with improved UI and brick-level alignment
harissabil Jun 2, 2026
e1f737f
Replace AI Assist fragment with overlay and enhance sprite validation
harissabil Jun 2, 2026
1c25c38
Remove unused formula string building methods from Formula and Formul…
harissabil Jun 12, 2026
19adc6b
Refactor sprite XML parsing by simplifying getSpriteFromXmlString method
harissabil Jun 12, 2026
ab356f8
Remove AI Assist strings and adjust layout visibility in XML files
harissabil Jun 16, 2026
3156f35
Refactor AI Tutor integration by removing unused validation and updat…
harissabil Jun 16, 2026
d7639f0
Refactor AI Assist package structure and enhance UI components
harissabil Jun 16, 2026
7cc2003
Refactor AI Tutor diff screen UI and modularize diffing logic
harissabil Jun 16, 2026
e3e952d
Add Compose UI tooling dependencies for preview
harissabil Jun 16, 2026
c90c2da
Enhance AiTutorDiffScreen UI and improve handling of long formula cha…
harissabil Jun 16, 2026
9df9503
Enhance AiTutorDiffScreen with script header interaction and improved…
harissabil Jun 16, 2026
f6764e5
Refactor BrickDiffDialog to display native brick prototype views
harissabil Jun 16, 2026
274b171
Add ic_minus and ic_edit_pencil vector drawables
harissabil Jun 17, 2026
7ac1809
Remove manual undo button visibility restoration from ScriptFragment
harissabil Jun 18, 2026
8764772
Restrict technical error details in AiTutorErrorDialog to debug builds
harissabil Jun 28, 2026
bc1d67c
Refactor and document AI Assist diffing and formatting logic
harissabil Jun 29, 2026
2857d60
Refactor brick representation in AI Tutor diffs to match editor phrases
harissabil Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ allprojects {
google()
mavenCentral()
maven { url = "https://developer.huawei.com/repo/" }
maven { url = uri("https://repository.kotzilla.io/repository/Koin-Embedded/") }
}
}
15 changes: 13 additions & 2 deletions catroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ plugins {
id "io.gitlab.arturbosch.detekt" version "1.23.7"
id 'com.google.devtools.ksp' version '2.0.21-1.0.25' apply true
id 'checkstyle'
id 'org.jetbrains.kotlin.plugin.compose' version '2.0.21'
}

repositories {
Expand Down Expand Up @@ -113,6 +114,7 @@ android {
buildFeatures {
buildConfig = true
viewBinding = true
compose = true
}

defaultConfig {
Expand Down Expand Up @@ -161,7 +163,7 @@ android {
buildConfigField "boolean", "FEATURE_USER_REPORTERS_ENABLED", "true"
buildConfigField "boolean", "FEATURE_MULTIPLAYER_VARIABLES_ENABLED", "true"
buildConfigField "boolean", "FEATURE_TESTBRICK_ENABLED", "true"
buildConfigField "boolean", "FEATURE_AI_ASSIST_ENABLED", "false"
buildConfigField "boolean", "FEATURE_AI_ASSIST_ENABLED", "true"
resValue "string", "FEATURE_EMBROIDERY_PREFERENCES_ENABLED", "false"
resValue "string", "FEATURE_PHIRO_PREFERENCES_ENABLED", "false"
resValue "string", "FEATURE_MINDSTORMS_PREFERENCES_ENABLED", "false"
Expand Down Expand Up @@ -222,7 +224,7 @@ android {
debug {
buildConfigField "boolean", "USE_ANDROID_LOCALES_FOR_SCREENSHOTS", useAndroidLocales()
resValue "string", "DEBUG_MODE", "true"
buildConfigField "boolean", "FEATURE_AI_ASSIST_ENABLED", "false"
buildConfigField "boolean", "FEATURE_AI_ASSIST_ENABLED", "true"
signingConfig = signingConfigs.debug
enableAndroidTestCoverage = true
}
Expand Down Expand Up @@ -472,6 +474,15 @@ dependencies {

implementation "com.google.android.gms:play-services-auth:17.0.0"

// Catrobat AI Tutor
implementation("org.catrobat:aitutor:0.0.1")

// Compose
implementation "androidx.compose.ui:ui:1.7.5"
implementation "androidx.compose.runtime:runtime:1.7.5"
implementation "androidx.compose.foundation:foundation:1.7.5"
implementation "androidx.compose.material3:material3:1.3.1"

androidTestImplementation('tools.fastlane:screengrab:2.1.1') {
// https://issuetracker.google.com/issues/123060356
exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
Expand Down
Loading
Loading