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

Synced translations, and renamed some string resources.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-22 18:39:05 +02:00
commit 193fa74ab0
40 changed files with 112 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class CreatePlaylistDialog extends DialogFragment {
.inputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PERSON_NAME |
InputType.TYPE_TEXT_FLAG_CAP_WORDS)
.input(R.string.playlist_name, 0, false, new MaterialDialog.InputCallback() {
.input(R.string.playlist_name_empty, 0, false, new MaterialDialog.InputCallback() {
@Override
public void onInput(MaterialDialog materialDialog, CharSequence charSequence) {
if (getActivity() == null)

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

@ -34,7 +34,7 @@ public class RenamePlaylistDialog extends DialogFragment {
.inputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PERSON_NAME |
InputType.TYPE_TEXT_FLAG_CAP_WORDS)
.input(getString(R.string.playlist_name), PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId), false,
.input(getString(R.string.playlist_name_empty), PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId), false,
new MaterialDialog.InputCallback() {
@Override
public void onInput(MaterialDialog materialDialog, CharSequence charSequence) {

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -355,7 +355,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
case R.id.action_playing_queue:
NavigationUtil.openPlayingQueueDialog(this);
return true;
case R.id.action_current_playing:
case R.id.action_now_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true;
case R.id.action_tag_editor:

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -411,7 +411,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show();
setUpArtistImageAndApplyPalette(true);
return true;
case R.id.action_current_playing:
case R.id.action_now_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true;
}

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -322,6 +322,7 @@ public class MainActivity extends AbsFabActivity
public void restoreActionBar() {
ActionBar actionBar = getSupportActionBar();
//noinspection ConstantConditions
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeButtonEnabled(true);
@ -349,7 +350,7 @@ public class MainActivity extends AbsFabActivity
case R.id.action_search:
startActivity(new Intent(MainActivity.this, SearchActivity.class));
return true;
case R.id.action_current_playing:
case R.id.action_now_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true;
case R.id.action_playing_queue:

4
app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
View file

@ -94,7 +94,7 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
recyclerView.addItemDecoration(dragSortRecycler);
recyclerView.addOnItemTouchListener(dragSortRecycler);
recyclerView.setOnScrollListener(dragSortRecycler.getScrollListener());
recyclerView.addOnScrollListener(dragSortRecycler.getScrollListener());
}
recyclerView.setAdapter(adapter);
}
@ -139,7 +139,7 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
case android.R.id.home:
onBackPressed();
return true;
case R.id.action_current_playing:
case R.id.action_now_playing:
NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
return true;
case R.id.action_playing_queue:

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
View file

@ -104,7 +104,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
}
@Override
@ -121,7 +121,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
@Override
public void onError() {
Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
}
}
);
@ -190,7 +190,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
Toast.makeText(AlbumTagEditorActivity.this,
R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
}
@Override