Skip to content

fix: Use material theming for encryption feature screens #2925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elouan1411 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Use material theming for encryption feature screens #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9143db4
feat: Create theme
Elouan1411 Jun 1, 2026
1405d4e
feat: Apply theme and default colors
Elouan1411 Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/res/layout/bottom_sheet_encryption_actions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/EncryptionPrimaryColorTheme"
tools:context=".ui.newMessage.encryption.EncryptionActionsBottomSheet">

<TextView
Expand All @@ -32,7 +33,7 @@
android:paddingVertical="@dimen/marginStandardSmall"
android:text="@string/encryptedStatePanelTitle"
app:drawableStartCompat="@drawable/ic_shield_lock"
app:drawableTint="@color/encryptionIconColor" />
app:drawableTint="?attr/colorPrimary" />

<TextView
android:id="@+id/encryptionStatusDescription"
Expand All @@ -48,7 +49,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_lock_password_field"
app:iconColor="@color/encryptionIconColor"
app:iconColor="?attr/colorPrimary"
app:title="@string/encryptedMessageAddPasswordButton"
app:visibleDivider="false" />

Expand All @@ -57,7 +58,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_lock_open"
app:iconColor="@color/encryptionIconColor"
app:iconColor="?attr/colorPrimary"
app:title="@string/encryptedMessageDisableEncryptionButton" />

</com.infomaniak.mail.views.BottomSheetScaffoldingView>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/bottom_sheet_encryption_discovery.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
-->
<com.infomaniak.mail.views.BottomSheetScaffoldingView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:theme="@style/EncryptionPrimaryColorTheme">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/bottom_sheet_unencryptable_recipients.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/EncryptionPrimaryColorTheme"
app:useDefaultLayout="false"
tools:context=".ui.main.thread.calendar.AttendeesBottomSheetDialog"
tools:title="@string/encryptedRecipientRequiringPasswordTitle">
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/res/layout/fragment_encryption_password.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
android:theme="@style/EncryptionPrimaryColorTheme">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
Expand Down Expand Up @@ -64,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/marginStandardVerySmall"
android:text="@string/readMore"
android:textColor="@color/encryptionButtonColor" />
android:textColor="@color/primary_color_disabled" />
Copy link
Copy Markdown
Contributor

@FabianDevel FabianDevel Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THis doesn't work, the button is disabled but it keeps the same color


<TextView
style="@style/BodyMedium"
Expand Down Expand Up @@ -118,13 +119,13 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/marginStandardSmall"
android:hint="@string/attachMailboxPasswordInputHint"
app:boxStrokeColor="@color/encryptionButtonColor"
app:cursorColor="@color/encryptionButtonColor"
app:boxStrokeColor="?attr/colorPrimary"
app:cursorColor="?attr/colorPrimary"
app:endIconContentDescription="@string/encryptedMessageGeneratePasswordContentDescription"
app:endIconDrawable="@drawable/ic_text_field_arrows_counter_clockwise"
app:endIconMode="custom"
app:hintTextColor="@color/encryptionButtonColor"
app:placeholderTextColor="@color/encryptionButtonColor">
app:hintTextColor="?attr/colorPrimary"
app:placeholderTextColor="?attr/colorPrimary">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordInput"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/item_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@
android:id="@+id/encryptionAlert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/EncryptionPrimaryColorTheme"
android:visibility="gone"
app:icon="@drawable/ic_lock_filled_big"
app:style="encryption"
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@
<color name="encryptionOnButtonColor">@color/sovereignBlue950</color>
<color name="encryptionTextButtonColor">@color/sovereignBlue200</color>

<color name="encryptionColorPrimary">@color/sovereignBlue300</color>
<color name="encryptionOnColorPrimary">@color/sovereignBlue950</color>
<color name="encryptionPrimaryContainer">@color/sovereignBlue900</color>
<color name="encryptionOnPrimaryContainer">@color/sovereignBlue200</color>

<!-- Thread -->
<color name="folderTagTextColor">@color/shark</color>
<color name="folderTagBackground">@color/orca</color>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@
<color name="encryptionTextButtonColor">@color/sovereignBlue600</color>
<color name="encryptionSnackbarActionColor">@color/sovereignBlue300</color>

<color name="encryptionColorPrimary">@color/sovereignBlue600</color>
<color name="encryptionOnColorPrimary">@color/white</color>
<color name="encryptionPrimaryContainer">@color/sovereignBlue100</color>
<color name="encryptionOnPrimaryContainer">@color/sovereignBlue900</color>

<color name="partialEncryptionTagColor">@color/favoriteYellow</color>
<color name="validEncryptionTagColor">@color/greenSuccess</color>
<color name="onEncryptionTagColor">@color/orca</color>
Expand Down
25 changes: 17 additions & 8 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
</style>

<style name="TextButtonEncryptionAlert" parent="TextButtonAlerts">
<item name="android:textColor">@color/encryptionTextButtonColor</item>
<item name="android:textColor">?attr/colorPrimary</item>
</style>
Comment thread
Elouan1411 marked this conversation as resolved.

<style name="IconButtonSmall" parent="Widget.Material3.Button.TextButton">
Expand Down Expand Up @@ -567,16 +567,25 @@
<!-- Encryption -->

<style name="EncryptionMessageAlertView" parent="BasicMessageAlertView">
<item name="android:background">@color/encryptionBackgroundColor</item>
<item name="android:textColor">@color/encryptionTextColor</item>
<item name="tint">@color/encryptionIconColor</item>
<item name="materialButtonStyle">@style/TextButtonEncryptionAlert</item>
<item name="android:background">?attr/colorPrimaryContainer</item>
<item name="android:textColor">?attr/colorOnPrimaryContainer</item>
<item name="tint">?attr/colorPrimary</item>
</style>
Comment thread
Elouan1411 marked this conversation as resolved.

<style name="TextButtonPrimary.EncryptionButton">
<item name="iconTint">@color/encryption_on_primary_color</item>
<item name="android:textColor">@color/encryption_on_primary_color</item>
<item name="backgroundTint">@color/encryption_primary_color</item>
<item name="iconTint">?attr/colorOnPrimary</item>
<item name="android:textColor">?attr/colorOnPrimary</item>
<item name="backgroundTint">?attr/colorPrimary</item>
<item name="materialButtonStyle">@style/TextButtonEncryptionAlert</item>
</style>

<style name="EncryptionPrimaryColorTheme">
<item name="colorControlActivated">@color/encryptionColorPrimary</item>
<item name="colorOnPrimary">@color/encryptionOnColorPrimary</item>
<item name="colorPrimary">@color/encryptionColorPrimary</item>
<item name="colorPrimaryContainer">@color/encryptionPrimaryContainer</item>
<item name="colorOnPrimaryContainer">@color/encryptionOnPrimaryContainer</item>
<item name="colorControlNormal">@color/encryptionOnPrimaryContainer</item>
</style>

<!-- Other -->
Expand Down
Loading