Theme override #4226

bmarty · 2025-01-31T17:49:25Z

Content

Give ability to override theme color at build time.
Get color from ElementTheme instead of MaterialTheme when possible.

Motivation and context

Allow Element Enterprise customization.

Screenshots / GIFs

Tests

Should not impact the EXA application, only minor changes on the colors.

Tested devices

Physical
Emulator
OS version(s):

Checklist

Changes have been tested on an Android device or Android emulator with API 24
UI change has been tested on both light and dark themes
Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
Pull request is based on the develop branch
Pull request title will be used in the release note, it clearly define what will change for the user
Pull request includes screenshots or videos if containing UI changes
You've made a self review of your PR

github-actions · 2025-01-31T17:56:32Z

📱 Scan the QR code below to install the build (arm64 only) for this PR.

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/ByJuR1

jmartinesp

The PR looks good in general, but I'm a bit worried about the changes in tokens and how they affected the preview. Can we double check those are fine?

jmartinesp · 2025-02-03T08:46:02Z

tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png

Haven't these been reversed?

Yes, but we were using colors not from the theme... We need a design source for this anyway.
@amshakal can you help please? We need colors for this banner:

Thanks!

@jmartinesp , Amsha will provide some design for this banner, but I do not think this should block this PR. Coming design will be handle in a specific PR. This PR just ensure that we are at least using semantic colors for this banner. Do you agree? If yes, I guess we can merge the PR except if you have other remarks?

I'd rather not change this color to change it back later, but I don't think it should be blocking either, so it's ok to keep the change. I'll review the PR again.

jmartinesp · 2025-02-03T08:50:54Z

...s/images/libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en.png

I'm a bit worried these items now look less like they're in a disabled state, but I guess they are using the right tokens now?

Yes, I think so

codecov · 2025-02-03T08:58:44Z

Codecov Report

Attention: Patch coverage is 81.11111% with 34 lines in your changes missing coverage. Please review.

Project coverage is 80.19%. Comparing base (ce1c01e) to head (108b849).
Report is 15 commits behind head on develop.

Files with missing lines	Patch %	Lines
...c/main/kotlin/io/element/android/x/MainActivity.kt	0.00%	6 Missing ⚠️
...roid/features/call/impl/ui/IncomingCallActivity.kt	0.00%	6 Missing ⚠️
...droid/features/call/impl/ui/ElementCallActivity.kt	0.00%	5 Missing ⚠️
...ckscreen/impl/unlock/activity/PinUnlockActivity.kt	0.00%	5 Missing ⚠️
...id/libraries/designsystem/theme/ElementThemeApp.kt	0.00%	4 Missing ⚠️
...droid/libraries/designsystem/theme/ColorAliases.kt	0.00%	3 Missing ⚠️
...atures/enterprise/impl/DefaultEnterpriseService.kt	0.00%	2 Missing ⚠️
...ent/android/features/messages/impl/MessagesView.kt	92.85%	1 Missing ⚠️
...oid/libraries/matrix/ui/components/SelectedRoom.kt	87.50%	0 Missing and 1 partial ⚠️
...ies/mediaviewer/impl/local/audio/MediaAudioView.kt	80.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #4226      +/-   ##
===========================================
- Coverage    80.23%   80.19%   -0.04%     
===========================================
  Files         2045     2045              
  Lines        54184    54204      +20     
  Branches      6580     6581       +1     
===========================================
- Hits         43473    43471       -2     
- Misses        8434     8456      +22     
  Partials      2277     2277

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bmarty · 2025-02-06T09:01:33Z

...ures/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.Center
    ) {
        Text(
            text = stringResource(id = R.string.screen_room_timeline_no_permission_to_post),
-            color = MaterialTheme.colorScheme.onSecondary,
+            color = ElementTheme.colors.textSecondary,


Using Semantic colors for this banner, waiting for design input that can be handled later.

jmartinesp

I added question and a possible issues with a template. Once the latter is fixed, it should be fine to merged this, thanks!

jmartinesp · 2025-02-06T09:45:21Z

features/enterprise/impl/build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
    api(projects.features.enterprise.api)
    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
+    api(libs.compound)


Are these api needed (here and in the api module)? Couldn't they just be implementation since the designsystem module will already provide the compound dependency?

You're right: b7dc2e3

jmartinesp · 2025-02-06T09:54:09Z

tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.2.kt

@@ -19,7 +19,7 @@ fun ${NAME}View(
    Box(modifier, contentAlignment = Alignment.Center) {
        Text(
            "${NAME} feature view",
-            color = MaterialTheme.colorScheme.primary,
+            color = ElementTheme.colors.textprimary,


This may be a typo. textPrimary with capital P?

Good spot, thanks! 9411cad

sonarqubecloud · 2025-02-06T14:44:21Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

bmarty requested a review from a team as a code owner January 31, 2025 17:49

bmarty requested review from jmartinesp and removed request for a team January 31, 2025 17:49

bmarty added the PR-Misc For other changes label Jan 31, 2025

jmartinesp reviewed Feb 3, 2025

View reviewed changes

bmarty commented Feb 6, 2025

View reviewed changes

jmartinesp approved these changes Feb 6, 2025

View reviewed changes

bmarty and others added 9 commits February 6, 2025 15:10

Add ability to EnterpriseService to override theme colors

1654f56

Color aliases now use ElementTheme

4f5155c

Use ElementTheme instead of MaterialTheme

07d4778

Update screenshots

84908ba

move enterprise module ref

0d5912e

Use color from ElementTheme.

cc7fd55

Fix Text button color.

d173d67

No need to expose libs.compound here.

b7dc2e3

Fix typo.

9411cad

bmarty force-pushed the feature/bma/themeOverride branch from 823485b to 9411cad Compare February 6, 2025 14:12

Update ref to enterprise

108b849

bmarty merged commit 5456f0e into develop Feb 6, 2025
28 checks passed

bmarty deleted the feature/bma/themeOverride branch February 6, 2025 15:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Theme override #4226

Theme override #4226

bmarty commented Jan 31, 2025

github-actions bot commented Jan 31, 2025 •

edited

Loading

jmartinesp left a comment

jmartinesp Feb 3, 2025

bmarty Feb 3, 2025

bmarty Feb 6, 2025

jmartinesp Feb 6, 2025

jmartinesp Feb 3, 2025

bmarty Feb 4, 2025

codecov bot commented Feb 3, 2025 •

edited

Loading

bmarty Feb 6, 2025

jmartinesp left a comment

jmartinesp Feb 6, 2025

bmarty Feb 6, 2025

jmartinesp Feb 6, 2025

bmarty Feb 6, 2025 •

edited

Loading

sonarqubecloud bot commented Feb 6, 2025

Theme override #4226

Theme override #4226

Conversation

bmarty commented Jan 31, 2025

Content

Motivation and context

Screenshots / GIFs

Tests

Tested devices

Checklist

github-actions bot commented Jan 31, 2025 • edited Loading

jmartinesp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Feb 3, 2025 • edited Loading

Codecov Report

Choose a reason for hiding this comment

jmartinesp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmarty Feb 6, 2025 • edited Loading

Choose a reason for hiding this comment

sonarqubecloud bot commented Feb 6, 2025

Quality Gate passed

github-actions bot commented Jan 31, 2025 •

edited

Loading

codecov bot commented Feb 3, 2025 •

edited

Loading

bmarty Feb 6, 2025 •

edited

Loading