@ -132,6 +132,8 @@ class ScreenCaptureService : Service() {
private lateinit var screenCaptureManager : ScreenCaptureManager private lateinit var screenCaptureManager : ScreenCaptureManager
private var detectionOverlay : DetectionOverlay ? = null private var detectionOverlay : DetectionOverlay ? = null
private var overlayEnabled = true // Track overlay visibility state
private var lastDetections : List < MLDetection > = emptyList ( ) // Cache last detections for toggle
// MVC Components // MVC Components
private lateinit var detectionController : DetectionController private lateinit var detectionController : DetectionController
@ -190,9 +192,8 @@ class ScreenCaptureService : Service() {
enhancedFloatingFAB = EnhancedFloatingFAB ( enhancedFloatingFAB = EnhancedFloatingFAB (
context = this , context = this ,
onDetectionRequested = { triggerDetection ( ) } , onDetectionRequested = { triggerDetection ( ) } ,
onClassFilterRequested = { className -> setClassFilter ( className ) } , onToggleOverlay = { toggleOverlay ( ) } ,
onDebugToggled = { toggleDebugMode ( ) } , onReturnToApp = { returnToMainApp ( ) }
onClose = { stopSelf ( ) }
) )
PGHLog . d ( TAG , " ✅ MVC architecture initialized " ) PGHLog . d ( TAG , " ✅ MVC architecture initialized " )
@ -210,17 +211,39 @@ class ScreenCaptureService : Service() {
} }
/ * * / * *
* Set class filter from UI * Toggle overlay visibility from UI
* / * /
fun setClassFilter ( className : String ? ) { fun toggleOverlay ( ) {
detectionController . onClassFilterChanged ( className ) overlayEnabled = ! overlayEnabled
if ( ! overlayEnabled ) {
hideDetectionOverlay ( )
PGHLog . i ( TAG , " 🔇 Detection overlay disabled and hidden " )
} else {
// Show cached detections immediately if available
if ( lastDetections . isNotEmpty ( ) ) {
showYOLODetectionOverlay ( lastDetections )
PGHLog . i ( TAG , " 🔊 Detection overlay enabled and showing ${lastDetections.size} cached detections " )
} else {
PGHLog . i ( TAG , " 🔊 Detection overlay enabled (no cached detections to show) " )
}
}
} }
/ * * / * *
* Toggle debug mode from UI * Return to main app from UI
* / * /
fun toggleDebugMode ( ) { fun returnToMainApp ( ) {
detectionController . onDebugModeToggled ( ) try {
val intent = Intent ( this , MainActivity :: class . java ) . apply {
flags = Intent . FLAG_ACTIVITY_NEW_TASK or
Intent . FLAG_ACTIVITY_CLEAR_TOP or
Intent . FLAG_ACTIVITY_SINGLE_TOP
}
startActivity ( intent )
PGHLog . i ( TAG , " 🏠 Returning to main app " )
} catch ( e : Exception ) {
PGHLog . e ( TAG , " Failed to return to main app " , e )
}
} }
override fun onStartCommand ( intent : Intent ? , flags : Int , startId : Int ) : Int { override fun onStartCommand ( intent : Intent ? , flags : Int , startId : Int ) : Int {
@ -498,9 +521,16 @@ class ScreenCaptureService : Service() {
PGHLog . w ( TAG , " ⚠️ Missing expected elements: $missingElements " ) PGHLog . w ( TAG , " ⚠️ Missing expected elements: $missingElements " )
} }
// Show detection overlay IMMEDIATELY (no OCR blocking) // Cache detections for overlay toggle
showYOLODetectionOverlay ( detections ) lastDetections = detections
PGHLog . i ( TAG , " 📺 Overlay displayed with ${detections.size} detections " )
// Show detection overlay IMMEDIATELY (no OCR blocking) if enabled
if ( overlayEnabled ) {
showYOLODetectionOverlay ( detections )
PGHLog . i ( TAG , " 📺 Overlay displayed with ${detections.size} detections " )
} else {
PGHLog . i ( TAG , " 📺 Overlay disabled - skipping display " )
}
// Extract Pokemon info using YOLO detections in background // Extract Pokemon info using YOLO detections in background
extractPokemonInfoFromYOLOAsync ( mat , detections ) extractPokemonInfoFromYOLOAsync ( mat , detections )
@ -1143,9 +1173,14 @@ class ScreenCaptureService : Service() {
mlInferenceEngine ?. detect ( bitmap ) ?. getOrDefault ( emptyList ( ) ) ?: emptyList ( ) mlInferenceEngine ?. detect ( bitmap ) ?. getOrDefault ( emptyList ( ) ) ?: emptyList ( )
} }
// Show detection overlay with results // Cache detections for overlay toggle
if ( detections . isNotEmpty ( ) ) { if ( detections . isNotEmpty ( ) ) {
showYOLODetectionOverlay ( detections ) lastDetections = detections
// Show detection overlay with results if enabled
if ( overlayEnabled ) {
showYOLODetectionOverlay ( detections )
}
// Extract Pokemon info using YOLO detections with OCR // Extract Pokemon info using YOLO detections with OCR
extractPokemonInfoFromYOLOAsync ( mat , detections ) extractPokemonInfoFromYOLOAsync ( mat , detections )
