Merge branch 'develop' into develop

app/src/main/AndroidManifest.xml

@@ -90,7 +90,7 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
@@ -60,7 +61,7 @@ object DrawableHelper {
     /**
      * Tints a Drawable.
      *
-     * REMARK: you MUST always wrap the Drawable before tint it.
+     * REMARK: you MUST always wrap the Drawable before tinting it.
      *
      * @param drawable The Drawable to tint.
      * @param context The context.
@@ -72,58 +73,74 @@ object DrawableHelper {
         DrawableCompat.setTint(drawable, ContextCompat.getColor(context, resId))
 
     /**
-     * Compounds an array of Drawable (to appear to the left of the text) into an array of TextView.
+     * Compounds an array of Drawable (to appear on the start side of a text) into an array of TextView.
      *
-     * REMARK: the number of elements in both array of Drawable and EditText MUST be equal.
+     * REMARK: the number of elements in both arrays of Drawable and TextView MUST be equal.
      *
      * @param textView The array of TextView.
      * @param drawables The array of Drawable.
-     * @see compoundLeftDrawable
+     * @see compoundStartDrawable
      */
     fun compoundDrawables(textView: Array<TextView>, drawables: Array<Drawable>) {
         if (textView.size != drawables.size) {
             return
         } else {
             for (i in textView.indices) {
-                textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                if (textView[i].resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                } else {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(null, null, drawables[i], null)
+                }
             }
         }
     }
 
     /**
-     * Compounds a Drawable (to appear on the left side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the start side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
      * @see compoundDrawables
      */
-    fun compoundLeftDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+    fun compoundStartDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        }
 
     /**
-     * Compounds a Drawable (to appear on the right side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the end side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
-     * @see compoundLeftDrawable
+     * @see compoundStartDrawable
      */
-    fun compoundRightDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+    fun compoundEndDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        }
 
     /**
-     * Compounds a Drawable (to appear on the left and right side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the start and end side of a text) into a TextView.
      *
      * @param textView The TextView.
-     * @param leftDrawable The left Drawable.
-     * @param rightDrawable The right Drawable.
-     * @see compoundLeftDrawable
+     * @param startDrawable The start Drawable.
+     * @param endDrawable The end Drawable.
+     * @see compoundStartDrawable
      */
