diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 73bc4c761c..3f5618b208 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -241,6 +241,9 @@ dependencies {
allServicesImpl()
if (isEnterpriseBuild) {
allEnterpriseImpl(rootDir, logger)
+ implementation(projects.appicon.enterprise)
+ } else {
+ implementation(projects.appicon.element)
}
allFeaturesImpl(rootDir, logger)
implementation(projects.features.migration.api)
diff --git a/tests/uitests/src/main/kotlin/ui/ElementXShowkaseRootModule.kt b/appicon/element/build.gradle.kts
similarity index 70%
rename from tests/uitests/src/main/kotlin/ui/ElementXShowkaseRootModule.kt
rename to appicon/element/build.gradle.kts
index 6e162a0d37..7e45c16e02 100644
--- a/tests/uitests/src/main/kotlin/ui/ElementXShowkaseRootModule.kt
+++ b/appicon/element/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2024 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,11 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+plugins {
+ id("io.element.android-compose-library")
+}
-package ui
+android {
+ namespace = "io.element.android.appicon.element"
-import com.airbnb.android.showkase.annotation.ShowkaseRoot
-import com.airbnb.android.showkase.annotation.ShowkaseRootModule
-
-@ShowkaseRoot
-class ElementXShowkaseRootModule : ShowkaseRootModule
+ buildTypes {
+ register("nightly")
+ }
+}
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/appicon/element/src/debug/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/debug/res/drawable/ic_launcher_background.xml
rename to appicon/element/src/debug/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/ic_launcher-playstore.png b/appicon/element/src/main/ic_launcher-playstore.png
similarity index 100%
rename from app/src/main/ic_launcher-playstore.png
rename to appicon/element/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt b/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
similarity index 97%
rename from app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt
rename to appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
index ce8eb0eba7..749ed8571a 100644
--- a/app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt
+++ b/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.element.android.x.icon
+package io.element.android.appicon.element
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -31,7 +31,6 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import io.element.android.x.R
@Preview
@Composable
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_background.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
rename to appicon/element/src/main/res/mipmap-hdpi/ic_launcher_background.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
rename to appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp
rename to appicon/element/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_background.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
rename to appicon/element/src/main/res/mipmap-mdpi/ic_launcher_background.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
rename to appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp
rename to appicon/element/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
rename to appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
rename to appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp
rename to appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
rename to appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
rename to appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp
rename to appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
rename to appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
rename to appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp
rename to appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/app/src/nightly/res/drawable/ic_launcher_background.xml b/appicon/element/src/nightly/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/nightly/res/drawable/ic_launcher_background.xml
rename to appicon/element/src/nightly/res/drawable/ic_launcher_background.xml
diff --git a/app/src/release/res/drawable/ic_launcher_background.xml b/appicon/element/src/release/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/release/res/drawable/ic_launcher_background.xml
rename to appicon/element/src/release/res/drawable/ic_launcher_background.xml
diff --git a/tests/uitests/src/main/kotlin/ui/ShowkaseNavigation.kt b/appicon/enterprise/build.gradle.kts
similarity index 55%
rename from tests/uitests/src/main/kotlin/ui/ShowkaseNavigation.kt
rename to appicon/enterprise/build.gradle.kts
index 5fbdfd4895..82cce718f5 100644
--- a/tests/uitests/src/main/kotlin/ui/ShowkaseNavigation.kt
+++ b/appicon/enterprise/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2024 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package ui
-
-import android.app.Activity
-import android.content.Intent
-import com.airbnb.android.showkase.ui.ShowkaseBrowserActivity
-
-fun openShowkase(activity: Activity) {
- val intent = Intent(activity, ShowkaseBrowserActivity::class.java)
- intent.putExtra(
- "SHOWKASE_ROOT_MODULE",
- "io.element.android.libraries.designsystem.showkase.DesignSystemShowkaseRootModule"
- )
- activity.startActivity(intent)
+plugins {
+ id("io.element.android-compose-library")
+}
+
+android {
+ namespace = "io.element.android.appicon.enterprise"
+
+ buildTypes {
+ register("nightly")
+ }
}
diff --git a/appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml b/appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml
new file mode 100644
index 0000000000..d41447906a
--- /dev/null
+++ b/appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt
new file mode 100644
index 0000000000..a474a49837
--- /dev/null
+++ b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appicon.enterprise
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+
+@Preview
+@Composable
+internal fun IconPreview() {
+ Box {
+ Image(painter = painterResource(id = R.mipmap.ic_launcher_background_enterprise), contentDescription = null)
+ Image(
+ modifier = Modifier.align(Alignment.Center),
+ painter = painterResource(id = R.mipmap.ic_launcher_foreground_enterprise),
+ contentDescription = null,
+ )
+ }
+}
+
+@Preview
+@Composable
+internal fun RoundIconPreview() {
+ Box(modifier = Modifier.clip(shape = CircleShape)) {
+ Image(painter = painterResource(id = R.mipmap.ic_launcher_background_enterprise), contentDescription = null)
+ Image(
+ modifier = Modifier.align(Alignment.Center),
+ painter = painterResource(id = R.mipmap.ic_launcher_foreground_enterprise),
+ contentDescription = null,
+ )
+ }
+}
diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000000..5a8a441e3f
--- /dev/null
+++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 0000000000..1bbcf33419
--- /dev/null
+++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_background_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_background_enterprise.webp
new file mode 100644
index 0000000000..f051ae3c81
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_background_enterprise.webp differ
diff --git a/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background_enterprise.webp
new file mode 100644
index 0000000000..27d9d1db19
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background_enterprise.webp differ
diff --git a/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background_enterprise.webp
new file mode 100644
index 0000000000..4dbc6db066
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background_enterprise.webp differ
diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background_enterprise.webp
new file mode 100644
index 0000000000..b635d5cbb5
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background_enterprise.webp differ
diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_enterprise.webp
new file mode 100644
index 0000000000..2250307a03
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_enterprise.webp differ
diff --git a/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background_enterprise.webp b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background_enterprise.webp
new file mode 100644
index 0000000000..b5cb68c7bb
Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background_enterprise.webp differ
diff --git a/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background_enterprise.xml b/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background_enterprise.xml
new file mode 100644
index 0000000000..dc27f37adf
--- /dev/null
+++ b/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background_enterprise.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/appicon/enterprise/src/release/res/drawable/ic_launcher_background_enterprise.xml b/appicon/enterprise/src/release/res/drawable/ic_launcher_background_enterprise.xml
new file mode 100644
index 0000000000..161c685ddb
--- /dev/null
+++ b/appicon/enterprise/src/release/res/drawable/ic_launcher_background_enterprise.xml
@@ -0,0 +1,2 @@
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0d120f244..b808d44090 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -145,6 +145,7 @@ test_truth = "com.google.truth:truth:1.4.3"
test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.16"
test_robolectric = "org.robolectric:robolectric:4.12.2"
test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
+test_composable_preview_scanner = "com.github.sergio-sastre.ComposablePreviewScanner:android:0.1.2"
# Others
coil = { module = "io.coil-kt:coil", version.ref = "coil" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5758d7a47e..7bb0543c01 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -71,6 +71,8 @@ rootProject.name = "ElementX"
include(":app")
include(":appnav")
include(":appconfig")
+include(":appicon:element")
+include(":appicon:enterprise")
include(":tests:konsist")
include(":tests:uitests")
include(":tests:testutils")
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index a7f35d0f1f..e82d27226f 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -39,10 +39,6 @@ tasks.withType {
}
dependencies {
- testImplementation(libs.test.junit)
- testImplementation(libs.test.parameter.injector)
- testImplementation(projects.libraries.designsystem)
-
// Paparazzi 1.3.2 workaround (see https://github.com/cashapp/paparazzi/blob/master/CHANGELOG.md#132---2024-01-13)
constraints.add("testImplementation", "com.google.guava:guava") {
attributes {
@@ -66,6 +62,11 @@ dependencies {
allLibrariesImpl()
allServicesImpl()
allFeaturesImpl(rootDir, logger)
+ implementation(projects.appicon.element)
+ implementation(projects.appicon.enterprise)
- testImplementation("com.github.sergio-sastre.ComposablePreviewScanner:android:0.1.2")
+ testImplementation(libs.test.junit)
+ testImplementation(libs.test.parameter.injector)
+ testImplementation(projects.libraries.designsystem)
+ testImplementation(libs.test.composable.preview.scanner)
}
diff --git a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
index 18449ee9b0..a35d863671 100644
--- a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
+++ b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
@@ -30,6 +30,7 @@ object ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
"io.element.android.features",
"io.element.android.libraries",
"io.element.android.services",
+ "io.element.android.appicon",
"io.element.android.appnav",
"io.element.android.x",
// Make sure we don't import Compound previews by mistake
diff --git a/tests/uitests/src/test/snapshots/images/appicon.element_Icon_en.png b/tests/uitests/src/test/snapshots/images/appicon.element_Icon_en.png
new file mode 100644
index 0000000000..97ef3ac651
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appicon.element_Icon_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f43597d36fd123dc4ec478ed8ddc3160d383881623d613b8ab8045f042b80cb
+size 44846
diff --git a/tests/uitests/src/test/snapshots/images/appicon.element_MonochromeIcon_en.png b/tests/uitests/src/test/snapshots/images/appicon.element_MonochromeIcon_en.png
new file mode 100644
index 0000000000..6646dc06ba
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appicon.element_MonochromeIcon_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09a5771a54ac2f2aa538fc86d33608a53f18126484547797bc2932b1a329eb83
+size 7170
diff --git a/tests/uitests/src/test/snapshots/images/appicon.element_RoundIcon_en.png b/tests/uitests/src/test/snapshots/images/appicon.element_RoundIcon_en.png
new file mode 100644
index 0000000000..5811dfb607
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appicon.element_RoundIcon_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74af6c3ed723f027bb38b2fd7c4b0441ff26149abb587058bd2bb5be9adbe63b
+size 40692
diff --git a/tests/uitests/src/test/snapshots/images/appicon.enterprise_Icon_en.png b/tests/uitests/src/test/snapshots/images/appicon.enterprise_Icon_en.png
new file mode 100644
index 0000000000..1032784bd9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appicon.enterprise_Icon_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fda6dfc8c57df5456535a8ec33f78830beaab61cc27ba4119e9576c5d641023b
+size 47856
diff --git a/tests/uitests/src/test/snapshots/images/appicon.enterprise_RoundIcon_en.png b/tests/uitests/src/test/snapshots/images/appicon.enterprise_RoundIcon_en.png
new file mode 100644
index 0000000000..1c729b1ba2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appicon.enterprise_RoundIcon_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60b169ac392d4b51e8260c595a97dd14f267facd8f428ad69814bd27e502e189
+size 44355