mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 09:53:33 +00:00
String extraction from everywhere
This commit is contained in:
parent
d169e3b188
commit
b28c230f5a
53 changed files with 333 additions and 170 deletions
|
|
@ -109,7 +109,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
|
|||
songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
|
|||
Playlist playlist = playlists.get(position);
|
||||
|
||||
holder.textPlaylistName.setText(MusicUtil.getReadableString(playlist.getName()));
|
||||
holder.textPlaylistSongCount.setText("Song count: " + playlist.getSongCount());
|
||||
holder.textPlaylistSongCount.setText(R.string.playlist_info_song_count + playlist.getSongCount());
|
||||
|
||||
CustomGlideRequest.Builder
|
||||
.from(context, playlist.getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
|
|||
Playlist playlist = playlists.get(position);
|
||||
|
||||
holder.playlistTitle.setText(MusicUtil.getReadableString(playlist.getName()));
|
||||
holder.playlistTrackCount.setText(MusicUtil.getReadableString(playlist.getSongCount() + " tracks"));
|
||||
holder.playlistTrackCount.setText(playlist.getSongCount() + R.string.playlist_counted_tracks);
|
||||
holder.playlistDuration.setText(MusicUtil.getReadableDurationString(playlist.getDuration(), false));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
|
|||
songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ public class AlbumCatalogueFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Albums");
|
||||
bind.toolbar.setTitle(R.string.album_catalogue_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.cappielloantonio.play.ui.fragment;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
|
@ -11,6 +12,7 @@ import androidx.fragment.app.Fragment;
|
|||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.cappielloantonio.play.R;
|
||||
import com.cappielloantonio.play.adapter.AlbumHorizontalAdapter;
|
||||
import com.cappielloantonio.play.databinding.FragmentAlbumListPageBinding;
|
||||
import com.cappielloantonio.play.model.Album;
|
||||
|
|
@ -56,19 +58,19 @@ public class AlbumListPageFragment extends Fragment {
|
|||
private void init() {
|
||||
if (requireArguments().getString(Album.RECENTLY_PLAYED) != null) {
|
||||
albumListPageViewModel.title = Album.RECENTLY_PLAYED;
|
||||
bind.pageTitleLabel.setText("Recently played albums");
|
||||
bind.pageTitleLabel.setText(R.string.album_list_page_recently_played);
|
||||
} else if (requireArguments().getString(Album.MOST_PLAYED) != null) {
|
||||
albumListPageViewModel.title = Album.MOST_PLAYED;
|
||||
bind.pageTitleLabel.setText("Most played albums");
|
||||
bind.pageTitleLabel.setText(R.string.album_list_page_most_played);
|
||||
} else if (requireArguments().getString(Album.RECENTLY_ADDED) != null) {
|
||||
albumListPageViewModel.title = Album.RECENTLY_ADDED;
|
||||
bind.pageTitleLabel.setText("Recently added albums");
|
||||
bind.pageTitleLabel.setText(R.string.album_list_page_recently_added);
|
||||
} else if (requireArguments().getString(Album.STARRED) != null) {
|
||||
albumListPageViewModel.title = Album.STARRED;
|
||||
bind.pageTitleLabel.setText("Starred albums");
|
||||
bind.pageTitleLabel.setText(R.string.album_list_page_starred);
|
||||
} else if (requireArguments().getString(Album.DOWNLOADED) != null) {
|
||||
albumListPageViewModel.title = Album.DOWNLOADED;
|
||||
bind.pageTitleLabel.setText("Downloaded albums");
|
||||
bind.pageTitleLabel.setText(R.string.album_list_page_downloaded);
|
||||
} else if (requireArguments().getParcelable("artist_object") != null) {
|
||||
albumListPageViewModel.artist = requireArguments().getParcelable("artist_object");
|
||||
albumListPageViewModel.title = Album.FROM_ARTIST;
|
||||
|
|
@ -88,9 +90,9 @@ public class AlbumListPageFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Albums");
|
||||
bind.toolbar.setTitle(R.string.album_list_page_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ public class AlbumPageFragment extends Fragment {
|
|||
bundle.putParcelable("artist_object", artist);
|
||||
activity.navController.navigate(R.id.action_albumPageFragment_to_artistPageFragment, bundle);
|
||||
} else
|
||||
Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.album_error_retrieving_artist), Toast.LENGTH_SHORT).show();
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ public class ArtistCatalogueFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.artistInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Artists");
|
||||
bind.toolbar.setTitle(R.string.artist_catalogue_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment;
|
|||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.cappielloantonio.play.R;
|
||||
import com.cappielloantonio.play.adapter.ArtistHorizontalAdapter;
|
||||
import com.cappielloantonio.play.databinding.FragmentArtistListPageBinding;
|
||||
import com.cappielloantonio.play.model.Artist;
|
||||
|
|
@ -55,10 +56,10 @@ public class ArtistListPageFragment extends Fragment {
|
|||
private void init() {
|
||||
if (requireArguments().getString(Artist.STARRED) != null) {
|
||||
artistListPageViewModel.title = Artist.STARRED;
|
||||
bind.pageTitleLabel.setText("Starred artists");
|
||||
bind.pageTitleLabel.setText(R.string.artist_list_page_starred);
|
||||
} else if (requireArguments().getString(Artist.DOWNLOADED) != null) {
|
||||
artistListPageViewModel.title = Artist.DOWNLOADED;
|
||||
bind.pageTitleLabel.setText("Downloaded artists");
|
||||
bind.pageTitleLabel.setText(R.string.artist_list_page_downloaded);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -74,9 +75,9 @@ public class ArtistListPageFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.artistInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Artists");
|
||||
bind.toolbar.setTitle(R.string.artist_list_page_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ public class ArtistPageFragment extends Fragment {
|
|||
MusicPlayerRemote.openQueue(songs, 0, true);
|
||||
activity.isBottomSheetInPeek(true);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Error retrieving artist's songs", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -155,7 +155,7 @@ public class ArtistPageFragment extends Fragment {
|
|||
artistRepository.getInstantMix(artistPageViewModel.getArtist(), 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -169,7 +169,7 @@ public class ArtistPageFragment extends Fragment {
|
|||
|
||||
MusicPlayerRemote.openQueue((List<Song>) media, 0, true);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Error retrieving artist's radio", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class FilterFragment extends Fragment {
|
|||
if (filterViewModel.getFilters().size() > 1)
|
||||
activity.navController.navigate(R.id.action_filterFragment_to_songListPageFragment, bundle);
|
||||
else
|
||||
Toast.makeText(requireContext(), "Select two or more filters", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.filter_info_selection), Toast.LENGTH_SHORT).show();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -81,9 +81,9 @@ public class FilterFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.genreFilterInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Filter");
|
||||
bind.toolbar.setTitle(R.string.filter_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ public class GenreCatalogueFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.genreInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Genre Catalogue");
|
||||
bind.toolbar.setTitle(R.string.genre_catalogue_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,9 +69,9 @@ public class LoginFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.serverInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Subsonic servers");
|
||||
bind.toolbar.setTitle(R.string.login_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,9 +93,9 @@ public class PlaylistCatalogueFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Playlist Catalogue");
|
||||
bind.toolbar.setTitle(R.string.playlist_catalogue_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ public class PlaylistPageFragment extends Fragment {
|
|||
bind.animToolbar.setTitle(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName()));
|
||||
|
||||
bind.playlistNameLabel.setText(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName()));
|
||||
bind.playlistSongCountLabel.setText("Song count: " + playlistPageViewModel.getPlaylist().getSongCount());
|
||||
bind.playlistDurationLabel.setText("Playlist duration: " + MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false));
|
||||
bind.playlistSongCountLabel.setText(getString(R.string.playlist_song_count) + playlistPageViewModel.getPlaylist().getSongCount());
|
||||
bind.playlistDurationLabel.setText(getString(R.string.playlist_duration) + MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false));
|
||||
|
||||
if (playlistPageViewModel.isOffline()) {
|
||||
bind.playlistSongCountLabel.setVisibility(View.GONE);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
|
|||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.cappielloantonio.play.R;
|
||||
import com.cappielloantonio.play.adapter.AlbumAdapter;
|
||||
import com.cappielloantonio.play.adapter.ArtistAdapter;
|
||||
import com.cappielloantonio.play.adapter.SongHorizontalAdapter;
|
||||
|
|
@ -129,7 +130,7 @@ public class SearchFragment extends Fragment {
|
|||
searchView.collapse();
|
||||
search(query);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Enter at least three characters", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.search_info_minimum_characters), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider;
|
|||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.cappielloantonio.play.App;
|
||||
import com.cappielloantonio.play.R;
|
||||
import com.cappielloantonio.play.adapter.SongHorizontalAdapter;
|
||||
import com.cappielloantonio.play.databinding.FragmentSongListPageBinding;
|
||||
import com.cappielloantonio.play.model.Song;
|
||||
|
|
@ -62,21 +63,21 @@ public class SongListPageFragment extends Fragment {
|
|||
private void init() {
|
||||
if (requireArguments().getString(Song.RECENTLY_PLAYED) != null) {
|
||||
songListPageViewModel.title = Song.RECENTLY_PLAYED;
|
||||
bind.pageTitleLabel.setText("Recently played tracks");
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_recently_played);
|
||||
} else if (requireArguments().getString(Song.MOST_PLAYED) != null) {
|
||||
songListPageViewModel.title = Song.MOST_PLAYED;
|
||||
bind.pageTitleLabel.setText("Most played tracks");
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_most_played);
|
||||
} else if (requireArguments().getString(Song.RECENTLY_ADDED) != null) {
|
||||
songListPageViewModel.title = Song.RECENTLY_ADDED;
|
||||
bind.pageTitleLabel.setText("Recently added tracks");
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_recently_added);
|
||||
} else if (requireArguments().getString(Song.BY_GENRE) != null) {
|
||||
songListPageViewModel.title = Song.BY_GENRE;
|
||||
songListPageViewModel.genre = requireArguments().getParcelable("genre_object");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()) + ": all tracks");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()) + getString(R.string.song_list_page_all));
|
||||
} else if (requireArguments().getString(Song.BY_ARTIST) != null) {
|
||||
songListPageViewModel.title = Song.BY_ARTIST;
|
||||
songListPageViewModel.artist = requireArguments().getParcelable("artist_object");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.artist.getName()) + "'s top tracks");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.artist.getName()) + getString(R.string.song_list_page_top));
|
||||
} else if (requireArguments().getString(Song.BY_GENRES) != null) {
|
||||
songListPageViewModel.title = Song.BY_GENRES;
|
||||
songListPageViewModel.filters = requireArguments().getStringArrayList("filters_list");
|
||||
|
|
@ -85,13 +86,13 @@ public class SongListPageFragment extends Fragment {
|
|||
} else if (requireArguments().getString(Song.BY_YEAR) != null) {
|
||||
songListPageViewModel.title = Song.BY_YEAR;
|
||||
songListPageViewModel.year = requireArguments().getInt("year_object");
|
||||
bind.pageTitleLabel.setText("Year " + songListPageViewModel.year);
|
||||
bind.pageTitleLabel.setText(getString(R.string.song_list_page_year) + songListPageViewModel.year);
|
||||
} else if (requireArguments().getString(Song.STARRED) != null) {
|
||||
songListPageViewModel.title = Song.STARRED;
|
||||
bind.pageTitleLabel.setText("Starred tracks");
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_starred);
|
||||
} else if (requireArguments().getString(Song.DOWNLOADED) != null) {
|
||||
songListPageViewModel.title = Song.DOWNLOADED;
|
||||
bind.pageTitleLabel.setText("Downloaded");
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_downloaded);
|
||||
} else if (requireArguments().getParcelable("album_object") != null) {
|
||||
songListPageViewModel.album = requireArguments().getParcelable("album_object");
|
||||
songListPageViewModel.title = Song.FROM_ALBUM;
|
||||
|
|
@ -111,9 +112,9 @@ public class SongListPageFragment extends Fragment {
|
|||
|
||||
bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
|
||||
if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
|
||||
bind.toolbar.setTitle("Songs");
|
||||
bind.toolbar.setTitle(R.string.song_list_page_title);
|
||||
} else {
|
||||
bind.toolbar.setTitle("");
|
||||
bind.toolbar.setTitle(R.string.empty_string);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
albumRepository.getInstantMix(album, 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
|
||||
dismissBottomSheet();
|
||||
}
|
||||
|
|
@ -99,7 +99,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
|
||||
MusicPlayerRemote.openQueue((List<Song>) media, 0, true);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Error retrieving album's radio", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.album_error_retrieving_radio), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
dismissBottomSheet();
|
||||
|
|
@ -162,7 +162,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
bundle.putParcelable("artist_object", artist);
|
||||
NavHostFragment.findNavController(this).navigate(R.id.artistPageFragment, bundle);
|
||||
} else
|
||||
Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.album_error_retrieving_artist), Toast.LENGTH_SHORT).show();
|
||||
|
||||
dismissBottomSheet();
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
|
|||
artistRepository.getInstantMix(artist, 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
|
||||
dismissBottomSheet();
|
||||
}
|
||||
|
|
@ -93,7 +93,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
|
|||
|
||||
MusicPlayerRemote.openQueue((List<Song>) media, 0, true);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Error retrieving artist's radio", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
dismissBottomSheet();
|
||||
|
|
@ -112,7 +112,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
|
|||
MusicPlayerRemote.openQueue(songs, 0, true);
|
||||
((MainActivity) requireActivity()).isBottomSheetInPeek(true);
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Error retrieving artist's songs", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
dismissBottomSheet();
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
songRepository.getInstantMix(song, 20, new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
Log.e(TAG, "onError: " + exception.getMessage());
|
||||
Log.e(TAG, "onError() " + exception.getMessage());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -177,7 +177,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
bundle.putParcelable("album_object", album);
|
||||
NavHostFragment.findNavController(this).navigate(R.id.albumPageFragment, bundle);
|
||||
} else
|
||||
Toast.makeText(requireContext(), "Error retrieving album", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.song_bottom_sheet_error_retrieving_album), Toast.LENGTH_SHORT).show();
|
||||
|
||||
dismissBottomSheet();
|
||||
}));
|
||||
|
|
@ -189,7 +189,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
bundle.putParcelable("artist_object", artist);
|
||||
NavHostFragment.findNavController(this).navigate(R.id.artistPageFragment, bundle);
|
||||
} else
|
||||
Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), getString(R.string.song_bottom_sheet_error_retrieving_artist), Toast.LENGTH_SHORT).show();
|
||||
|
||||
dismissBottomSheet();
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@ public class PlaylistChooserDialog extends DialogFragment {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog);
|
||||
|
||||
builder.setView(bind.getRoot())
|
||||
.setTitle("Add to a playlist")
|
||||
.setNeutralButton("Create", (dialog, id) -> {
|
||||
.setTitle(R.string.playlist_chooser_dialog_title)
|
||||
.setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> {
|
||||
})
|
||||
.setNegativeButton("Cancel", (dialog, id) -> dialog.cancel());
|
||||
.setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel());
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ public class PlaylistEditorDialog extends DialogFragment {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog);
|
||||
|
||||
builder.setView(bind.getRoot())
|
||||
.setTitle("Create playlist")
|
||||
.setPositiveButton("Save", (dialog, id) -> {
|
||||
.setTitle(R.string.playlist_editor_dialog_title)
|
||||
.setPositiveButton(R.string.playlist_editor_dialog_positive_button, (dialog, id) -> {
|
||||
})
|
||||
.setNeutralButton("Delete", (dialog, id) -> dialog.cancel())
|
||||
.setNegativeButton("Cancel", (dialog, id) -> dialog.cancel());
|
||||
.setNeutralButton(R.string.playlist_editor_dialog_neutral_button, (dialog, id) -> dialog.cancel())
|
||||
.setNegativeButton(R.string.playlist_editor_dialog_negative_button, (dialog, id) -> dialog.cancel());
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
|
@ -157,7 +157,7 @@ public class PlaylistEditorDialog extends DialogFragment {
|
|||
playlistName = Objects.requireNonNull(bind.playlistNameTextView.getText()).toString().trim();
|
||||
|
||||
if (TextUtils.isEmpty(playlistName)) {
|
||||
bind.playlistNameTextView.setError("Required");
|
||||
bind.playlistNameTextView.setError(getString(R.string.error_required));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ public class RatingDialog extends DialogFragment {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog);
|
||||
|
||||
builder.setView(bind.getRoot())
|
||||
.setTitle("Rate")
|
||||
.setNegativeButton("Cancel", (dialog, id) -> dialog.cancel())
|
||||
.setPositiveButton("Save", (dialog, id) -> ratingViewModel.rate((int) bind.ratingBar.getRating()));
|
||||
.setTitle(R.string.rating_dialog_title)
|
||||
.setNegativeButton(R.string.rating_dialog_negative_button, (dialog, id) -> dialog.cancel())
|
||||
.setPositiveButton(R.string.rating_dialog_positive_button, (dialog, id) -> ratingViewModel.rate((int) bind.ratingBar.getRating()));
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@ public class ServerSignupDialog extends DialogFragment {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog);
|
||||
|
||||
builder.setView(bind.getRoot())
|
||||
.setTitle("Add server")
|
||||
.setNeutralButton("Delete", (dialog, id) -> {
|
||||
.setTitle(R.string.server_signup_dialog_title)
|
||||
.setNeutralButton(R.string.server_signup_dialog_neutral_button, (dialog, id) -> {
|
||||
})
|
||||
.setPositiveButton("Save", (dialog, id) -> {
|
||||
.setPositiveButton(R.string.server_signup_dialog_positive_button, (dialog, id) -> {
|
||||
})
|
||||
.setNegativeButton("Cancel", (dialog, id) -> dialog.cancel());
|
||||
.setNegativeButton(R.string.server_signup_dialog_negative_button, (dialog, id) -> dialog.cancel());
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
|
@ -119,17 +119,17 @@ public class ServerSignupDialog extends DialogFragment {
|
|||
directAccess = bind.directAccessCheckbox.isChecked();
|
||||
|
||||
if (TextUtils.isEmpty(serverName)) {
|
||||
bind.serverNameTextView.setError("Required");
|
||||
bind.serverNameTextView.setError(getString(R.string.error_required));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(username)) {
|
||||
bind.usernameTextView.setError("Required");
|
||||
bind.usernameTextView.setError(getString(R.string.error_required));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(server)) {
|
||||
bind.serverTextView.setError("Required");
|
||||
bind.serverTextView.setError(getString(R.string.error_required));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue