Eleven: Complete Apollo rebrand.

* Fix remaining Apollo references

Change-Id: I7f0efcec2658f22467ba8aa5e08e7022bedfab1b

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 904854d..3466b3d 100644 (file)
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -138,7 +138,7 @@
   <string name="app_widget_small">Musiikki: 4 \u00d7 1</string>
   <string name="app_widget_large">Musiikki: 4 \u00d7 2</string>
   <string name="app_widget_large_alt">Musiikki: 4 \u00d7 2 (vaihtoehtoinen)</string>
-  <string name="app_widget_recent">Apollo: äskettäin kuunneltu</string>
+  <string name="app_widget_recent">Eleven: äskettäin kuunneltu</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">Taajuuskorjainta ei voitu avata.</string>
   <string name="empty_music">Kopioi musiikkia tietokoneelta laitteeseen käyttämällä USB-kaapelia.</string>

diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 913d1ee..79f6598 100644 (file)
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -119,7 +119,7 @@
   <string name="settings_download_missing_artwork_title">دابه‌زاندنی ئه‌لبومه‌ هونه‌رییه‌ ونبوه‌کان</string>
   <string name="settings_download_artist_images_title">دابه‌زاندنی وێنه‌ هونه‌رمه‌نده‌ ونبوه‌کان</string>
   <!-- App widget -->
-  <string name="app_widget_large_alt">Apollo: 4×2 (alternate)</string>
+  <string name="app_widget_large_alt">Eleven: 4×2 (alternate)</string>
   <string name="app_widget_recent">ئه‌پۆڵۆ:تازه‌ترین که‌ گوێلێگیراون</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">یه‌کسانکه‌ری ده‌نگ ناکرێته‌وه‌.</string>

diff --git a/src/org/lineageos/eleven/MusicPlaybackService.java b/src/org/lineageos/eleven/MusicPlaybackService.java
index 91859fa..4b3dcc9 100644 (file)
--- a/src/org/lineageos/eleven/MusicPlaybackService.java
+++ b/src/org/lineageos/eleven/MusicPlaybackService.java
@@ -90,7 +90,7 @@ import java.util.TreeSet;
 
 /**
  * A backbround {@link Service} used to keep music playing between activities
- * and when the user moves Apollo into the background.
+ * and when the user moves Eleven into the background.
  */
 @SuppressLint("NewApi")
 public class MusicPlaybackService extends Service {
@@ -1710,7 +1710,7 @@ public class MusicPlaybackService extends Service {
 
     /**
      * Reloads the queue as the user left it the last time they stopped using
-     * Apollo
+     * Eleven
      */
     private void reloadQueue() {
         int id = mCardId;

diff --git a/src/org/lineageos/eleven/adapters/AlbumAdapter.java b/src/org/lineageos/eleven/adapters/AlbumAdapter.java
index e8a3c8e..010f57c 100644 (file)
--- a/src/org/lineageos/eleven/adapters/AlbumAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumAdapter.java
@@ -26,7 +26,7 @@ import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.model.Album;
 import org.lineageos.eleven.ui.MusicHolder;
 import org.lineageos.eleven.ui.MusicHolder.DataHolder;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Collections;
@@ -80,7 +80,7 @@ public class AlbumAdapter extends BaseAdapter implements IPopupMenuCallback {
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         mPadding = context.getResources().getDimensionPixelSize(R.dimen.list_item_general_margin);
     }
 

diff --git a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
index 1e1eb9c..83e6840 100644 (file)
--- a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
@@ -32,7 +32,7 @@ import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ICacheListener;
 import org.lineageos.eleven.cache.ImageCache;
 import org.lineageos.eleven.model.AlbumArtistDetails;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.SquareImageView;
 
@@ -227,7 +227,7 @@ public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
                 }
 
                 mTask = new AlbumArtistLoader(this, getActivity());
-                ApolloUtils.execute(false, mTask, mAudioId);
+                ElevenUtils.execute(false, mTask, mAudioId);
             }
 
         }
