Flavor support #21551

kowczarz · 2023-06-26T08:33:49Z

Co-authored with @mczernek & @staszekscp

Details

We wanted to enable developers and testers to install multiple app variant simultaneously on physical devices.

To enable it we used:

On android: 4 different flavors with 2 build types, but since some of them are unused we have disabled them and final variants are presented in a table below

flavor	release	debug
default	✅	✅
AdHoc	✅	❌
Dev	✅	✅
e2e	✅	❌

on iOS: we used buildSchemes corresponding to variants from android.

Fixed Issues

$ #16805

Tests

Verify that no errors appear in the JS console

Offline tests

Contributor+ test: Confirm the Android and iOS apps can be installed side by side

Install the production app from the Play Store or App Store
Pull the branch
Attempt to build the local build app as you normally would
The dev app should side by side with no errors
The dev app should contain a unique logo
In the Settings > About page, the PR number and 'flavour' should be shown

Internal tests: Confirm the Android and iOS apps can be installed side by side

Install the production app from the Play Store or App Store
Install the AdHoc build
Install the local dev build
All apps should be installed side-by-side

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

# Conflicts: # ios/Podfile.lock # package.json

# Conflicts: # src/components/SplashScreenHider/index.native.js

android/app/build.gradle

android/app/src/main/res/values/styles.xml

Julesssss

Looking good, I'll compile some builds for WIP testing.

This icon (assets/images/new-expensify-adhoc.svg) seems to have been converted from light to dark, is that expected?

allroundexperts · 2023-08-09T15:27:20Z

Sure.

allroundexperts · 2023-08-09T15:32:02Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

Screen.Recording.2023-08-09.at.9.10.36.PM.mov

Julesssss

Unfortunately, the latest commit didn't fix the Ad Hoc build showing the dev logo. This is the last blocker though!

N/A

OSBotify · 2023-08-11T13:59:00Z

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/21551/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/21551/index.html

desktop 💻	web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/21551/NewExpensify.dmg	https://21551.pr-testing.expensify.com

Julesssss

Final logo issue was resolved 👍

Julesssss · 2023-08-11T14:12:51Z

Okay lets merge! Now is a good time as we likely won't deploy today and I have time to update the icons. I'll continue to work on the additional tasks in the meantime.

OSBotify · 2023-08-11T14:17:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

situchan

Is it intentional to add main.jsbundle.map file to git?

Julesssss · 2023-08-14T15:08:11Z

Nope, thanks. I'll clean it up.

Julesssss · 2023-08-14T15:12:59Z

Follow up to untrack jsbundle file: #24540

OSBotify · 2023-08-14T20:04:40Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.54-0 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2023-08-14T21:04:56Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.54-0 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

Julesssss · 2023-08-15T14:27:31Z

android/app/build.gradle

