From 4e2acbf456194cc7d866ce8e5799f1f1d3cae853 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:50:20 +0400
Subject: [PATCH] android: fix full name entry on profile creation; fix text on
 profile update (#2737)

---
 .../src/main/java/chat/simplex/app/views/WelcomeView.kt      | 5 +----
 .../common/src/commonMain/resources/MR/base/strings.xml      | 2 +-
 .../common/src/commonMain/resources/MR/de/strings.xml        | 2 +-
 .../common/src/commonMain/resources/MR/ru/strings.xml        | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt
index 57ca136cf0..d273c17dbd 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt
@@ -22,8 +22,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
-import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
 import chat.simplex.app.ui.theme.*
@@ -32,7 +30,6 @@ import chat.simplex.app.views.onboarding.OnboardingStage
 import chat.simplex.app.views.onboarding.ReadableText
 import com.google.accompanist.insets.navigationBarsWithImePadding
 import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 
@@ -81,7 +78,7 @@ fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
         fontSize = 16.sp,
         modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
       )
-      ProfileNameField(fullName, "", ::isValidDisplayName)
+      ProfileNameField(fullName, "")
     }
     Spacer(Modifier.fillMaxHeight().weight(1f))
     Row {
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index 8d46700dc0..f3fd6f128b 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -654,7 +654,7 @@
 
   <!-- User profile details - UserProfileView.kt -->
   <string name="display_name__field">Display name:</string>
-  <string name="full_name__field">"Full name:</string>
+  <string name="full_name__field">Full name:</string>
   <string name="your_current_profile">Your current profile</string>
   <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</string>
   <string name="edit_image">Edit image</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
index 7c3b075d13..1478e71a52 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
@@ -419,7 +419,7 @@
     <string name="delete_address">Adresse löschen</string>
     <!-- User profile details - UserProfileView.kt -->
     <string name="display_name__field">Angezeigter Name:</string>
-    <string name="full_name__field">"Vollständiger Name:</string>
+    <string name="full_name__field">Vollständiger Name:</string>
     <string name="your_current_profile">Mein aktuelles Chat-Profil</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt. SimpleX-Server können Ihr Profil nicht sehen.</string>
     <string name="edit_image">Bild bearbeiten</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
index 77903a4d7b..04a724e5cf 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
@@ -418,7 +418,7 @@
     <string name="delete_address">Удалить адрес</string>
     <!-- User profile details - UserProfileView.kt -->
     <string name="display_name__field">Имя профиля:</string>
-    <string name="full_name__field">"Полное имя:</string>
+    <string name="full_name__field">Полное имя:</string>
     <string name="your_current_profile">Ваш активный профиль</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам. SimpleX серверы не могут получить доступ к Вашему профилю.</string>
     <string name="edit_image">Поменять аватар</string>