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

feat(flavours): add chv-neo flavour #343

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
87 changes: 27 additions & 60 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 2.6
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this change intentional? I think we bumped this to 2.7 recently to address: #340


- name: Set up Fastlane
run: gem install fastlane --no-document --quiet
Expand Down Expand Up @@ -222,39 +222,6 @@ jobs:
with:
lane: build
options: '{ "flavor": "itech_malawi" }'

- name: Unpack secrets cares_malawi_kch
Copy link
Contributor

Choose a reason for hiding this comment

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

Did the jobs for cares_malawi_kch, cares_malawi_mpc, and moh_togo_uat get removed from there on purpose? If so, should we completely remove those brands from the repo?

env:
ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_CARES_MALAWI_KCH }}
ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_CARES_MALAWI_KCH }}
run: make org=cares_malawi_kch keydec

- name: Assemble cares_malawi_kch
uses: maierj/[email protected]
with:
lane: build
options: '{ "flavor": "cares_malawi_kch" }'
env:
ANDROID_KEYSTORE_PATH: cares_malawi_kch.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CARES_MALAWI_KCH }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CARES_MALAWI_KCH }}

- name: Unpack secrets cares_malawi_mpc
env:
ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_CARES_MALAWI_MPC }}
ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_CARES_MALAWI_MPC }}
run: make org=cares_malawi_mpc keydec

- name: Assemble cares_malawi_mpc
uses: maierj/[email protected]
with:
lane: build
options: '{ "flavor": "cares_malawi_mpc" }'
env:
ANDROID_KEYSTORE_PATH: cares_malawi_mpc.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CARES_MALAWI_MPC }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CARES_MALAWI_MPC }}

- name: Assemble alerte_niger
uses: maierj/[email protected]
with:
Expand Down Expand Up @@ -392,32 +359,6 @@ jobs:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_NIGER_CHW }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_NIGER_CHW }}

- name: Unpack secrets moh_togo_uat
env:
ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_TOGO_UAT }}
ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_TOGO_UAT }}
run: make org=moh_togo_uat keydec

- name: Assemble moh_togo_uat
uses: maierj/[email protected]
with:
lane: build
options: '{ "flavor": "moh_togo_uat" }'
env:
ANDROID_KEYSTORE_PATH: moh_togo_uat.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_TOGO_UAT }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_TOGO_UAT }}

- name: Bundle moh_togo_uat
uses: maierj/[email protected]
with:
lane: bundle
options: '{ "flavor": "moh_togo_uat" }'
env:
ANDROID_KEYSTORE_PATH: moh_togo_uat.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_TOGO_UAT }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_TOGO_UAT }}

- name: GitHub release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -428,3 +369,29 @@ jobs:
build/outputs/bundle/**/*-release.aab
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

- name: Unpack secrets chv_neo
env:
ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_CHV_NEO }}
ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_CHV_NEO }}
run: make org=chv_neo keydec

- name: Assemble chv_neo
uses: maierj/[email protected]
with:
lane: build
options: '{ "flavor": "chv_neo" }'
env:
ANDROID_KEYSTORE_PATH: chv_neo.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CHV_NEO }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CHV_NEO }}

- name: Bundle chv_neo
uses: maierj/[email protected]
with:
lane: bundle
options: '{ "flavor": "chv_neo" }'
env:
ANDROID_KEYSTORE_PATH: chv_neo.keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CHV_NEO }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CHV_NEO }}
15 changes: 2 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,6 @@ android {
applicationId = 'org.medicmobile.webapp.mobile.itech_malawi'
}

cares_malawi_kch {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here. Was cares_malawi_kch, cares_malawi_mpc, and moh_togo_uat supposed to be removed!

dimension = 'brand'
applicationId = 'org.medicmobile.webapp.mobile.cares_malawi_kch'
}

cares_malawi_mpc {
dimension = 'brand'
applicationId = 'org.medicmobile.webapp.mobile.cares_malawi_mpc'
}

alerte_niger {
dimension = 'brand'
applicationId = 'org.medicmobile.webapp.mobile.alerte_niger'
Expand Down Expand Up @@ -401,11 +391,10 @@ android {
applicationId = 'org.medicmobile.webapp.mobile.moh_kenya_echis'
}

moh_togo_uat {
chv_neo {
dimension = 'brand'
applicationId = 'org.medicmobile.webapp.mobile.moh_togo_uat'
applicationId = 'org.medicmobile.webapp.mobile.chv_neo'
}

}

splits {
Expand Down
Binary file added secrets/secrets-chv_neo.tar.gz.enc
Binary file not shown.
7 changes: 7 additions & 0 deletions src/chv_neo/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.medicmobile.webapp.mobile">

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
</manifest>
Binary file added src/chv_neo/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/chv_neo/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +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>
5 changes: 5 additions & 0 deletions src/chv_neo/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -0,0 +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>
Binary file added src/chv_neo/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/chv_neo/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/chv_neo/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/chv_neo/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/chv_neo/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions src/chv_neo/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>
5 changes: 5 additions & 0 deletions src/chv_neo/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">CHV-NEO</string>
<string name="app_host">chv-neo.org</string>
</resources>