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

Various title, content, and action title updates for dialogs to make them more consistent and professional

Browse source
This commit is contained in:
Aidan Follestad 2015-04-16 20:24:59 -05:00
commit d5c5d02360
24 changed files with 42 additions and 1238 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java
View file

@ -40,11 +40,12 @@ public class AddToPlaylistDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
final List<Playlist> playlists = PlaylistLoader.getAllPlaylists(getActivity());
CharSequence[] playlistNames = new CharSequence[playlists.size() + 1];
playlistNames[0] = getActivity().getResources().getString(R.string.action_new_playlist);
playlistNames[0] = getActivity().getResources().getString(R.string.new_playlist_action);
for (int i = 1; i < playlistNames.length; i++) {
playlistNames[i] = playlists.get(i - 1).name;
}
return new MaterialDialog.Builder(getActivity())
.title(R.string.add_playlist_title)
.items(playlistNames)
.itemsCallback(new MaterialDialog.ListCallback() {
@Override

2
app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java
View file

@ -41,7 +41,7 @@ public class CreatePlaylistDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new MaterialDialog.Builder(getActivity())
.title(R.string.action_new_playlist)
.title(R.string.new_playlist_title)
.positiveText(android.R.string.ok)
.negativeText(android.R.string.cancel)
.inputType(InputType.TYPE_CLASS_TEXT |

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

@ -2,7 +2,9 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html;
import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R;
@ -21,14 +23,16 @@ public class DeletePlaylistDialog extends DialogFragment {
return dialog;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
long playlistId = getArguments().getLong("playlist_id");
return new MaterialDialog.Builder(getActivity())
.title(getActivity().getResources().getString(R.string.delete_playlist) +
PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId))
.positiveText(getActivity().getResources().getString(android.R.string.ok))
.negativeText(getActivity().getResources().getString(android.R.string.cancel))
.title(R.string.delete_playlist_title)
.content(Html.fromHtml(getString(R.string.delete_playlist_x,
PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId))))
.positiveText(R.string.delete_action)
.negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() {
@Override
public void onPositive(MaterialDialog dialog) {

4
app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java
View file

@ -28,8 +28,8 @@ public class RenamePlaylistDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
long playlistId = getArguments().getLong("playlist_id");
return new MaterialDialog.Builder(getActivity())
.title(R.string.rename_playlist)
.positiveText(android.R.string.ok)
.title(R.string.rename_playlist_title)
.positiveText(R.string.rename_action)
.negativeText(android.R.string.cancel)
.inputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PERSON_NAME |

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

@ -27,7 +27,7 @@ public class DeleteSongsDialogHelper {
return new MaterialDialog.Builder(context)
.title(title)
.content(context.getResources().getString(R.string.delete_warning))
.positiveText(context.getResources().getString(R.string.delete))
.positiveText(context.getResources().getString(R.string.delete_action))
.negativeText(context.getResources().getString(android.R.string.cancel))
.callback(new MaterialDialog.ButtonCallback() {
@Override

15
app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
View file

@ -41,14 +41,16 @@ public class PlaylistsUtil {
values);
cursor.close();
if (uri != null) {
Toast.makeText(context, context.getResources().getString(R.string.created_playlist) + name, Toast.LENGTH_SHORT).show();
Toast.makeText(context, context.getResources().getString(
R.string.created_playlist_x, name), Toast.LENGTH_SHORT).show();
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
return Integer.parseInt(uri.getLastPathSegment());
}
}
cursor.close();
}
Toast.makeText(context, context.getResources().getString(R.string.create_playlist_failed) + name, Toast.LENGTH_SHORT).show();
Toast.makeText(context, context.getResources().getString(
R.string.couldnot_create_playlist_x, name), Toast.LENGTH_SHORT).show();
return -1;
}
@ -62,7 +64,8 @@ public class PlaylistsUtil {
String where = MediaStore.Audio.Playlists._ID + "=?";
String[] whereVal = {String.valueOf(playlistId)};
context.getContentResolver().delete(uri, where, whereVal);
Toast.makeText(context, context.getResources().getString(R.string.deleted_playlist) + getNameForPlaylist(context, playlistId), Toast.LENGTH_SHORT).show();
Toast.makeText(context, context.getResources().getString(R.string.deleted_playlist_x,
getNameForPlaylist(context, playlistId)), Toast.LENGTH_SHORT).show();
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
}
@ -95,11 +98,11 @@ public class PlaylistsUtil {
}
int numinserted = 0;
for (int offSet = 0; offSet < size; offSet += 1000) {
for (int offSet = 0; offSet < size; offSet += 1000)
numinserted += resolver.bulkInsert(uri, makeInsertItems(songs, offSet, 1000, base));
}
Toast.makeText(context, context.getResources().getString(R.string.inserted_titles_to_playlist_1) + numinserted + context.getResources().getString(R.string.inserted_titles_to_playlist_2), Toast.LENGTH_SHORT).show();
Toast.makeText(context, context.getResources().getString(
R.string.inserted_x_songs_into_playlist, numinserted), Toast.LENGTH_SHORT).show();
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
}