Skip to content

Commit 3b64145

Browse files
committed
Screensaver now exits on OK button
Fix not being able to forward/rewind videos in slideshow
1 parent 9a124fc commit 3b64145

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ android {
3030
applicationId "nl.giejay.android.tv.immich"
3131
minSdkVersion 24
3232
targetSdkVersion 35
33-
versionCode 77
34-
versionName "2.4.2"
33+
versionCode 79
34+
versionName "2.5.0"
3535

3636
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3737
testOptions.unitTests.includeAndroidResources = true

app/src/main/java/nl/giejay/android/tv/immich/screensaver/ScreenSaverService.kt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package nl.giejay.android.tv.immich.screensaver
22

33
import android.annotation.SuppressLint
44
import android.service.dreams.DreamService
5+
import android.view.KeyEvent
56
import android.widget.Toast
67
import androidx.media3.datasource.DefaultHttpDataSource
78
import arrow.core.Either
@@ -20,11 +21,12 @@ import nl.giejay.android.tv.immich.api.model.Asset
2021
import nl.giejay.android.tv.immich.shared.prefs.PreferenceManager
2122
import nl.giejay.android.tv.immich.shared.util.toSliderItems
2223
import nl.giejay.mediaslider.LoadMore
24+
import nl.giejay.mediaslider.MediaSliderListener
2325
import nl.giejay.mediaslider.MediaSliderView
2426
import timber.log.Timber
2527
import java.util.EnumSet
2628

27-
class ScreenSaverService : DreamService() {
29+
class ScreenSaverService : DreamService(),MediaSliderListener {
2830
private val ioScope = CoroutineScope(Job() + Dispatchers.IO)
2931
private lateinit var apiClient: ApiClient
3032
private lateinit var mediaSliderView: MediaSliderView
@@ -192,7 +194,7 @@ class ScreenSaverService : DreamService() {
192194
maxCutOffHeight = PreferenceManager.maxCutOffHeight(),
193195
maxCutOffWidth = PreferenceManager.maxCutOffWidth(),
194196
transformation = PreferenceManager.glideTransformation(),
195-
debugEnabled = PreferenceManager.debugEnabled()
197+
debugEnabled = PreferenceManager.debugEnabled(),
196198
)
197199
)
198200
mediaSliderView.toggleSlideshow(false)
@@ -206,5 +208,13 @@ class ScreenSaverService : DreamService() {
206208
companion object ScreenSaverService {
207209
private const val PAGE_COUNT = 100
208210
}
211+
212+
override fun onButtonPressed(event: KeyEvent): Boolean {
213+
if(event.keyCode == KeyEvent.KEYCODE_DPAD_CENTER || event.keyCode == KeyEvent.KEYCODE_ENTER){
214+
finish()
215+
return true
216+
}
217+
return false
218+
}
209219
}
210220

0 commit comments

Comments
 (0)