Merge branch 'develop' into feature/fga/presenter_tests

This commit is contained in:
ganfra 2023-01-18 20:47:15 +01:00
commit 3a6be5f745
300 changed files with 772 additions and 209 deletions

View file

@ -20,6 +20,7 @@
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
id("io.element.android-compose-application")
alias(libs.plugins.stem)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.anvil)
@ -118,7 +119,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.3.2"
kotlinCompilerExtensionVersion = "1.4.0"
}
packagingOptions {
resources {
@ -175,8 +176,6 @@ dependencies {
// https://developer.android.com/studio/write/java8-support#library-desugaring-versions
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
implementation(libs.compose.destinations)
ksp(libs.compose.destinations.processor)
implementation(libs.appyx.core)
implementation(libs.androidx.corektx)

View file

@ -48,7 +48,7 @@ internal fun ShowkaseButton(
.size(16.dp),
onClick = onCloseClicked,
) {
Icon(imageVector = Icons.Filled.Close, contentDescription = "")
Icon(imageVector = Icons.Filled.Close, contentDescription = "Close showkase button")
}
}
}

View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 New Vector Ltd
~ Copyright (c) 2023 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,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- The https://github.com/LikeTheSalad/android-stem requires a non empty strings.xml -->
<string name="ignored_placeholder" translatable="false" tools:ignore="UnusedResources">ignored</string>
</resources>