Update app launcher icon

Orange-OpenSource · Nov 13, 2024 · f7bdcf0 · f7bdcf0
1 parent 08d5e77
commit f7bdcf0
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 220 deletions.
diff --git a/.github/actions/app-distribution/action.yml b/.github/actions/app-distribution/action.yml
@@ -7,9 +7,9 @@ inputs:
     description: Indicates if short Git SHA should be appended to the version name
     required: false
     default: 'false'
-  application-id:
-    description: Application ID
-    required: false
+  variant:
+    description: Variant
+    required: true
   firebase-token:
     description: Firebase token
     required: true
@@ -34,7 +34,7 @@ runs:
         BRANCH_SHA=${{ github.event.pull_request.head.sha }}
         COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA}
         [ ${{ inputs.append-git-sha-to-version-name }} == 'true' ] && VERSION_NAME_SUFFIX=-${COMMIT_SHA::7} || VERSION_NAME_SUFFIX=''
-        ./gradlew :app:appDistributionUpload -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=release -PapplicationId=${{ inputs.application-id }} -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
+        ./gradlew :app:appDistributionUpload -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=${{ inputs.variant }} -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
       env:
         GITHUB_TOKEN: ${{ inputs.github-token }}
         FIREBASE_TOKEN: ${{ inputs.firebase-token }}
diff --git a/...hub/workflows/app-distribution-review.yml → .github/workflows/app-distribution-alpha.yml b/...hub/workflows/app-distribution-review.yml → .github/workflows/app-distribution-alpha.yml
@@ -1,4 +1,4 @@
-name: app-distribution-review
+name: app-distribution-alpha
 
 on:
   workflow_dispatch:
@@ -10,7 +10,7 @@ on:
       - unlabeled
 
 jobs:
-  app-distribution-review:
+  app-distribution-alpha:
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'tokenator-update-tokens-'))
     steps:
@@ -44,11 +44,11 @@ jobs:
         uses: ./.github/actions/app-distribution
         with:
           append-git-sha-to-version-name: 'true'
-          application-id: 'com.orange.ouds.review.app'
+          variant: 'alphaRelease'
           firebase-token: ${{ secrets.FIREBASE_TOKEN }}
-          git-tag-prefix: 'ci/review-app'
+          git-tag-prefix: 'ci/alpha-app'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          group: 'ouds-android-review'
+          group: 'ouds-android-alpha'
 
       - name: Publish Firebase App Distribution QR code
         run: ./gradlew publishAppDistributionQrCode

diff --git a/.github/workflows/app-distribution-daily.yml → .github/workflows/app-distribution-beta.yml b/.github/workflows/app-distribution-daily.yml → .github/workflows/app-distribution-beta.yml
@@ -1,12 +1,12 @@
-name: app-distribution-daily
+name: app-distribution-beta
 
 on:
   schedule:
     - cron: '31 3 * * MON-FRI'
   workflow_dispatch:
 
 jobs:
-  app-distribution-daily:
+  app-distribution-beta:
     runs-on: ubuntu-latest
     if: github.repository == 'Orange-OpenSource/ouds-android'
     steps:
@@ -33,8 +33,8 @@ jobs:
         uses: ./.github/actions/app-distribution
         with:
           append-git-sha-to-version-name: 'true'
-          application-id: 'com.orange.ouds.test.app'
+          variant: 'betaRelease'
           firebase-token: ${{ secrets.FIREBASE_TOKEN }}
-          git-tag-prefix: 'ci/daily-app'
+          git-tag-prefix: 'ci/beta-app'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          group: 'ouds-android-test'
+          group: 'ouds-android-beta'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,15 +53,15 @@ jobs:
         run: ./gradlew :core:verifyPaparazziDebug
 
       - name: Run Android Linter
-        run: ./gradlew lint
+        run: ./gradlew lintProdDebug lintProdRelease
 
       - name: Build
         run: |
           # Git SHA is equal to github.event.pull_request.head.sha for pull requests
           # This value is unset if workflow has not been triggered by a pull request, use GITHUB_SHA instead
           BRANCH_SHA=${{ github.event.pull_request.head.sha }}
           COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA}
