diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 0e0f7f7b..4524be86 100644 Binary files a/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin index c1633ce6..90658033 100644 Binary files a/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index a67c83e2..4faca386 100644 Binary files a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index fdf13fdd..e04bc215 100644 Binary files a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 72c82519..9a86bae0 100644 Binary files a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 28788a0b..856ff8dd 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "22.0.1" defaultConfig { - applicationId "com.thejoshwa.ultrasonic.androidapp" + applicationId "org.moire.ultrasonic" minSdkVersion 14 targetSdkVersion 22 } diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml index 99997053..09a5cb4c 100644 --- a/ultrasonic/src/main/AndroidManifest.xml +++ b/ultrasonic/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -118,12 +118,12 @@ a:label="UltraSonic Download Service" a:exported="false"> - - - - - - + + + + + + @@ -187,11 +187,11 @@ + a:authorities="org.moire.ultrasonic.provider.SearchSuggestionProvider"/> + a:value="org.moire.ultrasonic.activity.QueryReceiverActivity"/>
- - - - + + + +

- To submit feature requests or file bug reports, please visit the UltraSonic for Android forum. Source code for UltraSonic is available at github.com. + To submit feature requests or file bug reports, please visit the UltraSonic for Android forum. Source code for UltraSonic is available at github.com.

diff --git a/ultrasonic/src/main/assets/html/fr/index.html b/ultrasonic/src/main/assets/html/fr/index.html index 5073d94d..b2081f83 100644 --- a/ultrasonic/src/main/assets/html/fr/index.html +++ b/ultrasonic/src/main/assets/html/fr/index.html @@ -42,57 +42,19 @@

- Cliquez sur l'un des boutons suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit, soit en utilisant votre compte PayPal. + Cliquez sur le bouton suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit, soit en utilisant votre compte PayPal. Une fois le don reçu et traité, vous recevrez votre clé d'activation par e-mail.

- - - - - - - -
- - - - - - - -
10€
- 		- - - - - - - -
20€
- 		- - - - - - - -
25€
- 		- - - - - - - -
30€
-
+
+ + + + +

- Pour plus d'information, veuiller visitez subsonic.org. Le code source de UltraSonic est disponible à l'adresse suivante : github.com. + Pour plus d'information, veuiller visitez subsonic.org. Le code source de UltraSonic est disponible à l'adresse suivante : github.com.

diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java index 7e723e3d..411dbada 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -30,17 +30,17 @@ import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Pair; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Pair; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java index cd68bede..2e4bf1c8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.os.AsyncTask; import android.os.Bundle; @@ -17,14 +17,14 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ChatAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ChatAdapter; import java.util.ArrayList; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java index 83c219a5..4ed38866 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.app.Dialog; @@ -50,21 +50,21 @@ import android.widget.TextView; import android.widget.ViewFlipper; import com.mobeta.android.dslv.DragSortListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.SilentBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.AutoRepeatButton; -import com.thejoshwa.ultrasonic.androidapp.view.SongListAdapter; -import com.thejoshwa.ultrasonic.androidapp.view.VisualizerView; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.SilentBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.AutoRepeatButton; +import org.moire.ultrasonic.view.SongListAdapter; +import org.moire.ultrasonic.view.VisualizerView; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -77,10 +77,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.COMPLETED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.IDLE; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PAUSED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STOPPED; +import static org.moire.ultrasonic.domain.PlayerState.COMPLETED; +import static org.moire.ultrasonic.domain.PlayerState.IDLE; +import static org.moire.ultrasonic.domain.PlayerState.PAUSED; +import static org.moire.ultrasonic.domain.PlayerState.STOPPED; public class DownloadActivity extends SubsonicTabActivity implements OnGestureListener { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java index 529ec87c..58047244 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.media.audiofx.Equalizer; import android.os.Bundle; @@ -30,10 +30,10 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; import java.util.HashMap; import java.util.Map; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java index 332affd5..874fe118 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.ActionBar; import android.content.Intent; @@ -32,9 +32,9 @@ import android.webkit.WebViewClient; import android.widget.Button; import android.widget.ImageView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -50,9 +50,9 @@ public final class HelpActivity extends ResultActivity implements OnClickListene private ImageView backButton; private ImageView forwardButton; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; public MenuDrawer menuDrawer; private int activePosition = 1; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java similarity index 81% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java index 16b3d291..f067c576 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java @@ -17,19 +17,19 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.os.Bundle; import android.view.View; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; /** * Displays song lyrics. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java index 56a2de6c..ed4a5f1e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.content.SharedPreferences; @@ -33,13 +33,13 @@ import android.widget.AdapterView; import android.widget.ListView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.MergeAdapter; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.MergeAdapter; +import org.moire.ultrasonic.util.Util; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java similarity index 84% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java index 042a10f2..2e458370 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.Activity; import android.content.Intent; import android.preference.PreferenceActivity; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Created by Joshua Bahnsen on 12/30/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java index ae14cf03..4000e107 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java @@ -17,16 +17,16 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.SearchManager; import android.content.Intent; import android.os.Bundle; import android.provider.SearchRecentSuggestions; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Receives search queries and forwards to the SelectAlbumActivity. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java index 44ed0c3d..26a57c2a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.Activity; import android.content.Intent; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Created by Joshua Bahnsen on 12/30/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java index 42b0e990..6ed7e942 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.Bundle; @@ -31,22 +31,22 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.MergeAdapter; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ArtistAdapter; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.MergeAdapter; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ArtistAdapter; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java index 2d5a53d4..7a2bd5df 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -34,19 +34,19 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.AlbumHeader; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.EntryByDiscAndTrackComparator; -import com.thejoshwa.ultrasonic.androidapp.util.Pair; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.AlbumHeader; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.EntryByDiscAndTrackComparator; +import org.moire.ultrasonic.util.Pair; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java index 6b01a155..48aaef8b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -35,17 +35,17 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ArtistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ArtistAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java index 37813ac9..aa038463 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -32,15 +32,15 @@ import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.GenreAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.GenreAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java index 20c9a15f..b0874491 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -43,19 +43,19 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.service.OfflineException; -import com.thejoshwa.ultrasonic.androidapp.service.ServerTooOldException; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LoadingTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.PlaylistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.service.OfflineException; +import org.moire.ultrasonic.service.ServerTooOldException; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LoadingTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.PlaylistAdapter; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java index ca47a469..c3962cbf 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.ActionBar; import android.app.Dialog; @@ -39,19 +39,19 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.ErrorDialog; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.ModalBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPreference; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.ErrorDialog; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.ModalBackgroundTask; +import org.moire.ultrasonic.util.TimeSpanPreference; +import org.moire.ultrasonic.util.Util; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -96,9 +96,9 @@ public class SettingsActivity extends PreferenceResultActivity implements Shared private int maxServerCount = 10; private int minServerCount; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; public MenuDrawer menuDrawer; private int activePosition = 1; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java index 78f2d80d..65670e11 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -44,20 +44,20 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.service.OfflineException; -import com.thejoshwa.ultrasonic.androidapp.service.ServerTooOldException; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LoadingTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpan; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPicker; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ShareAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.service.OfflineException; +import org.moire.ultrasonic.service.ServerTooOldException; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LoadingTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.TimeSpan; +import org.moire.ultrasonic.util.TimeSpanPicker; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ShareAdapter; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java index 1343fdef..d5a4ec08 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.annotation.SuppressLint; import android.app.ActionBar; @@ -52,28 +52,28 @@ import android.widget.ImageView; import android.widget.RemoteViews; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.EntryByDiscAndTrackComparator; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.ModalBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.ShareDetails; -import com.thejoshwa.ultrasonic.androidapp.util.SilentBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpan; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPicker; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.util.VideoPlayerType; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.EntryByDiscAndTrackComparator; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.ModalBackgroundTask; +import org.moire.ultrasonic.util.ShareDetails; +import org.moire.ultrasonic.util.SilentBackgroundTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.TimeSpan; +import org.moire.ultrasonic.util.TimeSpanPicker; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.util.VideoPlayerType; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -100,9 +100,9 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen private boolean destroyed; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; private static final int DIALOG_ASK_FOR_SHARE_DETAILS = 102; public MenuDrawer menuDrawer; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java index a7c2e18c..fd51bf45 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java @@ -17,16 +17,16 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.SearchManager; import android.content.Intent; import android.os.Bundle; import android.provider.SearchRecentSuggestions; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Receives voice search queries and forwards to the SearchActivity. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java index 174fc677..80df615d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java @@ -16,14 +16,14 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.audiofx; +package org.moire.ultrasonic.audiofx; import android.content.Context; import android.media.MediaPlayer; import android.media.audiofx.Equalizer; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.util.FileUtil; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java index c1507bb5..95c7d3b7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.audiofx; +package org.moire.ultrasonic.audiofx; import android.media.MediaPlayer; import android.media.audiofx.Visualizer; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java index d3f9259f..24e35edb 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java index cc52301b..f3a4c84b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; import java.io.Serializable; import java.text.ParseException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java index 258e2119..d5b71f7b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java index e56a0a1a..8ab360f3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java similarity index 79% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java index 67e31025..81fbdd86 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; import java.util.List; @@ -33,8 +33,8 @@ public class Indexes implements Serializable private static final long serialVersionUID = 8156117238598414701L; private final long lastModified; private final String ignoredArticles; - private final List shortcuts; - private final List artists; + private final List shortcuts; + private final List artists; public Indexes(long lastModified, String ignoredArticles, List shortcuts, List artists) { @@ -49,12 +49,12 @@ public class Indexes implements Serializable return lastModified; } - public List getShortcuts() + public List getShortcuts() { return shortcuts; } - public List getArtists() + public List getArtists() { return artists; } diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java index d7c5164b..2b2c1578 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java index b635e535..47d07245 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Song lyrics. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java index 86c0bcdc..983a7a88 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; import java.text.ParseException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java index beec72fb..30eb590d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Represents a top level directory in which music or other media is stored. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java index 0cedbd24..81f8179e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java index afa97877..c2a6db77 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java index e3cb000e..bae62f3f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java index 323ddb70..e3169a0a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * The criteria for a music search. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java index bb9616f6..08da3c8d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java index e24144cf..13f7a7a7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Information about the Subsonic server. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java index 18bef43a..3c5e5392 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; import java.io.Serializable; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java index 35417e6e..6853a3ae 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java @@ -16,7 +16,7 @@ Copyright 2013 (C) Joshua Bahnsen */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Information about the Subsonic server. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java index fd6a7a77..aedf40ea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.util.regex.Pattern; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java index 0e698cd7..4cca8444 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; import android.content.SearchRecentSuggestionsProvider; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java index 944c16b7..d4e986c6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -13,13 +13,13 @@ import android.util.Log; import android.view.KeyEvent; import android.widget.RemoteViews; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.MainActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.MainActivity; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.FileUtil; public class UltraSonicAppWidgetProvider extends AppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java index 8c3b1690..0dfa8dcf 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x1 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java index 9581fb69..6dd9a019 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x2 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java index 52269d0a..0038c902 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x3 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java index 23bc9cee..35922218 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x4 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java similarity index 84% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java index 7064d957..721f0eb1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java @@ -1,12 +1,12 @@ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; public class A2dpIntentReceiver extends BroadcastReceiver { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java index 9c75d3ac..4a731322 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -24,8 +24,8 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Util; /** * Request media button focus when connected to Bluetooth A2DP. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java index 91d3600b..a98f3724 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,8 +25,8 @@ import android.os.Bundle; import android.os.Parcelable; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java index 1a700357..e112084d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java @@ -16,31 +16,31 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LRUCache; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.TimeLimitedCache; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LRUCache; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.TimeLimitedCache; +import org.moire.ultrasonic.util.Util; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java index 488ea343..69a138d8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java @@ -16,18 +16,18 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.net.wifi.WifiManager; import android.os.PowerManager; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.Util; import org.apache.http.Header; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java index c4e62da5..63e36a13 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java index 76f6d4f9..7c2e3efa 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.annotation.SuppressLint; import android.app.Notification; @@ -40,29 +40,29 @@ import android.util.Log; import android.widget.RemoteViews; import android.widget.SeekBar; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x1; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x2; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x3; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x4; -import com.thejoshwa.ultrasonic.androidapp.receiver.MediaButtonIntentReceiver; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.LRUCache; -import com.thejoshwa.ultrasonic.androidapp.util.ShufflePlayBuffer; -import com.thejoshwa.ultrasonic.androidapp.util.SimpleServiceBinder; -import com.thejoshwa.ultrasonic.androidapp.util.StreamProxy; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x1; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x2; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x3; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x4; +import org.moire.ultrasonic.receiver.MediaButtonIntentReceiver; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.LRUCache; +import org.moire.ultrasonic.util.ShufflePlayBuffer; +import org.moire.ultrasonic.util.SimpleServiceBinder; +import org.moire.ultrasonic.util.StreamProxy; +import org.moire.ultrasonic.util.Util; import java.io.File; import java.net.URLEncoder; @@ -71,14 +71,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.COMPLETED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.DOWNLOADING; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.IDLE; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PAUSED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PREPARED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PREPARING; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STARTED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STOPPED; +import static org.moire.ultrasonic.domain.PlayerState.COMPLETED; +import static org.moire.ultrasonic.domain.PlayerState.DOWNLOADING; +import static org.moire.ultrasonic.domain.PlayerState.IDLE; +import static org.moire.ultrasonic.domain.PlayerState.PAUSED; +import static org.moire.ultrasonic.domain.PlayerState.PREPARED; +import static org.moire.ultrasonic.domain.PlayerState.PREPARING; +import static org.moire.ultrasonic.domain.PlayerState.STARTED; +import static org.moire.ultrasonic.domain.PlayerState.STOPPED; /** * @author Sindre Mehus, Joshua Bahnsen @@ -88,12 +88,12 @@ public class DownloadServiceImpl extends Service implements DownloadService { private static final String TAG = DownloadServiceImpl.class.getSimpleName(); - public static final String CMD_PLAY = "com.thejoshwa.ultrasonic.androidapp.CMD_PLAY"; - public static final String CMD_TOGGLEPAUSE = "com.thejoshwa.ultrasonic.androidapp.CMD_TOGGLEPAUSE"; - public static final String CMD_PAUSE = "com.thejoshwa.ultrasonic.androidapp.CMD_PAUSE"; - public static final String CMD_STOP = "com.thejoshwa.ultrasonic.androidapp.CMD_STOP"; - public static final String CMD_PREVIOUS = "com.thejoshwa.ultrasonic.androidapp.CMD_PREVIOUS"; - public static final String CMD_NEXT = "com.thejoshwa.ultrasonic.androidapp.CMD_NEXT"; + public static final String CMD_PLAY = "org.moire.ultrasonic.CMD_PLAY"; + public static final String CMD_TOGGLEPAUSE = "org.moire.ultrasonic.CMD_TOGGLEPAUSE"; + public static final String CMD_PAUSE = "org.moire.ultrasonic.CMD_PAUSE"; + public static final String CMD_STOP = "org.moire.ultrasonic.CMD_STOP"; + public static final String CMD_PREVIOUS = "org.moire.ultrasonic.CMD_PREVIOUS"; + public static final String CMD_NEXT = "org.moire.ultrasonic.CMD_NEXT"; private final IBinder binder = new SimpleServiceBinder(this); private Looper mediaPlayerLooper; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java index 1957b5a6..3441e95f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.BroadcastReceiver; import android.content.Context; @@ -29,11 +29,11 @@ import android.telephony.TelephonyManager; import android.util.Log; import android.view.KeyEvent; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.Util; import java.io.Serializable; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java index 8a66c364..a43e0b98 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.os.Handler; @@ -27,11 +27,11 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.Toast; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SubsonicRESTException; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.service.parser.SubsonicRESTException; +import org.moire.ultrasonic.util.Util; import java.util.ArrayList; import java.util.Iterator; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java index da5481d6..08ce0e2e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import java.io.File; @@ -28,8 +28,8 @@ import android.net.Uri; import android.provider.MediaStore; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.FileUtil; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java index a082a855..1889eb2a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java @@ -16,27 +16,27 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.ProgressListener; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java index db68dbd0..4cc80d75 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java @@ -16,11 +16,11 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java index 4bf8d641..845ba693 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; /** * Thrown by service methods that are not available in offline mode. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java index 1c89e2bf..44cc47f2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java @@ -16,29 +16,29 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; import android.media.MediaMetadataRetriever; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index 11935dc3..8e2f0869 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.content.SharedPreferences; @@ -25,48 +25,48 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.ServerInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.service.parser.AlbumListParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.BookmarkParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ChatMessageParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ErrorParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.GenreParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.IndexesParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.JukeboxStatusParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.LicenseParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.LyricsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.MusicDirectoryParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.MusicFoldersParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.PlaylistParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.PlaylistsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.RandomSongsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SearchResult2Parser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SearchResultParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ShareParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.UserInfoParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.VersionParser; -import com.thejoshwa.ultrasonic.androidapp.service.ssl.SSLSocketFactory; -import com.thejoshwa.ultrasonic.androidapp.service.ssl.TrustSelfSignedStrategy; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.ServerInfo; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.service.parser.AlbumListParser; +import org.moire.ultrasonic.service.parser.BookmarkParser; +import org.moire.ultrasonic.service.parser.ChatMessageParser; +import org.moire.ultrasonic.service.parser.ErrorParser; +import org.moire.ultrasonic.service.parser.GenreParser; +import org.moire.ultrasonic.service.parser.IndexesParser; +import org.moire.ultrasonic.service.parser.JukeboxStatusParser; +import org.moire.ultrasonic.service.parser.LicenseParser; +import org.moire.ultrasonic.service.parser.LyricsParser; +import org.moire.ultrasonic.service.parser.MusicDirectoryParser; +import org.moire.ultrasonic.service.parser.MusicFoldersParser; +import org.moire.ultrasonic.service.parser.PlaylistParser; +import org.moire.ultrasonic.service.parser.PlaylistsParser; +import org.moire.ultrasonic.service.parser.RandomSongsParser; +import org.moire.ultrasonic.service.parser.SearchResult2Parser; +import org.moire.ultrasonic.service.parser.SearchResultParser; +import org.moire.ultrasonic.service.parser.ShareParser; +import org.moire.ultrasonic.service.parser.UserInfoParser; +import org.moire.ultrasonic.service.parser.VersionParser; +import org.moire.ultrasonic.service.ssl.SSLSocketFactory; +import org.moire.ultrasonic.service.ssl.TrustSelfSignedStrategy; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -266,7 +266,7 @@ public class RESTMusicService implements MusicService return indexes; } - return cachedIndexes != null ? cachedIndexes : new Indexes(0, null, new ArrayList(), new ArrayList()); + return cachedIndexes != null ? cachedIndexes : new Indexes(0, null, new ArrayList(), new ArrayList()); } finally { @@ -313,7 +313,7 @@ public class RESTMusicService implements MusicService return indexes; } - return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList(), new ArrayList()); + return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList(), new ArrayList()); } finally { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java index ca218e82..80bdc035 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java @@ -1,9 +1,9 @@ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; /** * Scrobbles played songs to Last.fm. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java index 6ab304c7..b0c2bd0f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; /** * Thrown if the REST API version implemented by the server is too old. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java index 9ccc92f8..3dd3167b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Xml; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java index 6036211d..77c85eb6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java index 916247c9..2c51d9ad 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java index 4760d5cd..43b8618b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java index 5588bc3d..dab1a694 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java index 1d8d5733..85104ae4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java index 5cd734fd..faa39bd6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java index fa243325..a875e073 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java @@ -16,11 +16,11 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.JukeboxStatus; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java similarity index 89% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java index 5bef3fea..bc16dba2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; @@ -24,8 +24,8 @@ import org.xmlpull.v1.XmlPullParser; import java.io.Reader; -import com.thejoshwa.ultrasonic.androidapp.domain.ServerInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; +import org.moire.ultrasonic.domain.ServerInfo; +import org.moire.ultrasonic.domain.Version; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java index c8346e86..ee727359 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java @@ -16,13 +16,13 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java index d416d6f4..43f645ab 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java @@ -16,12 +16,12 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.Constants; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java index 5a86df3b..cdc6f1b1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java index 767e4be1..3e882554 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import java.io.Reader; import java.util.ArrayList; @@ -26,9 +26,9 @@ import org.xmlpull.v1.XmlPullParser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.util.ProgressListener; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java index 540e0b1f..8f52f283 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java index a9e8ebdd..9362dd7e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.view.PlaylistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.view.PlaylistAdapter; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java index 3fa596db..ddfb4955 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java index cf4d371c..f85f3eee 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java index 0cc44308..238748f8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java index 70458fd2..d8054591 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java index a7a5dedc..abc1373f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java index 7daab834..d1ca92d3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java index e58f7723..09d5ec6b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java @@ -16,9 +16,9 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; +import org.moire.ultrasonic.domain.Version; import java.io.BufferedReader; import java.io.Reader; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java index 988aa63c..4f87e1ea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java @@ -25,7 +25,7 @@ * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.conn.scheme.HostNameResolver; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java index 4b67390c..9b0104ce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java index f7b1d0a5..1e09924c 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java index edb4616d..950588b9 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java index 757c973e..d0b4ecf1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java @@ -1,8 +1,8 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.util.HashSet; import java.util.Set; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java index 51c00d76..76448a18 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.os.Handler; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; import org.xmlpull.v1.XmlPullParserException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java index 2cb38216..debc66c3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.os.AsyncTask; import android.os.StatFs; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; import java.io.File; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java index 89569b8e..eb3a1662 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.util.Log; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java index ac959abe..32a65b3a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; /** * @author Sindre Mehus @@ -131,7 +131,7 @@ public final class Constants public static final String PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY = "imageLoaderConcurrency"; // Name of the preferences file. - public static final String PREFERENCES_FILE_NAME = "com.thejoshwa.ultrasonic.androidapp_preferences"; + public static final String PREFERENCES_FILE_NAME = "org.moire.ultrasonic_preferences"; // Number of free trial days for non-licensed servers. public static final int FREE_TRIAL_DAYS = 30; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java index 42ff7e5b..3ec2a8c6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.io.Serializable; import java.util.Comparator; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java index f440c7f4..a2efddad 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java index 1e8f9b03..3fedccf4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.graphics.Bitmap; @@ -24,9 +24,9 @@ import android.graphics.BitmapFactory; import android.os.Environment; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.MusicDirectory; import java.io.File; import java.io.FileInputStream; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java index c2dba2a8..6391e66d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.content.res.Resources; @@ -30,10 +30,10 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java index ec3f1e28..2adc7cea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.lang.ref.SoftReference; import java.util.HashMap; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java index 2f3bbfe9..2ad49d9f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Build; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java index 75e8815a..834cee30 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java @@ -13,7 +13,7 @@ limitations under the License. */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.database.DataSetObserver; import android.view.View; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java index cb7e7f7e..583de313 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java index 3a28a182..3d33e442 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.util.AttributeSet; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java index 6c82973d..4bedd194 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java index 97b3d1f0..3b32a736 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java index 779851f5..22d7ed66 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.view.View; import android.view.ViewGroup; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java similarity index 62% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java index 35b65626..91d4986d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java index 5b7d292a..8b476acd 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java index d5310a22..6e751ed1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java index 9b2e00d0..47360a1b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.os.Binder; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java index 840a3466..848731f1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; import org.apache.http.HttpRequest; import org.apache.http.message.BasicHttpRequest; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java index e1fe3e0f..408a3355 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java index 729825fe..1a39a440 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.lang.ref.SoftReference; import java.util.concurrent.TimeUnit; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java index c72bb29a..e4ac46c9 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.util.Calendar; import java.util.Date; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java index b582c196..2b294861 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.content.res.Resources; @@ -14,7 +14,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.Spinner; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * Created by Joshua Bahnsen on 12/22/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java index 60736cb6..7f1840b3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.preference.DialogPreference; import android.util.AttributeSet; import android.view.View; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; import java.util.regex.Pattern; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java index f1cb024b..c191d179 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; @@ -50,21 +50,21 @@ import android.view.KeyEvent; import android.widget.RemoteViews; import android.widget.Toast; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.MainActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.SettingsActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.receiver.MediaButtonIntentReceiver; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.MainActivity; +import org.moire.ultrasonic.activity.SettingsActivity; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.receiver.MediaButtonIntentReceiver; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; import org.apache.http.HttpEntity; @@ -105,8 +105,8 @@ public class Util extends DownloadActivity private static DecimalFormat KILO_BYTE_LOCALIZED_FORMAT; private static DecimalFormat BYTE_LOCALIZED_FORMAT; - public static final String EVENT_META_CHANGED = "com.thejoshwa.ultrasonic.androidapp.EVENT_META_CHANGED"; - public static final String EVENT_PLAYSTATE_CHANGED = "com.thejoshwa.ultrasonic.androidapp.EVENT_PLAYSTATE_CHANGED"; + public static final String EVENT_META_CHANGED = "org.moire.ultrasonic.EVENT_META_CHANGED"; + public static final String EVENT_PLAYSTATE_CHANGED = "org.moire.ultrasonic.EVENT_PLAYSTATE_CHANGED"; public static final String CM_AVRCP_PLAYSTATE_CHANGED = "com.android.music.playstatechanged"; public static final String CM_AVRCP_METADATA_CHANGED = "com.android.music.metachanged"; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java index dda57d45..a03036a4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java @@ -16,7 +16,7 @@ Copyright 2013 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; @@ -24,9 +24,9 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicServiceFactory; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java index b8c38319..6d5e85a0 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,12 +26,12 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.Util; /** * Used to display albums in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java index 8d54d3a6..c153e3dc 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.widget.ArrayAdapter; import android.widget.SectionIndexer; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java index d4badc01..b86a2086 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.util.AttributeSet; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java index 5d81f706..9fc000c2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.text.method.LinkMovementMethod; import android.text.util.Linkify; @@ -9,11 +9,11 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.Util; import java.text.DateFormat; import java.util.Date; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java index 7e7d0fde..4b3b5317 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; @@ -25,9 +25,9 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.util.ImageLoader; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java index 895fc3b2..ba194f10 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.widget.ArrayAdapter; import android.widget.SectionIndexer; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java index 9d6f1e7f..39d6bbce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Playlist; import java.io.Serializable; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java index b518fbab..f8919709 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.LayoutInflater; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; /** * Used to display playlists in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java index e35c5641..b1ae9ca7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Share; import java.io.Serializable; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java index 82bdeab3..ffe5fdce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.LayoutInflater; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; /** * Used to display playlists in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java index 111b9cd4..1844e4d2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java @@ -1,12 +1,12 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadFile; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java index f8982346..83ba491f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -29,15 +29,15 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.util.VideoPlayerType; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.util.VideoPlayerType; import java.io.File; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java index 21dac706..1dea8db3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.os.Handler; @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.LinearLayout; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java index dd90d4a6..c8aafa47 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.Canvas; @@ -25,10 +25,10 @@ import android.graphics.Paint; import android.media.audiofx.Visualizer; import android.view.View; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; /** * A simple class that draws waveform data received from a diff --git a/ultrasonic/src/main/res/layout-land/download.xml b/ultrasonic/src/main/res/layout-land/download.xml index 1fb0425c..df93d6dc 100644 --- a/ultrasonic/src/main/res/layout-land/download.xml +++ b/ultrasonic/src/main/res/layout-land/download.xml @@ -4,7 +4,7 @@ a:layout_height="fill_parent" a:orientation="horizontal"> - - + - - + diff --git a/ultrasonic/src/main/res/layout/download_playlist.xml b/ultrasonic/src/main/res/layout/download_playlist.xml index 72e32883..6502ff20 100644 --- a/ultrasonic/src/main/res/layout/download_playlist.xml +++ b/ultrasonic/src/main/res/layout/download_playlist.xml @@ -15,7 +15,7 @@ a:padding="10dip"/> - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml index cf5b0bee..e4e2b4bd 100644 --- a/ultrasonic/src/main/res/xml/settings.xml +++ b/ultrasonic/src/main/res/xml/settings.xml @@ -148,7 +148,7 @@ -