From 05146d62587e97a7eb8545b951c25d196e8f472a Mon Sep 17 00:00:00 2001 From: h4h13 Date: Fri, 8 Nov 2019 21:18:15 +0530 Subject: [PATCH] Fix hiding year if not available --- .../monkey/retromusic/activities/AlbumDetailsActivity.kt | 7 +++++-- .../appthemehelper/util/ToolbarContentTintHelper.java | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index e0340aab..31e697e5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -139,8 +139,11 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { this.album = album albumTitle.text = album.title - albumText.text = String.format("%s • %s • %s", album.artistName, MusicUtil.getYearString(album.year), MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))) - + if (MusicUtil.getYearString(album.year) == "-") { + albumText.text = String.format("%s • %s", album.artistName, MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))) + } else { + albumText.text = String.format("%s • %s • %s", album.artistName, MusicUtil.getYearString(album.year), MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))) + } loadAlbumCover() simpleSongAdapter.swapDataSet(album.songs) albumDetailsPresenter.loadMore(album.artistId) diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java index d0deb3c5..7b1c70b8 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java @@ -17,7 +17,6 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.RadioButton; -import android.widget.TextView; import androidx.annotation.CheckResult; import androidx.annotation.ColorInt; @@ -91,8 +90,6 @@ public final class ToolbarContentTintHelper { final View backButton = toolbar.getChildAt(i); if (backButton instanceof ImageView) { ((ImageView) backButton).getDrawable().setColorFilter(colorFilter); - } else if (backButton instanceof TextView) { - // ((TextView) backButton).setTextColor(color); } } }