Skip to content
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.

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

Prepare application for being configurable #4285

Merged
merged 7 commits into from
Feb 21, 2025
Merged

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Feb 20, 2025

Content

Move all fields used at build time to a single place.
Prepare the app to be able to customize the default homeserver URL.

There should be no impact on the current EXA application.

Motivation and context

Preparatory work for Element Enterprise.

Screenshots / GIFs

Tests

  • ensure the application work as before.

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

@bmarty bmarty requested a review from a team as a code owner February 20, 2025 17:43
@bmarty bmarty requested review from jmartinesp and removed request for a team February 20, 2025 17:43
@bmarty bmarty added the PR-Build For changes related to build, tools, CI/CD label Feb 20, 2025
Copy link
Contributor

github-actions bot commented Feb 20, 2025

📱 Scan the QR code below to install the build (arm64 only) for this PR.
QR code
If you can't scan the QR code you can install the build via this link: https://i.diawi.com/BYKdZA

Copy link

codecov bot commented Feb 20, 2025

Codecov Report

Attention: Patch coverage is 40.00000% with 21 lines in your changes missing coverage. Please review.

Project coverage is 80.12%. Comparing base (d92d85f) to head (03e05ff).
Report is 12 commits behind head on develop.

Files with missing lines Patch % Lines
...c/main/kotlin/io/element/android/x/di/AppModule.kt 0.00% 16 Missing ⚠️
.../features/enterprise/test/FakeEnterpriseService.kt 60.00% 4 Missing ⚠️
.../impl/accountprovider/AccountProviderDataSource.kt 87.50% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #4285      +/-   ##
===========================================
- Coverage    80.13%   80.12%   -0.01%     
===========================================
  Files         2052     2052              
  Lines        54576    54590      +14     
  Branches      6672     6675       +3     
===========================================
+ Hits         43733    43742       +9     
- Misses        8560     8564       +4     
- Partials      2283     2284       +1     

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

Copy link
Member

@jmartinesp jmartinesp left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
)
): BuildMeta {
val applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should have different variants for desktop and production app names for the enterprise case too?

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe. We will update the code if this is a new requirement. FTR iOS did the same here: https://github.com/element-hq/element-enterprise/blob/d9c2d058d901872d3a0e8ea55e5f3ff806836c37/Templates/iOS/XcodeGen.pkl#L10-L11

@bmarty bmarty enabled auto-merge February 21, 2025 15:36
Copy link
Member

@jmartinesp jmartinesp left a comment

Choose a reason for hiding this comment

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

Thanks for the update, I missed the Anvil issue.

@bmarty bmarty merged commit b35feb0 into develop Feb 21, 2025
26 checks passed
@bmarty bmarty deleted the feature/bma/appConfig branch February 21, 2025 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Build For changes related to build, tools, CI/CD
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants