nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated onBackPressed

Browse source
This commit is contained in:
Jarne Demeulemeester 2022-12-04 00:12:14 +01:00
parent 48e5b99cf8
commit bd2bf79bc8
No known key found for this signature in database
GPG key ID: 65C6006F2032DD14
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
View file

@ -6,6 +6,7 @@ import android.os.Bundle
import android.view.View import android.view.View
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
import androidx.navigation.NavGraph import androidx.navigation.NavGraph
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.AppBarConfiguration
@ -35,6 +36,8 @@ class MainActivity : AppCompatActivity() {
@Inject @Inject
lateinit var appPreferences: AppPreferences lateinit var appPreferences: AppPreferences
lateinit var navController: NavController
@OptIn(NavigationUiSaveStateControl::class) @OptIn(NavigationUiSaveStateControl::class)
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -46,7 +49,7 @@ class MainActivity : AppCompatActivity() {
val navHostFragment = val navHostFragment =
supportFragmentManager.findFragmentById(R.id.nav_host_fragment_activity_main) as NavHostFragment supportFragmentManager.findFragmentById(R.id.nav_host_fragment_activity_main) as NavHostFragment
val navController = navHostFragment.navController navController = navHostFragment.navController
val inflater = navController.navInflater val inflater = navController.navInflater
val graph = inflater.inflate(R.navigation.app_navigation) val graph = inflater.inflate(R.navigation.app_navigation)
@ -102,8 +105,7 @@ class MainActivity : AppCompatActivity() {
} }
override fun onSupportNavigateUp(): Boolean { override fun onSupportNavigateUp(): Boolean {
onBackPressed() return navController.navigateUp()
return true
} }
private fun checkServersEmpty(graph: NavGraph, onServersEmpty: () -> Unit = {}) { private fun checkServersEmpty(graph: NavGraph, onServersEmpty: () -> Unit = {}) {

4
app/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
View file

@ -59,7 +59,7 @@ class PlayerActivity : BasePlayerActivity() {
} }
binding.playerView.findViewById<View>(R.id.back_button).setOnClickListener { binding.playerView.findViewById<View>(R.id.back_button).setOnClickListener {
onBackPressed() finish()
} }
val videoNameTextView = binding.playerView.findViewById<TextView>(R.id.video_name) val videoNameTextView = binding.playerView.findViewById<TextView>(R.id.video_name)
@ -169,7 +169,7 @@ class PlayerActivity : BasePlayerActivity() {
viewModel.navigateBack.observe(this) { viewModel.navigateBack.observe(this) {
if (it) { if (it) {
onBackPressed() finish()
} }
} }

2
app/src/main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt
View file

@ -86,7 +86,7 @@ internal class TvPlayerActivity : BasePlayerActivity() {
} }
findViewById<View>(R.id.back_button).setOnClickListener { findViewById<View>(R.id.back_button).setOnClickListener {
onBackPressed() finish()
} }
bindAudioControl() bindAudioControl()