Skip to content

Commit

Permalink
Migrate exoplayer to androidx.media3 (#3437)
Browse files Browse the repository at this point in the history
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: mueller-ma <mueller-ma@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and mueller-ma authored Aug 31, 2023
1 parent 6016392 commit f5fee09
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
6 changes: 4 additions & 2 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
ext.about_libraries_version = '10.6.3'
ext.powermock_version = '2.0.9'
ext.espresso_version = '3.5.1'
ext.exoplayer_version = '2.18.7'
ext.media3_version = '1.1.0'
ext.acra_version = '5.11.1'

repositories {
Expand Down Expand Up @@ -161,7 +161,9 @@ dependencies {
implementation "androidx.work:work-runtime-ktx:$work_manager_version"
fullImplementation "androidx.work:work-gcm:$work_manager_version"
implementation "androidx.security:security-crypto:1.0.0"
implementation "com.google.android.exoplayer:exoplayer:$exoplayer_version"
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-ui:$media3_version"
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
implementation "org.jmdns:jmdns:3.5.8"
implementation "com.squareup.okhttp3:okhttp:$ok_http_version"
implementation "com.squareup.okhttp3:logging-interceptor:$ok_http_version"
Expand Down
20 changes: 10 additions & 10 deletions mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ import androidx.core.widget.ContentLoadingProgressBar
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.DialogFragment
import androidx.recyclerview.widget.RecyclerView
import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.PlaybackException
import com.google.android.exoplayer2.analytics.AnalyticsListener
import com.google.android.exoplayer2.source.LoadEventInfo
import com.google.android.exoplayer2.source.MediaLoadData
import com.google.android.exoplayer2.source.ProgressiveMediaSource
import com.google.android.exoplayer2.source.hls.HlsMediaSource
import com.google.android.exoplayer2.upstream.DataSource
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
import androidx.media3.common.MediaItem
import androidx.media3.common.PlaybackException
import androidx.media3.datasource.DataSource
import androidx.media3.datasource.DefaultHttpDataSource
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.analytics.AnalyticsListener
import androidx.media3.exoplayer.hls.HlsMediaSource
import androidx.media3.exoplayer.source.LoadEventInfo
import androidx.media3.exoplayer.source.MediaLoadData
import androidx.media3.exoplayer.source.ProgressiveMediaSource
import com.google.android.material.button.MaterialButton
import com.google.android.material.button.MaterialButtonToggleGroup
import com.google.android.material.datepicker.MaterialDatePicker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ package org.openhab.habdroid.ui.widget
import android.content.Context
import android.util.AttributeSet
import android.view.View
import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.ui.StyledPlayerView
import com.google.android.exoplayer2.video.VideoSize
import androidx.media3.common.Player
import androidx.media3.common.VideoSize
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.PlayerView

class AutoHeightPlayerView constructor(context: Context, attrs: AttributeSet) :
StyledPlayerView(context, attrs),
PlayerView(context, attrs),
Player.Listener {
private var currentPlayer: ExoPlayer? = null

Expand Down

0 comments on commit f5fee09

Please sign in to comment.