From 9f26226edc2012255b89044954221089cf2a2c4f Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@lunarian.uk>
Date: Thu, 1 Jun 2023 09:44:16 +0100
Subject: [PATCH] Create room: fix text colours and strings

---
 .../createroom/impl/root/CreateRoomRootView.kt | 18 ++++++++++++++----
 .../impl/src/main/res/values/localazy.xml      |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index 21abc6546d..78c7e1f46c 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -26,9 +26,11 @@ import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -142,7 +144,11 @@ fun CreateRoomRootViewTopBar(
         },
         actions = {
             IconButton(onClick = onClosePressed) {
-                Icon(imageVector = Icons.Default.Close, contentDescription = stringResource(id = StringR.string.action_close))
+                Icon(
+                    imageVector = Icons.Default.Close,
+                    contentDescription = stringResource(id = StringR.string.action_close),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
             }
         }
     )
@@ -157,7 +163,7 @@ fun CreateRoomActionButtonsList(
     Column(modifier = modifier) {
         CreateRoomActionButton(
             iconRes = DrawableR.drawable.ic_groups,
-            text = stringResource(id = StringR.string.action_create_a_room),
+            text = stringResource(id = R.string.screen_create_room_action_create_room),
             onClick = onNewRoomClicked,
         )
         CreateRoomActionButton(
@@ -185,11 +191,15 @@ fun CreateRoomActionButton(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
-            modifier = Modifier.alpha(0.5f), // FIXME align on Design system theme (removing alpha should be fine)
+            modifier = Modifier.size(24.dp).alpha(0.5f), // FIXME align on Design system theme (removing alpha should be fine)
             resourceId = iconRes,
             contentDescription = null,
         )
-        Text(text = text)
+        Text(
+            text = text,
+            fontSize = 16.sp,
+            fontWeight = FontWeight.Normal
+        )
     }
 }
 
diff --git a/features/createroom/impl/src/main/res/values/localazy.xml b/features/createroom/impl/src/main/res/values/localazy.xml
index 128855932a..b3c0a6e618 100644
--- a/features/createroom/impl/src/main/res/values/localazy.xml
+++ b/features/createroom/impl/src/main/res/values/localazy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"New room"</string>
-  <string name="screen_create_room_action_invite_people">"Invite people"</string>
-  <string name="screen_create_room_add_people_title">"Add people"</string>
+  <string name="screen_create_room_action_invite_people">"Invite friends to Element"</string>
+  <string name="screen_create_room_add_people_title">"Invite people"</string>
   <string name="screen_create_room_error_creating_room">"An error occurred when creating the room"</string>
   <string name="screen_create_room_private_option_description">"Messages in this room are encrypted. Encryption can’t be disabled afterwards."</string>
   <string name="screen_create_room_private_option_title">"Private room (invite only)"</string>