Fix ActionBar SearchView

1 files changed, 9 insertions, 15 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index edefb7d46..cfc540fd6 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -1,15 +1,15 @@
 package de.danoeh.antennapod.menuhandler;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Build;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.EditText;
 
-import de.danoeh.antennapod.core.R;
+import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
@@ -17,25 +17,19 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
  */
 public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuItemUtils {
 
-    public static MenuItem addSearchItem(Menu menu, SearchView searchView) {
-        MenuItem item = menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label);
-        MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW | MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-        MenuItemCompat.setActionView(item, searchView);
-
+    public static void adjustTextColor(Context context, SearchView sv) {
         if(Build.VERSION.SDK_INT < 14) {
-            SearchView.SearchAutoComplete textField = (SearchView.SearchAutoComplete) searchView.findViewById(de.danoeh.antennapod.R.id.search_src_text);
+            EditText searchEditText = (EditText) sv.findViewById(R.id.search_src_text);
             if(UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark) {
-                textField.setTextColor(Resources.getSystem().getColor(android.R.color.white));
+                searchEditText.setTextColor(Color.WHITE);
             } else {
-                textField.setTextColor(Resources.getSystem().getColor(android.R.color.black));
+                searchEditText.setTextColor(Color.BLACK);
             }
         }
-
-        return item;
     }
 
-    public static void refreshLockItem(Context context, Menu menu, MenuItem queueLock) {
-        queueLock = menu.findItem(de.danoeh.antennapod.R.id.queue_lock);
+    public static void refreshLockItem(Context context, Menu menu) {
+        final MenuItem queueLock = menu.findItem(de.danoeh.antennapod.R.id.queue_lock);
         int[] lockIcons = new int[] { de.danoeh.antennapod.R.attr.ic_lock_open, de.danoeh.antennapod.R.attr.ic_lock_closed };
         TypedArray ta = context.obtainStyledAttributes(lockIcons);
         if (UserPreferences.isQueueLocked()) {