remove actionbarsherlock, switch to appcompat stuff

3 files changed, 37 insertions, 36 deletions

diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index c879b0b1..fd05b596 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -21,19 +21,18 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
+import android.support.v7.view.ActionMode;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.widget.EditText;
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.actionbarsherlock.view.ActionMode;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-
 public class OfflineActivity extends CommonActivity {
 	private final String TAG = this.getClass().getSimpleName();
 
@@ -62,7 +61,7 @@ public class OfflineActivity extends CommonActivity {
 		@Override
 		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 			
-			 MenuInflater inflater = getSupportMenuInflater();
+			 MenuInflater inflater = getMenuInflater();
 	            inflater.inflate(R.menu.headlines_action_menu, menu);
 			
 			return true;
@@ -572,7 +571,7 @@ public class OfflineActivity extends CommonActivity {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getSupportMenuInflater();
+		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.offline_menu, menu);
 
 		m_menu = menu;
@@ -593,7 +592,7 @@ public class OfflineActivity extends CommonActivity {
 
 			if (hf != null) {
 				if (hf.getSelectedArticleCount() > 0 && m_headlinesActionMode == null) {
-					m_headlinesActionMode = startActionMode(m_headlinesActionModeCallback);
+					m_headlinesActionMode = startSupportActionMode(m_headlinesActionModeCallback);
 				} else if (hf.getSelectedArticleCount() == 0 && m_headlinesActionMode != null) { 
 					m_headlinesActionMode.finish();
 				}
@@ -628,37 +627,40 @@ public class OfflineActivity extends CommonActivity {
 				MenuItem search = m_menu.findItem(R.id.search);
 				
 				SearchView searchView = (SearchView) search.getActionView();
-				searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-					private String query = "";
-					
-					@Override
-					public boolean onQueryTextSubmit(String query) {
-						OfflineHeadlinesFragment frag = (OfflineHeadlinesFragment) getSupportFragmentManager()
-								.findFragmentByTag(FRAG_HEADLINES);
-						
-						if (frag != null) {
-							frag.setSearchQuery(query);
-							this.query = query;
-						}
+				
+				if (searchView != null) {				
+					searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+						private String query = "";
 						
-						return false;
-					}
-					
-					@Override
-					public boolean onQueryTextChange(String newText) {
-						if (newText.equals("") && !newText.equals(this.query)) {
+						@Override
+						public boolean onQueryTextSubmit(String query) {
 							OfflineHeadlinesFragment frag = (OfflineHeadlinesFragment) getSupportFragmentManager()
 									.findFragmentByTag(FRAG_HEADLINES);
 							
 							if (frag != null) {
-								frag.setSearchQuery(newText);
-								this.query = newText;
+								frag.setSearchQuery(query);
+								this.query = query;
 							}
+							
+							return false;
 						}
 						
-						return false;
-					}
-				});
+						@Override
+						public boolean onQueryTextChange(String newText) {
+							if (newText.equals("") && !newText.equals(this.query)) {
+								OfflineHeadlinesFragment frag = (OfflineHeadlinesFragment) getSupportFragmentManager()
+										.findFragmentByTag(FRAG_HEADLINES);
+								
+								if (frag != null) {
+									frag.setSearchQuery(newText);
+									this.query = newText;
+								}
+							}
+							
+							return false;
+						}
+					});
+				}
 			}
 		}		
 	}
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
index ac5ed128..c8a9cfc1 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
@@ -3,6 +3,8 @@ package org.fox.ttrss.offline;
 import org.fox.ttrss.GlobalState;
 import org.fox.ttrss.R;
 
+import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
+
 import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -14,12 +16,10 @@ import android.provider.BaseColumns;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.actionbarsherlock.view.MenuItem;
-import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
-
 public class OfflineFeedsActivity extends OfflineActivity implements OfflineHeadlinesEventListener {
 	private final String TAG = this.getClass().getSimpleName();
 	
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
index 644b7c61..128a5919 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
@@ -3,8 +3,6 @@ package org.fox.ttrss.offline;
 import org.fox.ttrss.GlobalState;
 import org.fox.ttrss.R;
 
-import com.actionbarsherlock.view.MenuItem;
-
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -16,6 +14,7 @@ import android.provider.BaseColumns;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 
 public class OfflineHeadlinesActivity extends OfflineActivity implements OfflineHeadlinesEventListener {