Merge feature/generic-data-grouping: UI/UX improvements and tracker restructure

Resolved conflict in release.yml by keeping clean workflow (removed duplicate steps)

Author: Dradebo

.github/workflows/release.yml

@@ -1,23 +1,19 @@
-# Build, sign and upload APK as a GitHub Release asset
 on:
   push:
-    branches:
-      - '**'
+    tags:
+      - "v*"
   workflow_dispatch:
 
 permissions:
   contents: write
 
-name: Build, Sign and Release APK
+name: Android Release
 
 jobs:
   build-and-release:
     runs-on: ubuntu-latest
-    env:
-      SIGNED_APK_DIR: signed-apks
-      RELEASE_TAG: apk-${{ github.sha }}
     steps:
-      - name: Checkout code
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -28,61 +24,60 @@ jobs:
           distribution: temurin
           java-version: '21'
 
-      - name: Stop any existing Gradle daemons
-        run: ./gradlew --stop || true
-      - name: Cache Gradle
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Decode keystore (if provided)
         run: |
           if [ -z "${{ secrets.KEYSTORE_BASE64 }}" ]; then
-            echo "KEYSTORE_BASE64 not set — skipping keystore decode (build will be unsigned)"
+            echo "KEYSTORE_BASE64 not set — continuing without keystore (build will be unsigned)"
             exit 0
           fi
-          # create runner temp directory path and decode keystore there
+          mkdir -p "$RUNNER_TEMP"
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > "$RUNNER_TEMP/keystore.jks"
+          chmod 600 "$RUNNER_TEMP/keystore.jks"
           echo "Keystore decoded to $RUNNER_TEMP/keystore.jks"
-      - name: Build release APK and AAB
+
+      - name: Debug: verify files before build
+        run: |
+          echo "JAVA_HOME=$JAVA_HOME"
+          java -version
+          ./gradlew -version
+
+      - name: Build release APK and AAB (signed if keystore present)
         env:
+          ANDROID_KEYSTORE_PATH: $RUNNER_TEMP/keystore.jks
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           ANDROID_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           ANDROID_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: |
-          # If keystore was decoded, RUNNER_TEMP/keystore.jks exists. Use injected signing props so no keystore info is committed.
-          STORE_FILE="$RUNNER_TEMP/keystore.jks"
+          STORE="$ANDROID_KEYSTORE_PATH"
           STORE_ARG=""
-          if [ -f "$STORE_FILE" ]; then
-            STORE_ARG="-Pandroid.injected.signing.store.file=$STORE_FILE -Pandroid.injected.signing.store.password=$ANDROID_KEYSTORE_PASSWORD -Pandroid.injected.signing.key.alias=$ANDROID_KEY_ALIAS -Pandroid.injected.signing.key.password=$ANDROID_KEY_PASSWORD"
-            echo "Signing with keystore at $STORE_FILE"
+          if [ -f "$STORE" ]; then
+            # Use Android's injected signing properties so you don't have to commit the keystore
+            STORE_ARG="-Pandroid.injected.signing.store.file=$STORE -Pandroid.injected.signing.store.password=$ANDROID_KEYSTORE_PASSWORD -Pandroid.injected.signing.key.alias=$ANDROID_KEY_ALIAS -Pandroid.injected.signing.key.password=$ANDROID_KEY_PASSWORD"
+            echo "Will sign using keystore at $STORE"
           else
-            echo "No keystore found at $STORE_FILE; building unsigned artifacts"
+            echo "No keystore found at $STORE; building unsigned artifacts"
           fi
-          # Force Gradle to use the setup-java JDK on the runner in case project has local overrides
-          ./gradlew assembleRelease bundleRelease -Dorg.gradle.java.home="$JAVA_HOME" $STORE_ARG
-      - name: Remove keystore file if present
-        if: always()
+
+          # Force Gradle to use the runner JDK and do a clean build
+          ./gradlew --no-daemon clean assembleRelease bundleRelease -Dorg.gradle.java.home="$JAVA_HOME" $STORE_ARG
+
+      - name: Show built artifacts (debug)
         run: |
-          if [ -f "$RUNNER_TEMP/keystore.jks" ]; then
-            shred -u "$RUNNER_TEMP/keystore.jks" || rm -f "$RUNNER_TEMP/keystore.jks"
-            echo "Keystore removed"
-          else
-            echo "No keystore to remove"
-          fi
+          echo "APK files:"
+          ls -al app/build/outputs/apk/release || true
+          echo "AAB files:"
+          ls -al app/build/outputs/bundle/release || true
 
