Merge "french: initial translation" into ics

diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
index d589ae2..c5cfd36 100644 (file)
--- a/res/layout/listview_items.xml
+++ b/res/layout/listview_items.xml
@@ -25,8 +25,6 @@
         android:paddingLeft="@dimen/listview_items_padding_left_top"\r
         android:paddingRight="@dimen/listview_items_padding_right"\r
         android:paddingTop="@dimen/listview_items_padding_left_top"\r
-        android:shadowColor="@color/black"\r
-        android:shadowRadius="0.5"\r
         android:singleLine="true"\r
         android:textSize="@dimen/text_size_medium" />\r
 \r
@@ -40,8 +38,6 @@
         android:paddingLeft="@dimen/listview_items_padding_left_top"\r
         android:paddingRight="@dimen/listview_items_padding_right"\r
         android:paddingTop="@dimen/listview_items_padding_left_top"\r
-        android:shadowColor="@color/black"\r
-        android:shadowRadius="0.2"\r
         android:singleLine="true"\r
         android:textSize="@dimen/text_size_small" />\r
 \r
@@ -61,4 +57,4 @@
         android:paddingRight="@dimen/listview_peak_meter_one_padding_right"\r
         android:paddingTop="@dimen/peak_meter_padding_top" />\r
 \r
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>\r

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
new file mode 100644 (file)
index 0000000..32d37e3
--- /dev/null
+++ b/res/values-ca/strings.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- App name -->
+    <string name="app_name">Apollo</string>
+
+    <!-- Content descriptions for the Bottom Action Bar -->
+    <string name="cd_favorite">Marca aquesta cançó com a preferida</string>
+    <string name="cd_search">Cerca la teva música</string>
+    <string name="cd_overflow">Mostra més opcions</string>
+    <string name="cd_bottom_action_bar_album_art">Coberta de l\'àlbum</string>
+    <string name="cd_repeat">Repeteix una o totes</string>
+    <string name="cd_previous">Salta enrere</string>
+    <string name="cd_play">Reprodueix i atura</string>
+    <string name="cd_next">Salta endavant</string>
+    <string name="cd_shuffle">Ordre aleatori</string>
+
+    <!-- AudioPlayer title -->
+    <string name="nowplaying">Reproduint</string>
+
+    <!-- Used to indicate the number of albums for an artist -->
+    <plurals name="Nalbums">
+
+        <!-- Number of albums is one -->
+        <item quantity="one">1 àlbum</item>
+        <!-- Number of albums is more than one -->
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> àlbums</item>
+    </plurals>
+
+    <!-- Used to indicate the number of songs for an album -->
+
+    <plurals name="Nsongs">
+
+        <!-- Number of songs is one -->
+        <item quantity="one">1 cançó</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> cançons</item>
+    </plurals>
+
+    <!-- Toasts after adding song(s) to playlists -->
+    <plurals name="NNNtrackstoplaylist">
+
+        <!-- message shown when one song was added -->
+        <item quantity="one">S\'ha afegit 1 cançó a la llista.</item>
+        <!-- message shown when zero or more than one song was added -->
+        <item quantity="other">S\'han afegit <xliff:g id="number" example="27">%d</xliff:g> cançons a la llista.</item>
+    </plurals>
+
+    <!-- Headers -->
+    <string name="album_header">LLISTA D\'ÀLBUMS</string>
+    <string name="track_header">LLISTA DE CANÇONS</string>
+
+    <!-- Options MenuItems -->
+    <string name="settings">Preferències</string>
+    <string name="shuffle_all">Cançons aleatòries</string>
+    <string name="share">Comparteix</string>
+    <string name="play_store">Play Store</string>
+
+    <!-- Set track as ringtone -->
+    <string name="set_as_ringtone">S\'ha establert \"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" com a to del telèfon</string>
+
+    <!-- Do not translate. Duration format for duration < 1 hour -->
+    <string name="durationformatshort" translatable="false"><xliff:g id="format">%2$d:%5$02d</xliff:g></string>
+    <!-- Do not translate. Duration format for duration >= 1 hour -->
+    <string name="durationformatlong" translatable="false"><xliff:g id="format">%1$d:%3$02d:%5$02d</xliff:g></string>
+
+    <!-- Transient popup message shown after renaming a playlist -->
+    <string name="rename_playlist">Canvia el nom de la llista</string>
+
+    <!-- Shuffle and repeat messages -->
+    <string name="repeat_one">Repeteix una</string>
+    <string name="repeat_all">Repeteix totes</string>
+    <string name="repeat_off">Sense repetició</string>
+    <string name="shuffle_off">Ordre aleatori desactivat</string>
+    <string name="shuffle_on">Ordre aleatori activat</string>
+
+    <!-- Share Intent -->
+    <string name="now_listening_to">Estic escoltant:</string>
+    <string name="by">per</string>
+    <string name="share_track_using">Comparteix la cançó fent servir</string>
+
+    <!-- ContextMenu items -->
+    <string name="play_all">Reprodueix totes</string>
+    <string name="add_to_playlist">Afegeix a una llista</string>
+    <string name="use_as_ringtone">Utilitza com a to del telèfon</string>
+    <string name="delete_playlist">Suprimeix aquesta llista</string>
+    <string name="search">Cerca</string>
+    <string name="remove">Suprimeix de la llista</string>
+
+    <!-- App Widgets -->
+    <string name="apollo_1x1">Apollo (1x1)</string>
+    <string name="apollo_4x1">Apollo (4x1)</string>
+    <string name="apollo_4x2">Apollo (4x2)</string>
+
+    <!-- Unknown genre name -->
+    <string name="unknown">Desconegut</string>
+
+    <!-- Settings -->
+    <string name="about">Quant a l\'Apollo</string>
+    <string name="eqalizer">Equalitzador</string>
+    <string name="header_interface">Interfície</string>
+    <string name="themes">Temes</string>
+    <string name="apollo_themes">Seleccioneu el tema per a l\'Apollo</string>
+    <string name="select_theme">Selecciona el tema</string>
+    <string name="version">Versió de l\'Apollo</string>
+
+    <!-- Theme layout Buttons -->
+    <string name="apply_theme">Aplica el tema</string>
+    <string name="get_more_themes">Aconsegueix més temes</string>
+
+    <!-- Playlists menu -->
+    <string name="favorite">Preferides</string>
+    <string name="queue">Cua</string>
+    <string name="new_playlist">Nova</string>
+    <string name="new_playlist_name_template">Llista <xliff:g id="number">%d</xliff:g></string>
+    <string name="save">Desa</string>
+    <string name="overwrite">Sobreescriu</string>
+
+    <!-- Tabs -->
+    <string name="tab_recent">RECENTS</string>
+    <string name="tab_artists">ARTISTES</string>
+    <string name="tab_albums">ÀLBUMS</string>
+    <string name="tab_songs">CANÇONS</string>
+    <string name="tab_playlists">LLISTES</string>
+    <string name="tab_genres">GÈNERES</string>
+
+    <!-- Something went wrong -->
+    <string name="error">Error</string>
+
+</resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c407272..49ee5d8 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -110,6 +110,13 @@
     <string name="save">Speichern</string>
     <string name="overwrite">Überschreiben</string>
 
