Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fga/timeline_thread_decoration

Browse source
This commit is contained in:
ganfra 2023-09-14 16:57:20 +02:00 • committed by GitHub
commit cc33e39dc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
217 changed files with 2370 additions and 1049 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
View file

@ -74,6 +74,8 @@ import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
import io.element.android.libraries.testtags.TestTags
import io.element.android.libraries.testtags.testTag
import io.element.android.libraries.textcomposer.components.FormattingOption
import io.element.android.libraries.textcomposer.components.FormattingOptionState
import io.element.android.libraries.theme.ElementTheme
@ -260,7 +262,8 @@ private fun TextInput(
start = 12.dp.applyScaleUp(),
end = 42.dp.applyScaleUp()
)
),
)
.testTag(TestTags.richTextEditor),
contentAlignment = Alignment.CenterStart,
) {

2
libraries/textcomposer/impl/src/main/res/values-de/translations.xml → libraries/textcomposer/impl/src/main/res/values-fr/translations.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="rich_text_editor_a11y_add_attachment">"Anhang hinzufügen"</string>
<string name="rich_text_editor_a11y_add_attachment">"Ajouter une pièce jointe"</string>
</resources>