Browse Source

Move application icon to their own module, to be able to have another icon for Element Enterprise

pull/3134/head
Benoit Marty 3 months ago
parent
commit
8d1a212bfd
  1. 3
      app/build.gradle.kts
  2. 26
      appicon/element/build.gradle.kts
  3. 0
      appicon/element/src/debug/res/drawable/ic_launcher_background.xml
  4. 0
      appicon/element/src/main/ic_launcher-playstore.png
  5. 3
      appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
  6. 0
      appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  7. 0
      appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  8. 0
      appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp
  9. 0
      appicon/element/src/main/res/mipmap-hdpi/ic_launcher_background.webp
  10. 0
      appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
  11. 0
      appicon/element/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp
  12. 0
      appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  13. 0
      appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp
  14. 0
      appicon/element/src/main/res/mipmap-mdpi/ic_launcher_background.webp
  15. 0
      appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
  16. 0
      appicon/element/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp
  17. 0
      appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  18. 0
      appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp
  19. 0
      appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
  20. 0
      appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
  21. 0
      appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp
  22. 0
      appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  23. 0
      appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  24. 0
      appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
  25. 0
      appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
  26. 0
      appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp
  27. 0
      appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  28. 0
      appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  29. 0
      appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
  30. 0
      appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
  31. 0
      appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp
  32. 0
      appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
  33. 0
      appicon/element/src/nightly/res/drawable/ic_launcher_background.xml
  34. 0
      appicon/element/src/release/res/drawable/ic_launcher_background.xml
  35. 2
      settings.gradle.kts

3
app/build.gradle.kts

@ -241,6 +241,9 @@ dependencies { @@ -241,6 +241,9 @@ dependencies {
allServicesImpl()
if (isEnterpriseBuild) {
allEnterpriseImpl(rootDir, logger)
// TODO implementation(projects.appicon.enterprise)
} else {
implementation(projects.appicon.element)
}
allFeaturesImpl(rootDir, logger)
implementation(projects.features.migration.api)

26
appicon/element/build.gradle.kts

@ -0,0 +1,26 @@ @@ -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.element"
buildTypes {
register("nightly")
}
}

0
app/src/debug/res/drawable/ic_launcher_background.xml → appicon/element/src/debug/res/drawable/ic_launcher_background.xml

0
app/src/main/ic_launcher-playstore.png → appicon/element/src/main/ic_launcher-playstore.png

Before

Width:  |  Height:  |  Size: 263 KiB

After

Width:  |  Height:  |  Size: 263 KiB

3
app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt → appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt

@ -14,7 +14,7 @@ @@ -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 @@ -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

0
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

0
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

0
app/src/main/res/mipmap-hdpi/ic_launcher.webp → appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
app/src/main/res/mipmap-hdpi/ic_launcher_background.webp → appicon/element/src/main/res/mipmap-hdpi/ic_launcher_background.webp

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp → appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp → appicon/element/src/main/res/mipmap-hdpi/ic_launcher_monochrome.webp

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp → appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
app/src/main/res/mipmap-mdpi/ic_launcher.webp → appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
app/src/main/res/mipmap-mdpi/ic_launcher_background.webp → appicon/element/src/main/res/mipmap-mdpi/ic_launcher_background.webp

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp → appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp → appicon/element/src/main/res/mipmap-mdpi/ic_launcher_monochrome.webp

Before

Width:  |  Height:  |  Size: 946 B

After

Width:  |  Height:  |  Size: 946 B

0
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp → appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
app/src/main/res/mipmap-xhdpi/ic_launcher.webp → appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp → appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_background.webp

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp → appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp → appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.webp

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp → appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp → appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp → appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp → appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp → appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.webp

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp → appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp → appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp → appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp → appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp → appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp → appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
app/src/nightly/res/drawable/ic_launcher_background.xml → appicon/element/src/nightly/res/drawable/ic_launcher_background.xml

0
app/src/release/res/drawable/ic_launcher_background.xml → appicon/element/src/release/res/drawable/ic_launcher_background.xml

2
settings.gradle.kts

@ -71,6 +71,8 @@ rootProject.name = "ElementX" @@ -71,6 +71,8 @@ rootProject.name = "ElementX"
include(":app")
include(":appnav")
include(":appconfig")
include(":appicon:element")
// TODO include(":appicon:enterprise")
include(":tests:konsist")
include(":tests:uitests")
include(":tests:testutils")

Loading…
Cancel
Save