diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cd4206e498..3f5618b208 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -241,7 +241,7 @@ dependencies { allServicesImpl() if (isEnterpriseBuild) { allEnterpriseImpl(rootDir, logger) - // TODO implementation(projects.appicon.enterprise) + implementation(projects.appicon.enterprise) } else { implementation(projects.appicon.element) } diff --git a/appicon/enterprise/build.gradle.kts b/appicon/enterprise/build.gradle.kts new file mode 100644 index 0000000000..82cce718f5 --- /dev/null +++ b/appicon/enterprise/build.gradle.kts @@ -0,0 +1,26 @@ +/* + * 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. + */ +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.xml b/appicon/enterprise/src/debug/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..d41447906a --- /dev/null +++ b/appicon/enterprise/src/debug/res/drawable/ic_launcher_background.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..009c42036c --- /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), contentDescription = null) + Image( + modifier = Modifier.align(Alignment.Center), + painter = painterResource(id = R.mipmap.ic_launcher_foreground), + contentDescription = null, + ) + } +} + +@Preview +@Composable +internal fun RoundIconPreview() { + Box(modifier = Modifier.clip(shape = CircleShape)) { + Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null) + Image( + modifier = Modifier.align(Alignment.Center), + painter = painterResource(id = R.mipmap.ic_launcher_foreground), + 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..ccc9fee468 --- /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..d80aecb99b --- /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.webp b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_background.webp new file mode 100644 index 0000000000..f051ae3c81 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_background.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background.webp new file mode 100644 index 0000000000..27d9d1db19 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_background.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background.webp new file mode 100644 index 0000000000..4dbc6db066 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_background.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp new file mode 100644 index 0000000000..b635d5cbb5 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000000..2250307a03 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp new file mode 100644 index 0000000000..b5cb68c7bb Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp differ diff --git a/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background.xml b/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..dc27f37adf --- /dev/null +++ b/appicon/enterprise/src/nightly/res/drawable/ic_launcher_background.xml @@ -0,0 +1,10 @@ + + + diff --git a/appicon/enterprise/src/release/res/drawable/ic_launcher_background.xml b/appicon/enterprise/src/release/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..6ff3e59543 --- /dev/null +++ b/appicon/enterprise/src/release/res/drawable/ic_launcher_background.xml @@ -0,0 +1,2 @@ + diff --git a/settings.gradle.kts b/settings.gradle.kts index 5aee1e207c..7bb0543c01 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -72,7 +72,7 @@ include(":app") include(":appnav") include(":appconfig") include(":appicon:element") -// TODO include(":appicon:enterprise") +include(":appicon:enterprise") include(":tests:konsist") include(":tests:uitests") include(":tests:testutils")