summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/downloaded_episodeslist_item.xml55
-rw-r--r--res/layout/downloadlog_item.xml24
-rw-r--r--res/layout/feeditemlist_item.xml14
-rw-r--r--res/layout/new_episodes_fragment.xml2
-rw-r--r--res/layout/new_episodes_listitem.xml22
-rw-r--r--res/layout/queue_fragment.xml2
-rw-r--r--res/layout/queue_listitem.xml54
-rw-r--r--res/values-large/dimens.xml5
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/strings.xml4
10 files changed, 55 insertions, 133 deletions
diff --git a/res/layout/downloaded_episodeslist_item.xml b/res/layout/downloaded_episodeslist_item.xml
index 35b3dbf9a..fc9913a74 100644
--- a/res/layout/downloaded_episodeslist_item.xml
+++ b/res/layout/downloaded_episodeslist_item.xml
@@ -9,40 +9,24 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_marginRight="16dp">
+ android:layout_marginRight="8dp">
<ImageView
android:id="@+id/imgvImage"
android:contentDescription="@string/cover_label"
- android:layout_width="@dimen/thumbnail_length_itemlist"
+ android:layout_width="@dimen/thumbnail_length_downloaded_item"
android:layout_height="@dimen/thumbnail_length_itemlist"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"/>
- <ImageView
- android:id="@+id/statusPlaying"
- android:contentDescription="@string/status_playing_label"
- android:layout_width="@dimen/status_indicator_width"
- android:layout_height="18dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginLeft="8dp"
- android:background="@color/status_playing"
- android:gravity="center"
- android:padding="2dp"
- android:src="@drawable/av_play_dark"/>
-
<TextView
android:id="@+id/txtvPublished"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorTertiary"
@@ -57,36 +41,23 @@
android:layout_marginRight="4dp"
android:layout_marginTop="2dp"
android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
android:ellipsize="end"
android:lines="2"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small"/>
- <LinearLayout
- android:layout_width="0dp"
+ <TextView
+ android:id="@+id/txtvSize"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
android:layout_alignParentRight="true"
- android:layout_toRightOf="@id/imgvImage"
- android:orientation="vertical">
-
- <RelativeLayout
- android:id="@+id/bottom_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <TextView
- android:id="@+id/txtvSize"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_alignParentLeft="true"
- android:textColor="?android:attr/textColorTertiary"
- android:textSize="@dimen/text_size_micro"/>
- </RelativeLayout>
- </LinearLayout>
+ android:layout_alignParentTop="true"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_micro"/>
</RelativeLayout>
<View
diff --git a/res/layout/downloadlog_item.xml b/res/layout/downloadlog_item.xml
index 7720888c6..22d669097 100644
--- a/res/layout/downloadlog_item.xml
+++ b/res/layout/downloadlog_item.xml
@@ -18,7 +18,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="8dp"
- android:textColor="?android:attr/textColorSecondary" />
+ android:textSize="@dimen/text_size_small"
+ android:textColor="?android:attr/textColorTertiary" />
<TextView
android:id="@+id/txtvTitle"
@@ -27,26 +28,43 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/txtvType"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_size_medium"
android:ellipsize="end"
android:maxLines="2" />
</RelativeLayout>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ >
<TextView
android:id="@+id/txtvDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="8dp" />
+ android:layout_marginRight="8dp"
+ android:lines="1"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_small"
+ android:layout_alignParentLeft="true"/>
<TextView
android:id="@+id/txtvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="8dp" />
+ android:lines="1"
+ android:textSize="@dimen/text_size_small"
+ android:layout_alignParentRight="true"/>
+
+ </RelativeLayout>
<TextView
android:id="@+id/txtvReason"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_micro"
android:layout_marginBottom="4dp"
android:layout_marginLeft="8dp" />
diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml
index c887d3a4f..ed85d9021 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/res/layout/feeditemlist_item.xml
@@ -97,20 +97,6 @@
android:textSize="@dimen/text_size_micro"
android:textStyle="bold"/>
- <ImageView
- android:id="@+id/statusPlaying"
- android:contentDescription="@string/status_playing_label"
- android:layout_width="@dimen/status_indicator_width"
- android:layout_height="18dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="8dp"
- android:layout_marginBottom="8dp"
- android:background="@color/status_playing"
- android:gravity="center"
- android:padding="2dp"
- android:src="@drawable/av_play_dark"/>
-
</RelativeLayout>
<View
diff --git a/res/layout/new_episodes_fragment.xml b/res/layout/new_episodes_fragment.xml
index 460fe73d0..b389d8858 100644
--- a/res/layout/new_episodes_fragment.xml
+++ b/res/layout/new_episodes_fragment.xml
@@ -8,8 +8,6 @@
<com.mobeta.android.dslv.DragSortListView
android:id="@android:id/list"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
android:scrollbarStyle="outsideOverlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/new_episodes_listitem.xml b/res/layout/new_episodes_listitem.xml
index 721b88071..481a225ae 100644
--- a/res/layout/new_episodes_listitem.xml
+++ b/res/layout/new_episodes_listitem.xml
@@ -10,7 +10,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_marginRight="16dp">
+ android:layout_marginRight="8dp">
<ImageView
android:id="@+id/imgvImage"
@@ -20,21 +20,6 @@
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"/>
- <ImageView
- android:id="@+id/statusPlaying"
- android:contentDescription="@string/status_playing_label"
- android:layout_width="@dimen/status_indicator_width"
- android:layout_height="18dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginLeft="8dp"
- android:background="@color/status_playing"
- android:gravity="center"
- android:padding="2dp"
- android:src="@drawable/av_play_dark"/>
-
<TextView
android:id="@+id/txtvPublished"
android:layout_width="0dp"
@@ -43,7 +28,7 @@
android:layout_marginRight="8dp"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
+ android:layout_alignParentRight="true"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorTertiary"
@@ -55,10 +40,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/txtvPublished"
android:layout_marginLeft="8dp"
- android:layout_marginRight="4dp"
android:layout_marginTop="2dp"
android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
+ android:layout_alignParentRight="true"
android:ellipsize="end"
android:lines="2"
android:textColor="?android:attr/textColorPrimary"
diff --git a/res/layout/queue_fragment.xml b/res/layout/queue_fragment.xml
index 1c48768a2..373975c1c 100644
--- a/res/layout/queue_fragment.xml
+++ b/res/layout/queue_fragment.xml
@@ -7,8 +7,6 @@
<com.mobeta.android.dslv.DragSortListView
android:id="@android:id/list"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
android:scrollbarStyle="outsideOverlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/queue_listitem.xml b/res/layout/queue_listitem.xml
index 5bac726f3..a2545097f 100644
--- a/res/layout/queue_listitem.xml
+++ b/res/layout/queue_listitem.xml
@@ -19,58 +19,30 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_marginRight="16dp">
+ android:layout_marginRight="8dp">
<ImageView
android:id="@+id/imgvImage"
android:contentDescription="@string/cover_label"
- android:layout_width="@dimen/thumbnail_length_itemlist"
- android:layout_height="@dimen/thumbnail_length_itemlist"
+ android:layout_width="@dimen/thumbnail_length_queue_item"
+ android:layout_height="@dimen/thumbnail_length_queue_item"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"/>
- <ImageView
- android:id="@+id/statusPlaying"
- android:contentDescription="@string/status_playing_label"
- android:layout_width="@dimen/status_indicator_width"
- android:layout_height="18dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:background="@color/status_playing"
- android:gravity="center"
- android:padding="2dp"
- android:src="@drawable/av_play_dark"/>
-
- <TextView
- android:id="@+id/txtvPublished"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
- android:ellipsize="end"
- android:maxLines="1"
- android:textColor="?android:attr/textColorTertiary"
- android:textSize="@dimen/text_size_micro"/>
-
<TextView
android:id="@+id/txtvTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvPublished"
+ android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
- android:layout_marginRight="4dp"
- android:layout_marginTop="2dp"
+ android:layout_marginTop="4dp"
+ android:layout_marginBottom="4dp"
android:layout_toRightOf="@id/imgvImage"
- android:layout_toLeftOf="@id/statusPlaying"
+ android:layout_alignParentRight="true"
android:ellipsize="end"
android:lines="2"
android:textColor="?android:attr/textColorPrimary"
- android:textSize="@dimen/text_size_small"/>
+ android:textSize="@dimen/queue_title_text_size"/>
<LinearLayout
android:layout_width="0dp"
@@ -96,16 +68,6 @@
android:layout_marginRight="8dp"
android:layout_alignParentLeft="true"/>
- <TextView
- android:id="@+id/txtvDuration"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:textColor="?android:attr/textColorTertiary"
- android:textSize="@dimen/text_size_micro"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index 08022d93a..27b4868c7 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -2,6 +2,7 @@
<resources>
<dimen name="thumbnail_length">170dp</dimen>
- <dimen name="thumbnail_length_itemlist">70dp</dimen>
-
+ <dimen name="thumbnail_length_queue_item">80dp</dimen>
+ <dimen name="thumbnail_length_downloaded_item">80dp</dimen>
+ <dimen name="queue_title_text_size">@dimen/text_size_medium</dimen>
</resources> \ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f90b25a3a..e7c9b9242 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -11,10 +11,14 @@
<dimen name="text_size_navdrawer">16sp</dimen>
<dimen name="text_size_medium">18sp</dimen>
<dimen name="text_size_large">22sp</dimen>
- <dimen name="status_indicator_width">36dp</dimen>
+ <dimen name="status_indicator_width">32dp</dimen>
<dimen name="thumbnail_length_itemlist">80dp</dimen>
+ <dimen name="thumbnail_length_queue_item">70dp</dimen>
+ <dimen name="thumbnail_length_downloaded_item">70dp</dimen>
<dimen name="thumbnail_length_onlinefeedview">110dp</dimen>
<dimen name="thumbnail_length_navlist">42dp</dimen>
<dimen name="listview_secondary_button_width">48dp</dimen>
<dimen name="drawer_width">280dp</dimen>
+ <dimen name="queue_title_text_size">@dimen/text_size_small</dimen>
+
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cf3b02148..7ba1dd827 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -102,8 +102,8 @@
<string name="skip_episode_label">Skip episode</string>
<!-- Download messages and labels -->
- <string name="download_successful">Download successful</string>
- <string name="download_failed">Download failed</string>
+ <string name="download_successful">successful</string>
+ <string name="download_failed">failed</string>
<string name="download_pending">Download pending</string>
<string name="download_running">Download running</string>
<string name="download_error_device_not_found">Storage device not found</string>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-18 04:28:48 +0000