From 892901b5383d16fb7d8157fc28ccf5305ad93b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BA=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=9C=D0=B8=D0=BD=D0=B3=D0=B5=D1=80?=
 <ekaterinaminger@MacBook-Pro-Ekaterina.local>
Date: Fri, 28 Feb 2025 14:36:34 +0600
Subject: [PATCH] [~] fix strings, navigation to profile and appbar on
 colleagues screen

---
 .../authorization_phone/AuthorizationPhoneScreen.kt            | 3 ---
 .../office/elevator/ui/employee/aboutEmployee/AboutEmployee.kt | 2 +-
 .../elevator/ui/profile/editProfile/ProfileEditScreen.kt       | 1 +
 .../office/elevator/ui/profile/mainProfile/ProfileScreen.kt    | 2 +-
 composeApp/src/commonMain/moko-resources/base/strings_ru.xml   | 3 ++-
 composeApp/src/commonMain/moko-resources/en/strings_en.xml     | 2 ++
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/authorization/authorization_phone/AuthorizationPhoneScreen.kt b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/authorization/authorization_phone/AuthorizationPhoneScreen.kt
index a24ddad7..b907673b 100644
--- a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/authorization/authorization_phone/AuthorizationPhoneScreen.kt
+++ b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/authorization/authorization_phone/AuthorizationPhoneScreen.kt
@@ -20,13 +20,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import band.effective.office.elevator.EffectiveTheme
-import band.effective.office.elevator.ExtendedThemeColors
 import band.effective.office.elevator.MainRes
 import band.effective.office.elevator.components.EffectiveButton
 import band.effective.office.elevator.components.UserInfoTextField
diff --git a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/employee/aboutEmployee/AboutEmployee.kt b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/employee/aboutEmployee/AboutEmployee.kt
index 71aa26ef..73219423 100644
--- a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/employee/aboutEmployee/AboutEmployee.kt
+++ b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/employee/aboutEmployee/AboutEmployee.kt
@@ -145,7 +145,7 @@ private fun AboutEmployeeContent(
                             painter = painterResource(MainRes.images.back_button),
                             contentDescription = stringResource(MainRes.strings.back),
                             tint = EffectiveTheme.colors.icon.secondary,
-                            modifier = Modifier.size(24.dp),
+                            modifier = Modifier.size(32.dp),
                         )
                     }
                     TitlePage(
diff --git a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/editProfile/ProfileEditScreen.kt b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/editProfile/ProfileEditScreen.kt
index 02d7764b..36d526ee 100644
--- a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/editProfile/ProfileEditScreen.kt
+++ b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/editProfile/ProfileEditScreen.kt
@@ -234,6 +234,7 @@ private fun ProfileEditScreenContent(
                     phoneNumberText,
                     telegramText
                 )
+                onReturnToProfile()
             },
             buttonText = stringResource(MainRes.strings.save),
         )
diff --git a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/mainProfile/ProfileScreen.kt b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/mainProfile/ProfileScreen.kt
index 6baa7058..2fc1798d 100644
--- a/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/mainProfile/ProfileScreen.kt
+++ b/composeApp/src/commonMain/kotlin/band/effective/office/elevator/ui/profile/mainProfile/ProfileScreen.kt
@@ -133,7 +133,7 @@ private fun ProfileScreenContent(
         }
         Spacer(modifier = Modifier.padding(24.dp))
         Text(
-            text = "Редактировать профиль",
+            text = stringResource(MainRes.strings.edit_profile),
             style = EffectiveTheme.typography.mMedium,
             color = EffectiveTheme.colors.text.secondary,
             modifier = Modifier.clickable(onClick = { onEditProfile() }),
diff --git a/composeApp/src/commonMain/moko-resources/base/strings_ru.xml b/composeApp/src/commonMain/moko-resources/base/strings_ru.xml
index cd02e97d..24f70012 100644
--- a/composeApp/src/commonMain/moko-resources/base/strings_ru.xml
+++ b/composeApp/src/commonMain/moko-resources/base/strings_ru.xml
@@ -188,6 +188,7 @@
     <string name="post">Должность</string>
     <string name="phone_number">Номер телефона</string>
     <string name="save">Сохранить</string>
+    <string name="edit_profile">Редактировать профиль</string>
 
     <!-- Booking title -->
     <string name="number_with_parametr"> %s числа </string>
@@ -201,7 +202,7 @@
     <string name="no_free_place">На это время нет мест. Выберите другое время</string>
 
     <!-- Employee -->
-    <string name="about_the_employee">О сотруднике</string>
+    <string name="about_the_employee">О коллеге</string>
     <string name="upcoming_bookings">Брони</string>
     <string name="transfer">Перевод</string>
     <string name="none_booking_seats_by_the_employee">У этого сотрудника пока нет бронирований</string>
diff --git a/composeApp/src/commonMain/moko-resources/en/strings_en.xml b/composeApp/src/commonMain/moko-resources/en/strings_en.xml
index 8c45c97b..23c7bdfb 100644
--- a/composeApp/src/commonMain/moko-resources/en/strings_en.xml
+++ b/composeApp/src/commonMain/moko-resources/en/strings_en.xml
@@ -119,6 +119,7 @@
     <string name="_continue">Continue</string>
 
     <string name="button_title">Information can be changed in the profile screen</string>
+
     <!--Tab titles-->
     <string name="profile">Profile</string>
     <string name="main">Main</string>
@@ -182,6 +183,7 @@
     <string name="post">Post</string>
     <string name="phone_number">Telephone number</string>
     <string name="save">Save</string>
+    <string name="edit_profile">Edit profile</string>
 
     <!-- Employee -->
     <string name="about_the_employee">About the employee</string>
-- 
GitLab