Merge branch 'develop' into develop

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

@@ -69,7 +69,6 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
 
     override fun onCancel(dialog: DialogInterface?) {
         super.onCancel(dialog)
-        directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
     }
 
     private fun setupView() {
@@ -87,16 +86,19 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
             checkSelection(text_channels, hashtagDrawable)
             uncheckSelection(text_users, userDrawable)
             isSortByChannels = true
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
         }
 
         text_users.setOnClickListener {
             checkSelection(text_users, userDrawable)
             uncheckSelection(text_channels, hashtagDrawable)
             isSortByChannels = false
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
         }
 
         switch_global_users.setOnCheckedChangeListener { _, isChecked ->
             isSearchForGlobalUsers = isChecked
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
         }
     }
 

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

@@ -362,8 +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 -->
+    <string name="status">Статус: %1$s</string>
+    <string name="user_detail_status">Статус</string>
 
     <!-- Report -->
     <string name="submit">Отправить</string>