hacked up possible alternate focus repo approach

app/src/main/java/org/mozilla/tv/firefox/MainActivity.kt

@@ -15,7 +15,8 @@ import android.view.KeyEvent
 import android.view.View
 import androidx.lifecycle.Observer
 import io.sentry.Sentry
-import kotlinx.android.synthetic.main.activity_main.container_navigation_overlay
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.fragment_navigation_overlay_top_nav.navButtonBack
 import kotlinx.android.synthetic.main.overlay_debug.debugLog
 import mozilla.components.browser.session.Session
 import mozilla.components.concept.engine.EngineView
@@ -104,7 +105,7 @@ class MainActivity : LocaleAwareAppCompatActivity(), OnUrlEnteredListener, Media
         serviceLocator.intentLiveData.value = Consumable.from(intentData)
 
         // Debug logging display for non public users
-        // TODO: refactor out the debug variant visibility check in #1953
+        // TODO: refactor out the debug variant visibility check in #1953\
         BuildConstants.debugLogStr?.apply {
             debugLog.visibility = View.VISIBLE
             debugLog.text = this
@@ -170,13 +171,15 @@ class MainActivity : LocaleAwareAppCompatActivity(), OnUrlEnteredListener, Media
         super.onStart()
         // TODO when MainActivity has a VM, route this call through it
         serviceLocator.pocketRepo.startBackgroundUpdates()
+        rootView.viewTreeObserver.addOnGlobalFocusChangeListener(serviceLocator.focusRepo)
     }
 
     override fun onStop() {
         super.onStop()
         // TODO when MainActivity has a VM, route this call through it
         serviceLocator.pocketRepo.stopBackgroundUpdates()
         TelemetryIntegration.INSTANCE.stopMainActivity()
+        rootView.viewTreeObserver.removeOnGlobalFocusChangeListener(serviceLocator.focusRepo)
     }
 
     override fun onDestroy() {

app/src/main/java/org/mozilla/tv/firefox/ScreenController.kt

@@ -11,7 +11,6 @@ import android.view.KeyEvent
 import androidx.fragment.app.FragmentManager
 import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
-import kotlinx.android.synthetic.main.fragment_navigation_overlay.navUrlInput
 import mozilla.components.browser.session.Session
 import org.mozilla.tv.firefox.ScreenControllerStateMachine.ActiveScreen
 import org.mozilla.tv.firefox.ScreenControllerStateMachine.Transition
@@ -143,7 +142,6 @@ class ScreenController(private val sessionRepo: SessionRepo) {
 
             transaction.show(overlayFragment)
             MenuInteractionMonitor.menuOpened()
-            overlayFragment.navUrlInput.requestFocus()
             // TODO: Disabled until Overlay refactor is complete #1666
             // overlayFragment.navOverlayScrollView.updateOverlayForHomescreen(isOnHomeUrl(fragmentManager))
         } else {

app/src/main/java/org/mozilla/tv/firefox/architecture/ViewModelFactory.kt

@@ -17,6 +17,7 @@ import org.mozilla.tv.firefox.navigationoverlay.ToolbarViewModel
 import org.mozilla.tv.firefox.settings.SettingsViewModel
 import org.mozilla.tv.firefox.utils.ServiceLocator
 import org.mozilla.tv.firefox.webrender.WebRenderHintViewModel
+import org.mozilla.tv.firefox.webrender.WebRenderViewModel
 import org.mozilla.tv.firefox.webrender.cursor.CursorViewModel
 
 /**
@@ -62,19 +63,26 @@ class ViewModelFactory(
             ) as T
 
             NavigationOverlayViewModel::class.java -> NavigationOverlayViewModel(
-                    serviceLocator.sessionRepo
+                serviceLocator.sessionRepo,
+                serviceLocator.focusRepo,
+                serviceLocator.screenController.currentActiveScreen
             ) as T
 
             OverlayHintViewModel::class.java -> OverlayHintViewModel(
-                    serviceLocator.sessionRepo,
-                    hintContentFactory.getCloseMenuHint()
+                serviceLocator.sessionRepo,
+                hintContentFactory.getCloseMenuHint()
             ) as T
 
             WebRenderHintViewModel::class.java -> WebRenderHintViewModel(
-                    serviceLocator.sessionRepo,
-                    serviceLocator.cursorEventRepo,
-                    serviceLocator.screenController,
-                    hintContentFactory.getOpenMenuHint()
+                serviceLocator.sessionRepo,
+                serviceLocator.cursorEventRepo,
+                serviceLocator.screenController,
+                hintContentFactory.getOpenMenuHint()
+            ) as T
+
+            WebRenderViewModel::class.java -> WebRenderViewModel(
+                serviceLocator.focusRepo,
+                serviceLocator.screenController.currentActiveScreen
             ) as T
 
         // This class needs to either return a ViewModel or throw, so we have no good way of silently handling

app/src/main/java/org/mozilla/tv/firefox/ext/View.kt

@@ -17,3 +17,14 @@ val View.isEffectivelyVisible: Boolean get() {
     }
     return true
 }
+
+// TODO test this.  likely off by 1 error here
+fun View.itAndAncestorsAreVisible(generationsUp: Int = Int.MAX_VALUE): Boolean {
+    var generations = generationsUp
+    var node: View? = this
+    while (node != null && generations-- > 0) {
+        if (node.visibility != View.VISIBLE) return false
+        node = node.parent as? View
+    }
+    return true
+}