-          ./gradlew assemble -PversionNameSuffix="-${COMMIT_SHA::7}" -PversionCode=$GITHUB_RUN_NUMBER --stacktrace
+          ./gradlew assembleProd -PversionNameSuffix="-${COMMIT_SHA::7}" -PversionCode=$GITHUB_RUN_NUMBER --stacktrace
 
       - name: Store tests artifacts
         if: always()
@@ -78,7 +78,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: app
-          path: app/build/outputs/apk/*/*.apk
+          path: app/build/outputs/apk/*/*/*.apk
 
       - name: Store core artifacts
         uses: actions/upload-artifact@v4

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -31,7 +31,6 @@ android {
     compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        applicationId = project.findTypedProperty<String>("applicationId") ?: "com.orange.ouds.app"
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
         versionCode = project.findTypedProperty<String>("versionCode")?.toInt() ?: 1
@@ -77,6 +76,23 @@ android {
         }
     }
 
+    val versionFlavorDimension = "version"
+    flavorDimensions.add(versionFlavorDimension)
+    productFlavors {
+        create("alpha") {
+            dimension = versionFlavorDimension
+            applicationId = "com.orange.ouds.alpha.app"
+        }
+        create("beta") {
+            dimension = versionFlavorDimension
+            applicationId = "com.orange.ouds.beta.app"
+        }
+        create("prod") {
+            dimension = versionFlavorDimension
+            applicationId = "com.orange.ouds.app"
+        }
+    }
+
     kotlin {
         jvmToolchain(17)
         compilerOptions {

diff --git a/app/google-services.json b/app/google-services.json
@@ -5,6 +5,25 @@
     "storage_bucket": "ouds-f91d8.appspot.com"
   },
   "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:756919609448:android:22744c13139c261a54f3dd",
+        "android_client_info": {
+          "package_name": "com.orange.ouds.alpha.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCAqxL90WNlSvstZOmrIZIMwS68GunWRDE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:756919609448:android:635d277f6d88a44154f3dd",
@@ -24,6 +43,25 @@
         }
       }
     },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:756919609448:android:ceefd1e4efd5d68654f3dd",
+        "android_client_info": {
+          "package_name": "com.orange.ouds.beta.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCAqxL90WNlSvstZOmrIZIMwS68GunWRDE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:756919609448:android:08045c141d8ea56d54f3dd",

diff --git a/app/src/alpha/res/drawable/ic_launcher_background.xml b/app/src/alpha/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,23 @@
+<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="108dp">
+
+    <path android:pathData="M-1,-1h1080v1080h-1080z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient android:endX="539" android:endY="-1" android:startX="539" android:startY="1079" android:type="linear">
+
+                <item android:color="#FF037BF3" android:offset="0"/>
+
+                <item android:color="#FF037BF3" android:offset="0.1"/>
+
+                <item android:color="#FF029EF9" android:offset="0.8"/>
+
+                <item android:color="#FF029EF9" android:offset="1"/>
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+</vector>
diff --git a/app/src/alpha/res/drawable/ic_launcher_foreground.xml b/app/src/alpha/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="108dp">
+
+    <path android:fillAlpha="0.4" android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M540.8,279L323.6,409.1l0.2,260.3L540.7,799.4l217.2,-130.1L757.9,409.1ZM565,554 L588.9,539.7L588.9,741.9l-23.8,14.3L565,554ZM540.8,307.9L709.3,409.1 540.8,510.4 372.1,409.2ZM613.3,727.3L613.3,525l23.8,-14.3L637.1,713ZM661.5,496 L685.3,481.7L685.3,684l-23.8,14.3v-202.3ZM709.7,669.4L709.7,467l23.8,-14.3L733.5,655.1Z" android:strokeColor="#fff" android:strokeLineJoin="round" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M757.7,410.8L540.6,540.1Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M323.8,410.8L540.3,539.7Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M710.2,641.7l22.8,13.5Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M662.6,671.6L685.5,685.2Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M614.2,700.6l23.2,13.8Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M565.7,729.4l23,13.7Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M540.8,800.4v0Z" android:strokeColor="#fff" android:strokeWidth="5"/>
+
+    <path android:fillAlpha="0.3" android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M451.3,658.8l1.1,0.7 0.2,2.1c2.1,12.8 10.7,24.4 24.1,32.5a9.8,9.8 0,0 0,4.5 1.6c7.5,3.6 13.1,2.4 13.1,-3.7a13.9,13.9 0,0 0,-5.8 -10.7A40.1,40.1 0,0 0,484 678c-6.5,-3.9 -8.4,-8 -8.4,-17.8V588.8a23.6,23.6 0,0 0,-11.6 -19.9c-7.1,-4.3 -11.7,-2 -11.7,5.6V580.7l-1.2,-0.7a79.6,79.6 0,0 0,-33.7 -40c-26,-15.7 -43.1,-4.1 -43.1,29.6V578.1c0,33.8 16.7,65 43.2,81C433.9,669 446.5,668.8 451.3,658.8ZM424.6,643.3c-15.6,-9.4 -25.6,-29.2 -25.6,-50.9v-7.4c0,-22.6 9.2,-30.3 25,-20.7 16.9,10.2 27.2,30.1 27.2,52.3v7.4C451.3,645.4 440.9,653.1 424.6,643.3Z" android:strokeColor="#fff" android:strokeLineJoin="round" android:strokeWidth="4"/>
+
+</vector>
diff --git a/app/src/beta/res/drawable/ic_launcher_background.xml b/app/src/beta/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,23 @@
+<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="108dp">
+
+    <path android:pathData="M-1,-1h1080v1080h-1080z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient android:endX="539" android:endY="-1" android:startX="539" android:startY="1079" android:type="linear">
+
+                <item android:color="#FF037BF3" android:offset="0"/>
+
+                <item android:color="#FF037BF3" android:offset="0.1"/>
+
+                <item android:color="#FF029EF9" android:offset="0.8"/>
+
+                <item android:color="#FF029EF9" android:offset="1"/>
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+</vector>
diff --git a/app/src/beta/res/drawable/ic_launcher_foreground.xml b/app/src/beta/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="108dp">
+
+    <path android:fillAlpha="0.4" android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M540.8,279L323.6,409.1l0.2,260.3L540.7,799.4l217.2,-130.1L757.9,409.1ZM565,554 L588.9,539.7L588.9,741.9l-23.8,14.3L565,554ZM540.8,307.9L709.3,409.1 540.8,510.4 372.1,409.2ZM613.3,727.3L613.3,525l23.8,-14.3L637.1,713ZM661.5,496 L685.3,481.7L685.3,684l-23.8,14.3v-202.3ZM709.7,669.4L709.7,467l23.8,-14.3L733.5,655.1Z" android:strokeColor="#fff" android:strokeLineJoin="round" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M757.7,410.8L540.6,540.1Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M323.8,410.8L540.3,539.7Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M710.2,641.7l22.8,13.5Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M662.6,671.6L685.5,685.2Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M614.2,700.6l23.2,13.8Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M565.7,729.4l23,13.7Z" android:strokeColor="#f8f9fc" android:strokeWidth="5"/>
+
+    <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M540.8,800.4v0Z" android:strokeColor="#fff" android:strokeWidth="5"/>
+
+    <path android:fillAlpha="0.3" android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M384.4,663.2a21,21 0,0 0,10.5 18.1c6.4,3.8 10.7,2.5 10.7,-5.3L405.7,637.5l0.8,0.5c5.5,14.3 16.4,26.6 30,34.7 25.1,15 39.9,6.9 39.9,-16.7 0,-19.7 -9.4,-37.7 -27.1,-52.5v-0.8c11.1,1.4 17.8,-5.1 17.8,-18.6 0,-21.1 -14.5,-43.5 -40.1,-58.8 -26.8,-16.1 -42.5,-10.6 -42.5,19.3L384.4,663.2ZM405.7,609.5v-51.4c0,-18 6.6,-24.5 21.5,-15.5 12.3,7.3 19.9,20 19.9,31.7 0,12.3 -6.3,16.2 -20.5,8.3 -5.6,-2.3 -8.6,-1.5 -8.6,3.1 0,4.9 3,9.2 8.8,13.6 18.3,11.8 27.9,27.3 27.9,42.8 0,14.6 -9.4,18.4 -23.3,10.1C415.4,642.5 405.7,625.8 405.7,609.5Z" android:strokeColor="#fff" android:strokeLineJoin="round" android:strokeWidth="4"/>
+
+</vector>