From 2a72b1b21f5323ada677657254a49ba4fe7332a6 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Mon, 18 Dec 2017 20:24:28 +0100 Subject: [PATCH] Code clean up --- .../gramophone/adapter/song/ArtistSongAdapter.java | 8 ++++---- .../gramophone/dialogs/ChangelogDialog.java | 2 +- .../gramophone/dialogs/SongDetailDialog.java | 14 +++++++------- .../mainactivity/folders/FoldersFragment.java | 2 +- .../fragments/player/card/CardPlayerFragment.java | 2 +- .../fragments/player/flat/FlatPlayerFragment.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java index 20114573..3f4f7377 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java @@ -67,9 +67,9 @@ public class ArtistSongAdapter extends ArrayAdapter implements MaterialCab convertView = LayoutInflater.from(getContext()).inflate(R.layout.item_list, parent, false); } - final TextView songTitle = (TextView) convertView.findViewById(R.id.title); - final TextView songInfo = (TextView) convertView.findViewById(R.id.text); - final ImageView albumArt = (ImageView) convertView.findViewById(R.id.image); + final TextView songTitle = convertView.findViewById(R.id.title); + final TextView songInfo = convertView.findViewById(R.id.text); + final ImageView albumArt = convertView.findViewById(R.id.image); final View shortSeparator = convertView.findViewById(R.id.short_separator); if (position == getCount() - 1) { @@ -93,7 +93,7 @@ public class ArtistSongAdapter extends ArrayAdapter implements MaterialCab albumArt.setTransitionName(activity.getString(R.string.transition_album_art)); } - final ImageView overflowButton = (ImageView) convertView.findViewById(R.id.menu); + final ImageView overflowButton = convertView.findViewById(R.id.menu); overflowButton.setOnClickListener(new SongMenuHelper.OnClickSongMenu(activity) { @Override public Song getSong() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java index 648c6a8e..34293c90 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java @@ -60,7 +60,7 @@ public class ChangelogDialog extends DialogFragment { }) .build(); - final WebView webView = (WebView) customView.findViewById(R.id.web_view); + final WebView webView = customView.findViewById(R.id.web_view); try { // Load from phonograph-changelog.html in the assets folder StringBuilder buf = new StringBuilder(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java index 87ce7204..f01afdb5 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java @@ -67,13 +67,13 @@ public class SongDetailDialog extends DialogFragment { .build(); View dialogView = dialog.getCustomView(); - final TextView fileName = (TextView) dialogView.findViewById(R.id.file_name); - final TextView filePath = (TextView) dialogView.findViewById(R.id.file_path); - final TextView fileSize = (TextView) dialogView.findViewById(R.id.file_size); - final TextView fileFormat = (TextView) dialogView.findViewById(R.id.file_format); - final TextView trackLength = (TextView) dialogView.findViewById(R.id.track_length); - final TextView bitRate = (TextView) dialogView.findViewById(R.id.bitrate); - final TextView samplingRate = (TextView) dialogView.findViewById(R.id.sampling_rate); + final TextView fileName = dialogView.findViewById(R.id.file_name); + final TextView filePath = dialogView.findViewById(R.id.file_path); + final TextView fileSize = dialogView.findViewById(R.id.file_size); + final TextView fileFormat = dialogView.findViewById(R.id.file_format); + final TextView trackLength = dialogView.findViewById(R.id.track_length); + final TextView bitRate = dialogView.findViewById(R.id.bitrate); + final TextView samplingRate = dialogView.findViewById(R.id.sampling_rate); fileName.setText(makeTextWithTitle(context, R.string.label_file_name, "-")); filePath.setText(makeTextWithTitle(context, R.string.label_file_path, "-")); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java index 5e64ce83..b8b6ea47 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java @@ -145,7 +145,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi if (savedInstanceState == null) { setCrumb(new BreadCrumbLayout.Crumb(tryGetCanonicalFile((File) getArguments().getSerializable(PATH))), true); } else { - breadCrumbs.restoreFromStateWrapper((BreadCrumbLayout.SavedStateWrapper) savedInstanceState.getParcelable(CRUMBS)); + breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS)); getLoaderManager().initLoader(LOADER_ID, null, this); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java index 3ef56ad8..71f82728 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java @@ -551,7 +551,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override public void setUpPanelAndAlbumCoverHeight() { - WidthFitSquareLayout albumCoverContainer = (WidthFitSquareLayout) fragment.getView().findViewById(R.id.album_cover_container); + WidthFitSquareLayout albumCoverContainer = fragment.getView().findViewById(R.id.album_cover_container); int topMargin = fragment.getResources().getDimensionPixelSize(R.dimen.status_bar_padding); final int availablePanelHeight = fragment.slidingUpPanelLayout.getHeight() - fragment.getView().findViewById(R.id.player_content).getHeight() + topMargin; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java index 4b0db653..4b5de378 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java @@ -530,7 +530,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override public void setUpPanelAndAlbumCoverHeight() { - WidthFitSquareLayout albumCoverContainer = (WidthFitSquareLayout) fragment.getView().findViewById(R.id.album_cover_container); + WidthFitSquareLayout albumCoverContainer = fragment.getView().findViewById(R.id.album_cover_container); final int availablePanelHeight = fragment.slidingUpPanelLayout.getHeight() - fragment.getView().findViewById(R.id.player_content).getHeight(); final int minPanelHeight = (int) ViewUtil.convertDpToPixel(8 + 72 + 24, fragment.getResources()) + fragment.getResources().getDimensionPixelSize(R.dimen.progress_container_height) + fragment.getResources().getDimensionPixelSize(R.dimen.media_controller_container_height);