diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f4aea0f7..1ccb0ead 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,28 +40,28 @@ jobs: - name: Build with Gradle run: ./gradlew assembleDebug # Upload all build artifacts in separate steps. This can be shortened once https://github.com/actions/upload-artifact/pull/354 is merged. - - name: Upload artifact phone-universal-debug.apk + - name: Upload artifact phone-libre-universal-debug.apk uses: actions/upload-artifact@v3 with: - name: phone-universal-debug.apk - path: ./app/phone/build/outputs/apk/debug/phone-universal-debug.apk - - name: Upload artifact phone-arm64-v8a-debug.apk + name: phone-libre-universal-debug.apk + path: ./app/phone/build/outputs/apk/libre/debug/phone-libre-universal-debug.apk + - name: Upload artifact phone-libre-arm64-v8a-debug.apk uses: actions/upload-artifact@v3 with: - name: phone-arm64-v8a-debug.apk - path: ./app/phone/build/outputs/apk/debug/phone-arm64-v8a-debug.apk - - name: Upload artifact phone-armeabi-v7a-debug.apk + name: phone-libre-arm64-v8a-debug.apk + path: ./app/phone/build/outputs/apk/libre/debug/phone-libre-arm64-v8a-debug.apk + - name: Upload artifact phone-libre-armeabi-v7a-debug.apk uses: actions/upload-artifact@v3 with: - name: phone-armeabi-v7a-debug.apk - path: ./app/phone/build/outputs/apk/debug/phone-armeabi-v7a-debug.apk - - name: Upload artifact phone-x86_64-debug.apk + name: phone-libre-armeabi-v7a-debug.apk + path: ./app/phone/build/outputs/apk/libre/debug/phone-libre-armeabi-v7a-debug.apk + - name: Upload artifact phone-libre-x86_64-debug.apk uses: actions/upload-artifact@v3 with: - name: phone-x86_64-debug.apk - path: ./app/phone/build/outputs/apk/debug/phone-x86_64-debug.apk - - name: Upload artifact phone-x86-debug.apk + name: phone-libre-x86_64-debug.apk + path: ./app/phone/build/outputs/apk/libre/debug/phone-libre-x86_64-debug.apk + - name: Upload artifact phone-libre-x86-debug.apk uses: actions/upload-artifact@v3 with: - name: phone-x86-debug.apk - path: ./app/phone/build/outputs/apk/debug/phone-x86-debug.apk + name: phone-libre-x86-debug.apk + path: ./app/phone/build/outputs/apk/libre/debug/phone-libre-x86-debug.apk diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts index d61a881f..4684e17b 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -27,10 +27,10 @@ android { } buildTypes { - getByName("debug") { + named("debug") { applicationIdSuffix = ".debug" } - getByName("release") { + named("release") { isMinifyEnabled = true isShrinkResources = true proguardFiles( @@ -38,12 +38,23 @@ android { "proguard-rules.pro" ) } - create("staging") { + register("staging") { initWith(getByName("release")) applicationIdSuffix = ".staging" } } + flavorDimensions += "variant" + productFlavors { + register("libre") { + dimension = "variant" + isDefault = true + } + register("huawei") { + dimension = "variant" + } + } + splits { abi { isEnable = true diff --git a/core/build.gradle.kts b/core/build.gradle.kts index fc849195..8bd3859b 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -18,14 +18,20 @@ android { } buildTypes { - getByName("release") { + named("release") { isMinifyEnabled = false } - create("staging") { + register("staging") { initWith(getByName("release")) } } + flavorDimensions += "variant" + productFlavors { + register("libre") + register("huawei") + } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/core/src/huawei/res/drawable-night/ic_banner.xml b/core/src/huawei/res/drawable-night/ic_banner.xml new file mode 100644 index 00000000..26f21a79 --- /dev/null +++ b/core/src/huawei/res/drawable-night/ic_banner.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/huawei/res/drawable/ic_banner.xml b/core/src/huawei/res/drawable/ic_banner.xml new file mode 100644 index 00000000..66a2e5e1 --- /dev/null +++ b/core/src/huawei/res/drawable/ic_banner.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/huawei/res/drawable/ic_banner_foreground.xml b/core/src/huawei/res/drawable/ic_banner_foreground.xml new file mode 100644 index 00000000..454f51ff --- /dev/null +++ b/core/src/huawei/res/drawable/ic_banner_foreground.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/huawei/res/drawable/ic_launcher_foreground.xml b/core/src/huawei/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..3e665448 --- /dev/null +++ b/core/src/huawei/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 2d501e97..6b9ef3a3 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -29,10 +29,10 @@ android { } buildTypes { - getByName("release") { + named("release") { isMinifyEnabled = false } - create("staging") { + register("staging") { initWith(getByName("release")) } } diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts index b17aec8d..fa73200e 100644 --- a/player/core/build.gradle.kts +++ b/player/core/build.gradle.kts @@ -16,10 +16,10 @@ android { } buildTypes { - getByName("release") { + named("release") { isMinifyEnabled = false } - create("staging") { + register("staging") { initWith(getByName("release")) } } diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts index 366bd941..0c69cf69 100644 --- a/player/video/build.gradle.kts +++ b/player/video/build.gradle.kts @@ -17,10 +17,10 @@ android { } buildTypes { - getByName("release") { + named("release") { isMinifyEnabled = false } - create("staging") { + register("staging") { initWith(getByName("release")) } } diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts index eb68c302..429df583 100644 --- a/preferences/build.gradle.kts +++ b/preferences/build.gradle.kts @@ -14,10 +14,10 @@ android { } buildTypes { - getByName("release") { + named("release") { isMinifyEnabled = false } - create("staging") { + register("staging") { initWith(getByName("release")) } }