From 005fac815fdab06b6c32bd578c49d8a2488b8ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sikora?= Date: Tue, 26 Nov 2024 13:09:50 +0100 Subject: [PATCH] Merge/release 7.77.1 into 7.78 (#3287) Co-authored-by: Philip Simpson Co-authored-by: Ashita Agrawal Co-authored-by: Philip Simpson --- metadata/release_notes.txt | 2 +- .../com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt | 4 ---- .../pocketcasts/repositories/playback/PlaybackState.kt | 1 + version.properties | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/metadata/release_notes.txt b/metadata/release_notes.txt index 898f77b9ace..a7b3f6f8377 100644 --- a/metadata/release_notes.txt +++ b/metadata/release_notes.txt @@ -7,6 +7,6 @@ * Updates * Update profile header UI ([#3235](https://github.com/Automattic/pocket-casts-android/pull/3235)) - * Deferred addition to UpNext post update after sync + * Deferred addition to UpNext post update after sync ([#3211](https://github.com/Automattic/pocket-casts-android/pull/312)) diff --git a/modules/features/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt b/modules/features/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt index c2b6ec128c1..a200567abb5 100644 --- a/modules/features/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt +++ b/modules/features/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt @@ -1,9 +1,7 @@ package au.com.shiftyjelly.pocketcasts.endofyear -import android.annotation.SuppressLint import android.app.Activity import android.content.Intent -import android.content.pm.ActivityInfo import android.graphics.Color import android.os.Bundle import android.view.WindowManager @@ -108,8 +106,6 @@ class StoriesActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) if (!isTablet) { - @SuppressLint("SourceLockedOrientationActivity") - requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT enableEdgeToEdge(SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)) hideSystemBars() } diff --git a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt b/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt index f576a285018..afb01509ca7 100644 --- a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt +++ b/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt @@ -66,6 +66,7 @@ data class PlaybackState( } return PlaybackState( + state = state, isBuffering = !episode.isDownloaded && state == State.PLAYING, isPrepared = isPrepared, isSleepTimerRunning = previousPlaybackState?.isSleepTimerRunning ?: false, diff --git a/version.properties b/version.properties index 8fb8d2d9016..03df1615019 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ versionName=7.78-rc-1 -versionCode=9287 \ No newline at end of file +versionCode=9288