Merge branch 'FE-904_search_2_feature' into 'development'

FE-904: search 2 feature

See merge request elixxir/client-android!76

app/src/main/java/io/xxlabs/messenger/search/UserSearchFragment.kt

@@ -106,7 +106,8 @@ class UserSearchFragment : RequestsFragment() {
                 }
             }.attach()
 
-            userSearchAppBarTabs.addOnTabSelectedListener(
+            userSearchAppBarTabs.apply {
+                addOnTabSelectedListener(
                     object : OnTabSelectedListener {
                         override fun onTabSelected(tab: TabLayout.Tab?) {
                             if (searchViewModel.previousTabPosition != SEARCH_QR && tab?.position == SEARCH_QR) {
@@ -126,6 +127,7 @@ class UserSearchFragment : RequestsFragment() {
                 )
             }
         }
+    }
 
     private fun navigateToQrCode() {
         val qrCodeScreen = UserSearchFragmentDirections.actionGlobalQrCode()
@@ -174,6 +176,16 @@ class UserSearchFragment : RequestsFragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        resetTabPosition()
+    }
+
+    private fun resetTabPosition() {
+        binding.userSearchAppBarTabs.setScrollPosition(SEARCH_USERNAME, 0f, true)
+        binding.userSearchViewPager.currentItem = SEARCH_USERNAME
+    }
+
     private fun observeUi() {
         searchViewModel.udSearchUi.observe(viewLifecycleOwner) { state ->
             binding.ui = state