fix: Use material theming for encryption feature screens#2925
Open
Elouan1411 wants to merge 2 commits into
Open
fix: Use material theming for encryption feature screens#2925Elouan1411 wants to merge 2 commits into
Elouan1411 wants to merge 2 commits into
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the encryption-related UI screens to rely on Material theme attributes (e.g. ?attr/colorPrimary, ?attr/colorPrimaryContainer) instead of hardcoded encryption color resources, by introducing an encryption-specific theme overlay and applying it to relevant layouts/components.
Changes:
- Introduces
EncryptionPrimaryColorThemeand applies it viaandroid:themeto encryption bottom sheets, the encryption password screen, and the message encryption alert. - Migrates encryption UI colors (alert background/text/icon + button tints) from
@color/...constants to Material color attributes. - Adds new encryption color role resources (
encryptionColorPrimary,encryptionPrimaryContainer, etc.) including night variants.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| app/src/main/res/values/styles.xml | Switches encryption styles to Material attributes and adds EncryptionPrimaryColorTheme. |
| app/src/main/res/values/colors.xml | Adds new encryption role colors for theming (colorPrimary, containers, on-colors). |
| app/src/main/res/values-night/colors.xml | Adds night equivalents for the new encryption role colors. |
| app/src/main/res/layout/item_message.xml | Applies the encryption theme overlay to the encryption alert view. |
| app/src/main/res/layout/fragment_encryption_password.xml | Applies encryption theme overlay and updates controls to use themed attributes. |
| app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml | Applies encryption theme overlay to the bottom sheet. |
| app/src/main/res/layout/bottom_sheet_encryption_discovery.xml | Applies encryption theme overlay to the bottom sheet root. |
| app/src/main/res/layout/bottom_sheet_encryption_actions.xml | Applies encryption theme overlay and updates icon tints to themed attributes. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Elouan1411
force-pushed
the
material-theming-encryption-screen
branch
from
a2b7354 to
9d4cc2f
Compare
Elouan1411
force-pushed
the
material-theming-encryption-screen
branch
from
9d4cc2f to
1405d4e
Compare
|
FabianDevel
requested changes
Jun 2, 2026
| android:layout_marginHorizontal="@dimen/marginStandardVerySmall" | ||
| android:text="@string/readMore" | ||
| android:textColor="@color/encryptionButtonColor" /> | ||
| android:textColor="@color/primary_color_disabled" /> |
Contributor
There was a problem hiding this comment.
THis doesn't work, the button is disabled but it keeps the same color
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.
No description provided.