tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ActionBarActivity is now AppCompatActivity, which has lots of new internals. http://android-developers.blogspot.com/2015/04/android-support-library-221.html

Browse source
This commit is contained in:
Aidan Follestad 2015-04-21 17:53:32 -05:00
commit 4d39cae75b
13 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
View file

@ -1,6 +1,6 @@
package com.kabouzeid.gramophone.adapter; package com.kabouzeid.gramophone.adapter;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -24,9 +24,9 @@ import java.util.ArrayList;
*/ */
public class PlayingQueueAdapter extends ArrayAdapter<Song> { public class PlayingQueueAdapter extends ArrayAdapter<Song> {
private final ActionBarActivity activity; private final AppCompatActivity activity;
public PlayingQueueAdapter(ActionBarActivity activity, ArrayList<Song> playList) { public PlayingQueueAdapter(AppCompatActivity activity, ArrayList<Song> playList) {
super(activity, R.layout.item_list_playlist_song, playList); super(activity, R.layout.item_list_playlist_song, playList);
this.activity = activity; this.activity = activity;
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.adapter; package com.kabouzeid.gramophone.adapter;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -26,10 +26,10 @@ import java.util.List;
public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHolder> { public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHolder> {
public static final String TAG = PlaylistAdapter.class.getSimpleName(); public static final String TAG = PlaylistAdapter.class.getSimpleName();
protected final ActionBarActivity activity; protected final AppCompatActivity activity;
protected List<Playlist> dataSet; protected List<Playlist> dataSet;
public PlaylistAdapter(ActionBarActivity activity) { public PlaylistAdapter(AppCompatActivity activity) {
this.activity = activity; this.activity = activity;
loadDataSet(); loadDataSet();
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
View file

@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.adapter;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -26,9 +26,9 @@ import java.util.List;
*/ */
public class SearchAdapter extends ArrayAdapter<SearchEntry> { public class SearchAdapter extends ArrayAdapter<SearchEntry> {
private final ActionBarActivity activity; private final AppCompatActivity activity;
public SearchAdapter(ActionBarActivity activity, List<SearchEntry> objects) { public SearchAdapter(AppCompatActivity activity, List<SearchEntry> objects) {
super(activity, R.layout.item_list_search, objects); super(activity, R.layout.item_list_search, objects);
this.activity = activity; this.activity = activity;
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java
View file

@ -1,6 +1,6 @@
package com.kabouzeid.gramophone.adapter.songadapter; package com.kabouzeid.gramophone.adapter.songadapter;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -24,10 +24,10 @@ import java.util.ArrayList;
public class AlbumSongAdapter extends RecyclerView.Adapter<AlbumSongAdapter.ViewHolder> { public class AlbumSongAdapter extends RecyclerView.Adapter<AlbumSongAdapter.ViewHolder> {
public static final String TAG = AlbumSongAdapter.class.getSimpleName(); public static final String TAG = AlbumSongAdapter.class.getSimpleName();
protected final ActionBarActivity activity; protected final AppCompatActivity activity;
protected final ArrayList<Song> dataSet; protected final ArrayList<Song> dataSet;
public AlbumSongAdapter(ActionBarActivity activity, ArrayList<Song> objects) { public AlbumSongAdapter(AppCompatActivity activity, ArrayList<Song> objects) {
this.activity = activity; this.activity = activity;
dataSet = objects; dataSet = objects;
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.adapter.songadapter; package com.kabouzeid.gramophone.adapter.songadapter;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -26,9 +26,9 @@ import java.util.List;
*/ */
public class ArtistSongAdapter extends ArrayAdapter<Song> { public class ArtistSongAdapter extends ArrayAdapter<Song> {
private final ActionBarActivity activity; private final AppCompatActivity activity;
public ArtistSongAdapter(ActionBarActivity activity, List<Song> songs) { public ArtistSongAdapter(AppCompatActivity activity, List<Song> songs) {
super(activity, R.layout.item_list_song, songs); super(activity, R.layout.item_list_song, songs);
this.activity = activity; this.activity = activity;
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
View file

@ -1,7 +1,7 @@
package com.kabouzeid.gramophone.adapter.songadapter; package com.kabouzeid.gramophone.adapter.songadapter;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -31,10 +31,10 @@ import java.util.List;
public class PlaylistSongAdapter extends RecyclerView.Adapter<PlaylistSongAdapter.ViewHolder> { public class PlaylistSongAdapter extends RecyclerView.Adapter<PlaylistSongAdapter.ViewHolder> {
public static final String TAG = AlbumSongAdapter.class.getSimpleName(); public static final String TAG = AlbumSongAdapter.class.getSimpleName();
protected final ActionBarActivity activity; protected final AppCompatActivity activity;
protected final ArrayList<PlaylistSong> dataSet; protected final ArrayList<PlaylistSong> dataSet;
public PlaylistSongAdapter(ActionBarActivity activity, ArrayList<PlaylistSong> objects) { public PlaylistSongAdapter(AppCompatActivity activity, ArrayList<PlaylistSong> objects) {
this.activity = activity; this.activity = activity;
dataSet = objects; dataSet = objects;
} }

6
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java
View file

@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.adapter.songadapter;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -37,10 +37,10 @@ public class SongAdapter extends RecyclerView.Adapter<SongAdapter.ViewHolder> {
private static final int SHUFFLE_BUTTON = 0; private static final int SHUFFLE_BUTTON = 0;
private static final int SONG = 1; private static final int SONG = 1;
protected final ActionBarActivity activity; protected final AppCompatActivity activity;
protected ArrayList<Song> dataSet; protected ArrayList<Song> dataSet;
public SongAdapter(ActionBarActivity activity) { public SongAdapter(AppCompatActivity activity) {
this.activity = activity; this.activity = activity;
loadDataSet(); loadDataSet();
} }

4
app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java
View file

@ -4,7 +4,7 @@ import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
@ -57,7 +57,7 @@ public class PlayingQueueDialog extends DialogFragment {
final ArrayList<Song> playingQueue = (ArrayList<Song>) getArguments().getSerializable("queue"); final ArrayList<Song> playingQueue = (ArrayList<Song>) getArguments().getSerializable("queue");
final DragSortListView dragSortListView = (DragSortListView) dialog.getCustomView().findViewById(R.id.dragSortListView); final DragSortListView dragSortListView = (DragSortListView) dialog.getCustomView().findViewById(R.id.dragSortListView);
final PlayingQueueAdapter playingQueueAdapter = final PlayingQueueAdapter playingQueueAdapter =
new PlayingQueueAdapter((ActionBarActivity) getActivity(), playingQueue); new PlayingQueueAdapter((AppCompatActivity) getActivity(), playingQueue);
dragSortListView.setAdapter(playingQueueAdapter); dragSortListView.setAdapter(playingQueueAdapter);
dragSortListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { dragSortListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override

6
app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
View file

@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.helper;
import android.content.Intent; import android.content.Intent;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem; import android.view.MenuItem;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -27,7 +27,7 @@ import java.io.File;
*/ */
public class MenuItemClickHelper { public class MenuItemClickHelper {
public static boolean handleSongMenuClick(ActionBarActivity activity, Song song, MenuItem item) { public static boolean handleSongMenuClick(AppCompatActivity activity, Song song, MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_delete_from_disk: case R.id.action_delete_from_disk:
DeleteSongsDialog.create(song).show(activity.getSupportFragmentManager(), "DELETE_SONGS"); DeleteSongsDialog.create(song).show(activity.getSupportFragmentManager(), "DELETE_SONGS");
@ -69,7 +69,7 @@ public class MenuItemClickHelper {
return false; return false;
} }
public static boolean handlePlaylistMenuClick(ActionBarActivity activity, Playlist playlist, MenuItem item) { public static boolean handlePlaylistMenuClick(AppCompatActivity activity, Playlist playlist, MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_rename_playlist: case R.id.action_rename_playlist:
RenamePlaylistDialog.create(playlist.id).show(activity.getSupportFragmentManager(), "RENAME_PLAYLIST"); RenamePlaylistDialog.create(playlist.id).show(activity.getSupportFragmentManager(), "RENAME_PLAYLIST");

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java
View file

@ -6,7 +6,7 @@ import android.graphics.BitmapFactory;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import com.afollestad.materialdialogs.ThemeSingleton; import com.afollestad.materialdialogs.ThemeSingleton;

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java
View file

@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
@ -41,7 +41,7 @@ public class PlaylistViewFragment extends AbsMainActivityRecyclerViewFragment {
@Override @Override
protected RecyclerView.Adapter createAdapter() { protected RecyclerView.Adapter createAdapter() {
PlaylistAdapter adapter = new PlaylistAdapter((ActionBarActivity) getActivity()); PlaylistAdapter adapter = new PlaylistAdapter((AppCompatActivity) getActivity());
View v = getView(); View v = getView();
if (v != null) { if (v != null) {
v.findViewById(android.R.id.empty).setVisibility( v.findViewById(android.R.id.empty).setVisibility(

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java
View file

@ -1,6 +1,6 @@
package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@ -26,6 +26,6 @@ public class SongViewFragment extends AbsMainActivityRecyclerViewFragment {
@Override @Override
protected RecyclerView.Adapter createAdapter() { protected RecyclerView.Adapter createAdapter() {
return new SongAdapter((ActionBarActivity) getActivity()); return new SongAdapter((AppCompatActivity) getActivity());
} }
} }

4
app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
View file

@ -7,7 +7,7 @@ import android.media.audiofx.AudioEffect;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity;
import android.widget.Toast; import android.widget.Toast;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -104,7 +104,7 @@ public class NavigationUtil {
} }
} }
public static void openPlayingQueueDialog(final ActionBarActivity activity) { public static void openPlayingQueueDialog(final AppCompatActivity activity) {
PlayingQueueDialog dialog = PlayingQueueDialog.create(); PlayingQueueDialog dialog = PlayingQueueDialog.create();
if (dialog != null) { if (dialog != null) {
dialog.show(activity.getSupportFragmentManager(), "PLAY_QUEUE"); dialog.show(activity.getSupportFragmentManager(), "PLAY_QUEUE");