minor code improvements

This commit is contained in:
Bnyro 2022-09-08 18:31:22 +02:00
parent 0272a00a0a
commit 0ab055303d
3 changed files with 7 additions and 9 deletions

View File

@ -167,15 +167,13 @@ class MainActivity : BaseActivity() {
if (binding.mainMotionLayout.progress == 0F) { if (binding.mainMotionLayout.progress == 0F) {
try { try {
minimizePlayer() minimizePlayer()
return
} catch (e: Exception) { } catch (e: Exception) {
if (navController.currentDestination?.id == startFragmentId) { // current fragment isn't the player fragment
// close app
moveTaskToBack(true)
} else {
navController.popBackStack()
}
} }
} else if (navController.currentDestination?.id == startFragmentId) { }
if (navController.currentDestination?.id == startFragmentId) {
moveTaskToBack(true) moveTaskToBack(true)
} else { } else {
navController.popBackStack() navController.popBackStack()

View File

@ -17,8 +17,8 @@ import com.github.libretube.R
import com.github.libretube.activities.MainActivity import com.github.libretube.activities.MainActivity
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.extensions.toID
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.extensions.toID
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

View File

@ -2,8 +2,8 @@ package com.github.libretube.util
import android.content.Context import android.content.Context
import android.view.accessibility.CaptioningManager import android.view.accessibility.CaptioningManager
import com.github.libretube.obj.PipedStream
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.obj.PipedStream
import com.google.android.exoplayer2.ui.CaptionStyleCompat import com.google.android.exoplayer2.ui.CaptionStyleCompat
object PlayerHelper { object PlayerHelper {