Resolve merge conflicts: feat/anime-list-style (Episode List Layouts) into main#327
Closed
Resolve merge conflicts: feat/anime-list-style (Episode List Layouts) into main#327
Conversation
Applies changes from PR #307 (feat/anime-list-style) onto current main: - Add episodeListLayout to UISettingsKeys, UISettings model, and Settings controller - Add blocks layout type to EpisodeLayoutType enum with _buildBlockLayout() - Update episode list builder, episodes pane, and player bottom sheet to use settings-driven layout type - Add EpisodeChunkSelector showAllLabel param for blocks layout - Create episode_layout_selector.dart settings widget - Add Episode List Layout option to UI settings page Co-authored-by: itsmechinmoy <167056923+itsmechinmoy@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Resolve merge conflicts between feat/anime-list-style and main
Resolve merge conflicts: feat/anime-list-style (Episode List Layouts) into main
Mar 1, 2026
Collaborator
|
@Rieversed how good is this?? |
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.
Resolves all merge conflicts between
feat/anime-list-style(PR #307) and currentmain, preserving the episode list layouts feature while adapting to main's current storage architecture (UISettingsKeys-based, not Hive).Description
PR #307 introduced 3 user-selectable episode list layouts (Detailed, Compact, Blocks). It conflicted with main because main had migrated
UISettingsaway from Hive to aUISettingsKeys-based persistence model — making the PR's@HiveField/ui_adaptor.g.dartchanges obsolete and inapplicable.Summary of Changes
Storage/Settings layer
UISettingsKeysenum: addepisodeListLayoutUISettingsmodel: addint episodeListLayoutfield +fromDB()persistence viaUISettingsKeys(replaces PR's@HiveField(24))Settingscontroller: add getter/setter with.clamp(0, 2), following currentuiSettings.update + UISettingsKeys.setpatternEpisode widget
EpisodeLayoutType: addblocksvariantBetterEpisode: addshowTitleInBlockLayoutparam;build()uses switch expression; new_buildBlockLayout()(number-only or number+title variants); compact height 100→92Player UI
EpisodesPane+PlayerBottomSheets: importsettingsController, add_resolveEpisodeLayoutType(), passshowTitleInBlockLayout; fixnumber!.toInt()→number.toInt()Detail page episode list
EpisodeListBuilder: addsettingsfield +_uiSettingsWorkerfor reactive rebuilds; layout-aware chunking (_buildBlockChunks, 50 eps/page for blocks vs. dynamic for others); responsive grid helpers (_getCrossAxisCount,_getMainAxisExtent, etc.); remove_initializedChunkEpisodeChunkSelector: addshowAllLabelparam (suppressed in blocks layout)Settings UI
episode_layout_selector.dart: dialog with animated per-layout live previewsettings_ui.dart: import + "Episode List Layout"CustomTileType of Changes
Testing Notes
Manually reviewed all changed files against the final state of the
feat/anime-list-stylebranch commits. Verified pattern consistency with surrounding code (carouselStyle, historyCardStyle) for the settings plumbing.Additional Context
The PR's
ui_adaptor.dart/ui_adaptor.g.dartHive changes were intentionally skipped —UISettingsno longer extendsHiveObjectin current main. All persistence now goes throughUISettingsKeys.Submission Checklist:
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
https://api.github.com/repos/Rieversed/AnymeX/contents/lib/screens/anime/widgets/episode_list_builder.dart/usr/bin/python3 python3 /tmp/fetch_pr_file.py(http block)If you need me to access, download, or install something from one of these locations, you can either:
Original prompt
This pull request was created from Copilot chat.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.