diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java index e0b2b2ce..bcdd1375 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java @@ -84,15 +84,6 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter getSongs(Context context); - - @NonNull - @Override - public String getInfoString(@NonNull Context context) { - int songCount = getSongs(context).size(); - String songCountString = MusicUtil.getSongCountString(context, songCount); - - return MusicUtil.buildInfoString( - songCountString, - super.getInfoString(context) - ); - } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java b/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java index f4bacdc7..98159d77 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java @@ -1,6 +1,5 @@ package com.kabouzeid.gramophone.model; -import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.NonNull; @@ -22,11 +21,6 @@ public class Playlist implements Parcelable { this.name = ""; } - @NonNull - public String getInfoString(@NonNull Context context) { - return ""; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java index 3cb423c4..1f8b200a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java @@ -4,11 +4,10 @@ import android.content.Context; import android.os.Parcel; import androidx.annotation.NonNull; -import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.loader.TopAndRecentlyPlayedTracksLoader; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.provider.HistoryStore; -import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.util.PreferenceUtil; import java.util.ArrayList; @@ -22,17 +21,6 @@ public class HistoryPlaylist extends AbsSmartPlaylist { super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp); } - @NonNull - @Override - public String getInfoString(@NonNull Context context) { - String cutoff = PreferenceUtil.getInstance(context).getRecentlyPlayedCutoffText(context); - - return MusicUtil.buildInfoString( - cutoff, - super.getInfoString(context) - ); - } - @NonNull @Override public ArrayList getSongs(@NonNull Context context) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java index 3f3da9f0..00508ce2 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java @@ -4,10 +4,9 @@ import android.content.Context; import android.os.Parcel; import androidx.annotation.NonNull; -import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.loader.LastAddedLoader; import com.kabouzeid.gramophone.model.Song; -import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.util.PreferenceUtil; import java.util.ArrayList; @@ -21,17 +20,6 @@ public class LastAddedPlaylist extends AbsSmartPlaylist { super(context.getString(R.string.last_added), R.drawable.ic_library_add_white_24dp); } - @NonNull - @Override - public String getInfoString(@NonNull Context context) { - String cutoff = PreferenceUtil.getInstance(context).getLastAddedCutoffText(context); - - return MusicUtil.buildInfoString( - cutoff, - super.getInfoString(context) - ); - } - @NonNull @Override public ArrayList getSongs(@NonNull Context context) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java index 13d874c8..368e08fa 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java @@ -12,6 +12,7 @@ import androidx.annotation.StyleRes; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; + import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.helper.SortOrder; import com.kabouzeid.gramophone.model.CategoryInfo; @@ -317,37 +318,6 @@ public final class PreferenceUtil { return (System.currentTimeMillis() - interval) / 1000; } - public String getLastAddedCutoffText(Context context) { - return getCutoffText(LAST_ADDED_CUTOFF, context); - } - - public String getRecentlyPlayedCutoffText(Context context) { - return getCutoffText(RECENTLY_PLAYED_CUTOFF, context); - } - - private String getCutoffText(final String cutoff, Context context) { - switch (mPreferences.getString(cutoff, "")) { - case "today": - return context.getString(R.string.today); - - case "this_week": - return context.getString(R.string.this_week); - - case "past_seven_days": - return context.getString(R.string.past_seven_days); - - case "past_three_months": - return context.getString(R.string.past_three_months); - - case "this_year": - return context.getString(R.string.this_year); - - case "this_month": - default: - return context.getString(R.string.this_month); - } - } - public int getLastSleepTimerValue() { return mPreferences.getInt(LAST_SLEEP_TIMER_VALUE, 30); } diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml index ee6bad8a..1a6ed7cb 100644 --- a/app/src/main/res/layout/item_list_single_row.xml +++ b/app/src/main/res/layout/item_list_single_row.xml @@ -54,35 +54,19 @@ - - - - - - - + android:fontFamily="sans-serif" + android:singleLine="true" + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - + \ No newline at end of file