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

Better info texts for album page

Browse source
This commit is contained in:
Karim Abou Zeid 2018-04-28 13:47:07 +02:00
commit f93407ca35
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -437,8 +437,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
getSupportActionBar().setTitle(album.getTitle()); getSupportActionBar().setTitle(album.getTitle());
artistTextView.setText(album.getArtistName()); artistTextView.setText(album.getArtistName());
songCountTextView.setText(MusicUtil.getSongCountString(this, album.getSongCount()));
durationTextView.setText(MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))); durationTextView.setText(MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)));
songCountTextView.setText(String.valueOf(album.getSongCount()));
albumYearTextView.setText(String.valueOf(album.getYear())); albumYearTextView.setText(String.valueOf(album.getYear()));
adapter.swapDataSet(album.songs); adapter.swapDataSet(album.songs);

11
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -32,7 +32,6 @@ import org.jaudiotagger.audio.AudioFileIO;
import org.jaudiotagger.tag.FieldKey; import org.jaudiotagger.tag.FieldKey;
import java.io.File; import java.io.File;
import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -124,10 +123,14 @@ public class MusicUtil {
@NonNull @NonNull
public static String getPlaylistInfoString(@NonNull final Context context, @NonNull List<Song> songs) { public static String getPlaylistInfoString(@NonNull final Context context, @NonNull List<Song> songs) {
final int songCount = songs.size();
final String songString = songCount == 1 ? context.getResources().getString(R.string.song) : context.getResources().getString(R.string.songs);
final long duration = getTotalDuration(context, songs); final long duration = getTotalDuration(context, songs);
return songCount + " " + songString + " • " + MusicUtil.getReadableDurationString(duration); return MusicUtil.getSongCountString(context, songs.size()) + " • " + MusicUtil.getReadableDurationString(duration);
}
@NonNull
public static String getSongCountString(@NonNull final Context context, int songCount) {
final String songString = songCount == 1 ? context.getResources().getString(R.string.song) : context.getResources().getString(R.string.songs);
return songCount + " " + songString;
} }
public static long getTotalDuration(@NonNull final Context context, @NonNull List<Song> songs) { public static long getTotalDuration(@NonNull final Context context, @NonNull List<Song> songs) {

12
app/src/main/res/layout/activity_album_detail.xml
View file

@ -108,18 +108,18 @@
android:paddingStart="0dp"> android:paddingStart="0dp">
<ImageView <ImageView
android:id="@+id/duration_icon" android:id="@+id/song_count_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginStart="0dp" android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_access_time_white_24dp" app:srcCompat="@drawable/ic_music_note_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />
<TextView <TextView
android:id="@+id/duration_text" android:id="@+id/song_count_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
@ -138,18 +138,18 @@
android:paddingStart="0dp"> android:paddingStart="0dp">
<ImageView <ImageView
android:id="@+id/song_count_icon" android:id="@+id/duration_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginStart="0dp" android:layout_marginStart="0dp"
app:srcCompat="@drawable/ic_music_note_white_24dp" app:srcCompat="@drawable/ic_timer_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />
<TextView <TextView
android:id="@+id/song_count_text" android:id="@+id/duration_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />