Improve file list UI
This commit is contained in:
parent
1b162c7610
commit
4572775a51
|
@ -686,25 +686,28 @@ public class MediaFileListFragment extends AbstractListFragment {
|
||||||
case ListType.ItemBase.TYPE_MOVIE:
|
case ListType.ItemBase.TYPE_MOVIE:
|
||||||
title = itemFile.title;
|
title = itemFile.title;
|
||||||
details = itemFile.tagline;
|
details = itemFile.tagline;
|
||||||
sizeDuration = itemFile.size > 0 ?
|
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
|
||||||
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
||||||
UIUtils.formatTime(itemFile.runtime);
|
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
|
||||||
|
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
|
||||||
artUrl = itemFile.thumbnail;
|
artUrl = itemFile.thumbnail;
|
||||||
break;
|
break;
|
||||||
case ListType.ItemBase.TYPE_EPISODE:
|
case ListType.ItemBase.TYPE_EPISODE:
|
||||||
title = itemFile.title;
|
title = itemFile.title;
|
||||||
details = String.format(context.getString(R.string.season_episode), itemFile.season, itemFile.episode);
|
details = String.format(context.getString(R.string.season_episode), itemFile.season, itemFile.episode);
|
||||||
sizeDuration = itemFile.size > 0 ?
|
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
|
||||||
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
||||||
UIUtils.formatTime(itemFile.runtime);
|
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
|
||||||
|
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
|
||||||
artUrl = itemFile.thumbnail;
|
artUrl = itemFile.thumbnail;
|
||||||
break;
|
break;
|
||||||
case ListType.ItemBase.TYPE_MUSIC_VIDEO:
|
case ListType.ItemBase.TYPE_MUSIC_VIDEO:
|
||||||
title = itemFile.title;
|
title = itemFile.title;
|
||||||
details = Utils.listStringConcat(itemFile.artist, ", ") + " | " + itemFile.album;
|
details = Utils.listStringConcat(itemFile.artist, ", ") + " | " + itemFile.album;
|
||||||
sizeDuration = itemFile.size > 0 ?
|
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
|
||||||
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
|
||||||
UIUtils.formatTime(itemFile.runtime);
|
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
|
||||||
|
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
|
||||||
artUrl = itemFile.thumbnail;
|
artUrl = itemFile.thumbnail;
|
||||||
break;
|
break;
|
||||||
case ListType.ItemBase.TYPE_ALBUM:
|
case ListType.ItemBase.TYPE_ALBUM:
|
||||||
|
@ -712,9 +715,10 @@ public class MediaFileListFragment extends AbstractListFragment {
|
||||||
title = itemFile.title;
|
title = itemFile.title;
|
||||||
details = itemFile.displayartist + " | " + itemFile.album;
|
details = itemFile.displayartist + " | " + itemFile.album;
|
||||||
artUrl = itemFile.thumbnail;
|
artUrl = itemFile.thumbnail;
|
||||||
sizeDuration = itemFile.size > 0 ?
|
sizeDuration = (itemFile.size > 0) && (itemFile.duration > 0) ?
|
||||||
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration) :
|
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration) :
|
||||||
UIUtils.formatTime(itemFile.duration);
|
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
|
||||||
|
(itemFile.duration > 0)? UIUtils.formatTime(itemFile.duration) : null;
|
||||||
break;
|
break;
|
||||||
case ListType.ItemBase.TYPE_PICTURE:
|
case ListType.ItemBase.TYPE_PICTURE:
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -42,7 +42,9 @@
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
style="@style/TextAppearance.Medialist.OtherInfo"/>
|
style="@style/TextAppearance.Medialist.OtherInfo"
|
||||||
|
android:paddingLeft="@dimen/small_padding"
|
||||||
|
android:paddingStart="@dimen/small_padding"/>
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/list_context_menu"
|
android:id="@+id/list_context_menu"
|
||||||
android:layout_width="@dimen/default_icon_size"
|
android:layout_width="@dimen/default_icon_size"
|
||||||
|
@ -65,6 +67,8 @@
|
||||||
android:layout_toStartOf="@id/list_context_menu"
|
android:layout_toStartOf="@id/list_context_menu"
|
||||||
android:layout_alignTop="@id/art"
|
android:layout_alignTop="@id/art"
|
||||||
style="@style/TextAppearance.Medialist.Title"
|
style="@style/TextAppearance.Medialist.Title"
|
||||||
|
android:paddingRight="@dimen/small_padding"
|
||||||
|
android:paddingEnd="@dimen/small_padding"
|
||||||
android:singleLine="false"
|
android:singleLine="false"
|
||||||
android:ellipsize="middle"/>
|
android:ellipsize="middle"/>
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -78,6 +82,8 @@
|
||||||
android:layout_toEndOf="@id/art"
|
android:layout_toEndOf="@id/art"
|
||||||
android:layout_toLeftOf="@id/size_duration"
|
android:layout_toLeftOf="@id/size_duration"
|
||||||
android:layout_toStartOf="@id/size_duration"
|
android:layout_toStartOf="@id/size_duration"
|
||||||
style="@style/TextAppearance.Medialist.Details"/>
|
style="@style/TextAppearance.Medialist.Details"
|
||||||
|
android:paddingRight="@dimen/small_padding"
|
||||||
|
android:paddingEnd="@dimen/small_padding"/>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</android.support.v7.widget.CardView>
|
</android.support.v7.widget.CardView>
|
Loading…
Reference in New Issue