diff options
| -rw-r--r-- | subsonic-android/res/layout-port/download.xml | 38 | ||||
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java | 10 |
2 files changed, 19 insertions, 29 deletions
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml index 02a5b427..a16659a5 100644 --- a/subsonic-android/res/layout-port/download.xml +++ b/subsonic-android/res/layout-port/download.xml @@ -22,7 +22,7 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_above="@+id/download_visualizer_view_layout">
+ android:layout_above="@+id/download_song_title">
<ImageView
android:id="@+id/download_album_art_image"
@@ -38,7 +38,7 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/overlayColor"
- android:layout_alignParentBottom="true">
+ android:layout_below="@id/download_album_art_image">
<Button
android:id="@+id/download_jukebox"
@@ -49,9 +49,9 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:paddingTop="12dip"
+ android:paddingTop="4dip"
android:paddingLeft="14dip"
- android:paddingBottom="12dip"/>
+ android:paddingBottom="4dip"/>
<Button
android:id="@+id/download_equalizer"
@@ -62,9 +62,9 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:paddingTop="12dip"
+ android:paddingTop="4dip"
android:paddingLeft="14dip"
- android:paddingBottom="12dip"/>
+ android:paddingBottom="4dip"/>
<Button
android:id="@+id/download_visualizer"
@@ -75,9 +75,9 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:paddingTop="12dip"
+ android:paddingTop="4dip"
android:paddingLeft="14dip"
- android:paddingBottom="12dip"/>
+ android:paddingBottom="4dip"/>
<ImageButton
android:id="@+id/download_star"
@@ -86,10 +86,19 @@ android:layout_below="@+id/download_jukebox"
android:background="@android:color/transparent"
android:src="@android:drawable/star_big_off"
- android:paddingTop="12dip"
+ android:paddingTop="4dip"
android:paddingLeft="14dip"
- android:paddingBottom="12dip"/>
+ android:paddingBottom="4dip"/>
</LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/download_visualizer_view_layout"
+ android:layout_width="fill_parent"
+ android:layout_height="60dip"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_gravity="center_horizontal"
+ android:layout_below="@id/download_album_art_image"/>
</RelativeLayout>
<TextView
@@ -120,15 +129,6 @@ android:textSize="18sp"
android:ellipsize="end"/>
- <LinearLayout
- android:id="@+id/download_visualizer_view_layout"
- android:layout_width="fill_parent"
- android:layout_height="60dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_gravity="center_horizontal"
- android:layout_above="@+id/download_song_title"/>
-
</RelativeLayout>
<include layout="@layout/download_playlist"/>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java index 29f6a311..1c8afc87 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java @@ -353,16 +353,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi } else { visualizerView = new VisualizerView(this); visualizerViewLayout.addView(visualizerView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.FILL_PARENT)); - - visualizerView.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View view, MotionEvent motionEvent) { - visualizerView.setActive(!visualizerView.isActive()); - getDownloadService().setShowVisualization(visualizerView.isActive()); - updateButtons(); - return true; - } - }); } // TODO: Extract to utility method and cache. |