Converted everything to ActionBarCompat

14 files changed, 55 insertions, 49 deletions

diff --git a/src/github/daneren2005/dsub/activity/DownloadActivity.java b/src/github/daneren2005/dsub/activity/DownloadActivity.java
index bfdc9eb9..447bbb34 100644
--- a/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -20,6 +20,7 @@ package github.daneren2005.dsub.activity;
 
 import github.daneren2005.dsub.R;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import github.daneren2005.dsub.fragments.DownloadFragment;
 import android.app.Dialog;
@@ -33,7 +34,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.util.Log;
 import android.view.View;
-import com.actionbarsherlock.view.MenuItem;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.service.DownloadFile;
 import github.daneren2005.dsub.service.MusicService;
diff --git a/src/github/daneren2005/dsub/activity/MainActivity.java b/src/github/daneren2005/dsub/activity/MainActivity.java
index c077c87c..8aa68b3d 100644
--- a/src/github/daneren2005/dsub/activity/MainActivity.java
+++ b/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -8,9 +8,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.Menu;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;
diff --git a/src/github/daneren2005/dsub/activity/SearchActivity.java b/src/github/daneren2005/dsub/activity/SearchActivity.java
index aeddcf4f..1dfe4790 100644
--- a/src/github/daneren2005/dsub/activity/SearchActivity.java
+++ b/src/github/daneren2005/dsub/activity/SearchActivity.java
@@ -23,9 +23,10 @@ import github.daneren2005.dsub.R;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MenuItem;
+
 import github.daneren2005.dsub.fragments.SearchFragment;
 import github.daneren2005.dsub.util.Constants;