-      - name: Upload APK artifact
+      - name: Upload APK artifact (Actions artifact - optional)
         uses: actions/upload-artifact@v4
         with:
           name: simple-data-entry-apk
           path: app/build/outputs/apk/release/*.apk
 
-      - name: Upload AAB artifact
+      - name: Upload AAB artifact (Actions artifact - optional)
         uses: actions/upload-artifact@v4
         with:
           name: simple-data-entry-aab
@@ -92,11 +87,23 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: ncipollo/release-action@v1
         with:
-          
           tag: ${{ github.ref_name }}
           name: "Release ${{ github.ref_name }}"
           body: |
             Release created by workflow run ${{ github.run_id }} for commit ${{ github.sha }}.
           files: |
             app/build/outputs/apk/release/*.apk
             app/build/outputs/bundle/release/*.aab
+
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Remove decoded keystore (always)
+        if: always()
+        run: |
+          if [ -f "$RUNNER_TEMP/keystore.jks" ]; then
+            shred -u "$RUNNER_TEMP/keystore.jks" || rm -f "$RUNNER_TEMP/keystore.jks"
+            echo "Keystore removed"
+          else
+            echo "No keystore to remove"
+          fi

.gitignore

@@ -130,6 +130,7 @@ build/reports/
 
 # Documentation and analysis files
 docs/
+design-system/
 
 # Ignore everything in .taskmaster except .gitignore
 

.idea/deploymentTargetSelector.xml

@@ -1,7 +1,7 @@
 # SimpleDataEntry DHIS2 Android App - Claude Context
 
-**Last Updated**: 2025-12-17
-**Status**: Production-ready for datasets and tracker enrollments. Login flow resilient. Nested accordion data entry fully functional.
+**Last Updated**: 2026-01-20
+**Status**: Production-ready for datasets and tracker enrollments. Login flow resilient. Nested accordion data entry fully functional. Implied grouping supports complex patterns.
 
 ## Project Overview
 
@@ -339,6 +339,32 @@ App Launch
 
 ---
 
+### Recent Work (2026-01-20)
+
+**Implied Grouping Enhancement** - Hyphen-Suffix Pattern Support:
+- **File**: `domain/grouping/ImpliedCategoryInferenceService.kt`
+- Added `HYPHEN_SUFFIX_GENDER_REGEX` pattern for complex data element names
+- Supports patterns like `WFP - Number of teachers in the school-Qualified Female`
+- Creates 3-level hierarchy: Indicator → Qualifier → Gender
+- New method: `tryInferWithHyphenSuffixGender()` with mapping support
+
+**Build Configuration** - CI Compatibility:
+- **File**: `settings.gradle.kts` - Added foojay-resolver-convention plugin for toolchain auto-download
+- **File**: `local.properties` - Contains `org.gradle.java.home` for local development (gitignored)
+- System Java 24 not compatible with Gradle 8.11.1; use Android Studio's bundled JDK 21
+- CI uses GitHub Actions Java 21 + foojay resolver
+
+### Known Issues (2026-01-20)
+
+**Validation Stack Overflow** (`domain/validation/ValidationService.kt`):
+- ⚠️ DHIS2 SDK validation engine hits StackOverflowError on complex rule expressions
+- Current behavior: Catches error and returns warning, allows completion
+- Root cause: Deep recursion in SDK expression parser (stack size 1035KB insufficient)
+- Potential fix: Run validation on thread with larger stack (not yet implemented)
+- Log signature: `"DHIS2 SDK validation engine stack overflow: stack size 1035KB"`
+
+---
+
 ### Previous Work (2025-12-11)
 
 **Design System Bug Fixes** (2026-01-09):

CLAUDE.md

@@ -88,6 +88,7 @@ dependencies {
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.navigation:navigation-compose:2.7.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.7.3'
     // Unit testing
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.7.0'

app/build.gradle

@@ -46,7 +46,8 @@ class DatabaseManager @Inject constructor(
             com.ash.simpledataentry.di.AppModule.MIGRATION_3_4,
             com.ash.simpledataentry.di.AppModule.MIGRATION_4_5,
             com.ash.simpledataentry.di.AppModule.MIGRATION_6_7,
-            com.ash.simpledataentry.di.AppModule.MIGRATION_7_8
+            com.ash.simpledataentry.di.AppModule.MIGRATION_7_8,
+            com.ash.simpledataentry.di.AppModule.MIGRATION_8_9
         )
         .build()
 

app/src/main/java/com/ash/simpledataentry/data/DatabaseManager.kt

@@ -44,7 +44,8 @@ class DatabaseProvider @Inject constructor(
             com.ash.simpledataentry.di.AppModule.MIGRATION_3_4,
             com.ash.simpledataentry.di.AppModule.MIGRATION_4_5,
             com.ash.simpledataentry.di.AppModule.MIGRATION_6_7,
-            com.ash.simpledataentry.di.AppModule.MIGRATION_7_8
+            com.ash.simpledataentry.di.AppModule.MIGRATION_7_8,
+            com.ash.simpledataentry.di.AppModule.MIGRATION_8_9
         )
         .build()
     }

app/src/main/java/com/ash/simpledataentry/data/DatabaseProvider.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -884,9 +885,22 @@ class SessionManager @Inject constructor(
             }
 
             // Check what we have after the download attempt
-            val hasOrgUnits = d2Instance.organisationUnitModule().organisationUnits().blockingCount() > 0
-            val hasPrograms = d2Instance.programModule().programs().blockingCount() > 0
-            val hasDatasets = d2Instance.dataSetModule().dataSets().blockingCount() > 0
+            val (hasOrgUnits, hasPrograms, hasDatasets) = coroutineScope {
+                val orgUnitsDeferred = async(Dispatchers.IO) {
+                    d2Instance.organisationUnitModule().organisationUnits().blockingCount() > 0
+                }
+                val programsDeferred = async(Dispatchers.IO) {
+                    d2Instance.programModule().programs().blockingCount() > 0
+                }
+                val datasetsDeferred = async(Dispatchers.IO) {
+                    d2Instance.dataSetModule().dataSets().blockingCount() > 0
+                }
+                Triple(
+                    orgUnitsDeferred.await(),
+                    programsDeferred.await(),
+                    datasetsDeferred.await()
+                )
+            }
             val hasUser = try {
                 d2Instance.userModule().user().blockingGet() != null
             } catch (e: Exception) {

app/src/main/java/com/ash/simpledataentry/data/SessionManager.kt

@@ -80,6 +80,7 @@ class MetadataCacheService @Inject constructor(
         }
 
         // 2. Get data elements from Room (already hydrated during login)
+        val totalInRoom = dataElementDao.count()
         val dataElements = dataElementDao.getByIds(allDataElementUids).associateBy { it.id }
 
         // DEBUG: Log what we found
@@ -91,18 +92,30 @@ class MetadataCacheService @Inject constructor(
         }
 
         // 3. Get category combos from Room (already hydrated during login)
-        val categoryCombos = categoryComboDao.getAll().associateBy { it.id }
+        val neededComboIds = dataElements.values.mapNotNull { it.categoryComboId }.distinct()
+        val categoryCombos = if (neededComboIds.isEmpty()) {
+            emptyMap()
+        } else {
+            categoryComboDao.getByIds(neededComboIds).associateBy { it.id }
+        }
 
         // 4. Get category option combos from Room (already hydrated during login)
-        val categoryOptionCombos = categoryOptionComboDao.getAll().associateBy { it.id }
+        val categoryOptionCombos = if (neededComboIds.isEmpty()) {
+            emptyMap()
+        } else {
+            categoryOptionComboDao.getByCategoryComboIds(neededComboIds).associateBy { it.id }
+        }
 
         // 5. Get org units from Room (already hydrated during login)
         val orgUnits = organisationUnitDao.getAll().associateBy { it.id }
 
         // 6. NEW STEP: Pre-fetch and map data values using the parsed UI structure
         val sdkDataValues = preFetchAndMapDataValues(datasetId, period, orgUnit, attributeOptionCombo)
 
-        Log.d("MetadataCacheService", "Optimized data complete: ${sections.size} sections, ${dataElements.size} data elements, ${sdkDataValues.size} data values")
+        Log.d(
+            "MetadataCacheService",
+            "Optimized data complete: ${sections.size} sections, ${dataElements.size}/${totalInRoom} data elements, ${sdkDataValues.size} data values"
+        )
 
         OptimizedEntryData(
             sections = sections,

app/src/main/java/com/ash/simpledataentry/data/cache/MetadataCacheService.kt

@@ -26,7 +26,7 @@ import com.ash.simpledataentry.data.local.DataValueDao
         TrackerEnrollmentEntity::class,
         EventInstanceEntity::class
     ],
-    version = 8,  // Incremented for tracker enrollment and event instance tables
+    version = 9,  // Incremented for index additions on metadata tables
     exportSchema = false
 )
 abstract class AppDatabase : RoomDatabase() {