Browse Source

Disable vector XML rasterisation on API 23 (#2128)

* Disable vector XML rasterisation on API 23

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
pull/2138/head
Jorge Martin Espinosa 9 months ago committed by GitHub
parent
commit
7fdba39d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      app/build.gradle.kts
  2. 1
      changelog.d/2124.bugfix
  3. 2
      gradle/libs.versions.toml
  4. 2
      libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
  5. 0
      libraries/designsystem/src/main/res/drawable/ic_plus_composer.xml
  6. 2
      libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/ComposerOptionsButton.kt
  7. 5
      plugins/src/main/kotlin/extension/CommonExtension.kt
  8. 3
      samples/minimal/build.gradle.kts
  9. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[f.createroom.impl.root_CreateRoomRootView_null_CreateRoomRootView-Day-4_4_null_0,NEXUS_5,1.0,en].png
  10. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[f.createroom.impl.root_CreateRoomRootView_null_CreateRoomRootView-Night-4_5_null_0,NEXUS_5,1.0,en].png
  11. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Day_0_null_1,NEXUS_5,1.0,en].png
  12. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Night_1_null_1,NEXUS_5,1.0,en].png
  13. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Day_0_null_0,NEXUS_5,1.0,en].png
  14. BIN
      tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Night_1_null_0,NEXUS_5,1.0,en].png

4
app/build.gradle.kts

@ -43,10 +43,6 @@ android { @@ -43,10 +43,6 @@ android {
versionCode = Versions.versionCode
versionName = Versions.versionName
vectorDrawables {
useSupportLibrary = true
}
// Keep abiFilter for the universalApk
ndk {
abiFilters += listOf("armeabi-v7a", "x86", "arm64-v8a", "x86_64")

1
changelog.d/2124.bugfix

@ -0,0 +1 @@ @@ -0,0 +1 @@
Disable rasterisation of Vector XMLs, which was causing crashes on API 23.

2
gradle/libs.versions.toml

@ -142,7 +142,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" } @@ -142,7 +142,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
coil_test = { module = "io.coil-kt:coil-test", version.ref = "coil" }
compound = { module = "io.element.android:compound-android", version = "0.0.2" }
compound = { module = "io.element.android:compound-android", version = "0.0.3" }
datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt

@ -41,7 +41,7 @@ internal val iconsOther = listOf( @@ -41,7 +41,7 @@ internal val iconsOther = listOf(
R.drawable.ic_location_navigator_centered,
R.drawable.ic_new_message,
R.drawable.ic_numbered_list,
R.drawable.ic_plus,
R.drawable.ic_plus_composer,
R.drawable.ic_quote,
R.drawable.ic_reply,
R.drawable.ic_retry,

0
libraries/designsystem/src/main/res/drawable/ic_plus.xml → libraries/designsystem/src/main/res/drawable/ic_plus_composer.xml

2
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/ComposerOptionsButton.kt

@ -41,7 +41,7 @@ internal fun ComposerOptionsButton( @@ -41,7 +41,7 @@ internal fun ComposerOptionsButton(
) {
Icon(
modifier = Modifier.size(30.dp),
resourceId = CommonDrawables.ic_plus,
resourceId = CommonDrawables.ic_plus_composer,
contentDescription = stringResource(R.string.rich_text_editor_a11y_add_attachment),
tint = ElementTheme.colors.iconPrimary,
)

5
plugins/src/main/kotlin/extension/CommonExtension.kt

@ -28,6 +28,11 @@ fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) { @@ -28,6 +28,11 @@ fun CommonExtension<*, *, *, *, *>.androidConfig(project: Project) {
compileSdk = Versions.compileSdk
minSdk = Versions.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
generatedDensities()
}
}
compileOptions {

3
samples/minimal/build.gradle.kts

@ -28,9 +28,6 @@ android { @@ -28,9 +28,6 @@ android {
versionCode = Versions.versionCode
versionName = Versions.versionName
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
}
}
buildTypes {

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[f.createroom.impl.root_CreateRoomRootView_null_CreateRoomRootView-Day-4_4_null_0,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[f.createroom.impl.root_CreateRoomRootView_null_CreateRoomRootView-Night-4_5_null_0,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Day_0_null_1,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsCompound_null_IconsCompound-Night_1_null_1,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Day_0_null_0,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.

BIN
tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.icons_IconsOther_null_IconsOther-Night_1_null_0,NEXUS_5,1.0,en].png (Stored with Git LFS)

Binary file not shown.
Loading…
Cancel
Save