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

Fixed deprecation

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-23 17:36:20 +01:00
commit c9d5990b15
6 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java
View file

@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist; import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist;
@ -37,15 +38,15 @@ public class ClearSmartPlaylistDialog extends LeakDetectDialogFragment {
.content(content) .content(content)
.positiveText(R.string.clear_action) .positiveText(R.string.clear_action)
.negativeText(android.R.string.cancel) .negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
super.onPositive(dialog);
if (getActivity() == null) { if (getActivity() == null) {
return; return;
} }
playlist.clear(getActivity()); playlist.clear(getActivity());
} }
}).build(); })
.build();
} }
} }

9
app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java
View file

@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Playlist; import com.kabouzeid.gramophone.model.Playlist;
@ -53,14 +54,14 @@ public class DeletePlaylistDialog extends LeakDetectDialogFragment {
.content(content) .content(content)
.positiveText(R.string.delete_action) .positiveText(R.string.delete_action)
.negativeText(android.R.string.cancel) .negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
super.onPositive(dialog);
if (getActivity() == null) if (getActivity() == null)
return; return;
PlaylistsUtil.deletePlaylists(getActivity(), playlists); PlaylistsUtil.deletePlaylists(getActivity(), playlists);
} }
}).build(); })
.build();
} }
} }

9
app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java
View file

@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.model.Song;
@ -52,14 +53,14 @@ public class DeleteSongsDialog extends LeakDetectDialogFragment {
.content(content) .content(content)
.positiveText(R.string.delete_action) .positiveText(R.string.delete_action)
.negativeText(android.R.string.cancel) .negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
super.onPositive(dialog);
if (getActivity() == null) if (getActivity() == null)
return; return;
MusicUtil.deleteTracks(getActivity(), songs); MusicUtil.deleteTracks(getActivity(), songs);
} }
}).build(); })
.build();
} }
} }

6
app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java
View file

@ -7,6 +7,7 @@ import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.PlayingQueueAdapterDeprecated; 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)) .title(getActivity().getResources().getString(R.string.label_current_playing_queue))
.customView(R.layout.dialog_playlist, false) .customView(R.layout.dialog_playlist, false)
.positiveText(R.string.save_as_playlist) .positiveText(R.string.save_as_playlist)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
super.onPositive(dialog);
if (getActivity() == null) if (getActivity() == null)
return; return;
//noinspection unchecked //noinspection unchecked

9
app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java
View file

@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.model.PlaylistSong; import com.kabouzeid.gramophone.model.PlaylistSong;
@ -52,14 +53,14 @@ public class RemoveFromPlaylistDialog extends LeakDetectDialogFragment {
.content(content) .content(content)
.positiveText(R.string.remove_action) .positiveText(R.string.remove_action)
.negativeText(android.R.string.cancel) .negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
super.onPositive(dialog);
if (getActivity() == null) if (getActivity() == null)
return; return;
PlaylistsUtil.removeFromPlaylist(getActivity(), songs); PlaylistsUtil.removeFromPlaylist(getActivity(), songs);
} }
}).build(); })
.build();
} }
} }

9
app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java
View file

@ -57,9 +57,9 @@ public class SleepTimerDialog extends LeakDetectDialogFragment {
materialDialog = new MaterialDialog.Builder(getActivity()) materialDialog = new MaterialDialog.Builder(getActivity())
.title(getActivity().getResources().getString(R.string.action_sleep_timer)) .title(getActivity().getResources().getString(R.string.action_sleep_timer))
.positiveText(R.string.action_set) .positiveText(R.string.action_set)
.callback(new MaterialDialog.ButtonCallback() { .onPositive(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
if (getActivity() == null) { if (getActivity() == null) {
return; 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(); Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.sleep_timer_set, minutes), Toast.LENGTH_SHORT).show();
} }
})
.onNeutral(new MaterialDialog.SingleButtonCallback() {
@Override @Override
public void onNeutral(MaterialDialog dialog) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
if (getActivity() == null) { if (getActivity() == null) {
return; return;
} }