Feature/convo capitalised (#1624)

* [SES-2551] capitalising sentences in convos

* [SES-2555] Add bg to image loading

* Using Robolectric to fix the tests
This commit is contained in:
ThomasSession 2024-08-19 09:35:11 +10:00 committed by GitHub
parent bc6718e996
commit f379604c54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 5 deletions

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?backgroundSecondary" />
<corners android:radius="?dialogCornerRadius" />
</shape>

View File

@ -47,7 +47,7 @@
android:textAlignment="center" android:textAlignment="center"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:inputType="text" android:inputType="textCapWords"
android:singleLine="true" android:singleLine="true"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:maxLength="@integer/max_group_and_community_name_length_chars" android:maxLength="@integer/max_group_and_community_name_length_chars"

View File

@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/transparent_black_6"> android:background="@drawable/image_loading_background">
<ImageView <ImageView
android:id="@+id/thumbnail_image" android:id="@+id/thumbnail_image"

View File

@ -37,7 +37,7 @@
<org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarEditText <org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarEditText
android:id="@+id/inputBarEditText" android:id="@+id/inputBarEditText"
android:contentDescription="@string/AccessibilityId_message_input" android:contentDescription="@string/AccessibilityId_message_input"
android:inputType="textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"

View File

@ -5,8 +5,9 @@ import org.hamcrest.core.IsEqual.equalTo
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
import org.robolectric.ParameterizedRobolectricTestRunner
@RunWith(Parameterized::class) @RunWith(ParameterizedRobolectricTestRunner::class)
class SnodeVersionTest( class SnodeVersionTest(
private val v1: String, private val v1: String,
private val v2: String, private val v2: String,
@ -15,7 +16,7 @@ class SnodeVersionTest(
) { ) {
companion object { companion object {
@JvmStatic @JvmStatic
@Parameterized.Parameters(name = "{index}: testVersion({0},{1}) = (equalTo: {2}, lessThan: {3})") @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: testVersion({0},{1}) = (equalTo: {2}, lessThan: {3})")
fun data(): Collection<Array<Any>> = listOf( fun data(): Collection<Array<Any>> = listOf(
arrayOf("1", "1", true, false), arrayOf("1", "1", true, false),
arrayOf("1", "2", false, true), arrayOf("1", "2", false, true),