From fd793d63541c56899eaa337085957d22318d8643 Mon Sep 17 00:00:00 2001 From: Tomer Froumin Date: Sat, 4 Jun 2016 16:25:15 +0300 Subject: [PATCH 1/2] Added file size to media file list view --- .../main/java/org/xbmc/kore/ui/MediaFileListFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java index e180b0c..5a7e869 100644 --- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java @@ -686,19 +686,19 @@ public class MediaFileListFragment extends AbstractListFragment { case ListType.ItemBase.TYPE_MOVIE: title = itemFile.title; details = itemFile.tagline; - sizeDuration = UIUtils.formatTime(itemFile.runtime); + sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_EPISODE: title = itemFile.title; details = String.format(context.getString(R.string.season_episode), itemFile.season, itemFile.episode); - sizeDuration = UIUtils.formatTime(itemFile.runtime); + sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_MUSIC_VIDEO: title = itemFile.title; details = Utils.listStringConcat(itemFile.artist, ", ") + " | " + itemFile.album; - sizeDuration = UIUtils.formatTime(itemFile.runtime); + sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_ALBUM: @@ -706,7 +706,7 @@ public class MediaFileListFragment extends AbstractListFragment { title = itemFile.title; details = itemFile.displayartist + " | " + itemFile.album; artUrl = itemFile.thumbnail; - sizeDuration = UIUtils.formatTime(itemFile.duration); + sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration); break; case ListType.ItemBase.TYPE_PICTURE: default: From 22ccee5b0fa86d99d414c4ea1652cc2039ae0e6d Mon Sep 17 00:00:00 2001 From: Tomer Froumin Date: Wed, 8 Jun 2016 13:56:15 +0300 Subject: [PATCH 2/2] Only show file size if available --- .../org/xbmc/kore/ui/MediaFileListFragment.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java index 5a7e869..4bcb0d5 100644 --- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java @@ -686,19 +686,25 @@ public class MediaFileListFragment extends AbstractListFragment { case ListType.ItemBase.TYPE_MOVIE: title = itemFile.title; details = itemFile.tagline; - sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); + sizeDuration = itemFile.size > 0 ? + UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) : + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_EPISODE: title = itemFile.title; details = String.format(context.getString(R.string.season_episode), itemFile.season, itemFile.episode); - sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); + sizeDuration = itemFile.size > 0 ? + UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) : + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_MUSIC_VIDEO: title = itemFile.title; details = Utils.listStringConcat(itemFile.artist, ", ") + " | " + itemFile.album; - sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime); + sizeDuration = itemFile.size > 0 ? + UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) : + UIUtils.formatTime(itemFile.runtime); artUrl = itemFile.thumbnail; break; case ListType.ItemBase.TYPE_ALBUM: @@ -706,7 +712,9 @@ public class MediaFileListFragment extends AbstractListFragment { title = itemFile.title; details = itemFile.displayartist + " | " + itemFile.album; artUrl = itemFile.thumbnail; - sizeDuration = UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration); + sizeDuration = itemFile.size > 0 ? + UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration) : + UIUtils.formatTime(itemFile.duration); break; case ListType.ItemBase.TYPE_PICTURE: default: