Fix search icon disappearing from toolbar after opening menu

Author: Suyog-Bauskar

Diff for: onebusaway-android/src/main/java/org/onebusaway/android/ui/HomeActivity.java

@@ -115,6 +115,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.SearchView;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
@@ -145,6 +146,7 @@ public class HomeActivity extends AppCompatActivity
         ArrivalsListFragment.Listener, NavigationDrawerCallbacks, WeatherRequestListener , RegionCallback,
         ObaRegionsTask.Callback {
 
+    private Menu mOptionsMenu;
 
     interface SlidingPanelController {
 
@@ -830,7 +832,9 @@ private void hideSlidingPanel() {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_options, menu);
-
+        
+        mOptionsMenu = menu;
+        
         UIUtils.setupSearch(this, menu);
 
         // Initialize fragment menu visibility here, so we don't have overlap between the various fragments
@@ -1276,6 +1280,16 @@ public void onSortBySelected() {
 
     @Override
     public void onBackPressed() {
+        // First, check if search view is expanded and collapse it if it is
+        MenuItem searchItem = mOptionsMenu != null ? mOptionsMenu.findItem(R.id.action_search) : null;
+        if (searchItem != null) {
+            SearchView searchView = (SearchView) searchItem.getActionView();
+            if (searchView != null && !searchView.isIconified()) {
+                searchView.setIconified(true);
+                return;
+            }
+        }
+        
         // Collapse the panel when the user presses the back button
         if (mSlidingPanel != null) {
             // Collapse the sliding panel if its anchored or expanded

Diff for: onebusaway-android/src/main/java/org/onebusaway/android/ui/MyRecentStopsAndRoutesActivity.java

@@ -142,4 +142,11 @@ private ShortcutInfoCompat getShortcut() {
                 new Intent(this, MyRecentStopsAndRoutesActivity.class),
                 R.drawable.ic_history);
     }
+
+    @Override
+    public void onBackPressed() {
+        // Use the same behavior as the toolbar's back arrow (up button)
+        super.onBackPressed();
+        NavHelp.goHome(this, false);
+    }
 }

Diff for: onebusaway-android/src/main/java/org/onebusaway/android/util/UIUtils.java

@@ -58,6 +58,7 @@
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
@@ -162,6 +163,12 @@ public void onFocusChange(View view, boolean queryTextFocused) {
                 }
             }
         });
+
+        // Limit the search view width to 70% of screen width to show kebab menu
+        DisplayMetrics metrics = activity.getResources().getDisplayMetrics();
+        int screenWidth = metrics.widthPixels;
+        int searchViewWidth = (int) (screenWidth * 0.7);
+        searchView.setMaxWidth(searchViewWidth);
     }
 
     public static void showProgress(Fragment fragment, boolean visible) {

Diff for: onebusaway-android/src/main/res/menu/main_options.xml

@@ -20,7 +20,7 @@
         <item android:id="@+id/action_search"
               android:title="@string/map_option_search"
               android:icon="@drawable/ic_action_search"
-              app:showAsAction="collapseActionView|ifRoom"
+              app:showAsAction="always"
               app:actionViewClass="androidx.appcompat.widget.SearchView"/>
         <item android:id="@+id/recent_stops_routes"
               android:title="@string/my_recent_menu_title"/>