Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into @radoslawkrzemien/136…
Browse files Browse the repository at this point in the history
…04-local-testing-of-github-actions

# Conflicts:
#	.github/workflows/platformDeploy.yml
#	.github/workflows/verifyPodfile.yml
  • Loading branch information
radoslawkrzemien committed Aug 30, 2023
2 parents ffcd370 + 6e17b64 commit 26bb430
Show file tree
Hide file tree
Showing 631 changed files with 19,576 additions and 14,125 deletions.
4 changes: 0 additions & 4 deletions .github/actions/composite/buildAndroidAPK/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ runs:
steps:
- uses: Expensify/App/.github/actions/composite/setupNode@main

- name: Setup credentails for Mapbox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
shell: bash

- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
with:
ruby-version: '2.7'
Expand Down
25 changes: 25 additions & 0 deletions .github/actions/composite/setupNode/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@ runs:
path: desktop/node_modules
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}

- name: Check if patch files changed
id: patchCheck
shell: bash
run: |
set -e
if [[ `git diff main --name-only | grep \.patch` != null ]]; then
echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
else
echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
fi
- name: Patch root project node packages
shell: bash
if: |
steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' &&
steps.cache-node-modules.outputs.cache-hit == 'true'
run: npx patch-package

- name: Patch node packages for desktop submodule
shell: bash
if: |
steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' &&
steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
run: cd desktop && npx patch-package

- name: Install root project node packages
if: steps.cache-node-modules.outputs.cache-hit != 'true'
uses: nick-fields/retry@v2
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ The GitHub workflows require a large list of secrets to deploy, notify and test
1. `APPLE_DEMO_PASSWORD` - Demo account password used for https://appstoreconnect.apple.com/
1. `BROWSERSTACK` - Used to access Browserstack's API

### Important note about Secrets
Secrets are available by default in most workflows. The exception to the rule is callable workflows. If a workflow is triggered by the `workflow_call` event, it will only have access to repo secrets if the workflow that called it passed in the secrets explicitly (for example, using `secrets: inherit`).

Furthermore, secrets are not accessible in actions. If you need to access a secret in an action, you must declare it as an input and pass it in. GitHub _should_ still obfuscate the value of the secret in workflow run logs.

## Actions

All these _workflows_ are comprised of atomic _actions_. Most of the time, we can use pre-made and independently maintained actions to create powerful workflows that meet our needs. However, when we want to do something very specific or have a more complex or robust action in mind, we can create our own _actions_.
Expand Down Expand Up @@ -144,4 +149,4 @@ In order to bundle actions with their dependencies into a single Node.js executa
Do not try to use a relative path.
- Confusingly, paths in action metadata files (`action.yml`) _must_ use relative paths.
- You can't use any dynamic values or environment variables in a `uses` statement
- In general, it is a best practice to minimize any side-effects of each action. Using atomic ("dumb") actions that have a clear and simple purpose will promote reuse and make it easier to understand the workflows that use them.
- In general, it is a best practice to minimize any side-effects of each action. Using atomic ("dumb") actions that have a clear and simple purpose will promote reuse and make it easier to understand the workflows that use them.
6 changes: 5 additions & 1 deletion .github/workflows/deployExpensifyHelp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,27 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8

- name: Setup NodeJS
uses: Expensify/App/.github/actions/composite/setupNode@main

- name: Setup Pages
uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382

- name: Create docs routes file
run: ./.github/scripts/createDocsRoutes.sh

- name: Build with Jekyll
uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e
with:
source: ./docs/
destination: ./docs/_site

- name: Upload artifact
uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187
with:
path: ./docs/_site


# Deployment job
deploy:
environment:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/e2ePerformanceTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:
git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1
git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }}
- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Build APK
if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main
Expand Down Expand Up @@ -112,6 +115,9 @@ jobs:
- name: Checkout "delta ref"
run: git checkout ${{ steps.getDeltaRef.outputs.DELTA_REF }}

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Build APK
uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/platformDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Setup Node
uses: Expensify/App/.github/actions/composite/setupNode@main

Expand Down Expand Up @@ -151,6 +154,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Setup Node
uses: Expensify/App/.github/actions/composite/setupNode@main

Expand All @@ -160,9 +166,6 @@ jobs:
ruby-version: '2.7'
bundler-cache: true

- name: Setup credentails for Mapbox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Install cocoapods
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
with:
Expand Down Expand Up @@ -255,9 +258,6 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

- name: Setup credentails for Mapbox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Build web for production
if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
run: npm run build
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ jobs:
name: Storybook tests
steps:
- uses: actions/checkout@v3

- uses: Expensify/App/.github/actions/composite/setupNode@main

- name: Storybook run
run: npm run storybook -- --smoke-test --ci

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/testBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

- name: Setup credentails for Mapbox SDK
- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Run Fastlane beta test
Expand Down Expand Up @@ -141,6 +141,9 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}

- name: Configure MapBox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
run: |
cp .env.staging .env.adhoc
Expand All @@ -159,9 +162,6 @@ jobs:
ruby-version: '2.7'
bundler-cache: true

- name: Setup credentails for Mapbox SDK
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

- name: Install cocoapods
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
with:
Expand Down
10 changes: 9 additions & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,23 @@ import ComposeProviders from '../src/components/ComposeProviders';
import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
import OnyxProvider from '../src/components/OnyxProvider';
import {LocaleContextProvider} from '../src/components/withLocalize';
import {KeyboardStateProvider} from '../src/components/withKeyboardState';
import {EnvironmentProvider} from '../src/components/withEnvironment';
import {WindowDimensionsProvider} from '../src/components/withWindowDimensions';
import ONYXKEYS from '../src/ONYXKEYS';

Onyx.init({
keys: ONYXKEYS,
initialKeyStates: {
[ONYXKEYS.NETWORK]: {isOffline: false},
},
});

const decorators = [
(Story) => (
<ComposeProviders components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider]}>
<ComposeProviders
components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider, EnvironmentProvider, KeyboardStateProvider, WindowDimensionsProvider]}
>
<Story />
</ComposeProviders>
),
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ react {
// The list of variants to that are debuggable. For those we're going to
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
// debuggableVariants = ["liteDebug", "prodDebug"]
debuggableVariants = ["developmentDebug"]

/* Bundling */
// A list containing the node command and its flags. Default is just 'node'.
Expand Down Expand Up @@ -90,8 +90,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001035507
versionName "1.3.55-7"
versionCode 1001035900
versionName "1.3.59-0"
}

flavorDimensions "default"
Expand Down
37 changes: 37 additions & 0 deletions android/app/src/adhoc/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="121"
android:viewportHeight="122">
<group android:scaleX="0.55155283"
android:scaleY="0.5561111"
android:translateX="27.131054"
android:translateY="27.077223">
<group>
<clip-path
android:pathData="M121,0H0V121.48H121V0Z"/>
<group>
<clip-path
android:pathData="M121,0H0V121.48H121V0Z"/>
<path
android:pathData="M81.83,42.82V30.22H39.17V91.41H81.83V78.81H54.9V67.12H76.68V54.21H54.9V43.13H81.83V42.82Z"
android:fillColor="#002E22"/>
<path
android:pathData="M60.5,9.87C71.24,9.87 81.22,13.21 89.54,18.98C91.66,20.5 94.53,20.35 96.35,18.53C98.31,16.55 98.31,13.21 95.89,11.39C85.91,4.25 73.66,0 60.5,0C27.07,0 0,27.18 0,60.74C0,73.95 4.24,86.25 11.34,96.12C13.01,98.4 16.33,98.55 18.45,96.58C20.27,94.76 20.42,91.87 18.91,89.74C13.16,81.54 9.83,71.52 9.83,60.59C9.83,32.65 32.52,9.87 60.5,9.87Z"
android:fillColor="#002E22"/>
<path
android:pathData="M110.41,26.42C108.75,23.99 105.27,23.84 103.3,25.97C101.49,27.79 101.34,30.52 102.7,32.65C107.99,40.7 111.17,50.41 111.17,60.74C111.17,71.07 107.99,81.09 102.4,89.29C101.04,91.41 101.04,94.3 102.85,96.12C104.97,98.25 108.29,98.1 109.96,95.67C116.92,85.8 121,73.8 121,60.74C121,47.83 117.07,36.14 110.41,26.42Z"
android:fillColor="#002E22"/>
<path
android:pathData="M60.5,111.61C50.21,111.61 40.53,108.42 32.52,103.11C30.4,101.74 27.53,101.89 25.86,103.71C23.75,105.84 23.9,109.18 26.32,110.85C36,117.53 47.79,121.48 60.5,121.48C73.2,121.48 85.3,117.38 95.29,110.4C97.71,108.73 97.86,105.39 95.74,103.26C93.93,101.44 91.05,101.29 88.93,102.8C80.92,108.27 71.09,111.61 60.5,111.61Z"
android:fillColor="#002E22"/>
</group>
<path
android:pathData="M73.73,77.11H91.88C100.19,77.11 107,83.94 107,92.3C107,100.65 100.19,107.48 91.88,107.48H73.73C65.41,107.48 58.6,100.65 58.6,92.3C58.6,83.94 65.41,77.11 73.73,77.11Z"
android:fillColor="#CF4CD9"/>
<path
android:pathData="M71.15,96.09L68.58,89.11H67.22L64.65,96.09H66.01L66.62,94.57H69.19L69.79,96.09H71.15ZM67.83,90.78L68.73,93.21H67.07L67.83,90.78ZM74.18,96.09C76.3,96.09 77.81,94.73 77.81,92.6C77.81,90.47 76.45,89.11 74.18,89.11H71.91V96.09H74.18ZM73.12,90.47H74.18C75.54,90.47 76.45,91.23 76.45,92.6C76.45,93.97 75.54,94.73 74.18,94.73H73.12V90.47ZM80.23,96.09V93.21H83.1V96.09H84.46V89.11H83.1V91.84H80.23V89.11H78.87V96.09H80.23ZM89.15,96.24C91.12,96.24 92.48,94.73 92.48,92.6C92.48,90.47 91.12,89.11 89.15,89.11C87.19,89.11 85.82,90.63 85.82,92.6C85.82,94.73 87.03,96.24 89.15,96.24ZM89.15,95.03C87.94,95.03 87.19,94.12 87.19,92.75C87.19,91.39 87.94,90.47 89.15,90.47C90.36,90.47 91.12,91.39 91.12,92.75C91.12,94.12 90.36,95.03 89.15,95.03ZM96.56,96.24C98.23,96.24 99.44,95.18 99.74,93.66H98.38C98.08,94.57 97.47,95.03 96.71,95.03C95.5,95.03 94.75,94.12 94.75,92.75C94.75,91.39 95.5,90.47 96.71,90.47C97.62,90.47 98.23,90.93 98.38,91.84H99.74C99.44,90.32 98.23,89.26 96.56,89.26C94.6,89.26 93.24,90.78 93.24,92.75C93.24,94.73 94.6,96.24 96.56,96.24Z"
android:fillColor="#ffffff"/>
</group>
</group>
</vector>
4 changes: 2 additions & 2 deletions android/app/src/adhoc/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified android/app/src/adhoc/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/adhoc/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions android/app/src/adhoc/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#3DDC84</color>
</resources>
<color name="ic_launcher_background">#03D47C</color>
</resources>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="121"
android:viewportHeight="122">
<group android:scaleX="0.55155283"
android:scaleY="0.5561111"
android:translateX="27.131054"
android:translateY="27.077223">
<group>
<clip-path
android:pathData="M121,0H0V121.48H121V0Z"/>
<group>
<clip-path
android:pathData="M121,0H0V121.48H121V0Z"/>
<path
android:pathData="M81.83,42.82V30.22H39.17V91.41H81.83V78.81H54.9V67.12H76.68V54.21H54.9V43.13H81.83V42.82Z"
android:fillColor="#002E22"/>
<path
android:pathData="M60.5,9.87C71.24,9.87 81.22,13.21 89.54,18.98C91.66,20.5 94.53,20.35 96.35,18.53C98.31,16.55 98.31,13.21 95.89,11.39C85.91,4.25 73.66,0 60.5,0C27.07,0 0,27.18 0,60.74C0,73.95 4.24,86.25 11.34,96.12C13.01,98.4 16.33,98.55 18.45,96.58C20.27,94.76 20.42,91.87 18.91,89.74C13.16,81.54 9.83,71.52 9.83,60.59C9.83,32.65 32.52,9.87 60.5,9.87Z"
android:fillColor="#002E22"/>
<path
android:pathData="M110.41,26.42C108.75,23.99 105.27,23.84 103.3,25.97C101.49,27.79 101.34,30.52 102.7,32.65C107.99,40.7 111.17,50.41 111.17,60.74C111.17,71.07 107.99,81.09 102.4,89.29C101.04,91.41 101.04,94.3 102.85,96.12C104.97,98.25 108.29,98.1 109.96,95.67C116.92,85.8 121,73.8 121,60.74C121,47.83 117.07,36.14 110.41,26.42Z"
android:fillColor="#002E22"/>
<path
android:pathData="M60.5,111.61C50.21,111.61 40.53,108.42 32.52,103.11C30.4,101.74 27.53,101.89 25.86,103.71C23.75,105.84 23.9,109.18 26.32,110.85C36,117.53 47.79,121.48 60.5,121.48C73.2,121.48 85.3,117.38 95.29,110.4C97.71,108.73 97.86,105.39 95.74,103.26C93.93,101.44 91.05,101.29 88.93,102.8C80.92,108.27 71.09,111.61 60.5,111.61Z"
android:fillColor="#002E22"/>
</group>
<path
android:pathData="M74.73,77.11H92.88C101.19,77.11 108,83.94 108,92.3C108,100.65 101.19,107.48 92.88,107.48H74.73C66.41,107.48 59.6,100.65 59.6,92.3C59.6,83.94 66.41,77.11 74.73,77.11Z"
android:fillColor="#F25730"/>
<path
android:pathData="M74.57,96.85C77.6,96.85 79.57,95.03 79.57,91.99C79.57,88.96 77.6,87.29 74.57,87.29H71.4V96.85H74.57ZM73.06,89.11H74.42C76.39,89.11 77.45,90.17 77.45,92.14C77.45,94.12 76.24,95.18 74.42,95.18H73.06V89.11ZM88.04,96.85V95.03H82.89V92.75H87.28V90.93H82.89V88.96H87.88V87.13H80.93V96.85H88.04ZM93.78,96.85L97.11,87.29H95.14L92.88,94.42L90.61,87.29H88.64L91.97,96.85H93.78Z"
android:fillColor="#ffffff"/>
</group>
</group>
</vector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified android/app/src/development/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/development/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/development/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#3DDC84</color>
</resources>
<color name="ic_launcher_background">#03D47C</color>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/ic_launcher" />
android:resource="@mipmap/ic_launcher" />

<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Diff not rendered.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Diff not rendered.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Diff not rendered.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Diff not rendered.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Diff not rendered.
4 changes: 2 additions & 2 deletions android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#3DDC84</color>
</resources>
<color name="ic_launcher_background">#03D47C</color>
</resources>
1 change: 1 addition & 0 deletions assets/animations/SaveTheWorld.json

Large diffs are not rendered by default.

Loading

0 comments on commit 26bb430

Please sign in to comment.