+    <!-- Tabs -->
+    <string name="tab_recent">NEU</string>
+    <string name="tab_artists">INTERPRETEN</string>
+    <string name="tab_albums">ALBEN</string>
+    <string name="tab_songs">TITEL</string>
+    <string name="tab_playlists">WIEDERGABELISTEN</string>
+
     <!-- Something went wrong -->
     <string name="error">Fehler</string>
 

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644 (file)
index 0000000..0349dcb
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">\r
+\r
+    <!-- App name -->\r
+    <string name="app_name">Apollo</string>\r
+\r
+    <!-- Content descriptions for the Bottom Action Bar -->\r
+    <string name="cd_favorite">この曲をお気に入りに追加する</string>\r
+    <string name="cd_search">曲を検索する</string>\r
+    <string name="cd_overflow">さらにオプションを表示</string>\r
+    <string name="cd_bottom_action_bar_album_art">この曲のアルバムアート</string>\r
+    <string name="cd_repeat">1曲またはすべてシャッフル</string>\r
+    <string name="cd_previous">前の曲にスキップ</string>\r
+    <string name="cd_play">再生と一時停止</string>\r
+    <string name="cd_next">次の曲にスキップ</string>\r
+    <string name="cd_shuffle">トラックをシャッフル</string>\r
+\r
+    <!-- AudioPlayer title -->\r
+    <string name="nowplaying">再生中</string>\r
+\r
+    <!-- Used to indicate the number of albums for an artist -->\r
+    <plurals name="Nalbums">\r
+\r
+        <!-- Number of albums is one -->\r
+        <item quantity="one">1つのアルバム</item>\r
+        <!-- Number of albums is more than one -->\r
+        <item quantity="other"><xliff:g id="count">%d</xliff:g>つのアルバム</item>\r
+    </plurals>\r
+\r
+    <!-- Used to indicate the number of songs for an album -->\r
+\r
+    <plurals name="Nsongs">\r
+\r
+        <!-- Number of songs is one -->\r
+        <item quantity="one">1曲</item>\r
+        <item quantity="other"><xliff:g id="count">%d</xliff:g>曲</item>\r
+    </plurals>\r
+\r
+    <!-- Toasts after adding song(s) to playlists -->\r
+    <plurals name="NNNtrackstoplaylist">\r
+\r
+        <!-- message shown when one song was added -->\r
+        <item quantity="one">1つの曲をプレイイストに追加しました</item>\r
+        <!-- message shown when zero or more than one song was added -->\r
+        <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g>つの曲をプレイイストに追加しました</item>\r
+    </plurals>\r
+\r
+    <!-- Headers -->\r
+    <string name="album_header">アルバムリスト</string>\r
+    <string name="track_header">トラックリスト</string>\r
+\r
+    <!-- Options MenuItems -->\r
+    <string name="settings">設定</string>\r
+    <string name="shuffle_all">すべてシャッフル</string>\r
+    <string name="share">共有</string>\r
+    <string name="play_store">プレイストア</string>\r
+\r
+    <!-- Set track as ringtone -->\r
+    <string name="set_as_ringtone">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" 着信音に設定</string>\r
+\r
+    <!-- Transient popup message shown after renaming a playlist -->\r
+    <string name="rename_playlist">プレイリストの名前を変更</string>\r
+\r
+    <!-- Shuffle and repeat messages -->\r
+    <string name="repeat_one">1曲リピート</string>\r
+    <string name="repeat_all">全曲リピート</string>\r
+    <string name="repeat_off">リピートなし</string>\r
+    <string name="shuffle_off">シャッフルオン</string>\r
+    <string name="shuffle_on">シャッフルオフ</string>\r
+\r
+    <!-- Share Intent -->\r
+    <string name="now_listening_to">現在再生中:</string>\r
+    <string name="by">by</string>\r
+    <string name="share_track_using">トラックを共有する</string>\r
+\r
+    <!-- ContextMenu items -->\r
+    <string name="play_all">すべて再生</string>\r
+    <string name="add_to_playlist">プレイリストに追加</string>\r
+    <string name="use_as_ringtone">着信音として使用</string>\r
+    <string name="delete_playlist">プレイリストを削除</string>\r
+    <string name="search">検索</string>\r
+    <string name="remove">プレイリストから削除</string>\r
+\r
+    <!-- App Widgets -->\r
+    <string name="apollo_1x1">Apollo (1x1)</string>\r
+    <string name="apollo_4x1">Apollo (4x1)</string>\r
+    <string name="apollo_4x2">Apollo (4x2)</string>\r
+\r
+    <!-- Unknown genre name -->\r
+    <string name="unknown">不明</string>\r
+\r
+    <!-- Settings -->\r
+    <string name="about">Apolloについて</string>\r
+    <string name="eqalizer">イコライザ</string>\r
+    <string name="header_interface">インタフェース</string>\r
+    <string name="themes">テーマ</string>\r
+    <string name="apollo_themes">Apolloのテーマを選択</string>\r
+    <string name="select_theme">あなたのテーマを選択</string>\r
+    <string name="version">Apollo バージョン</string>\r
+\r
+    <!-- Theme layout Buttons -->\r
+    <string name="apply_theme">テーマを適用</string>\r
+    <string name="get_more_themes">さらにテーマを入手</string>\r
+\r
+    <!-- Playlists menu -->\r
+    <string name="favorite">お気に入り</string>\r
+    <string name="queue">キュー</string>\r
+    <string name="new_playlist">New</string>\r
+    <string name="new_playlist_name_template">プレイリスト <xliff:g id="number">%d</xliff:g></string>\r
+    <string name="save">保存</string>\r
+    <string name="overwrite">上書き</string>\r
+\r
+    <!-- Something went wrong -->\r
+    <string name="error">エラー</string>\r
+\r
+</resources>\r

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 49c3d0b..4cf1c7f 100644 (file)
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -103,6 +103,14 @@
     <string name="save">Opslaan</string>\r
     <string name="overwrite">Overschrijven</string>\r
 \r
+    <!-- Tabs -->\r
+    <string name="tab_recent">RECENT</string>\r
+    <string name="tab_artists">ARTIESTEN</string>\r
+    <string name="tab_albums">ALBUMS</string>\r
+    <string name="tab_songs">NUMMERS</string>\r
+    <string name="tab_playlists">AFSPEELLIJSTEN</string>\r
+    <string name="tab_genres">GENRES</string>\r
+\r
     <!-- Something went wrong -->\r
     <string name="error">Fout</string>\r
 \r

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
new file mode 100644 (file)
index 0000000..61e150a
--- /dev/null
+++ b/res/values-tr/strings.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">\r
+\r
+    <!-- App name -->\r
+    <string name="app_name">Apollo</string>\r
+\r
+    <!-- Content descriptions for the Bottom Action Bar -->\r
+    <string name="cd_favorite">Bu şarkıyı beğenilenlere ekle</string>\r
+    <string name="cd_search">Şarkıları ara</string>\r
+    <string name="cd_overflow">Daha fazla seçenek</string>\r
+    <string name="cd_bottom_action_bar_album_art">Albüm kapağı</string>\r
+    <string name="cd_repeat">Tümünü tekrarla</string>\r
+    <string name="cd_previous">Önceki</string>\r
+    <string name="cd_play">Oynat/Beklet</string>\r
+    <string name="cd_next">Sonraki</string>\r
+    <string name="cd_shuffle">Karıştır</string>\r
+\r
+    <!-- AudioPlayer title -->\r
+    <string name="nowplaying">Şimdi Çalıyor</string>\r
+\r
+    <!-- Used to indicate the number of albums for an artist -->\r
+    <plurals name="Nalbums">\r
+        <!-- Number of albums is one -->\r
+        <item quantity="one">1 albüm</item>\r
+        <!-- Number of albums is more than one -->\r
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> albüm</item>\r
+    </plurals>\r
+\r
+    <!-- Used to indicate the number of songs for an album -->\r
+    <plurals name="Nsongs">\r
+        <!-- Number of songs is one -->\r
+        <item quantity="one">1 şarkı</item>\r
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> şarkı</item>\r
+    </plurals>\r
+\r
+    <!-- Toasts after adding song(s) to playlists -->\r
+    <plurals name="NNNtrackstoplaylist">\r
+        <!-- message shown when one song was added -->\r
+        <item quantity="one">1 şarkı çalma listesine eklendi</item>\r
+        <!-- message shown when zero or more than one song was added -->\r
+        <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> şarkı çalma listesine eklendi</item>\r
+    </plurals>\r
+\r
+    <!-- Headers -->\r
+    <string name="album_header">ALBÜM LİSTESİ</string>\r
+    <string name="track_header">ŞARKI LİSTESİ</string>\r
+\r
+    <!-- Options MenuItems -->\r
+    <string name="settings">Ayarlar</string>\r
+    <string name="shuffle_all">Tümünü karıştır</string>\r
+    <string name="share">Paylaş</string>\r
+    <string name="play_store">Play Mağazası</string>\r
+\r
+    <!-- Set track as ringtone -->\r
+    <string name="set_as_ringtone">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" zil sesi olarak ayarla</string>\r
+\r
+    <!-- Transient popup message shown after renaming a playlist -->\r
+    <string name="rename_playlist">Yeniden adlandır</string>\r
+\r
+    <!-- Shuffle and repeat messages -->\r
+    <string name="repeat_one">Bir kez tekrarla</string>\r
+    <string name="repeat_all">Sürekli tekrarla</string>\r
+    <string name="repeat_off">Tekrarlamayı kapat</string>\r
+    <string name="shuffle_off">Karıştırmayı kapat</string>\r
+    <string name="shuffle_on">Karıştırmayı aç</string>\r
+\r
+    <!-- Share Intent -->\r
+    <string name="now_listening_to">Şimdi dinleniyor:</string>\r
+    <string name="by"> - </string>\r
+    <string name="share_track_using">Şarkıyı paylaş</string>\r
+\r
+    <!-- ContextMenu items -->\r
+    <string name="play_all">Tümünü çal</string>\r
+    <string name="add_to_playlist">Şarkı listesine ekle</string>\r
+    <string name="use_as_ringtone">Zil sesi olarak ayarla</string>\r
+    <string name="delete_playlist">Şarkı listesini sil</string>\r
+    <string name="search">Ara</string>\r
+    <string name="remove">Şarkı listesinden sil</string>\r
+\r
+    <!-- App Widgets -->\r
+    <string name="apollo_1x1">Apollo (1x1)</string>\r
+    <string name="apollo_4x1">Apollo (4x1)</string>\r
+    <string name="apollo_4x2">Apollo (4x2)</string>\r
+\r
+    <!-- Unknown genre name -->\r
+    <string name="unknown">Bilinmeyen</string>\r
+\r
+    <!-- Settings -->\r
+    <string name="about">Apollo Hakkında</string>\r
+    <string name="eqalizer">Ekolayzer</string>\r
+    <string name="header_interface">Arayüz</string>\r
+    <string name="themes">Temalar</string>\r
+    <string name="apollo_themes">Apollo için tema seç</string>\r
+    <string name="select_theme">Temanızı seçin</string>\r
+    <string name="version">Apollo Sürümü</string>\r
+\r
+    <!-- Theme layout Buttons -->\r
+    <string name="apply_theme">Temayı uygula</string>\r
+    <string name="get_more_themes">Daha fazla tema bul</string>\r
+\r
+    <!-- Playlists menu -->\r
+    <string name="favorite">Beğenilenler</string>\r
+    <string name="queue">Liste</string>\r
+    <string name="new_playlist">Yeni</string>\r
+    <string name="new_playlist_name_template"><xliff:g id="number">%d</xliff:g> çalma listesi</string>\r
+    <string name="save">Kaydet</string>\r
+    <string name="overwrite">Üzerine yaz</string>\r
+\r
+    <!-- Something went wrong -->\r
+    <string name="error">Hata</string>\r
+\r
+</resources>\r

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35d3650..48ce696 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -38,11 +38,10 @@
 \r
     <!-- Toasts after adding song(s) to playlists -->\r
     <plurals name="NNNtrackstoplaylist">\r
-\r
         <!-- message shown when one song was added -->\r
         <item quantity="one">1 song added to playlist</item>\r
         <!-- message shown when zero or more than one song was added -->\r
-        <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlis.</item>\r
+        <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlist</item>\r
     </plurals>\r
 \r
     <!-- Headers -->\r

diff --git a/src/com/andrew/apollo/AudioPlayerFragment.java b/src/com/andrew/apollo/AudioPlayerFragment.java
index d61fb68..88517c8 100644 (file)
--- a/src/com/andrew/apollo/AudioPlayerFragment.java
+++ b/src/com/andrew/apollo/AudioPlayerFragment.java
@@ -37,10 +37,16 @@ import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_KEY;\r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_ID;\r
+import static com.andrew.apollo.Constants.ARTIST_KEY;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class AudioPlayerFragment extends Fragment implements Constants {\r
+public class AudioPlayerFragment extends Fragment {\r
 \r
     // Track, album, and artist name\r
     private TextView mTrackName, mAlbumArtistName;\r

diff --git a/src/com/andrew/apollo/Constants.java b/src/com/andrew/apollo/Constants.java
index 860fbbe..5491019 100644 (file)
--- a/src/com/andrew/apollo/Constants.java
+++ b/src/com/andrew/apollo/Constants.java
@@ -7,25 +7,26 @@ package com.andrew.apollo;
 /**\r
  * @author Andrew Neal\r
  */\r
-public interface Constants {\r
+public final class Constants {\r
 \r
     // Last.fm API\r
-    public String LASTFM_API_KEY = "0bec3f7ec1f914d7c960c12a916c8fb3";\r
+    public final static String LASTFM_API_KEY = "0bec3f7ec1f914d7c960c12a916c8fb3";\r
 \r
     // SharedPreferences\r
-    public String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences",\r
+    public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences",\r
             ARTIST_IMAGE = "artistimage", ARTIST_IMAGE_ORIGINAL = "artistimageoriginal",\r
             ALBUM_IMAGE = "albumimage", ARTIST_KEY = "artist", ALBUM_KEY = "album",\r
             GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",\r
             PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist",\r
             THEME_PACKAGE_NAME = "themePackageName", THEME_DESCRIPTION = "themeDescription",\r
-            THEME_PREVIEW = "themepreview", THEME_TITLE = "themeTitle";\r
+            THEME_PREVIEW = "themepreview", THEME_TITLE = "themeTitle",\r
+            UP_STARTS_ALBUM_ACTIVITY = "upStartsAlbumActivity";\r
 \r
     // Bundle & Intent type\r
-    public String MIME_TYPE = "mimetype", INTENT_ACTION = "action", DATA_SCHEME = "file";\r
+    public final static String MIME_TYPE = "mimetype", INTENT_ACTION = "action", DATA_SCHEME = "file";\r
 \r
     // Storage Volume\r
-    public String EXTERNAL = "external";\r
+    public final static String EXTERNAL = "external";\r
 \r
     // Playlists\r
     public final static long PLAYLIST_UNKNOWN = -1, PLAYLIST_ALL_SONGS = -2, PLAYLIST_QUEUE = -3,\r
@@ -66,4 +67,7 @@ public interface Constants {
             INTENT_RENAME_PLAYLIST = "com.andrew.apollo.RENAME_PLAYLIST",\r
             INTENT_KEY_RENAME = "rename", INTENT_KEY_DEFAULT_NAME = "default_name";\r
 \r
+    private Constants() {\r
+        throw new UnsupportedOperationException();\r
+    }\r
 }\r

diff --git a/src/com/andrew/apollo/activities/AudioPlayerHolder.java b/src/com/andrew/apollo/activities/AudioPlayerHolder.java
index a22c4c1..ef6eee8 100644 (file)
--- a/src/com/andrew/apollo/activities/AudioPlayerHolder.java
+++ b/src/com/andrew/apollo/activities/AudioPlayerHolder.java
@@ -29,7 +29,6 @@ import android.widget.ImageView;
 import android.widget.TextView;\r
 \r
 import com.andrew.apollo.AudioPlayerFragment;\r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.PagerAdapter;\r
@@ -41,11 +40,17 @@ import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;\r
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;\r
+import static com.andrew.apollo.Constants.THEME_ITEM_BACKGROUND;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This is the "holder" for the @TracksFragment(queue) and @AudioPlayerFragment\r
  */\r
-public class AudioPlayerHolder extends FragmentActivity implements ServiceConnection, Constants {\r
+public class AudioPlayerHolder extends FragmentActivity implements ServiceConnection {\r
 \r
     private ServiceToken mToken;\r
 \r

diff --git a/src/com/andrew/apollo/activities/MusicLibrary.java b/src/com/andrew/apollo/activities/MusicLibrary.java
index 42f8e7c..e86ebd8 100644 (file)
--- a/src/com/andrew/apollo/activities/MusicLibrary.java
+++ b/src/com/andrew/apollo/activities/MusicLibrary.java
@@ -19,7 +19,6 @@ import android.view.Window;
 \r
 import com.andrew.apollo.BottomActionBarControlsFragment;\r
 import com.andrew.apollo.BottomActionBarFragment;\r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.PagerAdapter;\r
@@ -37,11 +36,15 @@ import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_RECENTLY_ADDED;\r
+import static com.andrew.apollo.Constants.THEME_ITEM_BACKGROUND;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This is the "holder" for all of the tabs\r
  */\r
-public class MusicLibrary extends FragmentActivity implements ServiceConnection, Constants {\r
+public class MusicLibrary extends FragmentActivity implements ServiceConnection {\r
 \r
     private ServiceToken mToken;\r
 \r

diff --git a/src/com/andrew/apollo/activities/QueryBrowserActivity.java b/src/com/andrew/apollo/activities/QueryBrowserActivity.java
index 3ec7281..0891afd 100644 (file)
--- a/src/com/andrew/apollo/activities/QueryBrowserActivity.java
+++ b/src/com/andrew/apollo/activities/QueryBrowserActivity.java
@@ -46,13 +46,17 @@ import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.andrew.apollo.Constants;
 import com.andrew.apollo.R;
 import com.andrew.apollo.service.ServiceToken;
 import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;
 
-public class QueryBrowserActivity extends ListActivity implements Constants, ServiceConnection {
+import static com.andrew.apollo.Constants.ALBUM_KEY;
+import static com.andrew.apollo.Constants.ARTIST_ID;
+import static com.andrew.apollo.Constants.ARTIST_KEY;
+import static com.andrew.apollo.Constants.MIME_TYPE;
+
+public class QueryBrowserActivity extends ListActivity implements ServiceConnection {
     private QueryListAdapter mAdapter;
 
     private boolean mAdapterSent;

diff --git a/src/com/andrew/apollo/activities/QuickQueue.java b/src/com/andrew/apollo/activities/QuickQueue.java
index 136123a..15278b2 100644 (file)
--- a/src/com/andrew/apollo/activities/QuickQueue.java
+++ b/src/com/andrew/apollo/activities/QuickQueue.java
@@ -10,13 +10,15 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio;\r
 import android.support.v4.app.FragmentActivity;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.grid.fragments.QuickQueueFragment;\r
 \r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class QuickQueue extends FragmentActivity implements Constants {\r
+public class QuickQueue extends FragmentActivity {\r
 \r
     @Override\r
     protected void onCreate(Bundle icicle) {\r

diff --git a/src/com/andrew/apollo/activities/TracksBrowser.java b/src/com/andrew/apollo/activities/TracksBrowser.java
index 513e5c3..714f074 100644 (file)
--- a/src/com/andrew/apollo/activities/TracksBrowser.java
+++ b/src/com/andrew/apollo/activities/TracksBrowser.java
@@ -34,7 +34,6 @@ import android.widget.TextView;
 \r
 import com.andrew.apollo.BottomActionBarControlsFragment;\r
 import com.andrew.apollo.BottomActionBarFragment;\r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.PagerAdapter;\r
@@ -49,11 +48,25 @@ import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_KEY;\r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_KEY;\r
+import static com.andrew.apollo.Constants.ARTIST_ID;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE_ORIGINAL;\r
+import static com.andrew.apollo.Constants.GENRE_KEY;\r
+import static com.andrew.apollo.Constants.INTENT_ACTION;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_NAME;\r
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_FAVORITES;\r
+import static com.andrew.apollo.Constants.THEME_ITEM_BACKGROUND;\r
+import static com.andrew.apollo.Constants.UP_STARTS_ALBUM_ACTIVITY;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This displays specific track or album listings\r
  */\r
-public class TracksBrowser extends FragmentActivity implements Constants, ServiceConnection {\r
+public class TracksBrowser extends FragmentActivity implements ServiceConnection {\r
 \r
     // Bundle\r
     private Bundle bundle;\r
@@ -154,12 +167,15 @@ public class TracksBrowser extends FragmentActivity implements Constants, Servic
     public boolean onOptionsItemSelected(MenuItem item) {\r
         switch (item.getItemId()) {\r
             case android.R.id.home:\r
-                // Artist ID\r
-                long id = ApolloUtils.getArtistId(getArtist(), ARTIST_ID, this);\r
-                if (ApolloUtils.isAlbum(mimeType) && id != 0)\r
-                    tracksBrowser(id);\r
                 super.onBackPressed();\r
-                break;\r
+                if(bundle.getBoolean(UP_STARTS_ALBUM_ACTIVITY))\r
+                {\r
+                    // Artist ID\r
+                    long artistID = ApolloUtils.getArtistId(getArtist(), ARTIST_ID, this);\r
+                    if (ApolloUtils.isAlbum(mimeType) && artistID != 0)\r
+                        tracksBrowser(artistID);\r
+                }\r
+                return true;\r
             default:\r
                 break;\r
         }\r
@@ -393,7 +409,6 @@ public class TracksBrowser extends FragmentActivity implements Constants, Servic
      * tracks for the same artist\r
      */\r
     private void tracksBrowser(long id) {\r
-\r
         bundle.putString(MIME_TYPE, Audio.Artists.CONTENT_TYPE);\r
         bundle.putString(ARTIST_KEY, getArtist());\r
         bundle.putLong(BaseColumns._ID, id);\r

diff --git a/src/com/andrew/apollo/adapters/AlbumAdapter.java b/src/com/andrew/apollo/adapters/AlbumAdapter.java
index 69ee784..b7f22b1 100644 (file)
--- a/src/com/andrew/apollo/adapters/AlbumAdapter.java
+++ b/src/com/andrew/apollo/adapters/AlbumAdapter.java
@@ -12,7 +12,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.grid.fragments.AlbumsFragment;\r
 import com.andrew.apollo.tasks.LastfmGetAlbumImages;\r
@@ -22,10 +21,12 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.views.ViewHolderGrid;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class AlbumAdapter extends SimpleCursorAdapter implements Constants {\r
+public class AlbumAdapter extends SimpleCursorAdapter {\r
 \r
     private AnimationDrawable mPeakOneAnimation, mPeakTwoAnimation;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/ArtistAdapter.java b/src/com/andrew/apollo/adapters/ArtistAdapter.java
index eac0ef6..ceb2974 100644 (file)
--- a/src/com/andrew/apollo/adapters/ArtistAdapter.java
+++ b/src/com/andrew/apollo/adapters/ArtistAdapter.java
@@ -13,7 +13,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.grid.fragments.ArtistsFragment;\r
 import com.andrew.apollo.tasks.LastfmGetArtistImages;\r
@@ -23,10 +22,12 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.views.ViewHolderGrid;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class ArtistAdapter extends SimpleCursorAdapter implements Constants {\r
+public class ArtistAdapter extends SimpleCursorAdapter {\r
 \r
     private AnimationDrawable mPeakOneAnimation, mPeakTwoAnimation;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/ArtistAlbumAdapter.java b/src/com/andrew/apollo/adapters/ArtistAlbumAdapter.java
index b75e517..4faef37 100644 (file)
--- a/src/com/andrew/apollo/adapters/ArtistAlbumAdapter.java
+++ b/src/com/andrew/apollo/adapters/ArtistAlbumAdapter.java
@@ -12,7 +12,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.list.fragments.ArtistAlbumsFragment;\r
 import com.andrew.apollo.tasks.LastfmGetAlbumImages;\r
@@ -22,10 +21,12 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.views.ViewHolderList;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class ArtistAlbumAdapter extends SimpleCursorAdapter implements Constants {\r
+public class ArtistAlbumAdapter extends SimpleCursorAdapter {\r
 \r
     private AnimationDrawable mPeakOneAnimation, mPeakTwoAnimation;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/GenreAdapter.java b/src/com/andrew/apollo/adapters/GenreAdapter.java
index ce64a28..b0382cc 100644 (file)
--- a/src/com/andrew/apollo/adapters/GenreAdapter.java
+++ b/src/com/andrew/apollo/adapters/GenreAdapter.java
@@ -9,7 +9,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.list.fragments.GenresFragment;\r
 import com.andrew.apollo.utils.MusicUtils;\r
@@ -18,7 +17,7 @@ import com.andrew.apollo.views.ViewHolderList;
 /**\r
  * @author Andrew Neal\r
  */\r
-public class GenreAdapter extends SimpleCursorAdapter implements Constants {\r
+public class GenreAdapter extends SimpleCursorAdapter {\r
 \r
     private WeakReference<ViewHolderList> holderReference;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/QuickQueueAdapter.java b/src/com/andrew/apollo/adapters/QuickQueueAdapter.java
index 416815e..5c50740 100644 (file)
--- a/src/com/andrew/apollo/adapters/QuickQueueAdapter.java
+++ b/src/com/andrew/apollo/adapters/QuickQueueAdapter.java
@@ -10,7 +10,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.grid.fragments.QuickQueueFragment;\r
 import com.andrew.apollo.tasks.LastfmGetAlbumImages;\r
 import com.andrew.apollo.tasks.LastfmGetArtistImages;\r
@@ -19,10 +18,13 @@ import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.views.ViewHolderQueue;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class QuickQueueAdapter extends SimpleCursorAdapter implements Constants {\r
+public class QuickQueueAdapter extends SimpleCursorAdapter {\r
 \r
     private WeakReference<ViewHolderQueue> holderReference;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/RecentlyAddedAdapter.java b/src/com/andrew/apollo/adapters/RecentlyAddedAdapter.java
index 665fa53..8efa2eb 100644 (file)
--- a/src/com/andrew/apollo/adapters/RecentlyAddedAdapter.java
+++ b/src/com/andrew/apollo/adapters/RecentlyAddedAdapter.java
@@ -12,7 +12,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.list.fragments.RecentlyAddedFragment;\r
 import com.andrew.apollo.tasks.LastfmGetAlbumImages;\r
@@ -22,10 +21,12 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.views.ViewHolderList;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class RecentlyAddedAdapter extends SimpleCursorAdapter implements Constants {\r
+public class RecentlyAddedAdapter extends SimpleCursorAdapter {\r
 \r
     private AnimationDrawable mPeakOneAnimation, mPeakTwoAnimation;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/ScrollingTabsAdapter.java b/src/com/andrew/apollo/adapters/ScrollingTabsAdapter.java
index 2c84d14..d72f418 100644 (file)
--- a/src/com/andrew/apollo/adapters/ScrollingTabsAdapter.java
+++ b/src/com/andrew/apollo/adapters/ScrollingTabsAdapter.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
 import android.view.View;\r
 import android.widget.Button;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r

diff --git a/src/com/andrew/apollo/adapters/TrackAdapter.java b/src/com/andrew/apollo/adapters/TrackAdapter.java
index f465c8e..b529ae9 100644 (file)
--- a/src/com/andrew/apollo/adapters/TrackAdapter.java
+++ b/src/com/andrew/apollo/adapters/TrackAdapter.java
@@ -11,7 +11,6 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.list.fragments.TracksFragment;\r
 import com.andrew.apollo.utils.MusicUtils;\r
@@ -20,7 +19,7 @@ import com.andrew.apollo.views.ViewHolderList;
 /**\r
  * @author Andrew Neal\r
  */\r
-public class TrackAdapter extends SimpleCursorAdapter implements Constants {\r
+public class TrackAdapter extends SimpleCursorAdapter {\r
 \r
     private AnimationDrawable mPeakOneAnimation, mPeakTwoAnimation;\r
 \r

diff --git a/src/com/andrew/apollo/app/widgets/AppWidget11.java b/src/com/andrew/apollo/app/widgets/AppWidget11.java
index 6fdb63c..d963a49 100644 (file)
--- a/src/com/andrew/apollo/app/widgets/AppWidget11.java
+++ b/src/com/andrew/apollo/app/widgets/AppWidget11.java
@@ -11,17 +11,18 @@ import android.graphics.Bitmap;
 import android.view.View;\r
 import android.widget.RemoteViews;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.service.ApolloService;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * Simple widget to show currently playing album art along with play/pause and\r
  * next track buttons.\r
  */\r
-public class AppWidget11 extends AppWidgetProvider implements Constants {\r
+public class AppWidget11 extends AppWidgetProvider {\r
     static final String TAG = "MusicAppWidgetProvider1x1";\r
 \r
     public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate1x1";\r

diff --git a/src/com/andrew/apollo/app/widgets/AppWidget41.java b/src/com/andrew/apollo/app/widgets/AppWidget41.java
index be6b3bb..27c9ea3 100644 (file)
--- a/src/com/andrew/apollo/app/widgets/AppWidget41.java
+++ b/src/com/andrew/apollo/app/widgets/AppWidget41.java
@@ -26,7 +26,6 @@ import android.graphics.Bitmap;
 import android.view.View;\r
 import android.widget.RemoteViews;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.AudioPlayerHolder;\r
 import com.andrew.apollo.activities.MusicLibrary;\r
@@ -34,12 +33,14 @@ import com.andrew.apollo.service.ApolloService;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * Simple widget to show currently playing album art along with play/pause and\r
  * next track buttons.\r
  */\r
 \r
-public class AppWidget41 extends AppWidgetProvider implements Constants {\r
+public class AppWidget41 extends AppWidgetProvider {\r
 \r
     public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate4x1";\r
 \r

diff --git a/src/com/andrew/apollo/app/widgets/AppWidget42.java b/src/com/andrew/apollo/app/widgets/AppWidget42.java
index cda0719..c321ef3 100644 (file)
--- a/src/com/andrew/apollo/app/widgets/AppWidget42.java
+++ b/src/com/andrew/apollo/app/widgets/AppWidget42.java
@@ -26,7 +26,6 @@ import android.graphics.Bitmap;
 import android.view.View;\r
 import android.widget.RemoteViews;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.AudioPlayerHolder;\r
 import com.andrew.apollo.activities.MusicLibrary;\r
@@ -34,11 +33,13 @@ import com.andrew.apollo.service.ApolloService;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * Simple widget to show currently playing album art along with play/pause and\r
  * next track buttons.\r
  */\r
-public class AppWidget42 extends AppWidgetProvider implements Constants {\r
+public class AppWidget42 extends AppWidgetProvider {\r
 \r
     public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate4x2";\r
 \r

diff --git a/src/com/andrew/apollo/grid/fragments/AlbumsFragment.java b/src/com/andrew/apollo/grid/fragments/AlbumsFragment.java
index eb2bd19..1cc7d78 100644 (file)
--- a/src/com/andrew/apollo/grid/fragments/AlbumsFragment.java
+++ b/src/com/andrew/apollo/grid/fragments/AlbumsFragment.java
@@ -31,7 +31,6 @@ import android.widget.GridView;
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.TracksBrowser;\r
 import com.andrew.apollo.adapters.AlbumAdapter;\r
@@ -41,10 +40,18 @@ import com.andrew.apollo.tasks.LastfmGetAlbumImages;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ALBUM_KEY;\r
+import static com.andrew.apollo.Constants.ARTIST_KEY;\r
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;\r
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.UP_STARTS_ALBUM_ACTIVITY;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class AlbumsFragment extends Fragment implements LoaderCallbacks<Cursor>, Constants,\r
+public class AlbumsFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
         OnItemClickListener {\r
 \r
     // Adapter\r
@@ -183,6 +190,7 @@ public class AlbumsFragment extends Fragment implements LoaderCallbacks<Cursor>,
         bundle.putString(ARTIST_KEY, artistName);\r
         bundle.putString(ALBUM_KEY, albumName);\r
         bundle.putLong(BaseColumns._ID, id);\r
+        bundle.putBoolean(UP_STARTS_ALBUM_ACTIVITY, true);\r
 \r
         Intent intent = new Intent(Intent.ACTION_VIEW);\r
         intent.setClass(getActivity(), TracksBrowser.class);\r

diff --git a/src/com/andrew/apollo/grid/fragments/ArtistsFragment.java b/src/com/andrew/apollo/grid/fragments/ArtistsFragment.java
index 5b18e49..f35290b 100644 (file)
--- a/src/com/andrew/apollo/grid/fragments/ArtistsFragment.java
+++ b/src/com/andrew/apollo/grid/fragments/ArtistsFragment.java
@@ -31,7 +31,6 @@ import android.widget.GridView;
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.TracksBrowser;\r
 import com.andrew.apollo.adapters.ArtistAdapter;\r
@@ -41,12 +40,19 @@ import com.andrew.apollo.tasks.LastfmGetArtistImagesOriginal;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.ARTIST_ID;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE_ORIGINAL;\r
+import static com.andrew.apollo.Constants.ARTIST_KEY;\r
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;\r
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This is the first tab\r
  */\r
 public class ArtistsFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
-        OnItemClickListener, Constants {\r
+        OnItemClickListener {\r
 \r
     // Adapter\r
     private ArtistAdapter mArtistAdapter;\r

diff --git a/src/com/andrew/apollo/grid/fragments/QuickQueueFragment.java b/src/com/andrew/apollo/grid/fragments/QuickQueueFragment.java
index 4e2c254..dbee16d 100644 (file)
--- a/src/com/andrew/apollo/grid/fragments/QuickQueueFragment.java
+++ b/src/com/andrew/apollo/grid/fragments/QuickQueueFragment.java
@@ -31,7 +31,6 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;\r
 import android.widget.LinearLayout;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.NowPlayingCursor;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.QuickQueueAdapter;\r
@@ -42,7 +41,7 @@ import com.andrew.apollo.utils.MusicUtils;
  * @author Andrew Neal\r
  */\r
 public class QuickQueueFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
-        OnItemClickListener, Constants {\r
+        OnItemClickListener {\r
 \r
     // Adapter\r
     private QuickQueueAdapter mQuickQueueAdapter;\r

diff --git a/src/com/andrew/apollo/list/fragments/ArtistAlbumsFragment.java b/src/com/andrew/apollo/list/fragments/ArtistAlbumsFragment.java
index b074b70..c4d4b4d 100644 (file)
--- a/src/com/andrew/apollo/list/fragments/ArtistAlbumsFragment.java
+++ b/src/com/andrew/apollo/list/fragments/ArtistAlbumsFragment.java
@@ -31,7 +31,6 @@ import android.widget.ImageView;
 import android.widget.ListView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.TracksBrowser;\r
 import com.andrew.apollo.adapters.ArtistAlbumAdapter;\r
@@ -41,12 +40,20 @@ import com.andrew.apollo.tasks.LastfmGetAlbumImages;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ALBUM_KEY;\r
+import static com.andrew.apollo.Constants.ARTIST_KEY;\r
+import static com.andrew.apollo.Constants.EXTERNAL;\r
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;\r
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This is used in the @TracksBrowser after touching an artist from @ArtistsFragment\r
  */\r
 public class ArtistAlbumsFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
-        OnItemClickListener, Constants {\r
+        OnItemClickListener {\r
 \r
     // Adapter\r
     private ArtistAlbumAdapter mArtistAlbumAdapter;\r
@@ -186,7 +193,6 @@ public class ArtistAlbumsFragment extends Fragment implements LoaderCallbacks<Cu
      * @param id\r
      */\r
     private void tracksBrowser(long id) {\r
-\r
         String artistName = mCursor.getString(mArtistNameIndex);\r
         String albumName = mCursor.getString(mAlbumNameIndex);\r
 \r
@@ -200,7 +206,6 @@ public class ArtistAlbumsFragment extends Fragment implements LoaderCallbacks<Cu
         intent.setClass(getActivity(), TracksBrowser.class);\r
         intent.putExtras(bundle);\r
         getActivity().startActivity(intent);\r
-        getActivity().finish();\r
     }\r
 \r
     @Override\r

diff --git a/src/com/andrew/apollo/list/fragments/GenresFragment.java b/src/com/andrew/apollo/list/fragments/GenresFragment.java
index 3a686a5..710dc23 100644 (file)
--- a/src/com/andrew/apollo/list/fragments/GenresFragment.java
+++ b/src/com/andrew/apollo/list/fragments/GenresFragment.java
@@ -24,17 +24,19 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.ListView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.TracksBrowser;\r
 import com.andrew.apollo.adapters.GenreAdapter;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.GENRE_KEY;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note This is the fifth and final tab\r
  */\r
-public class GenresFragment extends Fragment implements LoaderCallbacks<Cursor>, Constants,\r
+public class GenresFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
         OnItemClickListener {\r
 \r
     // Adapter\r

diff --git a/src/com/andrew/apollo/list/fragments/PlaylistsFragment.java b/src/com/andrew/apollo/list/fragments/PlaylistsFragment.java
index c5e829c..a306269 100644 (file)
--- a/src/com/andrew/apollo/list/fragments/PlaylistsFragment.java
+++ b/src/com/andrew/apollo/list/fragments/PlaylistsFragment.java
@@ -28,16 +28,20 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.ListView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.TracksBrowser;\r
 import com.andrew.apollo.adapters.PlaylistAdapter;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.INTENT_KEY_RENAME;\r
+import static com.andrew.apollo.Constants.INTENT_RENAME_PLAYLIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_NAME;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class PlaylistsFragment extends Fragment implements LoaderCallbacks<Cursor>, Constants,\r
+public class PlaylistsFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
         OnItemClickListener {\r
 \r
     // Adapter\r

diff --git a/src/com/andrew/apollo/list/fragments/RecentlyAddedFragment.java b/src/com/andrew/apollo/list/fragments/RecentlyAddedFragment.java
index 0d36d61..3cd0d0f 100644 (file)
--- a/src/com/andrew/apollo/list/fragments/RecentlyAddedFragment.java
+++ b/src/com/andrew/apollo/list/fragments/RecentlyAddedFragment.java
@@ -26,18 +26,19 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.ListView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.NowPlayingCursor;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.RecentlyAddedAdapter;\r
 import com.andrew.apollo.service.ApolloService;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.NUMWEEKS;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
 public class RecentlyAddedFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
-        OnItemClickListener, Constants {\r
+        OnItemClickListener {\r
 \r
     // Adapter\r
     private RecentlyAddedAdapter mRecentlyAddedAdapter;\r

diff --git a/src/com/andrew/apollo/list/fragments/TracksFragment.java b/src/com/andrew/apollo/list/fragments/TracksFragment.java
index f199182..3f8e39d 100644 (file)
--- a/src/com/andrew/apollo/list/fragments/TracksFragment.java
+++ b/src/com/andrew/apollo/list/fragments/TracksFragment.java
@@ -36,7 +36,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.NowPlayingCursor;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.adapters.TrackAdapter;\r
@@ -44,11 +43,18 @@ import com.andrew.apollo.service.ApolloService;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.utils.MusicUtils;\r
 \r
+import static com.andrew.apollo.Constants.EXTERNAL;\r
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;\r
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;\r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+import static com.andrew.apollo.Constants.PLAYLIST_FAVORITES;\r
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
 public class TracksFragment extends Fragment implements LoaderCallbacks<Cursor>,\r
-        OnItemClickListener, Constants {\r
+        OnItemClickListener {\r
 \r
     // Adapter\r
     private TrackAdapter mTrackAdapter;\r

diff --git a/src/com/andrew/apollo/menu/PlaylistDialog.java b/src/com/andrew/apollo/menu/PlaylistDialog.java
index 05159b8..d31ce98 100644 (file)
--- a/src/com/andrew/apollo/menu/PlaylistDialog.java
+++ b/src/com/andrew/apollo/menu/PlaylistDialog.java
@@ -37,11 +37,17 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.andrew.apollo.Constants;
 import com.andrew.apollo.R;
 import com.andrew.apollo.utils.MusicUtils;
 
-public class PlaylistDialog extends FragmentActivity implements Constants, TextWatcher,
+import static com.andrew.apollo.Constants.INTENT_CREATE_PLAYLIST;
+import static com.andrew.apollo.Constants.INTENT_KEY_DEFAULT_NAME;
+import static com.andrew.apollo.Constants.INTENT_KEY_RENAME;
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;
+import static com.andrew.apollo.Constants.INTENT_RENAME_PLAYLIST;
+import static com.andrew.apollo.Constants.PLAYLIST_NAME_FAVORITES;
+
+public class PlaylistDialog extends FragmentActivity implements TextWatcher,
         OnCancelListener, OnShowListener {
 
     private AlertDialog mPlaylistDialog;

diff --git a/src/com/andrew/apollo/menu/PlaylistPicker.java b/src/com/andrew/apollo/menu/PlaylistPicker.java
index 8eb7afc..2014c44 100644 (file)
--- a/src/com/andrew/apollo/menu/PlaylistPicker.java
+++ b/src/com/andrew/apollo/menu/PlaylistPicker.java
@@ -16,8 +16,14 @@ import android.widget.Toast;
 import com.andrew.apollo.R;
 import com.andrew.apollo.utils.MusicUtils;
 
+import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;
+import static com.andrew.apollo.Constants.INTENT_CREATE_PLAYLIST;
+import static com.andrew.apollo.Constants.INTENT_PLAYLIST_LIST;
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;
+import static com.andrew.apollo.Constants.PLAYLIST_NEW;
+
 public class PlaylistPicker extends FragmentActivity implements DialogInterface.OnClickListener,
-        DialogInterface.OnCancelListener, com.andrew.apollo.Constants {
+        DialogInterface.OnCancelListener {
 
     private AlertDialog mPlayListPickerDialog;
 

diff --git a/src/com/andrew/apollo/preferences/SettingsFragment.java b/src/com/andrew/apollo/preferences/SettingsFragment.java
index 3f38b0a..fc308f3 100644 (file)
--- a/src/com/andrew/apollo/preferences/SettingsFragment.java
+++ b/src/com/andrew/apollo/preferences/SettingsFragment.java
@@ -4,10 +4,9 @@ package com.andrew.apollo.preferences;
 import android.os.Bundle;\r
 import android.preference.PreferenceFragment;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 \r
-public class SettingsFragment extends PreferenceFragment implements Constants {\r
+public class SettingsFragment extends PreferenceFragment {\r
 \r
     public SettingsFragment() {\r
     }\r

diff --git a/src/com/andrew/apollo/preferences/SettingsHolder.java b/src/com/andrew/apollo/preferences/SettingsHolder.java
index f9896ce..3704d6c 100644 (file)
--- a/src/com/andrew/apollo/preferences/SettingsHolder.java
+++ b/src/com/andrew/apollo/preferences/SettingsHolder.java
@@ -28,7 +28,6 @@ import android.view.View.OnClickListener;
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.AudioPlayerHolder;\r
@@ -40,12 +39,16 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.utils.ThemeUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.APOLLO;\r
+import static com.andrew.apollo.Constants.THEME_PACKAGE_NAME;\r
+import static com.andrew.apollo.Constants.THEME_PREVIEW;\r
 /**\r
  * @author Andrew Neal FIXME - Work on the IllegalStateException thrown when\r
  *         using PreferenceFragment and theme chooser\r
  */\r
 @SuppressWarnings("deprecation")\r
-public class SettingsHolder extends PreferenceActivity implements ServiceConnection, Constants {\r
+public class SettingsHolder extends PreferenceActivity implements ServiceConnection {\r
 \r
     // Service\r
     private ServiceToken mToken;\r

diff --git a/src/com/andrew/apollo/preferences/ThemePreview.java b/src/com/andrew/apollo/preferences/ThemePreview.java
index 7a8ddf8..3e956b8 100644 (file)
--- a/src/com/andrew/apollo/preferences/ThemePreview.java
+++ b/src/com/andrew/apollo/preferences/ThemePreview.java
@@ -14,10 +14,14 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.andrew.apollo.Constants;
 import com.andrew.apollo.R;
 
-public class ThemePreview extends Preference implements Constants {
+import static com.andrew.apollo.Constants.APOLLO;
+import static com.andrew.apollo.Constants.THEME_DESCRIPTION;
+import static com.andrew.apollo.Constants.THEME_PREVIEW;
+import static com.andrew.apollo.Constants.THEME_TITLE;
+
+public class ThemePreview extends Preference {
     private CharSequence themeName;
 
     private CharSequence themePackageName;

diff --git a/src/com/andrew/apollo/service/ApolloService.java b/src/com/andrew/apollo/service/ApolloService.java
index bc2c142..bbccfcd 100644 (file)
--- a/src/com/andrew/apollo/service/ApolloService.java
+++ b/src/com/andrew/apollo/service/ApolloService.java
@@ -64,7 +64,6 @@ import android.view.View;
 import android.widget.RemoteViews;\r
 import android.widget.Toast;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.app.widgets.AppWidget11;\r
@@ -75,7 +74,11 @@ import com.andrew.apollo.utils.MusicUtils;
 import com.andrew.apollo.utils.SharedPreferencesCompat;\r
 import com.androidquery.AQuery;\r
 \r
-public class ApolloService extends Service implements Constants {\r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.APOLLO_PREFERENCES;\r
+import static com.andrew.apollo.Constants.DATA_SCHEME;\r
+\r
+public class ApolloService extends Service {\r
     /**\r
      * used to specify whether enqueue() should start playing the new list of\r
      * files right away, next or once all the currently queued files have been\r

diff --git a/src/com/andrew/apollo/tasks/FetchAlbumImages.java b/src/com/andrew/apollo/tasks/FetchAlbumImages.java
index 64c6d96..7bd8b10 100644 (file)
--- a/src/com/andrew/apollo/tasks/FetchAlbumImages.java
+++ b/src/com/andrew/apollo/tasks/FetchAlbumImages.java
@@ -15,9 +15,10 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio;\r
 import android.provider.MediaStore.Audio.AlbumColumns;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @returns A String[] of all the artists and albums on a device in default\r
@@ -68,7 +69,7 @@ public class FetchAlbumImages {
      * @returns artist names in default album sort order that are then fed into\r
      *          the Last.fm API along with @getAlbumArtists()\r
      */\r
-    public class getAlbums extends AsyncTask<Void, Integer, String[]> implements Constants {\r
+    public class getAlbums extends AsyncTask<Void, Integer, String[]> {\r
 \r
         @Override\r
         protected String[] doInBackground(Void... params) {\r

diff --git a/src/com/andrew/apollo/tasks/FetchArtistImages.java b/src/com/andrew/apollo/tasks/FetchArtistImages.java
index 4800369..dcd03fa 100644 (file)
--- a/src/com/andrew/apollo/tasks/FetchArtistImages.java
+++ b/src/com/andrew/apollo/tasks/FetchArtistImages.java
@@ -15,15 +15,16 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio;\r
 import android.provider.MediaStore.Audio.ArtistColumns;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 \r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @returns A String[] of all the artists on a device in default artist order\r
  *          that are then fed into the Last.fm API\r
  */\r
-public class FetchArtistImages extends AsyncTask<Void, Integer, String[]> implements Constants {\r
+public class FetchArtistImages extends AsyncTask<Void, Integer, String[]> {\r
 \r
     private final WeakReference<Context> contextReference;\r
 \r

diff --git a/src/com/andrew/apollo/tasks/GetCachedImages.java b/src/com/andrew/apollo/tasks/GetCachedImages.java
index 041c9dd..7bd2b46 100644 (file)
--- a/src/com/andrew/apollo/tasks/GetCachedImages.java
+++ b/src/com/andrew/apollo/tasks/GetCachedImages.java
@@ -11,15 +11,17 @@ import android.graphics.Bitmap;
 import android.os.AsyncTask;\r
 import android.widget.ImageView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE_ORIGINAL;\r
+\r
 /**\r
  * @author Andrew Neal Returns a cached image for @TracksBrowser\r
  */\r
-public class GetCachedImages extends AsyncTask<String, Integer, Bitmap> implements Constants {\r
+public class GetCachedImages extends AsyncTask<String, Integer, Bitmap> {\r
 \r
     private final Context mContext;\r
 \r

diff --git a/src/com/andrew/apollo/tasks/LastfmGetAlbumImages.java b/src/com/andrew/apollo/tasks/LastfmGetAlbumImages.java
index 20ca3bf..ae8d74a 100644 (file)
--- a/src/com/andrew/apollo/tasks/LastfmGetAlbumImages.java
+++ b/src/com/andrew/apollo/tasks/LastfmGetAlbumImages.java
@@ -11,17 +11,19 @@ import android.content.Context;
 import android.os.AsyncTask;\r
 import android.widget.ImageView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.lastfm.api.Album;\r
 import com.andrew.apollo.lastfm.api.ImageSize;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.LASTFM_API_KEY;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @returns A convenient image size that's perfect for a GridView.\r
  */\r
-public class LastfmGetAlbumImages extends AsyncTask<String, Integer, String> implements Constants {\r
+public class LastfmGetAlbumImages extends AsyncTask<String, Integer, String> {\r
 \r
     // URL to cache\r
     private String url = null;\r

diff --git a/src/com/andrew/apollo/tasks/LastfmGetArtistImages.java b/src/com/andrew/apollo/tasks/LastfmGetArtistImages.java
index 1cf3bf0..2110fe5 100644 (file)
--- a/src/com/andrew/apollo/tasks/LastfmGetArtistImages.java
+++ b/src/com/andrew/apollo/tasks/LastfmGetArtistImages.java
@@ -10,7 +10,6 @@ import java.util.Iterator;
 import android.content.Context;\r
 import android.os.AsyncTask;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.lastfm.api.Artist;\r
 import com.andrew.apollo.lastfm.api.Image;\r
 import com.andrew.apollo.lastfm.api.ImageSize;\r
@@ -18,11 +17,14 @@ import com.andrew.apollo.lastfm.api.PaginatedResult;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+import static com.andrew.apollo.Constants.LASTFM_API_KEY;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @returns A convenient image size that's perfect for a GridView.\r
  */\r
-public class LastfmGetArtistImages extends AsyncTask<String, Integer, String> implements Constants {\r
+public class LastfmGetArtistImages extends AsyncTask<String, Integer, String> {\r
 \r
     // URL to cache\r
     private String url = null;\r

diff --git a/src/com/andrew/apollo/tasks/LastfmGetArtistImagesOriginal.java b/src/com/andrew/apollo/tasks/LastfmGetArtistImagesOriginal.java
index 46f5eab..8e38af4 100644 (file)
--- a/src/com/andrew/apollo/tasks/LastfmGetArtistImagesOriginal.java
+++ b/src/com/andrew/apollo/tasks/LastfmGetArtistImagesOriginal.java
@@ -11,7 +11,6 @@ import android.content.Context;
 import android.os.AsyncTask;\r
 import android.widget.ImageView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.lastfm.api.Artist;\r
 import com.andrew.apollo.lastfm.api.Image;\r
 import com.andrew.apollo.lastfm.api.ImageSize;\r
@@ -19,13 +18,14 @@ import com.andrew.apollo.lastfm.api.PaginatedResult;
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE_ORIGINAL;\r
+import static com.andrew.apollo.Constants.LASTFM_API_KEY;\r
 \r
 /**\r
  * @author Andrew Neal\r
  * @Note This is used to display artist images in @TracksBrowser\r
  */\r
-public class LastfmGetArtistImagesOriginal extends AsyncTask<String, Integer, String> implements\r
-        Constants {\r
+public class LastfmGetArtistImagesOriginal extends AsyncTask<String, Integer, String> {\r
 \r
     // URL to cache\r
     private String url = null;\r

diff --git a/src/com/andrew/apollo/tasks/ViewHolderQueueTask.java b/src/com/andrew/apollo/tasks/ViewHolderQueueTask.java
index 5515409..0357258 100644 (file)
--- a/src/com/andrew/apollo/tasks/ViewHolderQueueTask.java
+++ b/src/com/andrew/apollo/tasks/ViewHolderQueueTask.java
@@ -11,15 +11,17 @@ import android.graphics.Bitmap;
 import android.os.AsyncTask;\r
 import android.widget.ImageView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.views.ViewHolderQueue;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class ViewHolderQueueTask extends AsyncTask<String, Integer, Bitmap> implements Constants {\r
+public class ViewHolderQueueTask extends AsyncTask<String, Integer, Bitmap> {\r
 \r
     private final ViewHolderQueue mViewHolderQueue;\r
 \r

diff --git a/src/com/andrew/apollo/tasks/ViewHolderTask.java b/src/com/andrew/apollo/tasks/ViewHolderTask.java
index 9c3eac6..5468fc2 100644 (file)
--- a/src/com/andrew/apollo/tasks/ViewHolderTask.java
+++ b/src/com/andrew/apollo/tasks/ViewHolderTask.java
@@ -11,17 +11,19 @@ import android.graphics.Bitmap;
 import android.os.AsyncTask;\r
 import android.widget.ImageView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.utils.ApolloUtils;\r
 import com.andrew.apollo.views.ViewHolderGrid;\r
 import com.andrew.apollo.views.ViewHolderList;\r
 import com.androidquery.AQuery;\r
 \r
+import static com.andrew.apollo.Constants.ALBUM_IMAGE;\r
+import static com.andrew.apollo.Constants.ARTIST_IMAGE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class ViewHolderTask extends AsyncTask<String, Integer, Bitmap> implements Constants {\r
+public class ViewHolderTask extends AsyncTask<String, Integer, Bitmap> {\r
 \r
     private final ViewHolderList mViewHolderList;\r
 \r

diff --git a/src/com/andrew/apollo/ui/widgets/BottomActionBar.java b/src/com/andrew/apollo/ui/widgets/BottomActionBar.java
index 7141456..991c2fd 100644 (file)
--- a/src/com/andrew/apollo/ui/widgets/BottomActionBar.java
+++ b/src/com/andrew/apollo/ui/widgets/BottomActionBar.java
@@ -18,7 +18,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.activities.AudioPlayerHolder;\r
 import com.andrew.apollo.activities.QuickQueue;\r
@@ -29,8 +28,7 @@ import com.andrew.apollo.utils.ThemeUtils;
 /**\r
  * @author Andrew Neal\r
  */\r
-public class BottomActionBar extends LinearLayout implements OnClickListener, OnLongClickListener,\r
-        Constants {\r
+public class BottomActionBar extends LinearLayout implements OnClickListener, OnLongClickListener {\r
 \r
     public BottomActionBar(Context context) {\r
         super(context);\r

diff --git a/src/com/andrew/apollo/utils/ApolloUtils.java b/src/com/andrew/apollo/utils/ApolloUtils.java
index 9704343..d992cc5 100644 (file)
--- a/src/com/andrew/apollo/utils/ApolloUtils.java
+++ b/src/com/andrew/apollo/utils/ApolloUtils.java
@@ -32,15 +32,16 @@ import android.widget.ListView;
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.androidquery.util.AQUtility;\r
 \r
+import static com.andrew.apollo.Constants.MIME_TYPE;\r
+\r
 /**\r
  * @author Andrew Neal\r
  * @Note Various methods used to help with specific Apollo statements\r
  */\r
-public class ApolloUtils implements Constants {\r
+public class ApolloUtils {\r
 \r
     /**\r
      * Used to fit a Bitmap nicely inside a View\r

diff --git a/src/com/andrew/apollo/utils/MusicUtils.java b/src/com/andrew/apollo/utils/MusicUtils.java
index be25227..3d899f0 100644 (file)
--- a/src/com/andrew/apollo/utils/MusicUtils.java
+++ b/src/com/andrew/apollo/utils/MusicUtils.java
@@ -38,17 +38,22 @@ import android.support.v4.app.FragmentActivity;
 import android.widget.ImageButton;\r
 import android.widget.Toast;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.IApolloService;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.service.ApolloService;\r
 import com.andrew.apollo.service.ServiceBinder;\r
 import com.andrew.apollo.service.ServiceToken;\r
 \r
+import static com.andrew.apollo.Constants.EXTERNAL;\r
+import static com.andrew.apollo.Constants.GENRES_DB;\r
+import static com.andrew.apollo.Constants.PLAYLIST_NAME_FAVORITES;\r
+import static com.andrew.apollo.Constants.PLAYLIST_NEW;\r
+import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;\r
+\r
 /**\r
  * Various methods used to help with specific music statements\r
  */\r
-public class MusicUtils implements Constants {\r
+public class MusicUtils {\r
 \r
     // Used to make number of albums/songs/time strings\r
     private final static StringBuilder sFormatBuilder = new StringBuilder();\r

diff --git a/src/com/andrew/apollo/utils/ThemeUtils.java b/src/com/andrew/apollo/utils/ThemeUtils.java
index c1daa44..e7bbb2f 100644 (file)
--- a/src/com/andrew/apollo/utils/ThemeUtils.java
+++ b/src/com/andrew/apollo/utils/ThemeUtils.java
@@ -19,12 +19,15 @@ import android.widget.ImageView;
 import android.widget.SeekBar;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
+import static com.andrew.apollo.Constants.APOLLO;\r
+import static com.andrew.apollo.Constants.APOLLO_PREFERENCES;\r
+import static com.andrew.apollo.Constants.THEME_ITEM_FOREGROUND;\r
+import static com.andrew.apollo.Constants.THEME_PACKAGE_NAME;\r
 \r
 /**\r
  * @author Andrew Neal TODO - clean this up\r
  */\r
-public class ThemeUtils implements Constants {\r
+public class ThemeUtils {\r
 \r
     /**\r
      * @param context\r

diff --git a/src/com/andrew/apollo/views/ViewHolderList.java b/src/com/andrew/apollo/views/ViewHolderList.java
index d264467..5ceb08a 100644 (file)
--- a/src/com/andrew/apollo/views/ViewHolderList.java
+++ b/src/com/andrew/apollo/views/ViewHolderList.java
@@ -9,14 +9,13 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 \r
-import com.andrew.apollo.Constants;\r
 import com.andrew.apollo.R;\r
 import com.andrew.apollo.utils.ThemeUtils;\r
 \r
 /**\r
  * @author Andrew Neal\r
  */\r
-public class ViewHolderList implements Constants {\r
+public class ViewHolderList {\r
 \r
     public final ImageView mViewHolderImage, mPeakOne, mPeakTwo, mQuickContextDivider,\r
             mQuickContextTip;\r