tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup titles and content of more dialogs, also removed unnecessary empty dialog callbacks (you don't need to manually dismiss dialogs with auto dismiss on by default)

Browse source 
More dialog cleanup

The queue dialog will scroll to the queue position everytime it opens

Updates

FAB ripple color is set

Re-added accidentally removed method
This commit is contained in:
Aidan Follestad 2015-04-16 20:49:09 -05:00
commit f7c91839ba
12 changed files with 96 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
View file

@ -1,47 +0,0 @@
package com.kabouzeid.gramophone.helper;
import android.content.Context;
import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.MusicUtil;
import java.util.ArrayList;
import java.util.List;
/**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/
public class DeleteSongsDialogHelper {
public static MaterialDialog getDialog(final Context context, final Song song) {
List<Song> tmpList = new ArrayList<>();
tmpList.add(song);
return getDialog(context, tmpList);
}
public static MaterialDialog getDialog(final Context context, final List<Song> songs) {
String title = context.getResources().getString(R.string.delete_songs_1);
title = songs.size() > 1 ? title + songs.size() + context.getResources().getString(R.string.delete_songs_2) : title + "'" + songs.get(0).title + "' " + "?";
return new MaterialDialog.Builder(context)
.title(title)
.content(context.getResources().getString(R.string.delete_warning))
.positiveText(context.getResources().getString(R.string.delete_action))
.negativeText(context.getResources().getString(android.R.string.cancel))
.callback(new MaterialDialog.ButtonCallback() {
@Override
public void onPositive(MaterialDialog dialog) {
super.onPositive(dialog);
dialog.dismiss();
MusicUtil.deleteTracks(context, songs);
}
@Override
public void onNegative(MaterialDialog dialog) {
super.onNegative(dialog);
dialog.dismiss();
}
}).build();
}
}

3
app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
View file

@ -8,6 +8,7 @@ import android.view.MenuItem;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.dialogs.AddToPlaylistDialog;
import com.kabouzeid.gramophone.dialogs.DeletePlaylistDialog;
import com.kabouzeid.gramophone.dialogs.DeleteSongsDialog;
import com.kabouzeid.gramophone.dialogs.RenamePlaylistDialog;
import com.kabouzeid.gramophone.dialogs.SongDetailDialog;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
@ -28,7 +29,7 @@ public class MenuItemClickHelper {
public static boolean handleSongMenuClick(ActionBarActivity activity, Song song, MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete_from_disk:
DeleteSongsDialogHelper.getDialog(activity, song).show();
DeleteSongsDialog.create(song).show(activity.getSupportFragmentManager(), "DELETE_SONGS");
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialog.create(song).show(activity.getSupportFragmentManager(), "ADD_PLAYLIST");