@@ -111,20 +136,17 @@ android {
            signingConfig signingConfigs.debug
        }
        release {
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
+            productFlavors.production.signingConfig signingConfigs.release


Hey @kowczarz, do you recall why line 140 is necessary? Is this doing something that the following code would not?

signingConfig signingConfigs.release

mvtglobally · 2023-08-15T18:38:15Z

@Julesssss are we good to check this off?

Julesssss · 2023-08-15T20:24:49Z

Yep! Sorry I should have marked NO QA

OSBotify · 2023-08-17T02:55:32Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.54-13 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

WoLewicki · 2023-08-21T15:28:52Z

Hey, coming from the new arch intergration PR (#13767), we need to get some changes in order for the app to build and work correctly. All of them should be contained in this commit: 3b6a387. cc @kowczarz and @Julesssss for visibility.

They are needed since, for some reason, on new arch, the spaces in the scheme names are not accepted by one of the scripts. Also, there was a minor issue with Android build.

Julesssss · 2023-08-29T09:19:18Z

Hi @WoLewicki, I just got back from holiday. Could you please raise a PR for that? Kamil mentioned something similar to me and I created an issue here if that helps.

mananjadhav · 2023-09-07T19:11:23Z

We changed our dev logo in this PR assets/images/new-expensify-dev.svg, which caused a regression here (Dev logo is grayed out). I couldn't comment on the file change, hence I am commenting here.

staszekscp and others added 26 commits April 11, 2023 15:54

add flavors

7bcbb8b

support flavors on android

b84fefe

fix name

c2189e4

improve android splashscreen

991ed02

fix android script in package.json

f9f7a9a

fix last lines

6e6c1ff

fix fastfile

6274443

Merge branch 'main' into flavor-support

fc4f72a

add basic scheme support for ios

4c4ae64

add icon to schemes

d5e9a41

fix package.json

a2bd8a0

add .env detection

70545fe

Merge branch 'main' into flavor-support

2d23f8a

Merge branch 'main' into flavor-support

3aa64ff

merge

13f8dd5

Merge branch 'main' into flavor-support

e0449f9

Remove unnecesary buildTypes and flavors, add e2e flavor.

f4f3113

Remove Staging from iOS.

71dbe1e

Remove staging from some leftovers.

3e3b345

Fix Fastlane according to new flavors/buildTypes configuration.

e353839

Merge remote-tracking branch 'expensify/main' into flavor-support

aa383d6

# Conflicts: # ios/Podfile.lock # package.json

Add icons based on flavour to splash screen

047adac

Disable unused android build variants

097adf4

Fix splash screen icon based on app flavour

ca982f1

Merge remote-tracking branch 'expensify/main' into flavor-support

26470c2

# Conflicts: # src/components/SplashScreenHider/index.native.js

Update env configuration

4c0b60f

Julesssss assigned kowczarz Jun 26, 2023

Julesssss reviewed Jun 26, 2023

View reviewed changes

android/app/build.gradle Outdated Show resolved Hide resolved

Julesssss reviewed Jun 26, 2023

View reviewed changes

android/app/src/main/res/values/styles.xml Outdated Show resolved Hide resolved

Julesssss reviewed Jun 26, 2023

View reviewed changes

allroundexperts approved these changes Aug 9, 2023

View reviewed changes

Fix logo issue

d6ccac1

kowczarz force-pushed the flavor-support branch from 5e0156b to d6ccac1 Compare August 10, 2023 12:41

Julesssss previously requested changes Aug 10, 2023

View reviewed changes

kowczarz added 2 commits August 11, 2023 14:59

Update missing setup in build.gradle

69923ac

Typo

ffc1db5

kowczarz force-pushed the flavor-support branch from 4ac4219 to ffc1db5 Compare August 11, 2023 13:27

Expensify deleted a comment from OSBotify Aug 11, 2023

Julesssss approved these changes Aug 11, 2023

View reviewed changes

Julesssss merged commit 2b3fa65 into Expensify:main Aug 11, 2023
21 checks passed

situchan reviewed Aug 13, 2023

View reviewed changes

OSBotify mentioned this pull request Aug 14, 2023

Deploy Checklist: New Expensify 2023-08-14 #24550

Closed

49 tasks

Julesssss reviewed Aug 15, 2023

View reviewed changes

sakluger mentioned this pull request Aug 23, 2023

[HOLD for payment 2023-09-06] [$500] Dev : Splash logo is grayed out #25617

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Flavor support #21551

Flavor support #21551

kowczarz commented Jun 26, 2023 •

edited by Julesssss

Loading

Julesssss left a comment •

edited

Loading

allroundexperts commented Aug 9, 2023

allroundexperts commented Aug 9, 2023 •

edited

Loading

Julesssss left a comment

OSBotify commented Aug 11, 2023

Julesssss left a comment

Julesssss commented Aug 11, 2023

OSBotify commented Aug 11, 2023

situchan left a comment

Julesssss commented Aug 14, 2023

Julesssss commented Aug 14, 2023

OSBotify commented Aug 14, 2023

OSBotify commented Aug 14, 2023

Julesssss Aug 15, 2023

mvtglobally commented Aug 15, 2023

Julesssss commented Aug 15, 2023

OSBotify commented Aug 17, 2023

WoLewicki commented Aug 21, 2023

Julesssss commented Aug 29, 2023

mananjadhav commented Sep 7, 2023

Flavor support #21551

Flavor support #21551

Conversation

kowczarz commented Jun 26, 2023 • edited by Julesssss Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Julesssss left a comment • edited Loading

Choose a reason for hiding this comment

allroundexperts commented Aug 9, 2023

allroundexperts commented Aug 9, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Julesssss left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 11, 2023

Julesssss left a comment

Choose a reason for hiding this comment

Julesssss commented Aug 11, 2023

OSBotify commented Aug 11, 2023

situchan left a comment

Choose a reason for hiding this comment

Julesssss commented Aug 14, 2023

Julesssss commented Aug 14, 2023

OSBotify commented Aug 14, 2023

OSBotify commented Aug 14, 2023

Julesssss Aug 15, 2023

Choose a reason for hiding this comment

mvtglobally commented Aug 15, 2023

Julesssss commented Aug 15, 2023

OSBotify commented Aug 17, 2023

WoLewicki commented Aug 21, 2023

Julesssss commented Aug 29, 2023

mananjadhav commented Sep 7, 2023

kowczarz commented Jun 26, 2023 •

edited by Julesssss

Loading

Julesssss left a comment •

edited

Loading

allroundexperts commented Aug 9, 2023 •

edited

Loading