-    fun compoundLeftAndRightDrawable(
+    fun compoundStartAndEndDrawable(
         textView: TextView,
-        leftDrawable: Drawable,
-        rightDrawable: Drawable
+        startDrawable: Drawable,
+        endDrawable: Drawable
     ) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, rightDrawable, null)
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(startDrawable, null, endDrawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(endDrawable, null, startDrawable, null)
+        }
 
     /**
      * Returns the user status drawable.
@@ -141,4 +158,4 @@ object DrawableHelper {
             else -> getDrawableFromId(R.drawable.ic_status_invisible_12dp, context)
         }
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

@@ -140,7 +140,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
             DrawableHelper.wrapDrawable(atDrawable)
             DrawableHelper.tintDrawable(atDrawable, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundLeftDrawable(text_username, atDrawable)
+            DrawableHelper.compoundStartDrawable(text_username, atDrawable)
         }
     }
 

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

@@ -195,7 +195,7 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
             val wrappedDrawable = DrawableHelper.wrapDrawable(it)
             val mutableDrawable = wrappedDrawable.mutate()
             DrawableHelper.tintDrawable(mutableDrawable, context!!, R.color.colorPrimary)
-            DrawableHelper.compoundLeftDrawable(name, mutableDrawable)
+            DrawableHelper.compoundStartDrawable(name, mutableDrawable)
         }
     }
 

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

@@ -139,7 +139,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
     }
 
     fun setupExpandMoreForToolbar(listener: (View) -> Unit) {
-        DrawableHelper.compoundRightDrawable(
+        DrawableHelper.compoundEndDrawable(
             text_toolbar_title,
             DrawableHelper.getDrawableFromId(R.drawable.ic_chatroom_toolbar_expand_more_20dp, this)
         )

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.chatrooms.adapter
 import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.view.View
+import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -15,7 +16,6 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import kotlinx.android.synthetic.main.item_chat.view.*
-import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
 class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) :
     ViewHolder<RoomItemHolder>(itemView) {
@@ -31,8 +31,6 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
     override fun bindViews(data: RoomItemHolder) {
         val room = data.data
         with(itemView) {
-            val avatar = room.avatar
-
             Glide.with(image_avatar.context)
                 .load(room.avatar)
                 .apply(RequestOptions.bitmapTransform(RoundedCorners(10)))
@@ -63,6 +61,7 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
             }
 
             if (room.alert) {
+                val text_total_unread_messages = text_total_unread_messages as TextView
                 if (room.unread == null) text_total_unread_messages.text = "!"
                 if (room.unread != null) text_total_unread_messages.text = room.unread
                 if (room.mentions) text_total_unread_messages.text = "@${room.unread}"

app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt

@@ -233,14 +233,14 @@ class DirectoryFragment : Fragment(), DirectoryView {
     private fun updateSortByTitle() {
         if (isSortByChannels) {
             text_sort_by.text = getString(R.string.msg_channels)
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 text_sort_by,
                 hashtagDrawable,
                 arrowDownDrawable
             )
         } else {
             text_sort_by.text = getString(R.string.msg_users)
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 text_sort_by,
                 userDrawable,
                 arrowDownDrawable

app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt

@@ -11,7 +11,7 @@ import android.widget.TextView
 import androidx.fragment.app.FragmentManager
 import chat.rocket.android.R
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.bottom_seet_fragment_directory_sorting.*
+import kotlinx.android.synthetic.main.bottom_sheet_fragment_directory_sorting.*
 
 fun showDirectorySortingBottomSheetFragment(
     isSortByChannels: Boolean,
@@ -59,7 +59,7 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? =
-        inflater.inflate(R.layout.bottom_seet_fragment_directory_sorting, container, false)
+        inflater.inflate(R.layout.bottom_sheet_fragment_directory_sorting, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -100,21 +100,21 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
         }
     }
 
-    private fun checkSelection(textView: TextView, leftDrawable: Drawable) {
+    private fun checkSelection(textView: TextView, startDrawable: Drawable) {
         context?.let {
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 textView,
-                leftDrawable,
+                startDrawable,
                 checkDrawable
             )
         }
     }
 
-    private fun uncheckSelection(textView: TextView, leftDrawable: Drawable) {
+    private fun uncheckSelection(textView: TextView, startDrawable: Drawable) {
         context?.let {
-            DrawableHelper.compoundLeftDrawable(
+            DrawableHelper.compoundStartDrawable(
                 textView,
-                leftDrawable
+                startDrawable
             )
         }
     }

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
     @Inject
     lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
     @Inject
-    lateinit var fagmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject
     lateinit var presenter: MainPresenter
 
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), HasActivityInjector,
         activityDispatchingAndroidInjector
 
     override fun supportFragmentInjector(): AndroidInjector<Fragment> =
-        fagmentDispatchingAndroidInjector
+        fragmentDispatchingAndroidInjector
 
     override fun updateLanguage(language: String, country: String?) {
         val locale: Locale = if (country != null) {

app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt

@@ -143,21 +143,21 @@ class SortingAndGroupingBottomSheetFragment : BottomSheetDialogFragment(), Sorti
         text_sort_by.text = getString(R.string.msg_sort_by_placeholder, text.toLowerCase())
     }
 
-    private fun checkSelection(textView: TextView, @DrawableRes leftDrawable: Int) {
+    private fun checkSelection(textView: TextView, @DrawableRes startDrawable: Int) {
         context?.let {
-            DrawableHelper.compoundLeftAndRightDrawable(
+            DrawableHelper.compoundStartAndEndDrawable(
                 textView,
-                DrawableHelper.getDrawableFromId(leftDrawable, it),
+                DrawableHelper.getDrawableFromId(startDrawable, it),
                 DrawableHelper.getDrawableFromId(R.drawable.ic_check, it)
             )
         }
     }
 
-    private fun uncheckSelection(textView: TextView, @DrawableRes leftDrawable: Int) {
+    private fun uncheckSelection(textView: TextView, @DrawableRes startDrawable: Int) {
         context?.let {
-            DrawableHelper.compoundLeftDrawable(
+            DrawableHelper.compoundStartDrawable(
                 textView,
-                DrawableHelper.getDrawableFromId(leftDrawable, it)
+                DrawableHelper.getDrawableFromId(startDrawable, it)
             )
         }
     }

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

-<vector android:height="24dp" android:viewportHeight="100"
-    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ededed" android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z"/>
-    <path android:fillColor="#afafae" android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z"/>
-    <path android:fillColor="#afafae" android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+    <path
+        android:fillColor="#ededed"
+        android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z" />
+    <path
+        android:fillColor="#afafae"
+        android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z" />
+    <path
+        android:fillColor="#afafae"
+        android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z" />
 </vector>

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/actionMenuColor"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path

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

 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="832.000000dp"
-    android:height="220.000000dp"
-    android:viewportWidth="832.000000"
-    android:viewportHeight="220.000000">
+    android:width="832.0dp"
+    android:height="220.0dp"
+    android:viewportWidth="832.0"
+    android:viewportHeight="220.0">
 
     <group
-        android:translateY="220.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="220"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
         <path
             android:fillColor="#04436A"
             android:strokeWidth="1"

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:autoMirrored="true"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
 
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>

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

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="18dp"
-    android:viewportWidth="20"
-    android:viewportHeight="18">
-
-    <path
-        android:fillColor="#1D74F5"
-        android:fillType="nonZero"
-        android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#1D74F5"
-        android:fillType="nonZero"
-        android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF1D74F5"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
+    <path
+        android:fillColor="#FF1D74F5"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
+</vector>

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

@@ -4,7 +4,6 @@
     android:viewportWidth="17"
     android:viewportHeight="12">
 
-
     <path
         android:fillColor="#1D74F5"
         android:fillType="nonZero"

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#1D74F5"
     android:viewportWidth="24"
     android:viewportHeight="24">
 

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#999999"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path

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

@@ -3,10 +3,10 @@
     android:height="16dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
-  <path
-      android:pathData="M3.7143,10.5714L3.7143,5.4286L0.8571,5.4286C0.3838,5.4286 0,5.0448 0,4.5714L0,4.5714C0,4.098 0.3838,3.7143 0.8571,3.7143L3.7143,3.7143L3.7143,0.8571C3.7143,0.3838 4.098,0 4.5714,0L4.5714,0C5.0448,0 5.4286,0.3838 5.4286,0.8571L5.4286,3.7143L10.5714,3.7143L10.5714,0.8571C10.5714,0.3838 10.9552,0 11.4286,0L11.4286,0C11.902,0 12.2857,0.3838 12.2857,0.8571L12.2857,3.7143L15.1429,3.7143C15.6162,3.7143 16,4.098 16,4.5714L16,4.5714C16,5.0448 15.6162,5.4286 15.1429,5.4286L12.2857,5.4286L12.2857,10.5714L15.1429,10.5714C15.6162,10.5714 16,10.9552 16,11.4286L16,11.4286C16,11.902 15.6162,12.2857 15.1429,12.2857L12.2857,12.2857L12.2857,15.1429C12.2857,15.6162 11.902,16 11.4286,16L11.4286,16C10.9552,16 10.5714,15.6162 10.5714,15.1429L10.5714,12.2857L5.4286,12.2857L5.4286,15.1429C5.4286,15.6162 5.0448,16 4.5714,16L4.5714,16C4.098,16 3.7143,15.6162 3.7143,15.1429L3.7143,12.2857L0.8571,12.2857C0.3838,12.2857 0,11.902 0,11.4286L0,11.4286C0,10.9552 0.3838,10.5714 0.8571,10.5714L3.7143,10.5714ZM5.4286,10.5714L10.5714,10.5714L10.5714,5.4286L5.4286,5.4286L5.4286,10.5714Z"
-      android:strokeWidth="1"
-      android:fillColor="#CBCBCC"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M3.7143,10.5714L3.7143,5.4286L0.8571,5.4286C0.3838,5.4286 0,5.0448 0,4.5714L0,4.5714C0,4.098 0.3838,3.7143 0.8571,3.7143L3.7143,3.7143L3.7143,0.8571C3.7143,0.3838 4.098,0 4.5714,0L4.5714,0C5.0448,0 5.4286,0.3838 5.4286,0.8571L5.4286,3.7143L10.5714,3.7143L10.5714,0.8571C10.5714,0.3838 10.9552,0 11.4286,0L11.4286,0C11.902,0 12.2857,0.3838 12.2857,0.8571L12.2857,3.7143L15.1429,3.7143C15.6162,3.7143 16,4.098 16,4.5714L16,4.5714C16,5.0448 15.6162,5.4286 15.1429,5.4286L12.2857,5.4286L12.2857,10.5714L15.1429,10.5714C15.6162,10.5714 16,10.9552 16,11.4286L16,11.4286C16,11.902 15.6162,12.2857 15.1429,12.2857L12.2857,12.2857L12.2857,15.1429C12.2857,15.6162 11.902,16 11.4286,16L11.4286,16C10.9552,16 10.5714,15.6162 10.5714,15.1429L10.5714,12.2857L5.4286,12.2857L5.4286,15.1429C5.4286,15.6162 5.0448,16 4.5714,16L4.5714,16C4.098,16 3.7143,15.6162 3.7143,15.1429L3.7143,12.2857L0.8571,12.2857C0.3838,12.2857 0,11.902 0,11.4286L0,11.4286C0,10.9552 0.3838,10.5714 0.8571,10.5714L3.7143,10.5714ZM5.4286,10.5714L10.5714,10.5714L10.5714,5.4286L5.4286,5.4286L5.4286,10.5714Z"
+        android:strokeWidth="1"
+        android:fillColor="#CBCBCC"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000" />
 </vector>

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

@@ -3,14 +3,14 @@
     android:height="12dp"
     android:viewportWidth="12"
     android:viewportHeight="12">
-  <path
-      android:pathData="M1.5,5.5h9v6h-9z"
-      android:strokeWidth="1"
-      android:strokeColor="#787878"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M2.5,5.5L9.5,5.5L9.5,4C9.5,2.067 7.933,0.5 6,0.5C4.067,0.5 2.5,2.067 2.5,4L2.5,5.5Z"
-      android:strokeWidth="1"
-      android:strokeColor="#787878"
-      android:fillType="evenOdd"/>
+    <path
+        android:pathData="M1.5,5.5h9v6h-9z"
+        android:strokeWidth="1"
+        android:strokeColor="#787878"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M2.5,5.5L9.5,5.5L9.5,4C9.5,2.067 7.933,0.5 6,0.5C4.067,0.5 2.5,2.067 2.5,4L2.5,5.5Z"
+        android:strokeWidth="1"
+        android:strokeColor="#787878"
+        android:fillType="evenOdd" />
 </vector>

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

@@ -3,23 +3,23 @@
     android:height="20dp"
     android:viewportWidth="20"
     android:viewportHeight="20">
-  <path
-      android:pathData="M18.976,9.783C15.808,6.408 12.812,4.75 10,4.75c-2.812,0 -5.808,1.658 -8.976,5.033C4.28,13.166 7.278,14.829 10,14.829c2.722,0 5.72,-1.663 8.976,-5.046z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9EA2A8"/>
-  <path
-      android:pathData="M7.965,11.783a2.75,2.75 0,0 0,3.915 -3.661l-3.915,3.66z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9EA2A8"/>
-  <path
-      android:pathData="M3.025,15.047L16.105,3.14"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9EA2A8"
-      android:strokeLineCap="round"/>
+    <path
+        android:pathData="M18.976,9.783C15.808,6.408 12.812,4.75 10,4.75c-2.812,0 -5.808,1.658 -8.976,5.033C4.28,13.166 7.278,14.829 10,14.829c2.722,0 5.72,-1.663 8.976,-5.046z"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8" />
+    <path
+        android:pathData="M7.965,11.783a2.75,2.75 0,0 0,3.915 -3.661l-3.915,3.66z"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8" />
+    <path
+        android:pathData="M3.025,15.047L16.105,3.14"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
 </vector>

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
+    android:width="16dp"
     android:height="16dp"
-    android:viewportWidth="15"
+    android:viewportWidth="16"
     android:viewportHeight="16">
-
-    <path
-        android:fillColor="#CBCBCC"
-        android:fillType="nonZero"
-        android:pathData="M1.5248,13.3289C1.7124,13.3993 1.9453,13.471 2.2276,13.5407C3.3824,13.8259 5.0297,14 7.25,14C9.4703,14 11.1176,13.8259 12.2724,13.5407C12.5547,13.471 12.7876,13.3993 12.9752,13.3289C12.8483,12.2275 12.2304,11.6229 11.0233,11.1185C10.8562,11.0486 10.6821,10.9818 10.4514,10.8975C10.5051,10.9171 10.0041,10.7357 9.8749,10.6871C8.6886,10.2409 8.125,9.817 8.1271,8.9552C8.1257,8.9352 8.1257,8.9352 8.1232,8.8835C8.1089,8.5412 8.1341,8.1482 8.2352,7.7544C8.3357,7.3629 8.5018,7.0212 8.7796,6.7313C9.4429,6.0859 9.75,5.4186 9.75,4.4169C9.75,2.7871 8.6092,1.5 7.25,1.5C5.8908,1.5 4.75,2.7871 4.75,4.4169C4.75,5.4177 5.0499,6.0675 5.7166,6.7436C5.9791,7.0111 6.1513,7.3472 6.2566,7.7298C6.3671,8.1314 6.3941,8.5324 6.3773,8.8838C6.3741,8.9408 6.3741,8.9408 6.375,8.8986C6.375,9.817 5.8114,10.2409 4.6251,10.6871C4.4959,10.7357 3.9949,10.9171 4.0486,10.8975C3.8179,10.9818 3.6438,11.0486 3.4767,11.1185C2.2696,11.6229 1.6517,12.2275 1.5248,13.3289ZM0,13.7878C0,11.6909 1.029,10.5156 2.8983,9.7344C3.0901,9.6543 3.2836,9.58 3.5339,9.4886C3.4888,9.505 3.978,9.3279 4.0971,9.2831C4.7164,9.0502 4.875,8.9309 4.8778,8.834C4.8775,8.8383 4.8775,8.8383 4.879,8.8121C4.8889,8.6053 4.8718,8.351 4.8104,8.1279C4.7676,7.9725 4.7093,7.8588 4.6472,7.7955C3.7195,6.8547 3.25,5.8375 3.25,4.4169C3.25,1.9963 5.0194,0 7.25,0C9.4806,0 11.25,1.9963 11.25,4.4169C11.25,5.8419 10.7679,6.8896 9.8447,7.7872C9.7867,7.8479 9.7298,7.9649 9.6881,8.1274C9.6297,8.3548 9.6132,8.6125 9.6219,8.8209C9.6231,8.8456 9.6231,8.8456 9.625,8.8986C9.625,8.9309 9.7836,9.0502 10.4029,9.2831C10.522,9.3279 11.0112,9.505 10.9661,9.4886C11.2164,9.58 11.4099,9.6543 11.6017,9.7344C13.471,10.5156 14.5,11.6909 14.5,13.7878L14.5,14.1647L14.1975,14.3896C13.9508,14.573 13.4546,14.7939 12.6319,14.997C11.351,15.3133 9.5847,15.5 7.25,15.5C4.9153,15.5 3.149,15.3133 1.8681,14.997C1.0454,14.7939 0.5492,14.573 0.3025,14.3896L0,14.1647L0,13.7878Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
+    <group android:translateX="1">
+        <path
+            android:fillColor="#CBCBCC"
+            android:fillType="nonZero"
+            android:pathData="M1.5248,13.3289C1.7124,13.3993 1.9453,13.471 2.2276,13.5407C3.3824,13.8259 5.0297,14 7.25,14C9.4703,14 11.1176,13.8259 12.2724,13.5407C12.5547,13.471 12.7876,13.3993 12.9752,13.3289C12.8483,12.2275 12.2304,11.6229 11.0233,11.1185C10.8562,11.0486 10.6821,10.9818 10.4514,10.8975C10.5051,10.9171 10.0041,10.7357 9.8749,10.6871C8.6886,10.2409 8.125,9.817 8.1271,8.9552C8.1257,8.9352 8.1257,8.9352 8.1232,8.8835C8.1089,8.5412 8.1341,8.1482 8.2352,7.7544C8.3357,7.3629 8.5018,7.0212 8.7796,6.7313C9.4429,6.0859 9.75,5.4186 9.75,4.4169C9.75,2.7871 8.6092,1.5 7.25,1.5C5.8908,1.5 4.75,2.7871 4.75,4.4169C4.75,5.4177 5.0499,6.0675 5.7166,6.7436C5.9791,7.0111 6.1513,7.3472 6.2566,7.7298C6.3671,8.1314 6.3941,8.5324 6.3773,8.8838C6.3741,8.9408 6.3741,8.9408 6.375,8.8986C6.375,9.817 5.8114,10.2409 4.6251,10.6871C4.4959,10.7357 3.9949,10.9171 4.0486,10.8975C3.8179,10.9818 3.6438,11.0486 3.4767,11.1185C2.2696,11.6229 1.6517,12.2275 1.5248,13.3289ZM0,13.7878C0,11.6909 1.029,10.5156 2.8983,9.7344C3.0901,9.6543 3.2836,9.58 3.5339,9.4886C3.4888,9.505 3.978,9.3279 4.0971,9.2831C4.7164,9.0502 4.875,8.9309 4.8778,8.834C4.8775,8.8383 4.8775,8.8383 4.879,8.8121C4.8889,8.6053 4.8718,8.351 4.8104,8.1279C4.7676,7.9725 4.7093,7.8588 4.6472,7.7955C3.7195,6.8547 3.25,5.8375 3.25,4.4169C3.25,1.9963 5.0194,0 7.25,0C9.4806,0 11.25,1.9963 11.25,4.4169C11.25,5.8419 10.7679,6.8896 9.8447,7.7872C9.7867,7.8479 9.7298,7.9649 9.6881,8.1274C9.6297,8.3548 9.6132,8.6125 9.6219,8.8209C9.6231,8.8456 9.6231,8.8456 9.625,8.8986C9.625,8.9309 9.7836,9.0502 10.4029,9.2831C10.522,9.3279 11.0112,9.505 10.9661,9.4886C11.2164,9.58 11.4099,9.6543 11.6017,9.7344C13.471,10.5156 14.5,11.6909 14.5,13.7878L14.5,14.1647L14.1975,14.3896C13.9508,14.573 13.4546,14.7939 12.6319,14.997C11.351,15.3133 9.5847,15.5 7.25,15.5C4.9153,15.5 3.149,15.3133 1.8681,14.997C1.0454,14.7939 0.5492,14.573 0.3025,14.3896L0,14.1647L0,13.7878Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+    </group>
 </vector>

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="80dp"
-        android:height="45dp"
-        android:viewportWidth="80.0"
-        android:viewportHeight="45.0">
+    android:width="80dp"
+    android:height="45dp"
+    android:viewportWidth="80.0"
+    android:viewportHeight="45.0">
     <path
-            android:pathData="M0,0h80v45h-80z"
-            android:strokeColor="#00000000"
-            android:fillColor="#C3D1DA"
-            android:strokeWidth="1"/>
+        android:pathData="M0,0h80v45h-80z"
+        android:strokeColor="#00000000"
+        android:fillColor="#C3D1DA"
+        android:strokeWidth="1" />
     <path
-            android:pathData="M43.99,16.75C44.34,16.75 44.64,16.87 44.88,17.12C45.13,17.36 45.25,17.66 45.25,18.01L45.25,26.74C45.25,27.09 45.13,27.39 44.88,27.63C44.64,27.88 44.34,28 43.99,28L35.26,28C34.91,28 34.61,27.88 34.37,27.63C34.12,27.39 34,27.09 34,26.74L34,18.01C34,17.66 34.12,17.36 34.37,17.12C34.61,16.87 34.91,16.75 35.26,16.75L43.99,16.75ZM43.99,26.74L43.99,18.01L35.26,18.01L35.26,26.74L43.99,26.74ZM40.86,22.55L43.05,25.51L36.2,25.51L37.9,23.28L39.13,24.78L40.86,22.55Z"
-            android:strokeColor="#00000000"
-            android:fillColor="#5D8298"
-            android:strokeWidth="1"/>
+        android:pathData="M43.99,16.75C44.34,16.75 44.64,16.87 44.88,17.12C45.13,17.36 45.25,17.66 45.25,18.01L45.25,26.74C45.25,27.09 45.13,27.39 44.88,27.63C44.64,27.88 44.34,28 43.99,28L35.26,28C34.91,28 34.61,27.88 34.37,27.63C34.12,27.39 34,27.09 34,26.74L34,18.01C34,17.66 34.12,17.36 34.37,17.12C34.61,16.87 34.91,16.75 35.26,16.75L43.99,16.75ZM43.99,26.74L43.99,18.01L35.26,18.01L35.26,26.74L43.99,26.74ZM40.86,22.55L43.05,25.51L36.2,25.51L37.9,23.28L39.13,24.78L40.86,22.55Z"
+        android:strokeColor="#00000000"
+        android:fillColor="#5D8298"
+        android:strokeWidth="1" />
 </vector>

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

@@ -6,5 +6,7 @@
 
     <corners android:radius="4dp" />
 
-    <stroke android:color="#1D74F5" android:width="2dp" />
+    <stroke
+        android:width="2dp"
+        android:color="#1D74F5" />
 </shape>
\ No newline at end of file

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

 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-  <solid android:color="@color/colorAccent" />
+    <solid android:color="@color/colorAccent" />
 
-  <size
-      android:width="24dp"
-      android:height="24dp" />
+    <size
+        android:width="24dp"
+        android:height="24dp" />
 
 </shape>
\ No newline at end of file

app/src/main/res/layout/app_bar_password.xml

@@ -15,9 +15,11 @@
         app:navigationIcon="?android:attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ActionModeStyle">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <TextView
                 android:id="@+id/text_change_password"
                 android:layout_width="wrap_content"

app/src/main/res/layout/bottom_seet_fragment_directory_sorting.xml → app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml

@@ -83,11 +83,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/view_divider_two" />
 
-
     <Switch
         android:id="@+id/switch_global_users"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:checked="false"
         app:layout_constraintBottom_toBottomOf="@+id/text_search_for_global_users"
@@ -108,5 +108,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_search_for_global_users" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/dialog_report.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
-    <!--xmlns:app="http://schemas.android.com/apk/res-auto"-->
-    <!--xmlns:tools="http://schemas.android.com/tools"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:fillViewport="true">-->
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp">
-
-        <!--<com.google.android.material.appbar.AppBarLayout-->
-        <!--android:id="@+id/appBarLayout"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:background="@color/colorPrimary"-->
-        <!--android:theme="@style/Theme.AppCompat.Light.NoActionBar">-->
-
-        <!--<androidx.appcompat.widget.Toolbar-->
-        <!--android:id="@+id/toolbar"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="?attr/actionBarSize"-->
-        <!--app:layout_scrollFlags="scroll|enterAlways"-->
-        <!--app:navigationIcon="?android:attr/homeAsUpIndicator"-->
-        <!--app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-        <!--app:theme="@style/ActionModeStyle">-->
-
-        <!--<RelativeLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content">-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_change_password"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_alignParentStart="true"-->
-        <!--android:ellipsize="end"-->
-        <!--android:maxLines="1"-->
-        <!--android:text="@string/action_msg_report"-->
-        <!--android:textColor="@color/colorWhite"-->
-        <!--android:textSize="18sp"-->
-        <!--android:textStyle="bold" />-->
-        <!--</RelativeLayout>-->
-        <!--</androidx.appcompat.widget.Toolbar>-->
-
-        <!--</com.google.android.material.appbar.AppBarLayout>-->
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="24dp" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_end="24dp" />
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_report_label"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Description"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--app:layout_constraintStart_toStartOf="@+id/guideline_start"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_required"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginStart="8dp"-->
-        <!--android:text="(required)"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--android:textSize="14sp"-->
-        <!--app:layout_constraintEnd_toEndOf="@+id/guideline_end"-->
-        <!--app:layout_constraintStart_toEndOf="@id/text_view_report_label"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <EditText
-            android:id="@+id/edit_text_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:inputType="textCapSentences|textMultiLine"
-            android:maxLines="4"
-            android:overScrollMode="always"
-            android:scrollbarStyle="insideInset"
-            android:scrollbars="vertical"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Jot something untoward..." />
-
-        <TextView
-            android:id="@+id/text_view_error"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/required"
-            android:textColor="@color/colorRed"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@+id/edit_text_description"
-            tools:visibility="visible" />
-
-        <android.widget.Button
-            android:id="@+id/button_send_report"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/rounded_color_accent"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/submit"
-            android:textColor="@android:color/white"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@id/text_view_error" />1
-    </androidx.constraintlayout.widget.ConstraintLayout>
-<!--</androidx.core.widget.NestedScrollView>-->

app/src/main/res/layout/emoji_image_row_item.xml

 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/emoji_image_view"
     android:layout_width="48dp"
     android:layout_height="48dp"
-    android:layout_gravity="center">
-
-    <ImageView
-        android:id="@+id/emoji_image_view"
+    android:layout_gravity="center"
+    android:padding="8dp"
+    tools:src="@tools:sample/avatars" />
\ No newline at end of file
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center"
-        tools:src="@tools:sample/avatars" />
-</FrameLayout>

app/src/main/res/layout/fragment_authentication_on_boarding.xml

@@ -25,6 +25,7 @@
             android:id="@+id/text_on_boarding_title"
             style="@style/Authentication.TextView.Headline"
             android:layout_marginTop="32dp"
+            android:gravity="center"
             android:text="@string/msg_welcome_to_rocket_chat"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -33,6 +34,7 @@
         <TextView
             android:id="@+id/text_on_boarding_description"
             style="@style/Authentication.TextView.Description"
+            android:gravity="center"
             android:text="@string/msg_team_communication"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -41,7 +43,7 @@
         <RelativeLayout
             android:id="@+id/connect_with_a_server_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="32dp"
             android:background="@drawable/rounded_border"
             android:foreground="?selectableItemBackground"
@@ -84,7 +86,7 @@
         <RelativeLayout
             android:id="@+id/join_community_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="10dp"
             android:background="@drawable/rounded_border"
             android:foreground="?selectableItemBackground"
@@ -136,7 +138,7 @@
         <RelativeLayout
             android:id="@+id/create_server_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="10dp"
             android:background="@drawable/rounded_color_accent"
             android:foreground="?selectableItemBackground"

app/src/main/res/layout/fragment_authentication_server.xml

@@ -26,6 +26,7 @@
             android:id="@+id/text_sign_in_to_your_server"
             style="@style/Authentication.TextView.Headline"
             android:layout_marginTop="8dp"
+            android:gravity="center"
             android:text="@string/title_sign_in_your_server"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_chat_details.xml

@@ -21,7 +21,9 @@
                 style="@style/ChatDetails.Title.TextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:text="#important" />
+                android:drawableStart="@drawable/ic_hashtag_black_12dp"
+                android:drawablePadding="@dimen/text_view_drawable_padding"
+                tools:text="important" />
 
             <TextView
                 android:id="@+id/title_description"

app/src/main/res/layout/fragment_settings.xml

@@ -69,7 +69,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/image_avatar"
                     app:layout_constraintTop_toBottomOf="@+id/text_display_name"
-                    tools:text="visible" />
+                    tools:text="online" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView

app/src/main/res/layout/item_actions_attachment.xml

@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
 
     <View
         android:id="@+id/quote_bar"

app/src/main/res/layout/item_chat.xml

@@ -62,16 +62,16 @@
         android:layout_marginEnd="12dp"
         android:textDirection="locale"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
+        app:layout_constraintEnd_toStartOf="@+id/text_total_unread_messages"
         app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
         app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
         tools:text="Filipe de Lima Brito: Type something that is very long and need at least two lines, or maybe even more" />
 
     <include
-        android:id="@+id/layout_unread_messages_badge"
+        android:id="@+id/text_total_unread_messages"
         layout="@layout/unread_messages_badge"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
+        android:layout_width="21sp"
+        android:layout_height="21sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_last_message" />
 

app/src/main/res/layout/item_message.xml

@@ -156,7 +156,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/message_header"
         app:layout_constraintTop_toBottomOf="@+id/message_header"
-        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
 
     <Button
         android:id="@+id/button_join_video_call"

app/src/main/res/layout/message_attachment_options.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="20dp"
-        android:drawableStart="@drawable/ic_camera"
+        android:drawableStart="@drawable/ic_camera_24dp"
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 

app/src/main/res/layout/unread_messages_badge.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/text_total_unread_messages"
-        style="@style/ChatList.Badge.TextView"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
+    style="@style/ChatList.Badge.TextView"
+    android:layout_width="21sp"
+    android:layout_height="21sp"
+    android:background="@drawable/style_total_unread_messages"
+    android:visibility="gone"
+    tools:text="1"
+    tools:visibility="visible" />
\ No newline at end of file
-        android:background="@drawable/style_total_unread_messages"
-        android:visibility="gone"
-        tools:text="1"
-        tools:visibility="visible" />
-
-</LinearLayout>
\ No newline at end of file

app/src/main/res/values-ar/strings.xml

-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!-- Titles -->
@@ -21,7 +20,7 @@
     <string name="title_password">تغيير كلمة السر</string>
     <string name="title_update_profile">تحديث الملف الشخصي</string>
     <string name="title_create_channel">إنشاء قناة</string>
-    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
+    <string name="title_choose_language">اختر اللغة</string>
     <string name="title_license">الترخيص</string>
     <string name="title_are_you_sure">هل أنت متأكد؟</string>
     <string name="title_channel_details">تفاصيل القناة</string>
@@ -34,7 +33,7 @@
     <string name="action_use_this_username">استخدم هذا الاسم</string>
     <string name="action_terms_of_service">شروط الخدمة</string>
     <string name="action_privacy_policy">شروط الخدمة</string>
-    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
+    <string name="action_new_channel">قناة جديدة</string>
     <string name="action_search">بحث</string>
     <string name="action_update">تحديث</string>
     <string name="action_settings">الإعدادات</string>
@@ -58,40 +57,40 @@
     <string name="action_create_server">إنشاء خادم جديد</string>
     <string name="action_register">تسجيل</string>
     <string name="action_confirm">تأكيد</string>
-    <string name="action_favorite">Favorite</string> <!-- TODO Translate -->
-    <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Translate -->
+    <string name="action_favorite">تفضيل</string>
+    <string name="action_remove_favorite">إزالة التفضيل</string>
 
     <!-- Settings messages -->
-    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
-    <string name="msg_language">Language</string> <!-- TODO Translate -->
-    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
-    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
-    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
-    <string name="msg_license">License</string> <!-- TODO Translate -->
-    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
-    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
-    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
-    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
-    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
-    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+    <string name="msg_contact_us">اتصل بنا</string>
+    <string name="msg_language">تغيير اللغة</string>
+    <string name="msg_review_this_app">قيم هذا التطبيق</string>
+    <string name="msg_share_this_app">شارك هذا التطبيق</string>
+    <string name="msg_administration">الادارة</string>
+    <string name="msg_license">الرخصة</string>
+    <string name="msg_app_version">الإصدار: %1$s (%2$d)</string>
+    <string name="msg_server_version">إصدار الخادم: %1$s</string>
+    <string name="msg_send_analytics">إرسال التحليلات</string>
+    <string name="msg_logout_from_rocket_chat">تسجيل الخروج من Rocket.Chat</string>
+    <string name="msg_delete_account">حذف الحساب</string>
+    <string name="msg_change_status">تغيير الوضع</string>
 
-    <string-array name="languages"> <!-- TODO Add translations -->
-        <item>English</item>
-        <item>Arabic</item>
-        <item>German</item>
-        <item>Spanish</item>
-        <item>Persian</item>
-        <item>French</item>
-        <item>Hindi (IN)</item>
-        <item>Italian</item>
-        <item>Japanese</item>
-        <item>Portuguese (BR)</item>
-        <item>Portuguese (PT)</item>
-        <item>Russian (RU)</item>
-        <item>Turkish</item>
-        <item>Ukrainian</item>
-        <item>Chinese (CN)</item>
-        <item>Chinese (TW)</item>
+    <string-array name="languages">
+        <item>الإنجليزية</item>
+        <item>العربية</item>
+        <item>الألمانية</item>
+        <item>الأسبانية</item>
+        <item>الفارسية</item>
+        <item>الفرنسية</item>
+        <item>الهندية (IN)</item>
+        <item>الإيطالية</item>
+        <item>اليابانية</item>
+        <item>البرتغالية (BR)</item>
+        <item>البرتغالية (PT)</item>
+        <item>الروسية (RU)</item>
+        <item>التركية</item>
+        <item>الأوكرانية</item>
+        <item>الصينية (CN)</item>
+        <item>الصينية (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -116,10 +115,10 @@
     <string name="msg_yesterday">أمس</string>
     <string name="msg_today">اليوم</string>
     <string name="msg_message">رسالة</string>
-    <string name="msg_video_call">Video call</string> <!-- TODO Translate -->
-    <string name="msg_join_video_call">Join video call</string> <!-- TODO Translate -->
-    <string name="msg_this_room_is_read_only">هذه الغرفة للقراءة فقك</string>
-    <string name="msg_invalid_2fa_code">Invalid 2FA Code</string>
+    <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>
     <string name="msg_invalid_server_url">رابط خادم غير صحيح</string>
     <string name="msg_content_description_log_in_using_facebook">تسجيل باستخدام فيسبوك</string>
@@ -136,12 +135,12 @@
     <string name="msg_you">أنت</string>
     <string name="msg_unknown">غير معرف</string>
     <string name="msg_email_address">عنوان بريد</string>
-    <string name="msg_utc_offset">UTC offset</string>
+    <string name="msg_utc_offset">التقديم عن UTC</string>
     <string name="msg_new_password">إدخال كلمة سر جديدة</string>
     <string name="msg_confirm_password">تأكيد كلمة السر</string>
-    <string name="msg_channel_name">تغيير الاسم</string>
+    <string name="msg_channel_name">اسم القناة</string>
     <string name="msg_search">بحث</string>
-    <string name="msg_unread_messages">لرسالة غير مقروءة</string>
+    <string name="msg_unread_messages">رسائل غير مقروءة</string>
     <string name="msg_preview_video">فيديو</string>
     <string name="msg_preview_audio">صوت</string>
     <string name="msg_preview_photo">صورة</string>
@@ -153,9 +152,9 @@
     <string name="msg_ver_not_minimum">يبدو أن خادمك قديم %1$s من فضلك حدث الخادم للاستمرار</string>
     <string name="msg_no_chat_title">لا توجد رسائل</string>
     <string name="msg_no_chat_description">إبدأ المحادثة لترى الرسائل هنا</string>
-    <string name="msg_http_insecure">أنت تستخدم  HTTP وهو غير آمن ونحن لا نحبذ ذلك.</string>
+    <string name="msg_http_insecure">أنت تستخدم HTTP وهو غير آمن ونحن لا نحبذ ذلك.</string>
     <string name="msg_error_checking_server_version">حدذ خطأ عند محاولة الوصول نسخة خادمك حاول مرة أخرى</string>
-    <string name="msg_invalid_server_protocol">النظام المستخدم غير مقبول حاول ب  HTTPS</string>
+    <string name="msg_invalid_server_protocol">النظام المستخدم غير مقبول، حاول ب HTTPS</string>
     <string name="msg_image_saved_successfully">تم حفظ الصورة في المعرض</string>
     <string name="msg_image_saved_failed">لم يتم حفظ الصورة</string>
     <string name="msg_edited">(معدلة)</string>
@@ -186,23 +185,23 @@
     <string name="msg_no_announcement">لا يوجد ملف مضاف</string>
     <string name="msg_no_description">لا يوجد وصف مضاف</string>
     <string name="msg_send_email">أرسال بريد</string>
-    <string name="msg_android_app_support">خدمة البرنامج </string>
+    <string name="msg_android_app_support">خدمة البرنامج</string>
     <string name="msg_unable_to_update_password">لا يمكن تحديث كلمة السر خطأ: %1$s</string>
     <string name="msg_password_updated_successfully">تم تحديث كلمة السر</string>
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
-        <item quantity="many">%1$s reacted with %2$s</item>
-        <item quantity="zero">%1$s reacted with %2$s</item>
-        <item quantity="few">%1$s reacted with %2$s</item>
-        <item quantity="two">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s تفاعل مع %2$s</item>
+        <item quantity="other">%1$s تفاعل مع %2$s</item>
+        <item quantity="many">%1$s تفاعلوا مع %2$s</item>
+        <item quantity="zero">%1$s تفاعل مع %2$s</item>
+        <item quantity="few">%1$s تفاعلوا مع %2$s</item>
+        <item quantity="two">%1$s تفاعلا مع %2$s</item>
     </plurals>
-    <string name="msg_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Translate -->
-    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
-    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
-    <string name="msg_server">Server</string> <!-- TODO Translate -->
-    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
-    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
+    <string name="msg_credentials_saved_successfully">تم حفظ البيانات بنجاح</string>
+    <string name="msg_camera_permission_denied">هناك حاجة إلى إذن الكاميرا لفتحها.</string>
+    <string name="msg_storage_permission_denied">هناك حاجة إلى إذن التخزين لفتح الرسم.</string>
+    <string name="msg_server">الخادم</string>
+    <string name="msg_add_new_server">إضافة خادم جديد</string>
+    <string name="msg_directory">الدليل</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">خاص</string>
@@ -226,7 +225,7 @@
     <string name="msg_analytics_tracking">تتبع التحليلات</string>
     <string name="msg_send_analytics_tracking">إرسال تحليل لمساعدة تطوير البرنامج</string>
     <string name="msg_do_not_send_analytics_tracking">لا يتم إرسال تحليل لمساعدة تطوير البرنامج</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">لا يمكن لأنه إصدار  FOSS</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">لا يمكن لأنه إصدار FOSS</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">تم تغيير اسم الغرفة ل: %1$s بواسطة %2$s</string>
@@ -236,28 +235,28 @@
     <string name="message_user_joined_channel">إنضم للقناة</string>
     <string name="message_welcome">أهلا %s</string>
     <string name="message_removed">تم حذف الرسالة</string>
-    <string name="message_pinned">تمميز رسالة:</string>
+    <string name="message_pinned">تعلق رسالة:</string>
     <string name="message_muted">المسخدم %1$s صامت بواسطة %2$s</string>
     <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 Translate -->
+    <string name="message_video_call_started">بدأت مكالمة الفيديو بواسطة %1$s</string>
 
     <!-- Message actions -->
     <string name="action_msg_reply">رد</string>
-    <string name="action_info">Info</string>  <!-- TODO Translate -->
+    <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 Translate -->
-    <string name="action_unpin">Unpin</string> <!-- TODO Translate -->
-    <string name="action_star">Star</string> <!-- TODO Translate -->
-    <string name="action_unstar">Unstar</string> <!-- TODO Translate -->
+    <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_msg_add_reaction">إضافة تفاعل</string>
-    <string name="action_msg_permalink">Permalink</string>  <!-- TODO Translate -->
+    <string name="action_msg_permalink">ربط رابط ثابت</string>
     <string name="action_msg_report">إبلاغ</string>
 
     <!-- Permission messages -->
@@ -273,7 +272,7 @@
     <string name="title_members_list">الأعضاء</string>
 
     <!-- Mentions -->
-    <string name="msg_mentions">إشارة</string>
+    <string name="msg_mentions">إشارات</string>
     <string name="msg_no_mention">لا إشارة</string>
     <string name="msg_all_the_mentions_appear_here">الإشارات \nتظهر هنا</string>
 
@@ -283,7 +282,7 @@
     <string name="no_pinned_description">الرسائل المميزة\nتظهر هنا</string>
 
     <!-- Favorite Messages -->
-    <string name="title_favorite_messages">الرسائل المفصلة</string>
+    <string name="title_favorite_messages">الرسائل المفضلة</string>
     <string name="no_favorite_messages">الرسائل غير المفضلة</string>
     <string name="no_favorite_description">الرسائل المفضلة\nتظهر هنا</string>
 
@@ -304,7 +303,7 @@
     <string name="status_disconnecting">يتم قطع الاتصال</string>
     <string name="status_waiting">متصل في %d ثانية</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">تنبيه كل من في الغرفة</string>
     <string name="suggest_here_description">تنبيه الأعضاء المتصلين</string>
 
@@ -316,10 +315,10 @@
     <string name="Slash_TableUnflip_Description">عرض ┬─┬ ノ( ゜-゜ノ)</string>
     <string name="Create_A_New_Channel">إنشاء قناة جديدة</string>
     <string name="Show_the_keyboard_shortcut_list">عرض اختصارات الكيبورد</string>
-    <string name="Invite_user_to_join_channel_all_from">دعوة أعضاء  [#channel] للانضمام لهذه المجموعة</string>
+    <string name="Invite_user_to_join_channel_all_from">دعوة أعضاء [#channel] للانضمام لهذه المجموعة</string>
     <string name="Invite_user_to_join_channel_all_to">دعوة أعضاء هذه المجموعة للانضمام ل [#channel]</string>
     <string name="Archive">ارشيف</string>
-    <string name="Remove_someone_from_room">إوالة شخص من الغرفة</string>
+    <string name="Remove_someone_from_room">إزالة شخص من الغرفة</string>
     <string name="Leave_the_current_channel">مغادرة القناة الحالية</string>
     <string name="Displays_action_text">عرض نص الاجراء</string>
     <string name="Direct_message_someone">رسالة مباشرة</string>
@@ -329,33 +328,33 @@
     <string name="Unarchive">حذف من الأرشيف</string>
     <string name="Join_the_given_channel">الانضمام للقناة المعطاه</string>
     <string name="Guggy_Command_Description">صنع gif بناءا على النص المعطى</string>
-    <string name="Slash_Topic_Description">وضع الموضوع</string>
+    <string name="Slash_Topic_Description">تعيين الموضوع</string>
 
-    <!-- Emoji message-->
-    <string name="msg_no_recent_emoji">لا يوجد ايموجيز </string>
-    <string name="alert_title_default_skin_tone">نغمة الجلد الافتراضية</string>
+    <!-- Emoji messages -->
+    <string name="msg_no_recent_emoji">لا يوجد ايموجيز</string>
+    <string name="alert_title_default_skin_tone">لون البشرة الافتراضي</string>
 
     <!-- Sort and group -->
-    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
-    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
-    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
-    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
-    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
-    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
-    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_placeholder">ترتيب حسب %1$s</string>
+    <string name="msg_sort_by">ترتيب حسب</string>
+    <string name="msg_sort_by_activity">النشاط</string>
+    <string name="msg_sort_by_name">الاسم</string>
+    <string name="msg_group_by_unread_on_top">غير مقروء على القمة</string>
+    <string name="msg_group_by_type">تجميع حسب النوع</string>
+    <string name="msg_group_by_favorites">تجميع حسب المفضلات</string>
 
-    <!--ChatRooms Headers-->
-    <string name="header_favorite">Favorites</string> <!-- TODO Translate -->
+    <!-- ChatRooms Headers -->
+    <string name="header_favorite">المفضلات</string>
     <string name="msg_channels">القنوات</string>
-    <string name="msg_users">Users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_users">المستخدمين</string>
+    <string name="msg_search_for_global_users">البحث عن المستخدمين العالميين</string>
+    <string name="msg_search_for_global_users_description">إذا قمت بالتشغيل، يمكنك البحث عن أي مستخدم من شركات أو خوادم أخرى.</string>
     <string name="header_private_groups">المجموعات الخاصة</string>
     <string name="header_direct_messages">الرسائل المباشرة</string>
     <string name="header_live_chats">محادثات حية</string>
     <string name="header_unknown">غير معروف</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">تعديل الرسالة المنشورة</string>
     <string name="notif_action_reply_hint">رد</string>
     <string name="notif_error_sending">فشل الرد حاول مرة أخرى</string>
@@ -365,10 +364,12 @@
     <string name="message_room_changed_privacy">تم تغيير نوع الغرفة ل: %1$s بواسطة %2$s</string>
 
     <!-- User Details -->
-    <string name="timezone">المنظقة الزمنية</string>
+    <string name="timezone">المنطقة الزمنية</string>
+    <string name="status">الوضع: %1$s</string>
+    <string name="user_detail_status">الوضع</string>
 
     <!-- Report -->
     <string name="submit">تأكيد</string>
     <string name="required">*مطلوب</string>
     <string name="report_sent">تم إرسال تقريرك!</string>
-</resources>
+</resources>
\ No newline at end of file

app/src/main/res/values-de/strings.xml

@@ -67,11 +67,11 @@
     <string name="msg_share_this_app">Teile diese App</string>
     <string name="msg_administration">Administration</string>
     <string name="msg_license">Lizenz</string>
-    <string name="msg_app_version">Version: %1$s (%2$d)</string> 
+    <string name="msg_app_version">Version: %1$s (%2$d)</string>
     <string name="msg_server_version">Serverversion: %1$s</string>
     <string name="msg_send_analytics">Analysesaten senden</string>
     <string name="msg_logout_from_rocket_chat">Logout von Rocket.Chat</string>
-    <string name="msg_delete_account">Konto löschen</string> 
+    <string name="msg_delete_account">Konto löschen</string>
     <string name="msg_change_status">Status ändern</string>
 
     <string-array name="languages"> <!-- TODO Add translations -->
@@ -243,7 +243,7 @@
 
     <!-- Message actions -->
     <string name="action_msg_reply">Antworten</string>
-    <string name="action_info">Info</string> 
+    <string name="action_info">Info</string>
     <string name="action_msg_edit">Bearbeiten</string>
     <string name="action_msg_copy">Kopieren</string>
     <string name="action_msg_quote">Zitieren</string>
@@ -302,7 +302,7 @@
     <string name="status_disconnecting">Trenne</string>
     <string name="status_waiting">Verbinde in %d Sekunden</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Benachrichtige alle in diesem Raum</string>
     <string name="suggest_here_description">Benachrichtige aktive Benutzer in diesem Raum</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">Erstelle ein Gif, basierend auf den eingegebenen Text</string>
     <string name="Slash_Topic_Description">Setze Topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
     <string name="alert_title_default_skin_tone">Standard Hautton</string>
 
@@ -341,8 +341,8 @@
     <string name="msg_group_by_unread_on_top">Ungelesen oben</string>
     <string name="msg_group_by_type">Gruppieren nach Typ</string>
     <string name="msg_group_by_favorites">Gruppieren nach Favoriten</string>
-    
-    <!--ChatRooms Headers-->
+
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoriten</string>
     <string name="msg_channels">Räume</string>
     <string name="msg_users">Benutzer</string>
@@ -353,7 +353,7 @@
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unbekannt</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Bearbeite geteilte Nachricht</string>
     <string name="notif_action_reply_hint">Antworten</string>
     <string name="notif_error_sending">Antworten fehlgeschlagen. Bitte versuchen Sie es noch einmal.</string>
@@ -364,6 +364,8 @@
 
     <!-- User Details -->
     <string name="timezone">Zeitzone</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Senden</string>

app/src/main/res/values-es/strings.xml

@@ -251,8 +251,7 @@
     <string name="action_title_editing">Edición de mensaje</string>
     <string name="action_msg_add_reaction">Añadir una reacción</string>
     <string name="action_msg_permalink">Permalink</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Report</string> <!-- TODO Add translation -->
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La edición no és permitida</string>
@@ -299,7 +298,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando en %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notificar a todos en esta sala</string>
     <string name="suggest_here_description">Notificar usuarios activos en esta sala</string>
 
@@ -326,7 +325,7 @@
     <string name="Guggy_Command_Description">Genera un gif basado en el texto proporcionado</string>
     <string name="Slash_Topic_Description">Establecer tema</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
 
@@ -339,18 +338,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Canales</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos privados</string>
     <string name="header_direct_messages">Mensajes directos</string>
     <string name="header_live_chats">Chats en vivo</string>
     <string name="header_unknown">Desconocido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
@@ -366,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

app/src/main/res/values-fa/strings.xml

@@ -182,8 +182,8 @@
     <string name="msg_continue_with_gitlab">ادامه دادن با <b>گیت‌لب</b></string>
     <string name="msg_continue_with_wordpress">ادامه دادن با <b>وردپرس</b></string>
     <string name="msg_two_factor_authentication">تایید هویت دو فاکتوره</string>
-	<string name="msg_your_2fa_code">کد 2FA تان چیست؟</string>
-	<string name="msg_permalink_copied">پیوند کپی شد</string>
+    <string name="msg_your_2fa_code">کد 2FA تان چیست؟</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 -->
@@ -302,7 +302,7 @@
     <string name="status_disconnecting">درحال قطع شده</string>
     <string name="status_waiting">Connecting in %d seconds</string> <!-- TODO Add translation -->
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">به همه در این اتاق خبر بده</string>
     <string name="suggest_here_description">به کاربران فعال در این اتاق خبر بده</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">ساخت یک gif بر اساس متن آماده‌شده</string>
     <string name="Slash_Topic_Description">تعیین موضوع</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">هیچ ایموجی اخیری موجود نیست</string>
     <string name="alert_title_default_skin_tone">مدل پوسته‌ی پیش‌فرض</string>
 
@@ -342,18 +342,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">کانال‌ها</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">گروه‌های خصوصی</string>
     <string name="header_direct_messages">پیام‌های خصوصی</string>
     <string name="header_live_chats">گفت‌وگوهای زنده</string>
     <string name="header_unknown">ناشناس</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">ویراش پیام به اشتراک گذاشته شده</string>
     <string name="notif_action_reply_hint">جواب دادن</string>
     <string name="notif_error_sending">جواب با شکست مواجه شد. لطفا دوباره تلاش کنید.</string>
@@ -363,7 +363,9 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO Add translation -->
 
     <!-- User Details -->
-    <string name="timezone">منطقه‌ی زمانی</string>
+    <string name="timezone">منطقه‌ زمانی</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">واگذاری</string>

app/src/main/res/values-fr/strings.xml

@@ -300,7 +300,7 @@
     <string name="status_disconnecting">Déconnexion</string>
     <string name="status_waiting">Connexion dans %d secondes</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifier tous les utilisateurs dans ce salon</string>
     <string name="suggest_here_description">Notifier les utilisateurs actifs dans ce salon</string>
 
@@ -327,7 +327,7 @@
     <string name="Guggy_Command_Description">Génère un gif basé sur le texte fourni</string>
     <string name="Slash_Topic_Description">Définir le sujet</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Aucun emoji récent</string>
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
 
@@ -340,18 +340,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoris</string>
     <string name="msg_channels">Salons</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Groupes privés</string>
     <string name="header_direct_messages">Messages directs</string>
     <string name="header_live_chats">Chats en direct</string>
     <string name="header_unknown">Inconnu</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
     <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>
@@ -362,9 +362,10 @@
     <string name="msg_sent_attachment">Envoyé un fichier</string>
     <string name="message_room_changed_privacy">Changé de type de chambre : %1$s de %2$s</string>
 
-
     <!-- User Details -->
     <string name="timezone">Fuseau horaire</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Soumettre</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -303,7 +303,7 @@
     <string name="status_disconnecting">डिसकनेक्टिंग</string>
     <string name="status_waiting">%d सेकेंड में कनेक्ट हो रहा है</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">इस कमरे में सभी को सूचित करें</string>
     <string name="suggest_here_description">इस कमरे में सक्रिय उपयोगकर्ताओं को सूचित करना</string>
 
@@ -330,7 +330,7 @@
     <string name="Guggy_Command_Description">दिए गए पाठ पर आधारित gif उत्पन्न करता</string>
     <string name="Slash_Topic_Description">विषय सेट करें</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji"> कोई नया इमोजी नहीं</string>
     <string name="alert_title_default_skin_tone">डिफ़ॉल्ट त्वचा टोन</string>
 
@@ -343,18 +343,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">पसंदीदा</string>
     <string name="msg_channels">चैनलों</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="header_private_groups">निजी समूहों</string>
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_direct_messages">प्रत्यक्ष संदेश</string>
     <string name="header_live_chats">लाइव चैट</string>
     <string name="header_unknown">अज्ञात</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
     <string name="notif_error_sending">उत्तर विफल हुआ है। कृपया फिर से प्रयास करें।</string>
@@ -366,6 +366,8 @@
 
     <!-- User Details -->
     <string name="timezone">समय क्षेत्र</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">जमा करें</string>

app/src/main/res/values-it/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">Disconessione</string>
     <string name="status_waiting">Collegamento fra %d secondi</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica tutti in questa stanza</string>
     <string name="suggest_here_description">Notifica gli utenti attivi di questa stanza</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">Genera una gif in base al testo fornito</string>
     <string name="Slash_Topic_Description">Imposta argomento</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
@@ -339,18 +339,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Canali</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gruppi Privati</string>
     <string name="header_direct_messages">Messaggi Diretti</string>
     <string name="header_live_chats">Stanza in diretta</string>
     <string name="header_unknown">Sconosciuto</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifica messaggio condiviso</string>
     <string name="notif_action_reply_hint">Risposta</string>
     <string name="notif_error_sending">La risposta è fallita. Per favore riprova.</string>
@@ -361,6 +361,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso Orario</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Invia</string>

app/src/main/res/values-ja/strings.xml

@@ -302,7 +302,7 @@
     <string name="status_disconnecting">切断</string>
     <string name="status_waiting">%d 秒間接続中</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">このルームの全員に通知</string>
     <string name="suggest_here_description">この部屋のアクティブユーザーに通知する</string>
 
@@ -329,7 +329,7 @@
     <string name="Guggy_Command_Description">提供されたテキストに基づいてgifを生成する</string>
     <string name="Slash_Topic_Description">設定トピック</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
 
@@ -342,18 +342,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">チャンネル</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">プライベートグループ</string>
     <string name="header_direct_messages">ダイレクトメッセージ</string>
     <string name="header_live_chats">ライブチャット</string>
     <string name="header_unknown">不明</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">共有メッセージの編集</string>
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

app/src/main/res/values-pt-rBR/strings.xml

@@ -301,7 +301,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando em %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos nesta sala</string>
     <string name="suggest_here_description">Notifica usuários ativos nesta sala</string>
 
@@ -328,7 +328,7 @@
     <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
     <string name="Slash_Topic_Description">Definir tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
@@ -341,18 +341,18 @@
     <string name="msg_group_by_type">Agrupar por tipo</string>
     <string name="msg_group_by_favorites">Agrupar por favoritos</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
     <string name="msg_channels">Canais</string>
     <string name="msg_users">Usuários</string>
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens diretas</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso horário</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -57,6 +57,8 @@
     <string name="action_create_server">Crie um novo servidor</string>
     <string name="action_register">Registar</string>
     <string name="action_confirm">Confirmar</string>
+    <string name="action_favorite">Marcar chat como favorito</string>
+    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
 
     <!-- Settings messages -->
     <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
@@ -109,10 +111,11 @@
     <string name="msg_check_your_email_to_reset_your_password">E-mail enviado! Verifique a sua caixa de entrada para repor a sua palavra-passe.</string>
     <string name="msg_invalid_email">Por favor introduza um endereço de e-mail válido</string>
     <string name="msg_new_user_agreement">Ao prosseguir, você concorda com os nossos \n%1$s e %2$s</string>
-    <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
     <string name="msg_yesterday">Ontem</string>
     <string name="msg_today">Hoje</string>
     <string name="msg_message">Mensagem</string>
+    <string name="msg_video_call">Video call</string> <!-- TODO Translate -->
+    <string name="msg_join_video_call">Join video call</string> <!-- TODO Translate -->
     <string name="msg_this_room_is_read_only">Esta sala é apenas de leitura</string>
     <string name="msg_invalid_2fa_code">Código 2FA inválido</string>
     <string name="msg_invalid_file">Ficheiro inválido</string>
@@ -191,6 +194,7 @@
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
     </plurals>
+    <string name="msg_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Translate -->
     <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
     <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
     <string name="msg_server">Server</string> <!-- TODO Translate -->
@@ -234,8 +238,7 @@
     <string name="message_unmuted">Utilizador %2$s removeu o silêncio de %1$s</string>
     <string name="message_role_add">%3$s deu estatuto de %2$s a %1$s</string>
     <string name="message_role_removed">%3$s retirou o estatuto de %2$s a %1$s</string>
-    <string name="action_favorite">Marcar chat como favorito</string>
-    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
+    <string name="message_video_call_started">Video call started by %1$s</string> <!-- TODO Translate -->
 
     <!-- Message actions -->
     <string name="action_msg_reply">Responder</string>
@@ -298,7 +301,7 @@
     <string name="status_disconnecting">A desligar</string>
     <string name="status_waiting">A ligar dentro de %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos os utilizadores nesta sala</string>
     <string name="suggest_here_description">Notifica os utilizadores activos nesta sala</string>
 
@@ -325,7 +328,7 @@
     <string name="Guggy_Command_Description">Gera um GIF baseado no texto fornecido</string>
     <string name="Slash_Topic_Description">Define o tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emojis recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
@@ -338,18 +341,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
     <string name="msg_channels">Canais</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens Directas</string>
     <string name="header_live_chats">Chats ao Vivo</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem partilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">A resposta falhou. Tente novamente.</string>
@@ -358,11 +361,10 @@
     <string name="message_information_title">Informação da Mensagem</string>
     <string name="message_room_changed_privacy">Tipo de sala alterado para: %1$s por %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">Fuso Horário</string>
     <string name="status">Estado: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</string>

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

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">Отключаемся…</string>
     <string name="status_waiting">Соединение через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Уведомить всех в этом чате</string>
     <string name="suggest_here_description">Уведомить всех активных пользователей в этом чате</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">Создает gif на основе предоставленного текста</string>
     <string name="Slash_Topic_Description">Задать тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
 
@@ -339,7 +339,7 @@
     <string name="msg_group_by_type">Группировать по типу</string>
     <string name="msg_group_by_favorites">Группировать по избранному</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Избранные</string>
     <string name="msg_channels">Каналы</string>
     <string name="msg_users">Пользователи</string>
@@ -350,7 +350,7 @@
     <string name="header_live_chats">Живые чаты</string>
     <string name="header_unknown">Неизвестные</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
     <string name="notif_error_sending">Не удалось ответить. Пожалуйста, попробуйте еще раз.</string>
@@ -362,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Часовой пояс</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Отправить</string>

app/src/main/res/values-tr/strings.xml

@@ -303,7 +303,7 @@
     <string name="status_disconnecting">Bağlantı kesiliyor</string>
     <string name="status_waiting">%d saniye içinde bağlanılacak</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Bu odadaki herkese bildir</string>
     <string name="suggest_here_description">Bu odadaki aktif kullanıcılara bildir</string>
 
@@ -330,7 +330,7 @@
     <string name="Guggy_Command_Description">Belirlenen yazıya göre gif oluşturur</string>
     <string name="Slash_Topic_Description">Konuyu belirle</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Son kullanılan emoji bulunmamaktadır</string>
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
 
@@ -343,18 +343,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Kanallar</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gizli Gruplar</string>
     <string name="header_direct_messages">Direkt Mesajlar</string>
     <string name="header_live_chats">Canlı Sohbetler</string>
     <string name="header_unknown">Bilinmeyen</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Paylaşılan mesajı düzenle</string>
     <string name="notif_action_reply_hint">YANITLA</string>
     <string name="notif_error_sending">Yanıtlama başarısız oldu. Lütfen, tekrar deneyiniz.</string>
@@ -365,6 +365,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

app/src/main/res/values-uk/strings.xml

@@ -298,7 +298,7 @@
     <string name="status_disconnecting">Відключаємося…</string>
     <string name="status_waiting">З\'єднання через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Повідомити всіх у цьому чаті</string>
     <string name="suggest_here_description">Повідомити всіх активних користувачів у цьому чаті</string>
 
@@ -325,7 +325,7 @@
     <string name="Guggy_Command_Description">Створює gif використовуючи наданий текст</string>
     <string name="Slash_Topic_Description">Встановити тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
 
@@ -338,18 +338,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">Канали</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Приватні канали</string>
     <string name="header_direct_messages">Особисті повідомлення</string>
     <string name="header_live_chats">Живі чати</string>
     <string name="header_unknown">Невідомі</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редагувати повідомлення</string>
     <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
     <string name="notif_error_sending">Не вдалося відповісти. Будь ласка, спробуйте ще раз.</string>
@@ -362,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->

app/src/main/res/values-zh-rCN/strings.xml

@@ -299,7 +299,7 @@
     <string name="status_disconnecting">断线中</string>
     <string name="status_waiting">连接持续了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒频道内所有人</string>
     <string name="suggest_here_description">提醒频道内在线的人</string>
 
@@ -326,7 +326,7 @@
     <string name="Guggy_Command_Description">根据文本生成GIF</string>
     <string name="Slash_Topic_Description">设定主题</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">没有最近的emojis</string>
     <string name="alert_title_default_skin_tone">默认皮肤颜色</string>
 
@@ -339,18 +339,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">频道</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人组</string>
     <string name="header_direct_messages">直接对话</string>
     <string name="header_live_chats">Live 对话</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">编辑分享的消息</string>
     <string name="notif_action_reply_hint">回复</string>
     <string name="notif_error_sending">回复失败，请重试.</string>
@@ -359,11 +359,10 @@
     <string name="message_information_title">消息信息</string>
     <string name="message_room_changed_privacy">频道类型更改为: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(开源)</string>
-
     <!-- User Details -->
     <string name="timezone">时区</string>
-    <string name="status" translatable="false">状态: %1$s</string>
+    <string name="status">状态: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -23,6 +23,7 @@
     <string name="title_license">許可</string>
     <string name="title_are_you_sure">確定嗎?</string>
     <string name="title_channel_details">頻道訊息</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Translate -->
     <string name="title_topic">主題</string>
     <string name="title_announcement">公告</string>
     <string name="title_description">描述</string>
@@ -279,7 +280,7 @@
     <string name="status_disconnecting">斷線中</string>
     <string name="status_waiting">連線持續了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒頻道內所有成員</string>
     <string name="suggest_here_description">提醒頻道內所有在線上的成員</string>
 
@@ -306,7 +307,7 @@
     <string name="Guggy_Command_Description">根據輸入訊息產生GIF</string>
     <string name="Slash_Topic_Description">設定主題</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近沒有使用emojis</string>
     <string name="alert_title_default_skin_tone">預設主題顏色</string>
 
@@ -319,18 +320,18 @@
     <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
     <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
     <string name="msg_channels">頻道</string>
     <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人群組</string>
     <string name="header_direct_messages">直接對話</string>
     <string name="header_live_chats">Live 對話</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">編輯分享的訊息</string>
     <string name="notif_action_reply_hint">回覆</string>
     <string name="notif_error_sending">回覆失敗，請重試.</string>
@@ -339,11 +340,10 @@
     <string name="message_information_title">消息訊息</string>
     <string name="message_room_changed_privacy">頻道類型更改為: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">時區</string>
-    <string name="status" translatable="false">狀態: %1$s</string>
+    <string name="status">狀態: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</string>

app/src/main/res/values/strings.xml

@@ -315,7 +315,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="status_disconnecting">Disconnecting</string>
     <string name="status_waiting">Connecting in %d seconds</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notify all in this room</string>
     <string name="suggest_here_description">Notify active users in this room</string>
 
@@ -342,7 +342,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
     <string name="Slash_Topic_Description">Set topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
@@ -355,18 +355,18 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_group_by_type">Group by type</string>
     <string name="msg_group_by_favorites">Group by favorites</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string>
     <string name="msg_channels">Channels</string>
     <string name="msg_users">Users</string>
     <string name="msg_search_for_global_users">Search for global users</string>
-    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from others companies or servers.</string>
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string>
     <string name="header_private_groups">Private Groups</string>
     <string name="header_direct_messages">Direct Messages</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unknown</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>
     <string name="notif_error_sending">Reply has failed. Please try again.</string>
@@ -379,8 +379,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
-    <string name="status" translatable="false">Status: %1$s</string>
-    <string name="user_detail_status" translatable="false">Status</string>
+    <string name="status">Status: %1$s</string>
+    <string name="user_detail_status">Status</string>
 
     <!-- Report -->
     <string name="submit">Submit</string>

app/src/main/res/values/styles.xml

@@ -10,6 +10,7 @@
         <item name="searchViewStyle">@style/ChatRoom.SearchView</item>
         <item name="actionModeBackground">@color/colorPrimary</item>
         <item name="android:actionModeBackground">@color/colorPrimary</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <!-- Widget styles. -->

app/src/main/res/xml/lint.xml

 <lint>
     <issue id="InvalidPackage">
-        <ignore path="**/dropbox*.jar"/> <!--For Jitsi -->
+        <ignore path="**/dropbox*.jar"/> <!-- For Jitsi -->
     </issue>
 </lint>
