Skip to content

Update design with expressive theme - #30

Draft
pawcoding wants to merge 21 commits into
masterfrom
feat/expressive-theme
Draft

pawcoding wants to merge 21 commits into
masterfrom
feat/expressive-theme

Conversation

@pawcoding

@pawcoding pawcoding commented Sep 20, 2025 •

Copy link
Copy Markdown
Owner

Will be a draft until Material 3 Expressive is fully released (currently alpha)

@pawcoding pawcoding self-assigned this Sep 20, 2025
@pawcoding
pawcoding force-pushed the feat/expressive-theme branch from fa2f365 to 25b9f19 Compare September 20, 2025 15:28
Repository owner deleted a comment from pawcode-development-releaser Bot Sep 20, 2025
@pawcoding
pawcoding force-pushed the feat/expressive-theme branch from 25b9f19 to 1eed786 Compare September 20, 2025 16:37
@pawcoding
pawcoding changed the base branch from master to staging September 20, 2025 16:37
Base automatically changed from staging to master October 10, 2025 13:14
@pawcoding
pawcoding changed the base branch from master to staging November 22, 2025 19:17
Base automatically changed from staging to master December 12, 2025 10:37
@pawcoding
pawcoding changed the base branch from master to staging August 30, 2026 17:47
@pawcoding

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

@pawcoding

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

Copilot AI and others added 2 commits September 1, 2026 05:09
Co-authored-by: pawcoding <78467484+pawcoding@users.noreply.github.com>
Co-authored-by: pawcoding <78467484+pawcoding@users.noreply.github.com>

Copilot AI commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Merge conflicts have been resolved. Here's a summary of how each conflict was handled:

  • gradle/libs.versions.toml — adopted nav3, kotlin, kotlinSerialization, and lifecycle versions from staging; kept material3 = "1.5.0-alpha09" for the expressive theme
  • Navigation.kt — deleted (staging replaced the old navigation-compose system with a new nav3-based Navigator)
  • AddCardComponent.kt / CardComponent.kt — kept MaterialTheme.shapes.large (expressive theme shape tokens) over the hardcoded RoundedCornerShape(24.dp)
  • EditCardForm.kt — kept AnimatedVisibility for the check icon (expressive animation)
  • LabelsListComponent.kt — kept @OptIn(ExperimentalMaterial3ExpressiveApi::class) and added the FAVORITES_LABEL_ID sentinel constant from staging
  • CardListScreen.kt — kept both the Arrangement import (ours) and the Toast import (staging's)

Base automatically changed from staging to master September 22, 2026 18:16
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