Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Dont't bypass the context menu in long click on album view. 

(cherry picked from commit 2aa31e0)
This commit is contained in:
biconou 2016-02-10 21:55:32 +01:00 committed by rcocula
parent a0a8c86924
commit a17b2f978c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
View File

@ -145,16 +145,23 @@ public class SelectAlbumActivity extends SubsonicTabActivity
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
if (view instanceof AlbumView) { if (view instanceof AlbumView) {
AlbumView albumView = (AlbumView) view; AlbumView albumView = (AlbumView) view;
albumView.maximizeOrMinimize(); if (!albumView.isMaximized()) {
albumView.maximizeOrMinimize();
return true;
} else {
return false;
}
} }
if (view instanceof SongView) { if (view instanceof SongView) {
SongView songView = (SongView) view; SongView songView = (SongView) view;
songView.maximizeOrMinimize(); songView.maximizeOrMinimize();
return true;
} }
return true; return false;
} }
}); });
selectButton = (ImageView) findViewById(R.id.select_album_select); selectButton = (ImageView) findViewById(R.id.select_album_select);
playNowButton = (ImageView) findViewById(R.id.select_album_play_now); playNowButton = (ImageView) findViewById(R.id.select_album_play_now);
playNextButton = (ImageView) findViewById(R.id.select_album_play_next); playNextButton = (ImageView) findViewById(R.id.select_album_play_next);

4
ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java
View File

@ -95,6 +95,10 @@ public class AlbumView extends UpdateView
return this.entry; return this.entry;
} }
public boolean isMaximized() {
return maximized;
}
public void maximizeOrMinimize() { public void maximizeOrMinimize() {
if (maximized) { if (maximized) {
maximized = false; maximized = false;