diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8362680e..34a03d70 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 2.6 - name: Set up Fastlane run: gem install fastlane --no-document --quiet @@ -222,39 +222,6 @@ jobs: with: lane: build options: '{ "flavor": "itech_malawi" }' - - - name: Unpack secrets cares_malawi_kch - 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/fastlane-action@v1.4.0 - 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/fastlane-action@v1.4.0 - 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/fastlane-action@v1.4.0 with: @@ -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/fastlane-action@v1.4.0 - 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/fastlane-action@v1.4.0 - 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/') @@ -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/fastlane-action@v1.4.0 + 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/fastlane-action@v1.4.0 + 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 }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index edc72758..e11d0862 100644 --- a/build.gradle +++ b/build.gradle @@ -361,16 +361,6 @@ android { applicationId = 'org.medicmobile.webapp.mobile.itech_malawi' } - cares_malawi_kch { - 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' @@ -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 { diff --git a/secrets/secrets-chv_neo.tar.gz.enc b/secrets/secrets-chv_neo.tar.gz.enc new file mode 100644 index 00000000..f0996922 Binary files /dev/null and b/secrets/secrets-chv_neo.tar.gz.enc differ diff --git a/src/chv_neo/AndroidManifest.xml b/src/chv_neo/AndroidManifest.xml new file mode 100644 index 00000000..74273cda --- /dev/null +++ b/src/chv_neo/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/chv_neo/ic_launcher-playstore.png b/src/chv_neo/ic_launcher-playstore.png new file mode 100644 index 00000000..5a00424b Binary files /dev/null and b/src/chv_neo/ic_launcher-playstore.png differ diff --git a/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher.xml b/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/src/chv_neo/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/chv_neo/res/mipmap-hdpi/ic_launcher.webp b/src/chv_neo/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..07bf3962 Binary files /dev/null and b/src/chv_neo/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/src/chv_neo/res/mipmap-hdpi/ic_launcher_foreground.webp b/src/chv_neo/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..77f3ca92 Binary files /dev/null and b/src/chv_neo/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/src/chv_neo/res/mipmap-hdpi/ic_launcher_round.webp b/src/chv_neo/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..2db971e5 Binary files /dev/null and b/src/chv_neo/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/src/chv_neo/res/mipmap-mdpi/ic_launcher.webp b/src/chv_neo/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..ef06aa5e Binary files /dev/null and b/src/chv_neo/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/src/chv_neo/res/mipmap-mdpi/ic_launcher_foreground.webp b/src/chv_neo/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..582b91cb Binary files /dev/null and b/src/chv_neo/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/src/chv_neo/res/mipmap-mdpi/ic_launcher_round.webp b/src/chv_neo/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..7f8ce09e Binary files /dev/null and b/src/chv_neo/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/src/chv_neo/res/mipmap-xhdpi/ic_launcher.webp b/src/chv_neo/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..dcf956d5 Binary files /dev/null and b/src/chv_neo/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/src/chv_neo/res/mipmap-xhdpi/ic_launcher_foreground.webp b/src/chv_neo/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..6a1f5660 Binary files /dev/null and b/src/chv_neo/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/src/chv_neo/res/mipmap-xhdpi/ic_launcher_round.webp b/src/chv_neo/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..1b167230 Binary files /dev/null and b/src/chv_neo/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/src/chv_neo/res/mipmap-xxhdpi/ic_launcher.webp b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..2cb1572b Binary files /dev/null and b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..b0d8a033 Binary files /dev/null and b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..85006064 Binary files /dev/null and b/src/chv_neo/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher.webp b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..00397047 Binary files /dev/null and b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..d44dad58 Binary files /dev/null and b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..ed62fe2b Binary files /dev/null and b/src/chv_neo/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/chv_neo/res/values/ic_launcher_background.xml b/src/chv_neo/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..c5d5899f --- /dev/null +++ b/src/chv_neo/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/src/chv_neo/res/values/strings.xml b/src/chv_neo/res/values/strings.xml new file mode 100644 index 00000000..a8b812a4 --- /dev/null +++ b/src/chv_neo/res/values/strings.xml @@ -0,0 +1,5 @@ + + + CHV-NEO + chv-neo.org + \ No newline at end of file