-import com.actionbarsherlock.view.MenuItem;
 
 public class SearchActivity extends SubsonicActivity {
 	private static final String TAG = SearchActivity.class.getSimpleName();
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 611a19ee..f59d0a3f 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -12,18 +12,18 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;

 import android.support.v4.app.FragmentTransaction;

 import android.support.v4.view.ViewPager;

+import android.support.v7.app.ActionBar;

+import android.support.v7.app.ActionBarActivity;

 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.widget.AdapterView;

 import android.widget.AdapterView.OnItemSelectedListener;

 import android.widget.ArrayAdapter;

 import android.widget.Spinner;

-import com.actionbarsherlock.app.ActionBar;

-import com.actionbarsherlock.app.ActionBar.Tab;

-import com.actionbarsherlock.app.ActionBar.TabListener;

-import com.actionbarsherlock.app.SherlockFragmentActivity;

-import com.actionbarsherlock.view.Menu;

 

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.fragments.SubsonicFragment;

@@ -37,7 +37,7 @@ import java.io.PrintWriter;
 import java.util.ArrayList;

 import java.util.List;

 

-public class SubsonicActivity extends SherlockFragmentActivity implements OnItemSelectedListener {

+public class SubsonicActivity extends ActionBarActivity implements OnItemSelectedListener {

 	private static final String TAG = SubsonicActivity.class.getSimpleName();

 	private static ImageLoader IMAGE_LOADER;

 	protected static String theme;

@@ -131,7 +131,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 	

 	@Override

 	public boolean onCreateOptionsMenu(Menu menu) {

-		com.actionbarsherlock.view.MenuInflater menuInflater = getSupportMenuInflater();

+		MenuInflater menuInflater = getMenuInflater();

 		if(pagerAdapter != null) {

 			pagerAdapter.onCreateOptionsMenu(menu, menuInflater);

 		} else if(currentFragment != null) {

@@ -140,7 +140,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		return true;

 	}

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(pagerAdapter != null) {

 			return pagerAdapter.onOptionsItemSelected(item);

 		} else if(currentFragment != null) {

@@ -384,8 +384,8 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		}

 	}

 	

-	public class TabPagerAdapter extends FragmentPagerAdapter implements TabListener, ViewPager.OnPageChangeListener {

-		private SherlockFragmentActivity activity;

+	public class TabPagerAdapter extends FragmentPagerAdapter implements ActionBar.TabListener, ViewPager.OnPageChangeListener {

+		private ActionBarActivity activity;

 		private ViewPager pager;

 		private ActionBar actionBar;

 		private SubsonicFragment currentFragment;

@@ -394,7 +394,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		private List<QueuedFragment> queue = new ArrayList<QueuedFragment>();

 		private int currentPosition;

 

-		public TabPagerAdapter(SherlockFragmentActivity activity, ViewPager pager) {

+		public TabPagerAdapter(ActionBarActivity activity, ViewPager pager) {

 			super(activity.getSupportFragmentManager());

 			this.activity = activity;

 			this.actionBar = activity.getSupportActionBar();

@@ -428,7 +428,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			return tabs.size();

 		}

 		

-		public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+		public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 			if(currentFragment != null) {

 				currentFragment.onCreateOptionsMenu(menu, menuInflater);

 				

@@ -440,7 +440,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 				queue.clear();

 			}

 		}

-		public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+		public boolean onOptionsItemSelected(MenuItem item) {

 			if(currentFragment != null) {

 				return currentFragment.onOptionsItemSelected(item);

 			} else {

@@ -448,7 +448,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			}

 		}

 

-		public void onTabSelected(Tab tab, FragmentTransaction ft) {

+		public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {

 			TabInfo tabInfo = (TabInfo) tab.getTag();

 			for (int i = 0; i < tabs.size(); i++) {

 				if ( tabs.get(i) == tabInfo ) {

@@ -458,9 +458,9 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			}

 		}

 

-		public void onTabUnselected(Tab tab, FragmentTransaction ft) {}

+		public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {}

 

-		public void onTabReselected(Tab tab, FragmentTransaction ft) {}

+		public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {}

 

 		public void onPageScrollStateChanged(int arg0) {}

 

@@ -486,7 +486,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		public void addTab(CharSequence title, Class fragmentClass, Bundle args) {

 			final TabInfo tabInfo = new TabInfo(fragmentClass, args);

 

-			Tab tab = actionBar.newTab();

+			ActionBar.Tab tab = actionBar.newTab();

 			tab.setText(title);

 			tab.setTabListener(this);

 			tab.setTag(tabInfo);

diff --git a/src/github/daneren2005/dsub/fragments/ChatFragment.java b/src/github/daneren2005/dsub/fragments/ChatFragment.java
index 4f373442..a17d680c 100644
--- a/src/github/daneren2005/dsub/fragments/ChatFragment.java
+++ b/src/github/daneren2005/dsub/fragments/ChatFragment.java
@@ -12,6 +12,9 @@ import android.text.TextWatcher;
 import android.util.Log;

 import android.view.KeyEvent;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

+import android.view.MenuItem;

 import android.view.View;

 import android.view.ViewGroup;

 import android.view.WindowManager;

@@ -29,7 +32,6 @@ import github.daneren2005.dsub.util.BackgroundTask;
 import github.daneren2005.dsub.util.TabBackgroundTask;

 import github.daneren2005.dsub.util.Util;

 import github.daneren2005.dsub.view.ChatAdapter;

-import com.actionbarsherlock.view.Menu;

 import github.daneren2005.dsub.util.Constants;

 import java.util.concurrent.Executors;

 import java.util.concurrent.ScheduledExecutorService;

@@ -140,12 +142,12 @@ public class ChatFragment extends SubsonicFragment {
 	}

 	

 	@Override

-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 		menuInflater.inflate(R.menu.chat, menu);

 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(super.onOptionsItemSelected(item)) {

 			return true;

 		}

diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index 48102539..bed97137 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -20,6 +20,9 @@ import android.view.Display;
 import android.view.GestureDetector;

 import android.view.GestureDetector.OnGestureListener;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

+import android.view.MenuItem;

 import android.view.MotionEvent;

 import android.view.View;

 import android.view.View.OnClickListener;

@@ -36,9 +39,6 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;

 import android.widget.TextView;

 import android.widget.ViewFlipper;

-import com.actionbarsherlock.view.Menu;

-import com.actionbarsherlock.view.MenuItem;

-import com.actionbarsherlock.view.MenuInflater;

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.domain.MusicDirectory;

 import github.daneren2005.dsub.domain.PlayerState;

diff --git a/src/github/daneren2005/dsub/fragments/MainFragment.java b/src/github/daneren2005/dsub/fragments/MainFragment.java
index 9a48acd5..05726483 100644
--- a/src/github/daneren2005/dsub/fragments/MainFragment.java
+++ b/src/github/daneren2005/dsub/fragments/MainFragment.java
@@ -9,6 +9,9 @@ import android.os.Bundle;
 import android.os.StatFs;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

+import android.view.MenuItem;

 import android.view.View;

 import android.view.ViewGroup;

 import android.widget.AdapterView;

@@ -22,9 +25,6 @@ import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.LoadingTask;

 import github.daneren2005.dsub.view.MergeAdapter;

 import github.daneren2005.dsub.util.Util;

-import com.actionbarsherlock.view.Menu;

-import com.actionbarsherlock.view.MenuItem;

-import com.actionbarsherlock.view.MenuInflater;

 import github.daneren2005.dsub.service.MusicService;

 import github.daneren2005.dsub.service.MusicServiceFactory;

 import github.daneren2005.dsub.util.SilentBackgroundTask;

diff --git a/src/github/daneren2005/dsub/fragments/SearchFragment.java b/src/github/daneren2005/dsub/fragments/SearchFragment.java
index 1c35d38c..869287d1 100644
--- a/src/github/daneren2005/dsub/fragments/SearchFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SearchFragment.java
@@ -8,6 +8,8 @@ import android.content.Intent;
 import android.os.Bundle;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

 import android.view.View;

 import android.view.MenuItem;

 import android.widget.AdapterView;

@@ -16,7 +18,6 @@ import android.widget.ListView;
 import android.widget.TextView;

 import android.net.Uri;

 import android.view.ViewGroup;

-import com.actionbarsherlock.view.Menu;

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.activity.SearchActivity;

 import github.daneren2005.dsub.domain.Artist;

@@ -118,12 +119,12 @@ public class SearchFragment extends SubsonicFragment {
 	}

 

 	@Override

-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 		menuInflater.inflate(R.menu.search, menu);

 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(super.onOptionsItemSelected(item)) {

 			return true;

 		}

diff --git a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
index 0a35233e..9451c648 100644
--- a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
@@ -6,9 +6,9 @@ import android.support.v4.app.FragmentTransaction;
 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

 import android.view.MenuInflater;

 import android.view.MenuItem;

-import com.actionbarsherlock.view.Menu;

 import android.view.View;

 import android.view.ViewGroup;

 import android.widget.AdapterView;

@@ -68,12 +68,12 @@ public class SelectArtistFragment extends SubsonicFragment implements AdapterVie
 	}

 

 	@Override

-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 		menuInflater.inflate(R.menu.select_artist, menu);

 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(super.onOptionsItemSelected(item)) {

 			return true;

 		}

diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index be8cf91e..d75ba1b4 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -8,6 +8,8 @@ import android.os.Bundle;
 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

 import android.view.MenuItem;

 import android.view.View;

 import android.view.ViewGroup;

@@ -139,7 +141,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 	}

 

 	@Override

-	public void onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 		if(licenseValid == null) {

 			menuInflater.inflate(R.menu.empty, menu);

 		}

@@ -173,7 +175,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		switch (item.getItemId()) {

 			case R.id.menu_play_now:

 				playNow(false, false);

diff --git a/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java b/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
index 623aba4e..a509c4b7 100644
--- a/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
@@ -21,6 +21,9 @@ package github.daneren2005.dsub.fragments;
 import android.os.Bundle;

 import android.util.Log;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

+import android.view.MenuItem;

 import android.view.View;

 import android.view.ViewGroup;

 import android.widget.AdapterView;

@@ -33,9 +36,6 @@ import github.daneren2005.dsub.util.BackgroundTask;
 import github.daneren2005.dsub.util.Constants;

 import github.daneren2005.dsub.util.TabBackgroundTask;

 import github.daneren2005.dsub.view.GenreAdapter;

-import com.actionbarsherlock.view.Menu;

-import com.actionbarsherlock.view.MenuItem;

-import com.actionbarsherlock.view.MenuInflater;

 import java.util.ArrayList;

 import java.util.List;

 

diff --git a/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java b/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
index 84316b7c..8bcd9d7a 100644
--- a/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

 import android.view.MenuInflater;

 import android.view.MenuItem;

 import android.view.View;

@@ -61,12 +62,12 @@ public class SelectPlaylistFragment extends SubsonicFragment implements AdapterV
 	}

 

 	@Override

-	public void onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {

 		menuInflater.inflate(R.menu.select_playlist, menu);

 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(super.onOptionsItemSelected(item)) {

 			return true;

 		}

diff --git a/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java b/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
index ee816f6c..9cd42633 100644
--- a/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
@@ -27,14 +27,14 @@ import android.text.util.Linkify;
 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

+import android.view.Menu;

+import android.view.MenuInflater;

 import android.view.MenuItem;

 import android.view.View;

 import android.view.ViewGroup;

 import android.widget.AdapterView;

 import android.widget.ListView;

 import android.widget.TextView;

-import com.actionbarsherlock.view.Menu;

-import com.actionbarsherlock.view.MenuInflater;

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.domain.PodcastChannel;

 import github.daneren2005.dsub.service.MusicService;

@@ -89,7 +89,7 @@ public class SelectPodcastsFragment extends SubsonicFragment implements AdapterV
 	}

 	

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		if(super.onOptionsItemSelected(item)) {

 			return true;

 		}

diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 577d40d3..0d79ceda 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -29,6 +29,7 @@ import android.content.pm.ResolveInfo;
 import android.media.MediaMetadataRetriever;

 import android.net.Uri;

 import android.os.Bundle;

+import android.support.v4.app.Fragment;

 import android.util.Log;

 import android.view.ContextMenu;

 import android.view.MenuInflater;

@@ -38,7 +39,6 @@ import android.widget.Button;
 import android.widget.CheckBox;

 import android.widget.EditText;

 import android.widget.TextView;

-import com.actionbarsherlock.app.SherlockFragment;

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.activity.DownloadActivity;

 import github.daneren2005.dsub.activity.HelpActivity;

@@ -74,7 +74,7 @@ import java.util.List;
 import java.util.Random;

 import java.util.concurrent.atomic.AtomicInteger;

 

-public class SubsonicFragment extends SherlockFragment {

+public class SubsonicFragment extends Fragment {

 	private static final String TAG = SubsonicFragment.class.getSimpleName();

 	private static final AtomicInteger nextGeneratedId = new AtomicInteger(1);

 	private static int TAG_INC = 10;

@@ -115,7 +115,7 @@ public class SubsonicFragment extends SherlockFragment {
 	}

 

 	@Override

-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {

+	public boolean onOptionsItemSelected(MenuItem item) {

 		switch (item.getItemId()) {

 			case R.id.menu_refresh:

 				refresh(true);