SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve file list UI

This commit is contained in:
Synced Synapse 2016-06-16 19:40:36 +01:00
parent 1b162c7610
commit 4572775a51
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
View File

@ -686,25 +686,28 @@ public class MediaFileListFragment extends AbstractListFragment {
case ListType.ItemBase.TYPE_MOVIE:
title = itemFile.title;
details = itemFile.tagline;
sizeDuration = itemFile.size > 0 ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
UIUtils.formatTime(itemFile.runtime);
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
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 = itemFile.size > 0 ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
UIUtils.formatTime(itemFile.runtime);
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
artUrl = itemFile.thumbnail;
break;
case ListType.ItemBase.TYPE_MUSIC_VIDEO:
title = itemFile.title;
details = Utils.listStringConcat(itemFile.artist, ", ") + " | " + itemFile.album;
sizeDuration = itemFile.size > 0 ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
UIUtils.formatTime(itemFile.runtime);
sizeDuration = (itemFile.size > 0) && (itemFile.runtime > 0) ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.runtime) :
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
(itemFile.runtime > 0)? UIUtils.formatTime(itemFile.runtime) : null;
artUrl = itemFile.thumbnail;
break;
case ListType.ItemBase.TYPE_ALBUM:
@ -712,9 +715,10 @@ public class MediaFileListFragment extends AbstractListFragment {
title = itemFile.title;
details = itemFile.displayartist + " | " + itemFile.album;
artUrl = itemFile.thumbnail;
sizeDuration = itemFile.size > 0 ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration) :
UIUtils.formatTime(itemFile.duration);
sizeDuration = (itemFile.size > 0) && (itemFile.duration > 0) ?
UIUtils.formatFileSize(itemFile.size) + " | " + UIUtils.formatTime(itemFile.duration) :
(itemFile.size > 0) ? UIUtils.formatFileSize(itemFile.size) :
(itemFile.duration > 0)? UIUtils.formatTime(itemFile.duration) : null;
break;
case ListType.ItemBase.TYPE_PICTURE:
default:

10
app/src/main/res/layout/grid_item_file.xml
View File

@ -42,7 +42,9 @@
android:layout_alignParentBottom="true"
android:layout_alignParentRight="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
android:id="@+id/list_context_menu"
android:layout_width="@dimen/default_icon_size"
@ -65,6 +67,8 @@
android:layout_toStartOf="@id/list_context_menu"
android:layout_alignTop="@id/art"
style="@style/TextAppearance.Medialist.Title"
android:paddingRight="@dimen/small_padding"
android:paddingEnd="@dimen/small_padding"
android:singleLine="false"
android:ellipsize="middle"/>
<TextView
@ -78,6 +82,8 @@
android:layout_toEndOf="@id/art"
android:layout_toLeftOf="@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>
</android.support.v7.widget.CardView>