From f379604c54226e91924b7de444abef05c891a05e Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 19 Aug 2024 09:35:11 +1000
Subject: [PATCH] Feature/convo capitalised (#1624)

* [SES-2551] capitalising sentences in convos

* [SES-2555] Add bg to image loading

* Using Robolectric to fix the tests
---
 app/src/main/res/drawable/image_loading_background.xml | 10 ++++++++++
 app/src/main/res/layout/activity_edit_closed_group.xml |  2 +-
 app/src/main/res/layout/thumbnail_view.xml             |  2 +-
 app/src/main/res/layout/view_input_bar.xml             |  2 +-
 .../java/org/session/libsignal/utilities/SnodeTest.kt  |  5 +++--
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/image_loading_background.xml

diff --git a/app/src/main/res/drawable/image_loading_background.xml b/app/src/main/res/drawable/image_loading_background.xml
new file mode 100644
index 0000000000..d2e3dfbfa7
--- /dev/null
+++ b/app/src/main/res/drawable/image_loading_background.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml
index 78def9e972..c43360e362 100644
--- a/app/src/main/res/layout/activity_edit_closed_group.xml
+++ b/app/src/main/res/layout/activity_edit_closed_group.xml
@@ -47,7 +47,7 @@
                     android:textAlignment="center"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
-                    android:inputType="text"
+                    android:inputType="textCapWords"
                     android:singleLine="true"
                     android:imeOptions="actionDone"
                     android:maxLength="@integer/max_group_and_community_name_length_chars"
diff --git a/app/src/main/res/layout/thumbnail_view.xml b/app/src/main/res/layout/thumbnail_view.xml
index a93e158209..e6c6c342d6 100644
--- a/app/src/main/res/layout/thumbnail_view.xml
+++ b/app/src/main/res/layout/thumbnail_view.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/transparent_black_6">
+    android:background="@drawable/image_loading_background">
 
     <ImageView
         android:id="@+id/thumbnail_image"
diff --git a/app/src/main/res/layout/view_input_bar.xml b/app/src/main/res/layout/view_input_bar.xml
index 22240867c1..a78ac309cb 100644
--- a/app/src/main/res/layout/view_input_bar.xml
+++ b/app/src/main/res/layout/view_input_bar.xml
@@ -37,7 +37,7 @@
         <org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarEditText
             android:id="@+id/inputBarEditText"
             android:contentDescription="@string/AccessibilityId_message_input"
-            android:inputType="textMultiLine"
+            android:inputType="textCapSentences|textMultiLine"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_centerInParent="true"
diff --git a/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt b/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
index aed54fd0d3..8a1aaa1301 100644
--- a/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
+++ b/app/src/test/java/org/session/libsignal/utilities/SnodeTest.kt
@@ -5,8 +5,9 @@ import org.hamcrest.core.IsEqual.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
+import org.robolectric.ParameterizedRobolectricTestRunner
 
-@RunWith(Parameterized::class)
+@RunWith(ParameterizedRobolectricTestRunner::class)
 class SnodeVersionTest(
     private val v1: String,
     private val v2: String,
@@ -15,7 +16,7 @@ class SnodeVersionTest(
 ) {
     companion object {
         @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(
             arrayOf("1", "1", true, false),
             arrayOf("1", "2", false, true),