Use new interaction tracking API in MainActivity
This commit is contained in:
committed by
Niels van Velzen
parent
cafd225074
commit
c7d8790e17
@@ -24,6 +24,7 @@ import org.jellyfin.androidtv.integration.LeanbackChannelWorker
|
|||||||
import org.jellyfin.androidtv.ui.InteractionTrackerViewModel
|
import org.jellyfin.androidtv.ui.InteractionTrackerViewModel
|
||||||
import org.jellyfin.androidtv.ui.background.AppBackground
|
import org.jellyfin.androidtv.ui.background.AppBackground
|
||||||
import org.jellyfin.androidtv.ui.base.JellyfinTheme
|
import org.jellyfin.androidtv.ui.base.JellyfinTheme
|
||||||
|
import org.jellyfin.androidtv.ui.base.ProvideLocalInteractionTracker
|
||||||
import org.jellyfin.androidtv.ui.composable.compat.AppNavigationHost
|
import org.jellyfin.androidtv.ui.composable.compat.AppNavigationHost
|
||||||
import org.jellyfin.androidtv.ui.navigation.NavigationRepository
|
import org.jellyfin.androidtv.ui.navigation.NavigationRepository
|
||||||
import org.jellyfin.androidtv.ui.screensaver.InAppScreensaver
|
import org.jellyfin.androidtv.ui.screensaver.InAppScreensaver
|
||||||
@@ -65,12 +66,16 @@ class MainActivity : FragmentActivity() {
|
|||||||
|
|
||||||
setContent {
|
setContent {
|
||||||
JellyfinTheme {
|
JellyfinTheme {
|
||||||
AppBackground()
|
ProvideLocalInteractionTracker(
|
||||||
AppNavigationHost(
|
interactionTracker = { interactionTrackerViewModel.notifyInteraction(false, userInitiated = true) }
|
||||||
navigationRepository = navigationRepository,
|
) {
|
||||||
)
|
AppBackground()
|
||||||
InAppScreensaver()
|
AppNavigationHost(
|
||||||
MainActivitySettings()
|
navigationRepository = navigationRepository,
|
||||||
|
)
|
||||||
|
InAppScreensaver()
|
||||||
|
MainActivitySettings()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,12 +145,6 @@ class MainActivity : FragmentActivity() {
|
|||||||
override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean =
|
override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean =
|
||||||
onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event)
|
onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event)
|
||||||
|
|
||||||
override fun onUserInteraction() {
|
|
||||||
super.onUserInteraction()
|
|
||||||
|
|
||||||
interactionTrackerViewModel.notifyInteraction(false, userInitiated = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Suppress("RestrictedApi") // False positive
|
@Suppress("RestrictedApi") // False positive
|
||||||
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
|
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
|
||||||
// Ignore the key event that closes the screensaver
|
// Ignore the key event that closes the screensaver
|
||||||
|
|||||||
Reference in New Issue
Block a user