From 7467f89f821d5e5951b517893c041d750c088300 Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Sat, 11 Jun 2022 21:51:30 +0200 Subject: [PATCH] Clean up some code --- app/src/main/java/dev/jdtech/jellyfin/MainActivityTv.kt | 4 ++-- .../dev/jdtech/jellyfin/database/DownloadDatabaseDao.kt | 2 +- app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt | 2 +- .../main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt | 4 ++-- .../java/dev/jdtech/jellyfin/utils/ViewExtensions.kt | 8 -------- .../main/java/dev/jdtech/jellyfin/utils/extensions.kt | 9 +-------- .../jellyfin/viewmodels/PlayerActivityViewModel.kt | 2 +- 7 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 app/src/main/java/dev/jdtech/jellyfin/utils/ViewExtensions.kt diff --git a/app/src/main/java/dev/jdtech/jellyfin/MainActivityTv.kt b/app/src/main/java/dev/jdtech/jellyfin/MainActivityTv.kt index f67222bf..22848b10 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/MainActivityTv.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/MainActivityTv.kt @@ -27,11 +27,11 @@ internal class MainActivityTv : FragmentActivity() { loadDownloadLocation(applicationContext) - viewModel.navigateToAddServer.observe(this, { + viewModel.navigateToAddServer.observe(this) { if (it) { navController.navigate(HomeFragmentDirections.actionHomeFragmentToAddServerFragment()) viewModel.doneNavigateToAddServer() } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/dev/jdtech/jellyfin/database/DownloadDatabaseDao.kt b/app/src/main/java/dev/jdtech/jellyfin/database/DownloadDatabaseDao.kt index 1fe8e989..68427ae9 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/database/DownloadDatabaseDao.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/database/DownloadDatabaseDao.kt @@ -8,7 +8,7 @@ import java.util.* @Dao interface DownloadDatabaseDao { - @Insert() + @Insert fun insertItem(downloadItem: DownloadItem) @Query("select * from downloads where id = :id limit 1") diff --git a/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt b/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt index 678dfdb9..d8a6c763 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt @@ -207,7 +207,7 @@ class MPVPlayer( when (property) { "eof-reached" -> { if (value && isPlayerReady) { - if (currentIndex < internalMediaItems?.size ?: 0) { + if (currentIndex < (internalMediaItems?.size ?: 0)) { currentIndex += 1 prepareMediaItem(currentIndex) play() diff --git a/app/src/main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt b/app/src/main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt index fc571894..26514704 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/tv/TvPlayerActivity.kt @@ -61,9 +61,9 @@ internal class TvPlayerActivity : BasePlayerActivity() { private fun bind() = with(binding.playerView) { val videoNameTextView = findViewById(R.id.video_name) - viewModel.currentItemTitle.observe(this@TvPlayerActivity, { title -> + viewModel.currentItemTitle.observe(this@TvPlayerActivity) { title -> videoNameTextView.text = title - }) + } findViewById(R.id.exo_play_pause).apply { setOnClickListener { diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/ViewExtensions.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/ViewExtensions.kt deleted file mode 100644 index 2da7c0ec..00000000 --- a/app/src/main/java/dev/jdtech/jellyfin/utils/ViewExtensions.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.jdtech.jellyfin.utils - -import android.view.View -import androidx.core.view.isVisible - -fun View.toggleVisibility() { - isVisible = !isVisible -} diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/extensions.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/extensions.kt index a121adfb..6b2e15cd 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/utils/extensions.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/utils/extensions.kt @@ -1,14 +1,11 @@ package dev.jdtech.jellyfin.utils -import android.content.Context import android.content.res.ColorStateList import android.content.res.Resources import android.util.TypedValue import android.widget.ImageButton -import android.widget.Toast import androidx.annotation.AttrRes import androidx.annotation.ColorRes -import androidx.annotation.StringRes import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import dev.jdtech.jellyfin.AppNavigationDirections @@ -33,11 +30,7 @@ fun Fragment.checkIfLoginRequired(error: String?) { } } -inline fun Context.toast(@StringRes text: Int, duration: Int = Toast.LENGTH_SHORT) = - Toast.makeText(this, text, duration).show() - - -inline fun Resources.dip(px: Int) = (px * displayMetrics.density).toInt() +fun Resources.dip(px: Int) = (px * displayMetrics.density).toInt() fun ImageButton.setTintColor(@ColorRes colorId: Int, theme: Resources.Theme) { this.imageTintList = ColorStateList.valueOf( diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt index f36e6e1b..fdf2d005 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt @@ -183,7 +183,7 @@ constructor( viewModelScope.launch { try { for (item in items) { - if (item.itemId.toString() == player.currentMediaItem?.mediaId ?: "") { + if (item.itemId.toString() == (player.currentMediaItem?.mediaId ?: "")) { if (sp.getBoolean( "display_extended_title", false