kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2384 from Bnyro/master

Browse Source 
Check all backup options by default
This commit is contained in:
Bnyro 2022-12-15 19:51:10 +01:00 committed by GitHub
commit 4170834da9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/github/libretube/ui/dialogs/BackupDialog.kt
View File

@ -44,8 +44,8 @@ class BackupDialog(
it.localPlaylists = Database.localPlaylistsDao().getAll() it.localPlaylists = Database.localPlaylistsDao().getAll()
}) })
object Preferences : BackupOption(R.string.preferences, onSelected = { object Preferences : BackupOption(R.string.preferences, onSelected = { file ->
it.preferences = PreferenceHelper.settings.all.map { file.preferences = PreferenceHelper.settings.all.map {
PreferenceItem(it.key, it.value) PreferenceItem(it.key, it.value)
} }
}) })
@ -64,7 +64,7 @@ class BackupDialog(
val backupItems = backupOptions.map { context?.getString(it.name)!! }.toTypedArray() val backupItems = backupOptions.map { context?.getString(it.name)!! }.toTypedArray()
val selected = BooleanArray(backupOptions.size) { false } val selected = BooleanArray(backupOptions.size) { true }
return MaterialAlertDialogBuilder(requireContext()) return MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.backup) .setTitle(R.string.backup)

3
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -25,7 +25,6 @@ import androidx.annotation.RequiresApi
import androidx.constraintlayout.motion.widget.MotionLayout import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.os.postDelayed
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
@ -1421,7 +1420,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
.build() .build()
private fun shouldStartPiP(): Boolean { private fun shouldStartPiP(): Boolean {
if (!PlayerHelper.pipEnabled || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (!PlayerHelper.pipEnabled || SDK_INT >= Build.VERSION_CODES.S) {
return false return false
} }