Repository navigation
fix: premiere dates, every subscribe bell, Shorts on channel Home, force dark, and a swipe-away switch - #1521
Merged
Conversation
github-actions
Bot
added
documentation
There was a problem hiding this comment.
🟡 Changes recommended
The notification warning can appear behind an open bottom sheet, making its action inaccessible, and fails to detect a blocked New videos notification channel.
2 open issues
What changed in this PR
This PR addresses description metadata, subscription controls, Shorts visibility, and theme issues across Flow. It also adds a playback-on-close preference and skips online lyrics prefetching for local songs.
Changes:
- Formats fallback premiere and stream dates, connects subscription bells across surfaces, and adds blocked-alert warnings.
- Filters disabled Shorts from channel Home and Explore, and opts out of system force dark.
- Adds configurable swipe-away playback behavior, focused tests, and nightly release notes.
| File | Description |
|---|---|
| app/src/test/java/io/github/aedev/flow/ui/components/shared/SubscriptionBellTest.kt | Tests bell-state filtering and alert-block decisions. |
| app/src/test/java/io/github/aedev/flow/ui/components/shared/DescriptionFactoidsTest.kt | Tests absolute and relative description dates. |
| app/src/test/java/io/github/aedev/flow/service/TaskRemovalPolicyTest.kt | Tests stopping playback when the switch is off. |
| app/src/test/java/io/github/aedev/flow/player/LifecyclePlaybackPreferencesTest.kt | Tests the cold-start swipe preference default. |
| app/src/test/java/io/github/aedev/flow/data/shorts/FeedShelfShortsTest.kt | Tests Shorts filtering and empty-shelf handling. |
| app/src/test/java/io/github/aedev/flow/data/local/DevicePreferencesSplitTest.kt | Updates the expected profile preference count. |
| app/src/main/res/values/themes.xml | Disables platform force dark. |
| app/src/main/res/values/strings.xml | Adds date labels, alert text, and playback-setting strings. |
| app/src/main/java/io/github/aedev/flow/utils/DateDisplay.kt | Extracts reusable stream and premiere prefix removal. |
| app/src/main/java/io/github/aedev/flow/ui/screens/settings/taste/DiscoverChannelsViewModel.kt | Reuses notifying-channel ID extraction. |
| app/src/main/java/io/github/aedev/flow/ui/screens/settings/playback/PlaybackSettingsViewModel.kt | Exposes and saves the swipe-away preference. |
| app/src/main/java/io/github/aedev/flow/ui/screens/settings/playback/PlaybackSections.kt | Displays the new playback switch. |
| app/src/main/java/io/github/aedev/flow/ui/screens/settings/index/PlaybackIndex.kt | Registers the setting in the settings index. |
| app/src/main/java/io/github/aedev/flow/ui/screens/search/SearchResultsBody.kt | Connects search results to shared bell state. |
| app/src/main/java/io/github/aedev/flow/ui/screens/channel/ChannelViewModel.kt | Adds bell controls and filters Shorts from sections. |
| app/src/main/java/io/github/aedev/flow/ui/screens/channel/ChannelScreen.kt | Passes notification state and callbacks into channel content. |
| app/src/main/java/io/github/aedev/flow/ui/screens/channel/ChannelContent.kt | Wires related-channel bells and corrects Home loading detection. |
| app/src/main/java/io/github/aedev/flow/ui/screens/categories/CategoriesViewModel.kt | Filters Shorts from Explore shelves and paging data. |
| app/src/main/java/io/github/aedev/flow/ui/screens/categories/CategoriesScreen.kt | Displays filtered Explore shelves. |
| app/src/main/java/io/github/aedev/flow/ui/FlowApp.kt | Mounts the shared bell-alert presenter. |
| app/src/main/java/io/github/aedev/flow/ui/components/shorts/ShortsReelPage.kt | Connects Shorts to shared notification state. |
| app/src/main/java/io/github/aedev/flow/ui/components/shorts/ShortsMetadataOverlay.kt | Passes bell controls to the subscribe button. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/SubscriptionBell.kt | Adds shared bell state and blocked-alert recovery. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/quickactions/VideoQuickActionsSheet.kt | Connects the video-menu notification bell. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/FlowSubscribeButton.kt | Opens the menu when no bell handler exists. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/FlowDescriptionBottomSheet.kt | Delegates fallback statistics to the new helper. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/DescriptionFactoids.kt | Formats fallback dates and exact view counts. |
| app/src/main/java/io/github/aedev/flow/ui/components/shared/CollaboratorsBottomSheet.kt | Connects collaborator notification bells. |
| app/src/main/java/io/github/aedev/flow/ui/components/search/SearchResults.kt | Adds notification state and actions to channel results. |
| app/src/main/java/io/github/aedev/flow/ui/components/search/SearchChannelHeroCard.kt | Forwards bell controls through channel-card layouts. |
| app/src/main/java/io/github/aedev/flow/ui/components/channel/ChannelCards.kt | Adds bell controls to channel rows. |
| app/src/main/java/io/github/aedev/flow/service/VideoPlayerService.kt | Applies the swipe-away preference to video playback. |
| app/src/main/java/io/github/aedev/flow/service/TaskRemovalPolicy.kt | Includes the preference in service-retention decisions. |
| app/src/main/java/io/github/aedev/flow/service/PlaybackServiceEntryPoint.kt | Exposes playback preferences to the video service. |
| app/src/main/java/io/github/aedev/flow/service/Media3MusicService.kt | Applies swipe behavior and skips local-song lyrics prefetching. |
| app/src/main/java/io/github/aedev/flow/player/LifecyclePlaybackPreferences.kt | Adds the swipe preference to the playback snapshot. |
| app/src/main/java/io/github/aedev/flow/MainActivity.kt | Disables force dark on the window’s decor view. |
| app/src/main/java/io/github/aedev/flow/data/shorts/FeedShelfShorts.kt | Adds shared Shorts detection and shelf filtering. |
| app/src/main/java/io/github/aedev/flow/data/local/SubscriptionRepository.kt | Exposes notifying IDs and bell-enabled events. |
| app/src/main/java/io/github/aedev/flow/data/local/PlayerPreferences.kt | Persists the default-on swipe-away preference. |
| .github/nightly-notes/2026-10-28-fix-premiere-date-bell-shorts-home-force-dark.md | Adds user-facing notes for the changes. |
Review effort: Balanced
| internal val blockedBells: Flow<BellAlertBlock> = | ||
| subscriptionRepository.notificationsTurnedOn.mapNotNull { | ||
| bellAlertBlock( | ||
| systemAllows = NotificationManagerCompat.from(appContext).areNotificationsEnabled(), |
Comment on lines
+120
to
+121
| viewModel.blockedBells.collect { block -> | ||
| val result = snackbarHostState.showSnackbar(message, action, duration = SnackbarDuration.Long) |
2 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Related issue
Closes #1466
Closes #1467
Closes #1507
Closes #1517
Closes #1468
Closes #1464
Change type
Validation
./gradlew :app:assembleGithubDebug: passed./gradlew :app:testGithubDebugUnitTest: passed, 4561 tests, 0 failures./gradlew :app:compileFossDebugKotlinand./gradlew ktlintCheckpassed,python3 .github/scripts/nightly_notes.py --checkpassedTest device and Android version: Xiaomi 2311DRK48G, HyperOS, Android 16
Screenshots or recordings
Risk and compatibility
One new DataStore preference (
keep_playing_after_swipe, default on). No Room schema change.The swipe setting is read from the process-scoped playback snapshot, because
onTaskRemovedcan run after the activity is gone. A cold start with no activity reads the default, on.No new network requests. The bell state is one derived flow over the subscription store, collected with
WhileSubscribed(5_000).forceDarkAllowed=falseonly affects devices that apply force dark; Flow's own dark themes are drawn by Compose and are unchanged.The change does not introduce secrets, private data, or unexpected telemetry.
New user-facing text uses Android string resources.
Dependency and lockfile changes are intentional and limited to this PR.
Room schema changes include the required version bump and migration, or this PR does not change the Room schema.
Breaking changes and upgrade steps are clearly documented.