mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-24 03:36:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

PreviewUrl: fix layout issue and add more tests

Browse source
This commit is contained in:
Benoit Marty 2020-12-04 14:36:11 +01:00
parent 5d3682cd44
commit c2c9e37a36
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/media/UrlsExtractorTest.kt
View file

@ -50,6 +50,13 @@ internal class UrlsExtractorTest : InstrumentedTest {
}
}
@Test
fun withoutProtocolTest() {
createEvent(body = "www.matrix.org")
.let { urlsExtractor.extract(it) }
.size shouldBeEqualTo 0
}
@Test
fun oneUrlWithParamTest() {
createEvent(body = "https://matrix.org?foo=bar")
@ -60,6 +67,16 @@ internal class UrlsExtractorTest : InstrumentedTest {
}
}
@Test
fun oneUrlWithParamsTest() {
createEvent(body = "https://matrix.org?foo=bar&bar=foo")
.let { urlsExtractor.extract(it) }
.let { result ->
result.size shouldBeEqualTo 1
result[0] shouldBeEqualTo "https://matrix.org?foo=bar&bar=foo"
}
}
@Test
fun oneUrlInlinedTest() {
createEvent(body = "Hello https://matrix.org, how are you?")

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
View file

@ -117,7 +117,7 @@ class PreviewUrlView @JvmOverloads constructor(
}
private fun renderLoading() {
// TODO
// Just hide for the moment
isVisible = false
}

2
vector/src/main/res/layout/url_preview.xml
View file

@ -53,6 +53,7 @@
android:maxLines="4"
android:textColor="?riotx_text_secondary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
app:layout_constraintTop_toBottomOf="@+id/url_preview_image"
tools:text="The British perfumer says removing actor John Boyega from his own advert was “utterly despicable”." />
@ -68,6 +69,7 @@
android:singleLine="true"
android:textColor="?riotx_text_tertiary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
app:layout_constraintTop_toBottomOf="@+id/url_preview_description"
tools:text="BBC News" />