From b8bf1496e20caf69b23d30451306d6751ed7057f Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Mon, 7 Feb 2022 10:56:31 +0100 Subject: [PATCH] Revert "Rename Agent flavour to Tchap" This reverts commit f4a031881527d9682ad253894446bdec6d4f743d. Conflicts: vector/src/gplay/agent/google-services.json --- .github/workflows/build.yml | 2 +- vector/build.gradle | 2 +- vector/src/{tchap => agent}/AndroidManifest.xml | 0 .../drawable-anydpi-v26/ic_launcher_foreground.xml | 0 .../res/drawable-xxhdpi/logo_tchap_big.png | Bin .../res/drawable/ic_launcher_background.xml | 0 .../res/drawable/ic_tchap_splashscreen_logo.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin vector/src/{tchap => agent}/res/values/config.xml | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename vector/src/{tchap => agent}/AndroidManifest.xml (100%) rename vector/src/{tchap => agent}/res/drawable-anydpi-v26/ic_launcher_foreground.xml (100%) rename vector/src/{tchap => agent}/res/drawable-xxhdpi/logo_tchap_big.png (100%) rename vector/src/{tchap => agent}/res/drawable/ic_launcher_background.xml (100%) rename vector/src/{tchap => agent}/res/drawable/ic_tchap_splashscreen_logo.xml (100%) rename vector/src/{tchap => agent}/res/mipmap-hdpi/ic_launcher.png (100%) rename vector/src/{tchap => agent}/res/mipmap-hdpi/ic_launcher_round.png (100%) rename vector/src/{tchap => agent}/res/mipmap-mdpi/ic_launcher.png (100%) rename vector/src/{tchap => agent}/res/mipmap-mdpi/ic_launcher_round.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xhdpi/ic_launcher.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename vector/src/{tchap => agent}/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename vector/src/{tchap => agent}/res/values/config.xml (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02b93ebf2b..e460e90059 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning ] + target: [ GplayBtchapWithoutvoipWithpinning, GplayAgentWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidAgentWithoutvoipWithoutpinning ] steps: - uses: actions/checkout@v2 - uses: actions/cache@v2 diff --git a/vector/build.gradle b/vector/build.gradle index 3c26fc785a..d42230326d 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -323,7 +323,7 @@ android { resValue "bool", "labs_settings_visible", "true" } - tchap { + agent { dimension "target" resValue "string", "app_name", "Tchap" diff --git a/vector/src/tchap/AndroidManifest.xml b/vector/src/agent/AndroidManifest.xml similarity index 100% rename from vector/src/tchap/AndroidManifest.xml rename to vector/src/agent/AndroidManifest.xml diff --git a/vector/src/tchap/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector/src/agent/res/drawable-anydpi-v26/ic_launcher_foreground.xml similarity index 100% rename from vector/src/tchap/res/drawable-anydpi-v26/ic_launcher_foreground.xml rename to vector/src/agent/res/drawable-anydpi-v26/ic_launcher_foreground.xml diff --git a/vector/src/tchap/res/drawable-xxhdpi/logo_tchap_big.png b/vector/src/agent/res/drawable-xxhdpi/logo_tchap_big.png similarity index 100% rename from vector/src/tchap/res/drawable-xxhdpi/logo_tchap_big.png rename to vector/src/agent/res/drawable-xxhdpi/logo_tchap_big.png diff --git a/vector/src/tchap/res/drawable/ic_launcher_background.xml b/vector/src/agent/res/drawable/ic_launcher_background.xml similarity index 100% rename from vector/src/tchap/res/drawable/ic_launcher_background.xml rename to vector/src/agent/res/drawable/ic_launcher_background.xml diff --git a/vector/src/tchap/res/drawable/ic_tchap_splashscreen_logo.xml b/vector/src/agent/res/drawable/ic_tchap_splashscreen_logo.xml similarity index 100% rename from vector/src/tchap/res/drawable/ic_tchap_splashscreen_logo.xml rename to vector/src/agent/res/drawable/ic_tchap_splashscreen_logo.xml diff --git a/vector/src/tchap/res/mipmap-hdpi/ic_launcher.png b/vector/src/agent/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from vector/src/tchap/res/mipmap-hdpi/ic_launcher.png rename to vector/src/agent/res/mipmap-hdpi/ic_launcher.png diff --git a/vector/src/tchap/res/mipmap-hdpi/ic_launcher_round.png b/vector/src/agent/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from vector/src/tchap/res/mipmap-hdpi/ic_launcher_round.png rename to vector/src/agent/res/mipmap-hdpi/ic_launcher_round.png diff --git a/vector/src/tchap/res/mipmap-mdpi/ic_launcher.png b/vector/src/agent/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from vector/src/tchap/res/mipmap-mdpi/ic_launcher.png rename to vector/src/agent/res/mipmap-mdpi/ic_launcher.png diff --git a/vector/src/tchap/res/mipmap-mdpi/ic_launcher_round.png b/vector/src/agent/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from vector/src/tchap/res/mipmap-mdpi/ic_launcher_round.png rename to vector/src/agent/res/mipmap-mdpi/ic_launcher_round.png diff --git a/vector/src/tchap/res/mipmap-xhdpi/ic_launcher.png b/vector/src/agent/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from vector/src/tchap/res/mipmap-xhdpi/ic_launcher.png rename to vector/src/agent/res/mipmap-xhdpi/ic_launcher.png diff --git a/vector/src/tchap/res/mipmap-xhdpi/ic_launcher_round.png b/vector/src/agent/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from vector/src/tchap/res/mipmap-xhdpi/ic_launcher_round.png rename to vector/src/agent/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/vector/src/tchap/res/mipmap-xxhdpi/ic_launcher.png b/vector/src/agent/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from vector/src/tchap/res/mipmap-xxhdpi/ic_launcher.png rename to vector/src/agent/res/mipmap-xxhdpi/ic_launcher.png diff --git a/vector/src/tchap/res/mipmap-xxhdpi/ic_launcher_round.png b/vector/src/agent/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from vector/src/tchap/res/mipmap-xxhdpi/ic_launcher_round.png rename to vector/src/agent/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/vector/src/tchap/res/mipmap-xxxhdpi/ic_launcher.png b/vector/src/agent/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from vector/src/tchap/res/mipmap-xxxhdpi/ic_launcher.png rename to vector/src/agent/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/vector/src/tchap/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector/src/agent/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from vector/src/tchap/res/mipmap-xxxhdpi/ic_launcher_round.png rename to vector/src/agent/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/vector/src/tchap/res/values/config.xml b/vector/src/agent/res/values/config.xml similarity index 100% rename from vector/src/tchap/res/values/config.xml rename to vector/src/agent/res/values/config.xml