diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da560983..539f0572 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,5 +97,5 @@ jobs: gh release create "${{ env.TAG_NAME }}" \ - --latest=false --prerelease --title "${{ env.TAG_NAME }}" --target "${{ env.BRANCH_NAME }}" -F ci_release_note.txt \ + --latest=false --prerelease --title "${{ env.VERSION_NAME }}" --target "${{ env.BRANCH_NAME }}" -F ci_release_note.txt \ "app/build/outputs/apk/**/*.apk" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22167356..7c5c45f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,7 @@ defaults: env: APK_SHORT_NAME: Wholphin.apk GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx4g -XX:MaxMetaspaceSize=512m'" + TAG_NAME: ${{ github.ref_name }} jobs: publish: diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt index cd4e9a47..fc18bee2 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt @@ -192,7 +192,8 @@ sealed interface AppPreference { setter = { prefs, value -> prefs.updateHomePagePreferences { combineContinueNext = value } }, - summary = R.string.combine_continue_next_summary, + summaryOn = R.string.enabled, + summaryOff = R.string.disabled, ) val RewatchNextUp = diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackDebugOverlay.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackDebugOverlay.kt index a136112f..496166c3 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackDebugOverlay.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackDebugOverlay.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme import androidx.tv.material3.ProvideTextStyle import androidx.tv.material3.Text +import com.github.damontecres.wholphin.preferences.PlayerBackend import com.github.damontecres.wholphin.ui.byteRateSuffixes import com.github.damontecres.wholphin.ui.formatBytes import com.github.damontecres.wholphin.ui.letNotEmpty @@ -30,12 +31,14 @@ fun PlaybackDebugOverlay( ) { ProvideTextStyle(MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurface)) { SimpleTable( - listOf( - "Backend:" to currentPlayback?.backend?.toString(), - "Play method:" to currentPlayback?.playMethod?.serialName, - "Video Decoder:" to currentPlayback?.videoDecoder, - "Audio Decoder:" to currentPlayback?.audioDecoder, - ), + buildList { + add("Backend:" to currentPlayback?.backend?.toString()) + add("Play method:" to currentPlayback?.playMethod?.serialName) + if (currentPlayback?.backend == PlayerBackend.EXO_PLAYER) { + add("Video Decoder:" to currentPlayback.videoDecoder) + add("Audio Decoder:" to currentPlayback.audioDecoder) + } + }, ) currentPlayback?.transcodeInfo?.let { TranscodeInfo(it, Modifier)