Merge pull request #3134 from element-hq/feature/bma/applicationIcons

Add temporary icon for Element Enterprise

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)

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")
+    }
+}

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

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.
  */
+plugins {
+    id("io.element.android-compose-library")
+}
 
-package ui
-
-import android.app.Activity
-import android.content.Intent
-import com.airbnb.android.showkase.ui.ShowkaseBrowserActivity
+android {
+    namespace = "io.element.android.appicon.enterprise"
 
-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)
+    buildTypes {
+        register("nightly")
+    }
 }

appicon/enterprise/src/debug/res/drawable/ic_launcher_background_enterprise.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#F7F07E"
+        android:fillType="evenOdd"
+        android:pathData="m0,0h108v108h-108z" />
+</vector>

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,
+        )
+    }
+}

appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  ~
+  ~     http://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.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background_enterprise"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground_enterprise"/>
+</adaptive-icon>

appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  ~
+  ~     http://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.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background_enterprise" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground_enterprise" />
+</adaptive-icon>

appicon/enterprise/src/nightly/res/drawable/ic_launcher_background_enterprise.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#07007E"
+        android:fillType="evenOdd"
+        android:pathData="m0,0h108v108h-108z" />
+</vector>

appicon/enterprise/src/release/res/drawable/ic_launcher_background_enterprise.xml

@@ -0,0 +1,2 @@
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@mipmap/ic_launcher_background_enterprise" />

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" }

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")

tests/uitests/build.gradle.kts

@@ -39,10 +39,6 @@ tasks.withType<Test> {
 }
 
 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)
 }

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

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

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

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

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

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