From c9d5990b1573512cc51c5bbefc392abfc36d3033 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Wed, 23 Dec 2015 17:36:20 +0100 Subject: [PATCH] Fixed deprecation --- .../gramophone/dialogs/ClearSmartPlaylistDialog.java | 9 +++++---- .../gramophone/dialogs/DeletePlaylistDialog.java | 9 +++++---- .../kabouzeid/gramophone/dialogs/DeleteSongsDialog.java | 9 +++++---- .../kabouzeid/gramophone/dialogs/PlayingQueueDialog.java | 6 +++--- .../gramophone/dialogs/RemoveFromPlaylistDialog.java | 9 +++++---- .../kabouzeid/gramophone/dialogs/SleepTimerDialog.java | 9 +++++---- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java index fabd4932..60ddcb55 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.text.Html; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist; @@ -37,15 +38,15 @@ public class ClearSmartPlaylistDialog extends LeakDetectDialogFragment { .content(content) .positiveText(R.string.clear_action) .negativeText(android.R.string.cancel) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) { return; } playlist.clear(getActivity()); } - }).build(); + }) + .build(); } } \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java index 4db51603..79519dfa 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.text.Html; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.Playlist; @@ -53,14 +54,14 @@ public class DeletePlaylistDialog extends LeakDetectDialogFragment { .content(content) .positiveText(R.string.delete_action) .negativeText(android.R.string.cancel) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) return; PlaylistsUtil.deletePlaylists(getActivity(), playlists); } - }).build(); + }) + .build(); } } \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java index 1f169777..3405bc6b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.text.Html; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.Song; @@ -52,14 +53,14 @@ public class DeleteSongsDialog extends LeakDetectDialogFragment { .content(content) .positiveText(R.string.delete_action) .negativeText(android.R.string.cancel) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) return; MusicUtil.deleteTracks(getActivity(), songs); } - }).build(); + }) + .build(); } } \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java index 51bbabca..2dd5c897 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java @@ -7,6 +7,7 @@ import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.PlayingQueueAdapterDeprecated; @@ -37,10 +38,9 @@ public class PlayingQueueDialog extends LeakDetectDialogFragment { .title(getActivity().getResources().getString(R.string.label_current_playing_queue)) .customView(R.layout.dialog_playlist, false) .positiveText(R.string.save_as_playlist) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) return; //noinspection unchecked diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java index a91f57b9..13ecf897 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.text.Html; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.model.PlaylistSong; @@ -52,14 +53,14 @@ public class RemoveFromPlaylistDialog extends LeakDetectDialogFragment { .content(content) .positiveText(R.string.remove_action) .negativeText(android.R.string.cancel) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) return; PlaylistsUtil.removeFromPlaylist(getActivity(), songs); } - }).build(); + }) + .build(); } } \ No newline at end of file diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java index 5b035a35..7e658570 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java @@ -57,9 +57,9 @@ public class SleepTimerDialog extends LeakDetectDialogFragment { materialDialog = new MaterialDialog.Builder(getActivity()) .title(getActivity().getResources().getString(R.string.action_sleep_timer)) .positiveText(R.string.action_set) - .callback(new MaterialDialog.ButtonCallback() { + .onPositive(new MaterialDialog.SingleButtonCallback() { @Override - public void onPositive(MaterialDialog dialog) { + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) { return; } @@ -74,9 +74,10 @@ public class SleepTimerDialog extends LeakDetectDialogFragment { Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.sleep_timer_set, minutes), Toast.LENGTH_SHORT).show(); } - + }) + .onNeutral(new MaterialDialog.SingleButtonCallback() { @Override - public void onNeutral(MaterialDialog dialog) { + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { if (getActivity() == null) { return; }