Skip to content

Resolve merge conflicts: feat/anime-list-style (Episode List Layouts) into main#327

Closed
Copilot wants to merge 2 commits intomainfrom
copilot/resolve-merge-conflicts-anime-list
Closed

Resolve merge conflicts: feat/anime-list-style (Episode List Layouts) into main#327
Copilot wants to merge 2 commits intomainfrom
copilot/resolve-merge-conflicts-anime-list

Conversation

Copy link

Copilot AI commented Mar 1, 2026

Resolves all merge conflicts between feat/anime-list-style (PR #307) and current main, 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 UISettings away from Hive to a UISettingsKeys-based persistence model — making the PR's @HiveField/ui_adaptor.g.dart changes obsolete and inapplicable.

Summary of Changes

Storage/Settings layer

  • UISettingsKeys enum: add episodeListLayout
  • UISettings model: add int episodeListLayout field + fromDB() persistence via UISettingsKeys (replaces PR's @HiveField(24))
  • Settings controller: add getter/setter with .clamp(0, 2), following current uiSettings.update + UISettingsKeys.set pattern

Episode widget

  • EpisodeLayoutType: add blocks variant
  • BetterEpisode: add showTitleInBlockLayout param; build() uses switch expression; new _buildBlockLayout() (number-only or number+title variants); compact height 100→92

Player UI

  • EpisodesPane + PlayerBottomSheets: import settingsController, add _resolveEpisodeLayoutType(), pass showTitleInBlockLayout; fix number!.toInt()number.toInt()

Detail page episode list

  • EpisodeListBuilder: add settings field + _uiSettingsWorker for reactive rebuilds; layout-aware chunking (_buildBlockChunks, 50 eps/page for blocks vs. dynamic for others); responsive grid helpers (_getCrossAxisCount, _getMainAxisExtent, etc.); remove _initializedChunk
  • EpisodeChunkSelector: add showAllLabel param (suppressed in blocks layout)

Settings UI

  • New episode_layout_selector.dart: dialog with animated per-layout live preview
  • settings_ui.dart: import + "Episode List Layout" CustomTile

Type of Changes

  • Feature
  • Enhancement

Testing Notes

Manually reviewed all changed files against the final state of the feat/anime-list-style branch commits. Verified pattern consistency with surrounding code (carouselStyle, historyCardStyle) for the settings plumbing.

Manual review recommended on episode_list_builder.dart — the _updateChunkIndex logic now branches on layout type for chunk navigation; verify the blocks chunk index selection behaves as expected across edge cases (e.g., >50 episodes, progress at boundary).

Additional Context

The PR's ui_adaptor.dart / ui_adaptor.g.dart Hive changes were intentionally skipped — UISettings no longer extends HiveObject in current main. All persistence now goes through UISettingsKeys.

Submission Checklist:

  • I have read and followed the project's contributing guidelines
  • My code follows the code style of this project
  • I have tested the changes and ensured they do not break existing functionality
  • I have added or updated documentation as needed
  • I have linked related issues in the description above
  • I have tagged the appropriate reviewers for this pull request

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
    • Triggering command: /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

Resolve all merge conflicts between the 'feat/anime-list-style' branch and the latest 'main' branch. Ensure that the new episode list layouts feature and related changes are preserved, while incorporating any necessary updates from main. Do not merge this PR after creating it; let the project maintainers review and perform the final merge themselves. Add clear comments where any manual review is strongly recommended, especially if an automatic resolution could change core logic or UI.

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.

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
@itsmechinmoy
Copy link
Collaborator

@Rieversed how good is this??

@itsmechinmoy itsmechinmoy marked this pull request as ready for review March 2, 2026 06:59
@itsmechinmoy itsmechinmoy requested a review from RyanYuuki March 2, 2026 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants