diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/particle/ParticleCoreLayerValidationActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/particle/ParticleCoreLayerValidationActivity.kt index 6d1c0d542..d22096414 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/particle/ParticleCoreLayerValidationActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/particle/ParticleCoreLayerValidationActivity.kt @@ -147,16 +147,25 @@ class ParticleCoreLayerValidationActivity : AppCompatActivity() { return } layer.setProperties(PaintPropertyValue("raster-particle-time-mix", timeMix)) - status.text = "40-02 T0 east / T1 north timeMix=$timeMix" + status.text = statusText() Log.i(TAG, "ParticleGPU: test timeMix=$timeMix; expect no Field upload or simulation rebuild") } - private fun statusText(): String = when { - !enabled -> getString(R.string.particle_validation_disabled_status) - maskMode == MASK_OCEAN_A -> getString(R.string.particle_validation_ocean_a_status) - maskMode == MASK_OCEAN_B -> getString(R.string.particle_validation_ocean_b_status) - active -> getString(R.string.particle_validation_global_active_status) - else -> getString(R.string.particle_validation_global_static_status) + private fun statusText(): String { + val mask = when (maskMode) { + MASK_OCEAN_A -> "OCEAN A" + MASK_OCEAN_B -> "OCEAN B" + else -> "GLOBAL" + } + val runtime = if (enabled) if (active) "ACTIVE" else "STATIC" else "DISABLED" + val fields = if (timeWindowMode) { + "T0 EAST · T1 NORTH" + } else if (fixtureMode == FIXTURE_UNIFORM_NORTH) { + "NORTH" + } else { + "EAST" + } + return "$mask · $runtime · $fields · MIX ${(timeMix * 100).toInt()}%" } private fun validationStyle(active: Boolean, enabled: Boolean): String { diff --git a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_particle_core_layer_validation.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_particle_core_layer_validation.xml index 8d52a9e2a..546797ac5 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_particle_core_layer_validation.xml +++ b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_particle_core_layer_validation.xml @@ -15,167 +15,63 @@ android:layout_gravity="bottom" android:background="#DD102030" android:orientation="vertical" - android:padding="12dp"> + android:padding="4dp"> + android:textColor="@android:color/white" + android:textSize="12sp" /> -