Merge branch 'develop' into layout/change-chat-rooms-ui

app/build.gradle

@@ -18,7 +18,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2058
+        versionCode 2060
         versionName "3.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/chat/rocket/android/chatdetails/ui/Menu.kt

@@ -20,7 +20,7 @@ internal fun ChatDetailsFragment.setupMenu(menu: Menu) {
                     MENU_ACTION_VIDEO_CALL,
                     Menu.NONE,
                     R.string.msg_video_call
-                ).setIcon(R.drawable.ic_video_24dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                ).setIcon(R.drawable.ic_video_white_24dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
             }
         }
     }

app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt

@@ -92,7 +92,7 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
             data?.let { vm ->
                 vm.message.let {
                     val menuItems = view.context.inflate(R.menu.message_actions).toList()
-                    menuItems.find { it.itemId == R.id.action_unpin }?.apply {
+                    menuItems.find { it.itemId == R.id.action_pin }?.apply {
                         setTitle(if (it.pinned) R.string.action_unpin else R.string.action_pin)
                         isChecked = it.pinned
                     }

app/src/main/java/chat/rocket/android/chatroom/ui/Menu.kt

@@ -38,6 +38,7 @@ private fun ChatRoomFragment.setupSearchMessageMenuItem(menu: Menu, context: Con
 
     (searchItem.actionView as? SearchView)?.let {
         // TODO: Check why we need to stylize the search text programmatically instead of by defining it in the styles.xml (ChatRoom.SearchView)
+        it.maxWidth = Integer.MAX_VALUE
         stylizeSearchView(it, context)
         setupSearchViewTextListener(it)
         if (it.isIconified) {

app/src/main/res/drawable/ic_video_white_24dp.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M16.538,13.564l-3.388,-1.09v-2.07l3.394,-1.085 -0.006,4.245zM11.696,14.56L3.454,14.56L3.454,8.32h8.242v6.24zM17.428,8.107c0.362,0.261 0.57,0.69 0.57,1.176v4.312c0,0.487 -0.209,0.914 -0.57,1.175a1.37,1.37 0,0 1,-0.808 0.254c-0.164,0 -0.331,-0.026 -0.498,-0.08l-2.972,-0.956L13.15,16L2,16L2,6.88h11.15v2.01l2.973,-0.956c0.468,-0.15 0.943,-0.087 1.305,0.173zM4.424,5.44L4.424,4h6.302v1.44L4.424,5.44z" />
+</vector>

app/src/main/res/values-ru-rRU/strings.xml

@@ -59,8 +59,8 @@
     <string name="action_register">Зарегистрировать</string>
     <string name="action_confirm">Подтвердить</string>
     <string name="action_delete_account">Удалить аккаунт</string>
-    <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
-    <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
+    <string name="action_favorite">В избранное</string>
+    <string name="action_remove_favorite">Удалить из избранного</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -96,8 +96,8 @@
     <string name="msg_yesterday">Вчера</string>
     <string name="msg_today">Сегодня</string>
     <string name="msg_message">Сообщение</string>
-    <string name="msg_video_call">Video call</string> <!-- TODO Add translation -->
-    <string name="msg_join_video_call">Join video call</string> <!-- TODO Add translation -->
+    <string name="msg_video_call">Видеозвонок</string>
+    <string name="msg_join_video_call">Присоединиться к видеозвонку</string>
     <string name="msg_this_room_is_read_only">Канал только для чтения</string>
     <string name="msg_invalid_2fa_code">Неверный код 2FA</string>
     <string name="msg_invalid_file">Неверный файл</string>
@@ -166,9 +166,9 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
-    <string name="msg_no_topic">No topic</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description</string> <!-- TODO Add translation -->
+    <string name="msg_no_topic">Нет темы</string>
+    <string name="msg_no_announcement">Нет объявления</string>
+    <string name="msg_no_description">Нет описания</string>
     <string name="msg_send_email">Отправить e-mail</string>
     <string name="msg_android_app_support">Поддержка Android-приложения</string>
     <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
@@ -212,23 +212,23 @@
     <string name="message_unmuted">Пользователю %1$s вернули дар речи по решению %2$s</string>
     <string name="message_role_add">%1$s был назначен %2$s пользователем %3$s</string>
     <string name="message_role_removed">%1$s больше не %2$s по решению %3$s</string>
-    <string name="message_video_call_started">Video call started by %1$s</string> <!-- TODO Add translation -->
+    <string name="message_video_call_started">Видеозвонок, начатый %1$s</string>
 
     <!-- Message actions -->
     <string name="action_msg_reply">Ответить</string>
-    <string name="action_info">Info</string> <!-- TODO Add translation -->
+    <string name="action_info">Информация о прочтении</string>
     <string name="action_msg_edit">Редактировать</string>
     <string name="action_msg_copy">Копировать</string>
     <string name="action_msg_quote">Цитировать</string>
     <string name="action_msg_delete">Удалить</string>
-    <string name="action_pin">Pin</string> <!-- TODO Add translation -->
-    <string name="action_unpin">Unpin</string> <!-- TODO Add translation -->
-    <string name="action_star">Star</string> <!-- TODO Add translation -->
-    <string name="action_unstar">Unstar</string> <!-- TODO Add translation -->
+    <string name="action_pin">Закрепить сообщение</string>
+    <string name="action_unpin">Открепить сообщение</string>
+    <string name="action_star">В избранное</string>
+    <string name="action_unstar">Из избранного</string>
     <string name="action_msg_share">Поделиться</string>
-    <string name="action_title_editing">Редактирование сообщения</string>
+    <string name="action_title_editing">Редактировать</string>
     <string name="action_msg_add_reaction">Отреагировать</string>
-    <string name="action_msg_permalink">Permalink</string> <!-- TODO - Add proper translation -->
+    <string name="action_msg_permalink">Копировать ссылку</string>
     <string name="action_msg_report">Пожаловаться</string>
 
     <!-- Permission messages -->
@@ -316,7 +316,7 @@
     <string name="chatroom_header">Заголовок</string>
 
     <!--ChatRooms Headers-->
-    <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
+    <string name="header_favorite">Избранные</string>
     <string name="header_channel">Каналы</string>
     <string name="header_private_groups">Приватные каналы</string>
     <string name="header_direct_messages">Личная переписка</string>