@@ -238,7 +238,7 @@ public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
          */
         private void loadImageAsync(AlbumArtistDetails details) {
             // load the actual image
-            ApolloUtils.getImageFetcher(getActivity()).loadAlbumImage(
+            ElevenUtils.getImageFetcher(getActivity()).loadAlbumImage(
                     details.mArtistName,
                     details.mAlbumName,
                     details.mAlbumId,

diff --git a/src/org/lineageos/eleven/adapters/ArtistAdapter.java b/src/org/lineageos/eleven/adapters/ArtistAdapter.java
index 1b71d29..59827b3 100644 (file)
--- a/src/org/lineageos/eleven/adapters/ArtistAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistAdapter.java
@@ -26,7 +26,7 @@ import org.lineageos.eleven.model.Artist;
 import org.lineageos.eleven.sectionadapter.SectionAdapter.BasicAdapter;
 import org.lineageos.eleven.ui.MusicHolder;
 import org.lineageos.eleven.ui.MusicHolder.DataHolder;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
@@ -82,7 +82,7 @@ public class ArtistAdapter extends ArrayAdapter<Artist> implements BasicAdapter,
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // Cache the transparent overlay
         mOverlay = context.getResources().getColor(R.color.list_item_background);
     }

diff --git a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
index d1a101e..66fec09 100644 (file)
--- a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -31,7 +31,7 @@ import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.loaders.AlbumLoader;
 import org.lineageos.eleven.model.Album;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.NavUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 import org.lineageos.eleven.widgets.PopupMenuButton;
@@ -55,7 +55,7 @@ implements LoaderCallbacks<List<Album>>, IPopupMenuCallback {
 
     public ArtistDetailAlbumAdapter(final Activity activity) {
         mActivity = activity;
-        mImageFetcher = ApolloUtils.getImageFetcher(activity);
+        mImageFetcher = ElevenUtils.getImageFetcher(activity);
         mInflater = LayoutInflater.from(activity);
         mListMargin = activity.getResources().
             getDimensionPixelSize(R.dimen.list_item_general_margin);

diff --git a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
index 88ccf26..697a9dd 100644 (file)
--- a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
@@ -17,7 +17,7 @@ import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.model.Song;
 import org.lineageos.eleven.service.MusicPlaybackTrack;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 import org.lineageos.eleven.widgets.PopupMenuButton;
@@ -37,7 +37,7 @@ public abstract class DetailSongAdapter extends BaseAdapter
 
     public DetailSongAdapter(final Activity activity) {
         mActivity = activity;
-        mImageFetcher = ApolloUtils.getImageFetcher(activity);
+        mImageFetcher = ElevenUtils.getImageFetcher(activity);
         mInflater = LayoutInflater.from(activity);
     }
 

diff --git a/src/org/lineageos/eleven/adapters/SongAdapter.java b/src/org/lineageos/eleven/adapters/SongAdapter.java
index 64e7e20..f4d308e 100644 (file)
--- a/src/org/lineageos/eleven/adapters/SongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/SongAdapter.java
@@ -30,7 +30,7 @@ import org.lineageos.eleven.ui.MusicHolder;
 import org.lineageos.eleven.ui.MusicHolder.DataHolder;
 import org.lineageos.eleven.ui.fragments.QueueFragment;
 import org.lineageos.eleven.ui.fragments.SongFragment;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 import org.lineageos.eleven.widgets.PlayPauseProgressButton;
@@ -102,7 +102,7 @@ public class SongAdapter extends ArrayAdapter<Song>
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // set the source id and type
         mSourceId = sourceId;
         mSourceType = sourceType;

diff --git a/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java b/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
index 27dc823..85e9e1f 100644 (file)
--- a/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
+++ b/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
@@ -29,7 +29,7 @@ import org.lineageos.eleven.format.PrefixHighlighter;
 import org.lineageos.eleven.model.SearchResult;
 import org.lineageos.eleven.sectionadapter.SectionAdapter;
 import org.lineageos.eleven.ui.MusicHolder;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
@@ -69,7 +69,7 @@ public final class SummarySearchAdapter extends ArrayAdapter<SearchResult>
     public SummarySearchAdapter(final Activity context) {
         super(context, 0);
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // Create the prefix highlighter
         mHighlighter = new PrefixHighlighter(context);
     }

diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
index d2be599..519b9fc 100644 (file)
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
@@ -25,7 +25,7 @@ import android.widget.RemoteViews;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 /**
  * 4x2 App-Widget

diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
index c6eae88..dbbb3dd 100644 (file)
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
@@ -25,7 +25,7 @@ import android.widget.RemoteViews;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.widgets.RepeatButton;
 import org.lineageos.eleven.widgets.ShuffleButton;
 

diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
index f76ac9a..9315109 100644 (file)
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
@@ -27,7 +27,7 @@ import android.widget.RemoteViews;
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 /**
  * 4x1 App-Widget

diff --git a/src/org/lineageos/eleven/cache/ImageCache.java b/src/org/lineageos/eleven/cache/ImageCache.java
index dd23174..7b837b6 100644 (file)
--- a/src/org/lineageos/eleven/cache/ImageCache.java
+++ b/src/org/lineageos/eleven/cache/ImageCache.java
@@ -33,7 +33,7 @@ import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -138,7 +138,7 @@ public final class ImageCache {
      * @param cacheParams The cache parameters to initialize the cache
      */
     private void init(final Context context) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -512,7 +512,7 @@ public final class ImageCache {
      * cache first
      */
     public void flush() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -534,7 +534,7 @@ public final class ImageCache {
      * Clears the disk and memory caches
      */
     public void clearCaches() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -560,7 +560,7 @@ public final class ImageCache {
      * thread.
      */
     public void close() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {

diff --git a/src/org/lineageos/eleven/cache/ImageWorker.java b/src/org/lineageos/eleven/cache/ImageWorker.java
index 325533e..980fd82 100644 (file)
--- a/src/org/lineageos/eleven/cache/ImageWorker.java
+++ b/src/org/lineageos/eleven/cache/ImageWorker.java
@@ -28,7 +28,7 @@ import android.widget.ImageView;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.provider.PlaylistArtworkStore;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.ImageUtils;
 import org.lineageos.eleven.widgets.BlurScrimImage;
 import org.lineageos.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
@@ -177,7 +177,7 @@ public abstract class ImageWorker {
         }
 
         // Third, by now we need to download the image
-        if (bitmap == null && ApolloUtils.isOnline(context) && !sKeys.contains(key)) {
+        if (bitmap == null && ElevenUtils.isOnline(context) && !sKeys.contains(key)) {
             // Now define what the artist name, album name, and url are.
             String url = ImageUtils.processImageUrl(context, artistName, albumName, imageType);
             if (url != null) {
@@ -477,7 +477,7 @@ public abstract class ImageWorker {
                 final AsyncTaskContainer asyncTaskContainer = new AsyncTaskContainer(bitmapWorkerTask);
                 imageView.setTag(asyncTaskContainer);
                 try {
-                    ApolloUtils.execute(false, bitmapWorkerTask,
+                    ElevenUtils.execute(false, bitmapWorkerTask,
                             artistName, albumName, String.valueOf(albumId));
                 } catch (RejectedExecutionException e) {
                     // Executor has exhausted queue space
@@ -537,7 +537,7 @@ public abstract class ImageWorker {
             final AsyncTaskContainer asyncTaskContainer = new AsyncTaskContainer(bitmapWorkerTask);
             imageView.setTag(asyncTaskContainer);
             try {
-                ApolloUtils.execute(false, bitmapWorkerTask);
+                ElevenUtils.execute(false, bitmapWorkerTask);
             } catch (RejectedExecutionException e) {
                 // Executor has exhausted queue space
             }
@@ -569,7 +569,7 @@ public abstract class ImageWorker {
             blurScrimImage.setTag(asyncTaskContainer);
 
             try {
-                ApolloUtils.execute(false, blurWorkerTask, artistName, albumName, String.valueOf(albumId));
+                ElevenUtils.execute(false, blurWorkerTask, artistName, albumName, String.valueOf(albumId));
             } catch (RejectedExecutionException e) {
                 // Executor has exhausted queue space, show default artwork
                 blurScrimImage.transitionToDefaultState();

diff --git a/src/org/lineageos/eleven/lastfm/Caller.java b/src/org/lineageos/eleven/lastfm/Caller.java
index c312f88..c096b53 100644 (file)
--- a/src/org/lineageos/eleven/lastfm/Caller.java
+++ b/src/org/lineageos/eleven/lastfm/Caller.java
@@ -76,7 +76,7 @@ public class Caller {
 
     private final String apiRootUrl = DEFAULT_API_ROOT;
 
-    private final String userAgent = "Apollo";
+    private final String userAgent = "Eleven";
 
     private Result lastResult;
 

diff --git a/src/org/lineageos/eleven/menu/DeleteDialog.java b/src/org/lineageos/eleven/menu/DeleteDialog.java
index 121148c..65c4cbd 100644 (file)
--- a/src/org/lineageos/eleven/menu/DeleteDialog.java
+++ b/src/org/lineageos/eleven/menu/DeleteDialog.java
@@ -23,7 +23,7 @@ import android.support.v4.app.DialogFragment;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 
 /**
@@ -86,7 +86,7 @@ public class DeleteDialog extends DialogFragment {
         final String title = arguments.getString(Config.NAME);
         final String dialogTitle = getString(R.string.delete_dialog_title, title);
         // Initialize the image cache
-        mFetcher = ApolloUtils.getImageFetcher(getActivity());
+        mFetcher = ElevenUtils.getImageFetcher(getActivity());
         // Build the dialog
         return new AlertDialog.Builder(getActivity()).setTitle(dialogTitle)
                 .setMessage(R.string.cannot_be_undone)

diff --git a/src/org/lineageos/eleven/menu/FragmentMenuItems.java b/src/org/lineageos/eleven/menu/FragmentMenuItems.java
index f32b8c2..7dca614 100644 (file)
--- a/src/org/lineageos/eleven/menu/FragmentMenuItems.java
+++ b/src/org/lineageos/eleven/menu/FragmentMenuItems.java
@@ -14,7 +14,7 @@
 package org.lineageos.eleven.menu;
 
 /**
- * Several of the context menu items used in Apollo are reused. This class helps
+ * Several of the context menu items used in Eleven are reused. This class helps
  * keep things tidy. The integer values of the items are used both as the menu IDs
  * _and_ to determine the sort order of the items.
  */

diff --git a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index 2c14055..d7b9814 100644 (file)
--- a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
+++ b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -24,7 +24,7 @@ import android.widget.ListAdapter;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.HomeActivity;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.Lists;
 import org.lineageos.eleven.utils.MusicUtils;
 
@@ -121,7 +121,7 @@ public class PhotoSelectionDialog extends DialogFragment {
         // Select a photo from the gallery
         mChoices.add(NEW_PHOTO, getString(R.string.new_photo));
         /* Disable fetching image until we find a last.fm replacement
-        if (ApolloUtils.isOnline(getActivity())) {
+        if (ElevenUtils.isOnline(getActivity())) {
             // Option to fetch the old artist image
             mChoices.add(OLD_PHOTO, getString(R.string.context_menu_fetch_artist_image));
         }*/
@@ -135,7 +135,7 @@ public class PhotoSelectionDialog extends DialogFragment {
         mChoices.add(NEW_PHOTO, getString(R.string.new_photo));
         /* Disable fetching image until we find a last.fm replacement
         // Option to fetch the old album image
-        if (ApolloUtils.isOnline(getActivity())) {
+        if (ElevenUtils.isOnline(getActivity())) {
             // Option to fetch the old artist image
             mChoices.add(OLD_PHOTO, getString(R.string.context_menu_fetch_album_art));
         }*/

diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 03ddf26..efc6580 100644 (file)
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -43,7 +43,7 @@ import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ICacheListener;
 import org.lineageos.eleven.cache.ImageFetcher;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.Lists;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
@@ -55,7 +55,7 @@ import java.util.ArrayList;
 
 /**
  * A base {@link FragmentActivity} used to update the bottom bar and
- * bind to Apollo's service.
+ * bind to Eleven's service.
  * <p>
  * {@link SlidingPanelActivity} extends from this skeleton.
  *
@@ -118,7 +118,7 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
         // Control the media volume
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(this, this);
 
         // Initialize the broadcast receiver
@@ -341,7 +341,7 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
         // Set the artist name
         mArtistName.setText(MusicUtils.getArtistName());
         // Set the album art
-        ApolloUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
+        ElevenUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
     }
 
     /**
@@ -469,7 +469,7 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo
     @Override
     public void onCacheUnpaused() {
         // Set the album art
-        ApolloUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
+        ElevenUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
     }
 
     /**

diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index e2ab46b..72d651a 100644 (file)
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -49,7 +49,7 @@ import org.lineageos.eleven.ui.fragments.RecentFragment;
 import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
 import org.lineageos.eleven.ui.fragments.profile.LastAddedFragment;
 import org.lineageos.eleven.ui.fragments.profile.TopTracksFragment;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.BitmapWithColors;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.utils.NavUtils;
@@ -330,7 +330,7 @@ public class HomeActivity extends SlidingPanelActivity implements
                         Bitmap bitmap = ImageFetcher.decodeSampledBitmapFromUri(getContentResolver(),
                                 selectedImage);
 
-                        ImageFetcher imageFetcher = ApolloUtils.getImageFetcher(HomeActivity.this);
+                        ImageFetcher imageFetcher = ElevenUtils.getImageFetcher(HomeActivity.this);
                         imageFetcher.addBitmapToCache(mKey, bitmap);
 
                         MusicUtils.refresh();

diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
index 5f5bd3b..63dcf86 100644 (file)
--- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -61,7 +61,7 @@ import org.lineageos.eleven.sectionadapter.SectionAdapter;
 import org.lineageos.eleven.sectionadapter.SectionCreator;
 import org.lineageos.eleven.sectionadapter.SectionCreator.SimpleListLoader;
 import org.lineageos.eleven.sectionadapter.SectionListContainer;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
 import org.lineageos.eleven.utils.NavUtils;
@@ -81,7 +81,7 @@ import static android.view.View.OnTouchListener;
 import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 /**
- * Provides the search interface for Apollo.
+ * Provides the search interface for Eleven.
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
@@ -259,7 +259,7 @@ public class SearchActivity extends FragmentActivity implements
         // Control the media volume
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(this, this);
 
         // Set the layout
@@ -762,7 +762,7 @@ public class SearchActivity extends FragmentActivity implements
                 if (mSearchType == ResultType.Playlist) {
                     cursor = makePlaylistSearchCursor(getContext(), mQuery);
                 } else {
-                    cursor = ApolloUtils.createSearchQueryCursor(getContext(), mQuery);
+                    cursor = ElevenUtils.createSearchQueryCursor(getContext(), mQuery);
                 }
 
                 // pre-cache this index
@@ -838,7 +838,7 @@ public class SearchActivity extends FragmentActivity implements
             }
 
             // do fancy audio search
-            Cursor cursor = ApolloUtils.createSearchQueryCursor(getContext(), mQuery);
+            Cursor cursor = ElevenUtils.createSearchQueryCursor(getContext(), mQuery);
 
             // pre-cache this index
             final int mimeTypeIndex = cursor.getColumnIndexOrThrow(MediaStore.Audio.Media.MIME_TYPE);

diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index 55dc5c4..0417d36 100644 (file)
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -26,7 +26,7 @@ import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlide
 import org.lineageos.eleven.ui.HeaderBar;
 import org.lineageos.eleven.ui.fragments.AudioPlayerFragment;
 import org.lineageos.eleven.ui.fragments.QueueFragment;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.widgets.BlurScrimImage;
 
@@ -175,7 +175,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
         // since the previous view's is hiding the slide offset, we need to subtract that
         // from action bat height
         int slideOffset = getResources().getDimensionPixelOffset(R.dimen.sliding_panel_indicator_height);
-        slideOffset -= ApolloUtils.getActionBarHeight(this);
+        slideOffset -= ElevenUtils.getActionBarHeight(this);
         mSecondPanel.setSlidePanelOffset(slideOffset);
     }
 
@@ -276,7 +276,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
         super.onMetaChanged();
 
         // load the blurred image
-        mBlurScrimImage.loadBlurImage(ApolloUtils.getImageFetcher(this));
+        mBlurScrimImage.loadBlurImage(ElevenUtils.getImageFetcher(this));
     }
 
     @Override
@@ -284,7 +284,7 @@ public abstract class SlidingPanelActivity extends BaseActivity {
         super.onCacheUnpaused();
 
         // load the blurred image
-        mBlurScrimImage.loadBlurImage(ApolloUtils.getImageFetcher(this));
+        mBlurScrimImage.loadBlurImage(ElevenUtils.getImageFetcher(this));
     }
 
     protected AudioPlayerFragment getAudioPlayerFragment() {

diff --git a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
index d40cfb1..b5942e4 100644 (file)
--- a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
@@ -38,7 +38,7 @@ import org.lineageos.eleven.sectionadapter.SectionListContainer;
 import org.lineageos.eleven.ui.activities.BaseActivity;
 import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
 import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.utils.NavUtils;
 import org.lineageos.eleven.utils.PopupMenuHelper;
@@ -306,7 +306,7 @@ public class AlbumFragment extends MusicBrowserFragment implements
      * Sets up the grid view
      */
     private void initGridView() {
-        int columns = ApolloUtils.isLandscape(getActivity()) ? FOUR : TWO;
+        int columns = ElevenUtils.isLandscape(getActivity()) ? FOUR : TWO;
         mAdapter.setNumColumns(columns);
         // Initialize the grid
         mGridView = (GridView)mRootView.findViewById(R.id.grid_base);

diff --git a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
index 0221e06..0f250fd 100644 (file)
--- a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
@@ -56,7 +56,7 @@ import org.lineageos.eleven.menu.CreateNewPlaylist;
 import org.lineageos.eleven.menu.DeleteDialog;
 import org.lineageos.eleven.menu.FragmentMenuItems;
 import org.lineageos.eleven.ui.activities.HomeActivity;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 import org.lineageos.eleven.utils.NavUtils;
 import org.lineageos.eleven.utils.PreferenceUtils;
@@ -157,11 +157,11 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection {
         // Control the media volume
         getActivity().setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(getActivity(), this);
 
         // Initialize the image fetcher/cache
-        mImageFetcher = ApolloUtils.getImageFetcher(getActivity());
+        mImageFetcher = ElevenUtils.getImageFetcher(getActivity());
 
         // Initialize the handler used to update the current time
         mTimeHandler = new TimeHandler(this);

diff --git a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
index 5773af0..1b91cf2 100644 (file)
--- a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
@@ -250,7 +250,7 @@ public class QueueFragment extends Fragment implements LoaderCallbacks<List<Song
         // Initialize the broadcast receiver
         mQueueUpdateListener = new QueueUpdateListener(this);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(getActivity(), this);
     }
 

diff --git a/src/org/lineageos/eleven/utils/ApolloUtils.java b/src/org/lineageos/eleven/utils/ElevenUtils.java
similarity index 99%
rename from src/org/lineageos/eleven/utils/ApolloUtils.java
rename to src/org/lineageos/eleven/utils/ElevenUtils.java
index 8226189..0b55778 100644 (file)
--- a/src/org/lineageos/eleven/utils/ApolloUtils.java
+++ b/src/org/lineageos/eleven/utils/ElevenUtils.java
@@ -45,7 +45,7 @@ import java.util.concurrent.ThreadPoolExecutor;
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
-public final class ApolloUtils {
+public final class ElevenUtils {
 
     /**
      * The threshold used calculate if a color is light or dark
@@ -75,7 +75,7 @@ public final class ApolloUtils {
     }
 
     /* This class is never initiated */
-    public ApolloUtils() {
+    public ElevenUtils() {
     }
 
     /**

diff --git a/src/org/lineageos/eleven/utils/MusicUtils.java b/src/org/lineageos/eleven/utils/MusicUtils.java
index 908c169..2d129f8 100644 (file)
--- a/src/org/lineageos/eleven/utils/MusicUtils.java
+++ b/src/org/lineageos/eleven/utils/MusicUtils.java
@@ -69,7 +69,7 @@ import java.util.Iterator;
 import java.util.WeakHashMap;
 
 /**
- * A collection of helpers directly related to music or Apollo's service.
+ * A collection of helpers directly related to music or Eleven's service.
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
@@ -1711,7 +1711,7 @@ public final class MusicUtils {
      * Removes the header image from the cache.
      */
     public static void removeFromCache(Activity activity, String key) {
-        ImageFetcher imageFetcher = ApolloUtils.getImageFetcher(activity);
+        ImageFetcher imageFetcher = ElevenUtils.getImageFetcher(activity);
         imageFetcher.removeFromCache(key);
         // Give the disk cache a little time before requesting a new image.
         SystemClock.sleep(80);

diff --git a/src/org/lineageos/eleven/utils/PreferenceUtils.java b/src/org/lineageos/eleven/utils/PreferenceUtils.java
index d72fd30..002eb46 100644 (file)
--- a/src/org/lineageos/eleven/utils/PreferenceUtils.java
+++ b/src/org/lineageos/eleven/utils/PreferenceUtils.java
@@ -30,7 +30,7 @@ import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
 
 /**
  * A collection of helpers designed to get and set various preferences across
- * Apollo.
+ * Eleven.
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
@@ -120,7 +120,7 @@ public final class PreferenceUtils {
      *            in {@link MusicBrowserPhoneFragment}.
      */
     public void setStartPage(final int value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();
@@ -155,7 +155,7 @@ public final class PreferenceUtils {
      * @param value The new theme color to use.
      */
     public void setDefaultThemeColor(final int value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();
@@ -209,7 +209,7 @@ public final class PreferenceUtils {
      * @param value The new sort order
      */
     private void setSortOrder(final String key, final String value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();

diff --git a/src/org/lineageos/eleven/widgets/AudioButton.java b/src/org/lineageos/eleven/widgets/AudioButton.java
index ff469e4..6967dda 100644 (file)
--- a/src/org/lineageos/eleven/widgets/AudioButton.java
+++ b/src/org/lineageos/eleven/widgets/AudioButton.java
@@ -9,7 +9,7 @@ import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
 
 import org.lineageos.eleven.R;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 public abstract class AudioButton extends ImageButton implements OnClickListener, OnLongClickListener {
     public static float ACTIVE_ALPHA = 1.0f;
@@ -31,7 +31,7 @@ public abstract class AudioButton extends ImageButton implements OnClickListener
         if (TextUtils.isEmpty(view.getContentDescription())) {
             return false;
         } else {
-            ApolloUtils.showCheatSheet(view);
+            ElevenUtils.showCheatSheet(view);
             return true;
         }
     }

diff --git a/src/org/lineageos/eleven/widgets/PlayPauseButton.java b/src/org/lineageos/eleven/widgets/PlayPauseButton.java
index 0292ee4..e38f4da 100644 (file)
--- a/src/org/lineageos/eleven/widgets/PlayPauseButton.java
+++ b/src/org/lineageos/eleven/widgets/PlayPauseButton.java
@@ -26,7 +26,7 @@ import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
 
 import org.lineageos.eleven.R;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 
 /**
@@ -88,7 +88,7 @@ public class PlayPauseButton extends ImageButton implements OnClickListener, OnL
         if (TextUtils.isEmpty(view.getContentDescription())) {
             return false;
         } else {
-            ApolloUtils.showCheatSheet(view);
+            ElevenUtils.showCheatSheet(view);
             return true;
         }
     }

diff --git a/src/org/lineageos/eleven/widgets/RepeatingImageButton.java b/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
index b14c147..e54f6f2 100644 (file)
--- a/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
+++ b/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
@@ -21,7 +21,7 @@ import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
 import org.lineageos.eleven.R;
-import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 import org.lineageos.eleven.utils.MusicUtils;
 
 /**
@@ -87,7 +87,7 @@ public class RepeatingImageButton extends ImageButton implements OnClickListener
     @Override
     public boolean performLongClick() {
         if (mListener == null) {
-            ApolloUtils.showCheatSheet(this);
+            ElevenUtils.showCheatSheet(this);
         }
         mStartTime = SystemClock.elapsedRealtime();
         mRepeatCount = 0;