Initial compile error fixes after merge

This commit is contained in:
Niels van Velzen
2022-03-05 11:44:57 +01:00
parent a9a203841d
commit 966f6ba746
16 changed files with 13 additions and 21 deletions

View File

@ -11,8 +11,8 @@ import org.jellyfin.apiclient.interaction.ApiClient
import org.jellyfin.apiclient.model.dto.BaseItemDto
import org.jellyfin.apiclient.model.dto.ImageOptions
import org.jellyfin.apiclient.model.entities.ImageType
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import timber.log.Timber
class ImageCollection(original: BaseItemDto) {

View File

@ -8,7 +8,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.leanback.widget.BaseCardView
import kotlinx.android.synthetic.main.multi_badge_image_card_view.view.*
import org.jellyfin.androidtv.R
class MultiBadgeImageCardView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : BaseCardView(context, attrs, defStyleAttr) {

View File

@ -4,7 +4,6 @@ import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout
import kotlinx.android.synthetic.main.badge_watched.view.*
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.data.itemtypes.PlayableItem

View File

@ -3,7 +3,7 @@ package org.jellyfin.androidtv.ui.itemdetail.actions
import android.graphics.drawable.Drawable
import android.view.View
import androidx.lifecycle.LiveData
import org.koin.core.KoinComponent
import org.koin.core.component.KoinComponent
interface Action : KoinComponent {
val visible: LiveData<Boolean>

View File

@ -9,7 +9,7 @@ import org.jellyfin.androidtv.data.itemtypes.BaseItem
import org.jellyfin.androidtv.ui.playback.MediaManager
import org.jellyfin.androidtv.util.apiclient.getItem
import org.jellyfin.apiclient.interaction.ApiClient
import org.koin.core.get
import org.koin.core.component.get
private const val LOG_TAG = "AddToQueueAction"

View File

@ -14,7 +14,7 @@ import org.jellyfin.androidtv.data.itemtypes.BaseItem
import org.jellyfin.androidtv.util.DelayedMessage
import org.jellyfin.apiclient.interaction.ApiClient
import org.jellyfin.apiclient.interaction.EmptyResponse
import org.koin.core.get
import org.koin.core.component.get
import timber.log.Timber
class DeleteAction(private val context: Context, private val item: LiveData<out BaseItem>, private val onItemDeleted: () -> Unit) : Action {

View File

@ -15,7 +15,7 @@ import org.jellyfin.androidtv.util.apiclient.getItem
import org.jellyfin.apiclient.interaction.ApiClient
import org.jellyfin.apiclient.interaction.Response
import org.jellyfin.apiclient.model.dto.BaseItemDto
import org.koin.core.get
import org.koin.core.component.get
private const val LOG_TAG = "PlaybackAction"

View File

@ -9,7 +9,7 @@ import androidx.lifecycle.MutableLiveData
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.data.itemtypes.PlayableItem
import org.jellyfin.androidtv.preference.UserPreferences
import org.koin.core.get
import org.koin.core.component.get
private const val LOG_TAG = "ResumeAction"

View File

@ -11,7 +11,7 @@ import org.jellyfin.androidtv.TvApp
import org.jellyfin.androidtv.data.itemtypes.BaseItem
import org.jellyfin.androidtv.util.apiclient.updateFavoriteStatus
import org.jellyfin.apiclient.interaction.ApiClient
import org.koin.core.get
import org.koin.core.component.get
class ToggleFavoriteAction(val context: Context, val item: MutableLiveData<out BaseItem>) : ToggleableAction {
override val visible: LiveData<Boolean> = MutableLiveData(true)

View File

@ -10,7 +10,7 @@ import org.jellyfin.androidtv.data.itemtypes.PlayableItem
import org.jellyfin.androidtv.util.apiclient.markPlayed
import org.jellyfin.androidtv.util.apiclient.markUnplayed
import org.jellyfin.apiclient.interaction.ApiClient
import org.koin.core.get
import org.koin.core.component.get
class ToggleWatchedAction(context: Context, val item: MutableLiveData<out PlayableItem>) : ToggleableAction {
override val visible = MutableLiveData(true)

View File

@ -21,8 +21,8 @@ import org.jellyfin.androidtv.util.TimeUtils
import org.jellyfin.androidtv.util.apiclient.getItem
import org.jellyfin.androidtv.util.dp
import org.jellyfin.apiclient.interaction.ApiClient
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
class ChapterInfoPresenter(private val context: Context) : Presenter(), IItemClickListener, KoinComponent {

View File

@ -14,7 +14,6 @@ import androidx.core.text.bold
import androidx.leanback.widget.RowPresenter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import kotlinx.android.synthetic.main.row_details_description.view.*
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.data.itemtypes.Episode
import org.jellyfin.androidtv.data.itemtypes.Movie

View File

@ -11,8 +11,6 @@ import android.widget.TextView
import android.widget.Toast
import androidx.leanback.widget.RowPresenter
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.row_details_series_media.view.*
import kotlinx.android.synthetic.main.row_details_series_media_item.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch

View File

@ -5,7 +5,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.leanback.widget.Presenter
import kotlinx.android.synthetic.main.list_item_song.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@ -18,8 +17,8 @@ import org.jellyfin.androidtv.util.Utils
import org.jellyfin.androidtv.util.apiclient.PlaybackHelper
import org.jellyfin.androidtv.util.apiclient.getItem
import org.jellyfin.apiclient.interaction.ApiClient
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
class SongPresenter : Presenter(), KoinComponent {
override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {

View File

@ -6,7 +6,6 @@ import android.view.ViewGroup
import androidx.leanback.widget.ItemBridgeAdapter
import androidx.leanback.widget.RowPresenter
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.row_vertical_list.view.*
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.ui.itemdetail.rows.VerticalListRow

View File

@ -4,7 +4,6 @@ import android.content.Context
import android.view.ViewGroup
import androidx.appcompat.view.ContextThemeWrapper
import com.bumptech.glide.Glide
import kotlinx.android.synthetic.main.multi_badge_image_card_view.view.*
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.data.trailers.external.YouTubeTrailer
import org.jellyfin.androidtv.ui.MultiBadgeImageCardView