-
-
Notifications
You must be signed in to change notification settings - Fork 469
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove key listener from BaseActivity
- Loading branch information
1 parent
fe6fcbe
commit ab3710f
Showing
12 changed files
with
193 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseRecordingsActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class BrowseRecordingsActivity : BaseActivity() { | ||
| class BrowseRecordingsActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, BrowseRecordingsFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<BrowseRecordingsFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseScheduleActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class BrowseScheduleActivity : BaseActivity() { | ||
| class BrowseScheduleActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, BrowseScheduleFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<BrowseScheduleFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/CollectionActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class CollectionActivity : BaseActivity() { | ||
| class CollectionActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, CollectionFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<CollectionFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/GenericFolderActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class GenericFolderActivity : BaseActivity() { | ||
| class GenericFolderActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, GenericFolderFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<GenericFolderFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/GenericGridActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.FragmentActivity | ||
| import androidx.fragment.app.add | ||
| import androidx.fragment.app.commit | ||
| import org.jellyfin.androidtv.R | ||
|
|
||
| class GenericGridActivity : FragmentActivity() { | ||
| class GenericGridActivity : FragmentActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, BrowseGridFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| add<BrowseGridFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/SuggestedMoviesActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class SuggestedMoviesActivity : BaseActivity() { | ||
| class SuggestedMoviesActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, SuggestedMoviesFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<SuggestedMoviesFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
26 changes: 21 additions & 5 deletions
26
app/src/main/java/org/jellyfin/androidtv/ui/browsing/UserViewActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,31 @@ | ||
| package org.jellyfin.androidtv.ui.browsing | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.KeyEvent | ||
| import android.view.View | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.replace | ||
| import org.jellyfin.androidtv.R | ||
| import org.jellyfin.androidtv.ui.shared.BaseActivity | ||
|
|
||
| class UserViewActivity : BaseActivity() { | ||
| class UserViewActivity : BaseActivity(R.layout.fragment_content_view) { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| supportFragmentManager | ||
| .beginTransaction() | ||
| .replace(android.R.id.content, BrowseViewFragment()) | ||
| .commit() | ||
| supportFragmentManager.commit { | ||
| replace<BrowseViewFragment>(R.id.content_view) | ||
| } | ||
| } | ||
|
|
||
| // Forward key events to fragments | ||
| private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments | ||
| .filter { it.isVisible } | ||
| .filterIsInstance<View.OnKeyListener>() | ||
| .any { it.onKey(currentFocus, keyCode, event) } | ||
|
|
||
| override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event) | ||
|
|
||
| override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean = | ||
| onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event) | ||
| } |
Oops, something went wrong.