\ No newline at end of file

config/quality/checkstyle/checkstyle-config.xml

@@ -95,11 +95,11 @@
             <property name="tokens" value="COMMA"/>
             <property name="option" value="EOL"/>
         </module>
-        <!-- TODO module name="PackageName">
+        <!-- TODO <module name="PackageName">
           <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
           <message key="name.invalidPattern"
               value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module-->
+        </module>-->
         <module name="TypeName">
             <message key="name.invalidPattern"
                     value="Type name ''{0}'' must match pattern ''{1}''."/>
@@ -162,16 +162,16 @@
         </module>
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
-            <!-- TODO property name="allowedAbbreviationLength" value="1"/-->
+            <!-- TODO <property name="allowedAbbreviationLength" value="1"/>-->
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <!-- TODO module name="CustomImportOrder">
+        <!-- TODO <module name="CustomImportOrder">
           <property name="specialImportsRegExp" value="com.google"/>
           <property name="sortImportsInGroupAlphabetically" value="true"/>
           <property name="customImportOrderRules"
               value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-        </module-->
+        </module>-->
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>

config/quality/pmd/pmd-ruleset.xml

@@ -20,7 +20,7 @@
     <rule ref="rulesets/java/naming.xml">
         <exclude name="AbstractNaming" />
         <exclude name="LongVariable" />
-        <!--exclude name="ShortMethodName" /-->
+        <!--<exclude name="ShortMethodName" />-->
         <exclude name="ShortVariable" />
         <exclude name="ShortClassName" />
         <!--<exclude name="VariableNamingConventions" />-->

draw/src/main/res/drawable/circle_green.xml

@@ -3,6 +3,6 @@
     android:shape="oval">
 
     <solid android:color="@color/color_green" />
-        <corners android:radius="50dp" />
+    <corners android:radius="50dp" />
 
 </shape>
\ No newline at end of file

emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml

@@ -8,8 +8,5 @@
     <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
     <path
         android:fillColor="@color/colorEmojiIcon"
-        android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11
-C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3
-Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7
-L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
+        android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11 C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3 Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7 L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
 </vector>
\ No newline at end of file