Merge pull request #443 from filipedelimabrito/ux

[IMPROVEMENT] Closes keyboard of the searchView (if opened) when a chat room is visible.

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

@@ -128,6 +128,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
   private Message edittingMessage = null;
 
   private SlidingPaneLayout pane;
+  private SidebarMainFragment sidebarFragment;
 
   public RoomFragment() {}
 
@@ -333,11 +334,13 @@ public class RoomFragment extends AbstractChatRoomFragment implements
   private void setupSidebar() {
     SlidingPaneLayout subPane = getActivity().findViewById(R.id.sub_sliding_pane);
     RoomToolbar toolbar = getActivity().findViewById(R.id.activity_main_toolbar);
+    sidebarFragment = (SidebarMainFragment) getActivity().getSupportFragmentManager().findFragmentById(R.id.sidebar_fragment_container);
 
     pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
       @Override
       public void onPanelSlide(View view, float v) {
         messageFormManager.enableComposingText(false);
+        sidebarFragment.clearSearchViewFocus();
         //Ref: ActionBarDrawerToggle#setProgress
         toolbar.setNavigationIconProgress(v);
       }
@@ -364,11 +367,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
   }
 
   public void closeUserActionContainer() {
-    SidebarMainFragment sidebarFragment = (SidebarMainFragment) getActivity().getSupportFragmentManager()
-            .findFragmentById(R.id.sidebar_fragment_container);
-    if (sidebarFragment != null) {
       sidebarFragment.closeUserActionContainer();
-    }
   }
 
   private boolean closeSideMenuIfNeeded() {
@@ -652,4 +651,4 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     edittingMessage = message;
     messageFormManager.setEditMessage(message.getMessage());
   }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java

@@ -258,6 +258,10 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
     });
   }
 
+  public void clearSearchViewFocus() {
+    searchView.clearFocus();
+  }
+
   public void closeUserActionContainer() {
     final CompoundButton toggleUserAction = rootView.findViewById(R.id.toggle_user_action);
     if (toggleUserAction != null && toggleUserAction.isChecked()) {