From 4d39cae75be4cc8ebbbf335910a58cc7f28255dd Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Tue, 21 Apr 2015 17:53:32 -0500 Subject: [PATCH] ActionBarActivity is now AppCompatActivity, which has lots of new internals. http://android-developers.blogspot.com/2015/04/android-support-library-221.html --- .../kabouzeid/gramophone/adapter/PlayingQueueAdapter.java | 6 +++--- .../com/kabouzeid/gramophone/adapter/PlaylistAdapter.java | 6 +++--- .../com/kabouzeid/gramophone/adapter/SearchAdapter.java | 6 +++--- .../gramophone/adapter/songadapter/AlbumSongAdapter.java | 6 +++--- .../gramophone/adapter/songadapter/ArtistSongAdapter.java | 6 +++--- .../gramophone/adapter/songadapter/PlaylistSongAdapter.java | 6 +++--- .../gramophone/adapter/songadapter/SongAdapter.java | 6 +++--- .../kabouzeid/gramophone/dialogs/PlayingQueueDialog.java | 4 ++-- .../kabouzeid/gramophone/helper/MenuItemClickHelper.java | 6 +++--- .../gramophone/ui/activities/base/ThemeBaseActivity.java | 2 +- .../mainactivityfragments/PlaylistViewFragment.java | 4 ++-- .../fragments/mainactivityfragments/SongViewFragment.java | 4 ++-- .../java/com/kabouzeid/gramophone/util/NavigationUtil.java | 4 ++-- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java index b0c06493..c0015dbc 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java @@ -1,6 +1,6 @@ package com.kabouzeid.gramophone.adapter; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -24,9 +24,9 @@ import java.util.ArrayList; */ public class PlayingQueueAdapter extends ArrayAdapter { - private final ActionBarActivity activity; + private final AppCompatActivity activity; - public PlayingQueueAdapter(ActionBarActivity activity, ArrayList playList) { + public PlayingQueueAdapter(AppCompatActivity activity, ArrayList playList) { super(activity, R.layout.item_list_playlist_song, playList); this.activity = activity; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java index df92d178..44d311b6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java @@ -1,7 +1,7 @@ package com.kabouzeid.gramophone.adapter; 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.view.LayoutInflater; import android.view.MenuItem; @@ -26,10 +26,10 @@ import java.util.List; public class PlaylistAdapter extends RecyclerView.Adapter { public static final String TAG = PlaylistAdapter.class.getSimpleName(); - protected final ActionBarActivity activity; + protected final AppCompatActivity activity; protected List dataSet; - public PlaylistAdapter(ActionBarActivity activity) { + public PlaylistAdapter(AppCompatActivity activity) { this.activity = activity; loadDataSet(); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java index 4436ed9a..bcda3b56 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java @@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.adapter; import android.graphics.Color; import android.graphics.Typeface; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -26,9 +26,9 @@ import java.util.List; */ public class SearchAdapter extends ArrayAdapter { - private final ActionBarActivity activity; + private final AppCompatActivity activity; - public SearchAdapter(ActionBarActivity activity, List objects) { + public SearchAdapter(AppCompatActivity activity, List objects) { super(activity, R.layout.item_list_search, objects); this.activity = activity; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java index 44bfb681..da50c319 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java @@ -1,6 +1,6 @@ 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.view.LayoutInflater; import android.view.MenuItem; @@ -24,10 +24,10 @@ import java.util.ArrayList; public class AlbumSongAdapter extends RecyclerView.Adapter { public static final String TAG = AlbumSongAdapter.class.getSimpleName(); - protected final ActionBarActivity activity; + protected final AppCompatActivity activity; protected final ArrayList dataSet; - public AlbumSongAdapter(ActionBarActivity activity, ArrayList objects) { + public AlbumSongAdapter(AppCompatActivity activity, ArrayList objects) { this.activity = activity; dataSet = objects; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java index d6a5205a..08e6686e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java @@ -1,7 +1,7 @@ package com.kabouzeid.gramophone.adapter.songadapter; 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.MenuItem; import android.view.View; @@ -26,9 +26,9 @@ import java.util.List; */ public class ArtistSongAdapter extends ArrayAdapter { - private final ActionBarActivity activity; + private final AppCompatActivity activity; - public ArtistSongAdapter(ActionBarActivity activity, List songs) { + public ArtistSongAdapter(AppCompatActivity activity, List songs) { super(activity, R.layout.item_list_song, songs); this.activity = activity; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java index 851b193a..67c55576 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java @@ -1,7 +1,7 @@ package com.kabouzeid.gramophone.adapter.songadapter; 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.view.LayoutInflater; import android.view.MenuItem; @@ -31,10 +31,10 @@ import java.util.List; public class PlaylistSongAdapter extends RecyclerView.Adapter { public static final String TAG = AlbumSongAdapter.class.getSimpleName(); - protected final ActionBarActivity activity; + protected final AppCompatActivity activity; protected final ArrayList dataSet; - public PlaylistSongAdapter(ActionBarActivity activity, ArrayList objects) { + public PlaylistSongAdapter(AppCompatActivity activity, ArrayList objects) { this.activity = activity; dataSet = objects; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java index 7b01e992..0f8af282 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java @@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.adapter.songadapter; import android.graphics.Typeface; 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.view.LayoutInflater; import android.view.MenuItem; @@ -37,10 +37,10 @@ public class SongAdapter extends RecyclerView.Adapter { private static final int SHUFFLE_BUTTON = 0; private static final int SONG = 1; - protected final ActionBarActivity activity; + protected final AppCompatActivity activity; protected ArrayList dataSet; - public SongAdapter(ActionBarActivity activity) { + public SongAdapter(AppCompatActivity activity) { this.activity = activity; loadDataSet(); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java index bda4a265..36cef572 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java @@ -4,7 +4,7 @@ import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; @@ -57,7 +57,7 @@ public class PlayingQueueDialog extends DialogFragment { final ArrayList playingQueue = (ArrayList) getArguments().getSerializable("queue"); final DragSortListView dragSortListView = (DragSortListView) dialog.getCustomView().findViewById(R.id.dragSortListView); final PlayingQueueAdapter playingQueueAdapter = - new PlayingQueueAdapter((ActionBarActivity) getActivity(), playingQueue); + new PlayingQueueAdapter((AppCompatActivity) getActivity(), playingQueue); dragSortListView.setAdapter(playingQueueAdapter); dragSortListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java index 1d47aa4e..508a471d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java @@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.helper; import android.content.Intent; import android.support.v4.util.Pair; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import com.kabouzeid.gramophone.R; @@ -27,7 +27,7 @@ import java.io.File; */ 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()) { case R.id.action_delete_from_disk: DeleteSongsDialog.create(song).show(activity.getSupportFragmentManager(), "DELETE_SONGS"); @@ -69,7 +69,7 @@ public class MenuItemClickHelper { 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()) { case R.id.action_rename_playlist: RenamePlaylistDialog.create(playlist.id).show(activity.getSupportFragmentManager(), "RENAME_PLAYLIST"); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java index 427de40a..04b94e32 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java @@ -6,7 +6,7 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity; import com.afollestad.materialdialogs.ThemeSingleton; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java index 1bd8f556..78230653 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/PlaylistViewFragment.java @@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; 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.RecyclerView; import android.view.View; @@ -41,7 +41,7 @@ public class PlaylistViewFragment extends AbsMainActivityRecyclerViewFragment { @Override protected RecyclerView.Adapter createAdapter() { - PlaylistAdapter adapter = new PlaylistAdapter((ActionBarActivity) getActivity()); + PlaylistAdapter adapter = new PlaylistAdapter((AppCompatActivity) getActivity()); View v = getView(); if (v != null) { v.findViewById(android.R.id.empty).setVisibility( diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java index 94f1fd7e..1697b487 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java @@ -1,6 +1,6 @@ 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.RecyclerView; @@ -26,6 +26,6 @@ public class SongViewFragment extends AbsMainActivityRecyclerViewFragment { @Override protected RecyclerView.Adapter createAdapter() { - return new SongAdapter((ActionBarActivity) getActivity()); + return new SongAdapter((AppCompatActivity) getActivity()); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java index a92a4b81..98e20fb2 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java @@ -7,7 +7,7 @@ import android.media.audiofx.AudioEffect; import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.util.Pair; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.widget.Toast; 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(); if (dialog != null) { dialog.show(activity.getSupportFragmentManager(), "PLAY_QUEUE");