Moved a bunch of views into view folder

13 files changed, 18 insertions, 18 deletions

diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 3e3232ff..5b4db35e 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -15,7 +15,7 @@
 			android:layout_height="0dip"

 			android:layout_weight="1">

 

-			<github.daneren2005.dsub.util.MyViewFlipper

+			<github.daneren2005.dsub.view.MyViewFlipper

 				android:id="@+id/download_playlist_flipper"

 				android:layout_width="0dp"

 				android:layout_height="fill_parent"

@@ -31,7 +31,7 @@
 

 				<include layout="@layout/download_playlist"/>

 

-			</github.daneren2005.dsub.util.MyViewFlipper>

+			</github.daneren2005.dsub.view.MyViewFlipper>

 

 			<LinearLayout android:orientation="vertical"

 				android:id="@+id/download_control_layout"

diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index 73f3e037..4b39286a 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -10,7 +10,7 @@
 			android:layout_width="fill_parent"

 			android:layout_height="fill_parent">

 

-		<github.daneren2005.dsub.util.MyViewFlipper

+		<github.daneren2005.dsub.view.MyViewFlipper

 					 android:id="@+id/download_playlist_flipper"

 					 android:layout_width="fill_parent"

 					 android:layout_height="0dip"

@@ -142,7 +142,7 @@
 

 			<include layout="@layout/download_playlist"/>

 

-		</github.daneren2005.dsub.util.MyViewFlipper>

+		</github.daneren2005.dsub.view.MyViewFlipper>

 

 		<include layout="@layout/download_media_buttons"/>

 

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 589ff032..98454d4a 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -39,10 +39,9 @@ import github.daneren2005.dsub.service.DownloadServiceImpl;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.service.MusicServiceFactory;
 import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ErrorDialog;
+import github.daneren2005.dsub.view.ErrorDialog;
 import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.ModalBackgroundTask;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
 import github.daneren2005.dsub.util.Util;
 
 import java.io.File;
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index 71ec351b..56accc30 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -47,6 +47,7 @@ import github.daneren2005.dsub.service.DownloadFile;
 import github.daneren2005.dsub.service.DownloadService;

 import github.daneren2005.dsub.util.Constants;

 import github.daneren2005.dsub.util.SilentBackgroundTask;

+import github.daneren2005.dsub.view.FadeOutAnimation;

 import github.daneren2005.dsub.view.SongView;

 import github.daneren2005.dsub.util.Util;

 import github.daneren2005.dsub.view.VisualizerView;

diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
index 4f7a213e..1c8afbaa 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java
@@ -1,14 +1,12 @@
 package github.daneren2005.dsub.fragments;

 

 import android.app.AlertDialog;

-import android.content.Context;

 import android.content.DialogInterface;

 import android.content.Intent;

 import android.content.SharedPreferences;

 import android.net.Uri;

 import android.os.Bundle;

 import android.os.StatFs;

-import android.util.Log;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

 import android.view.View;

@@ -21,7 +19,7 @@ import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.service.DownloadService;

 import github.daneren2005.dsub.util.Constants;

 import github.daneren2005.dsub.util.FileUtil;

-import github.daneren2005.dsub.util.MergeAdapter;

+import github.daneren2005.dsub.view.MergeAdapter;

 import github.daneren2005.dsub.util.Util;

 import com.actionbarsherlock.view.Menu;

 import com.actionbarsherlock.view.MenuItem;

diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java
index e7bbf2ef..1c35d38c 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SearchFragment.java
@@ -8,16 +8,13 @@ import android.content.Intent;
 import android.os.Bundle;

 import android.view.ContextMenu;

 import android.view.LayoutInflater;

-import android.view.MenuInflater;

 import android.view.View;

 import android.view.MenuItem;

 import android.widget.AdapterView;

-import android.widget.ImageButton;

 import android.widget.ListAdapter;

 import android.widget.ListView;

 import android.widget.TextView;

 import android.net.Uri;

-import android.support.v4.app.FragmentTransaction;

 import android.view.ViewGroup;

 import com.actionbarsherlock.view.Menu;

 import github.daneren2005.dsub.R;

@@ -33,7 +30,7 @@ import github.daneren2005.dsub.view.ArtistAdapter;
 import github.daneren2005.dsub.util.BackgroundTask;

 import github.daneren2005.dsub.util.Constants;

 import github.daneren2005.dsub.view.EntryAdapter;

-import github.daneren2005.dsub.util.MergeAdapter;

+import github.daneren2005.dsub.view.MergeAdapter;

 import github.daneren2005.dsub.util.TabBackgroundTask;

 import github.daneren2005.dsub.util.Util;

 

diff --git a/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java
index c407a336..547bbd1e 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java
@@ -27,6 +27,7 @@ import android.app.Activity;
 import android.os.Handler;
 import android.util.Log;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.view.ErrorDialog;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java
index a81b9246..f0310780 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java
@@ -23,6 +23,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.util.Log;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.view.ErrorDialog;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/ErrorDialog.java b/subsonic-android/src/github/daneren2005/dsub/view/ErrorDialog.java
index ab9b4fa3..e9f25a2d 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/ErrorDialog.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/ErrorDialog.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.daneren2005.dsub.view;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -24,6 +24,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import github.daneren2005.dsub.activity.MainActivity;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/FadeOutAnimation.java b/subsonic-android/src/github/daneren2005/dsub/view/FadeOutAnimation.java
index 7acd79be..292529e6 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/FadeOutAnimation.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/FadeOutAnimation.java
@@ -16,7 +16,7 @@
 

  Copyright 2009 (C) Sindre Mehus

  */

-package github.daneren2005.dsub.util;

+package github.daneren2005.dsub.view;

 

 import android.view.View;

 import android.view.animation.AlphaAnimation;

diff --git a/subsonic-android/src/github/daneren2005/dsub/util/MergeAdapter.java b/subsonic-android/src/github/daneren2005/dsub/view/MergeAdapter.java
index 22655406..bfe777ea 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/MergeAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/MergeAdapter.java
@@ -13,7 +13,7 @@
  limitations under the License.
  */
 
-package github.daneren2005.dsub.util;
+package github.daneren2005.dsub.view;
 
 import android.database.DataSetObserver;
 import android.view.View;
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 
+import github.daneren2005.dsub.view.SackOfViewsAdapter;
+
 /**
  * Adapter that merges multiple child adapters and views
  * into a single contiguous whole.
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/MyViewFlipper.java b/subsonic-android/src/github/daneren2005/dsub/view/MyViewFlipper.java
index 55f01672..26a3de08 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/MyViewFlipper.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/MyViewFlipper.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.daneren2005.dsub.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/SackOfViewsAdapter.java b/subsonic-android/src/github/daneren2005/dsub/view/SackOfViewsAdapter.java
index 3fa96bbb..ff2280c1 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/SackOfViewsAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/SackOfViewsAdapter.java
@@ -12,7 +12,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-package github.daneren2005.dsub.util;
+package github.daneren2005.dsub.view;
 
 import android.view.View;
 import android.view.ViewGroup;