diff options
author | ByteHamster <info@bytehamster.com> | 2018-07-04 22:51:30 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2018-07-04 22:51:30 +0200 |
commit | dc8bd43d0692bd581b9fe6d1631b1eb1c00d09bf (patch) | |
tree | f18540bb7598914ff98276cc0d382b981b74b9ff /app/src/main/res/layout | |
parent | de21ff42d9a96a3993d2a1b2603d526fd38f16a9 (diff) | |
parent | dd4f0546e3031d80ef18288ed4113967337db2cd (diff) | |
download | AntennaPod-dc8bd43d0692bd581b9fe6d1631b1eb1c00d09bf.zip |
Merge branch 'develop' into playbackservice-improvements
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/all_episodes_fragment.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/new_episodes_listitem.xml | 25 | ||||
-rw-r--r-- | app/src/main/res/layout/secondary_action.xml | 3 |
3 files changed, 14 insertions, 20 deletions
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 5336fb8ce..7dd447bb2 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -13,7 +13,9 @@ android:scrollbarStyle="outsideOverlay" android:paddingTop="@dimen/list_vertical_padding" android:paddingBottom="@dimen/list_vertical_padding" - android:clipToPadding="false"/> + android:clipToPadding="false" + tools:listitem="@layout/new_episodes_listitem" + tools:itemCount="13"/> <ProgressBar android:id="@+id/progLoading" @@ -22,7 +24,7 @@ android:layout_gravity="center" android:indeterminateOnly="true" android:visibility="gone" - tools:visibility="visible" + tools:visibility="gone" tools:layout_width="match_parent" tools:layout_height="64dp" tools:background="@android:color/holo_red_light"/> diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index d533ee642..5e0d7451b 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:orientation="horizontal" - tools:background="@android:color/darker_gray" android:gravity="center_vertical"> <RelativeLayout @@ -42,8 +41,7 @@ android:layout_alignRight="@id/txtvPlaceholder" android:layout_alignBottom="@id/txtvPlaceholder" android:contentDescription="@string/cover_label" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + tools:src="@tools:sample/avatars" /> </RelativeLayout> @@ -54,8 +52,7 @@ android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:layout_weight="1" - tools:background="@android:color/white" > + android:layout_weight="1"> <TextView @@ -65,7 +62,8 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginLeft="8dp"/> + android:layout_marginLeft="8dp" + tools:text="@sample/episodes.json/data/status_label"/> <TextView android:id="@+id/txtvTitle" @@ -75,8 +73,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_toLeftOf="@id/statusUnread" - tools:text="Episode title" - tools:background="@android:color/holo_green_dark" /> + tools:text="@sample/episodes.json/data/title" /> <RelativeLayout android:id="@+id/bottom_bar" @@ -85,8 +82,7 @@ android:layout_below="@id/txtvTitle" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - tools:background="@android:color/holo_red_light" > + android:layout_alignParentRight="true"> <TextView android:id="@+id/txtvDuration" @@ -94,8 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - tools:text="00:42:23" - tools:background="@android:color/holo_blue_dark" /> + tools:text="@sample/episodes.json/data/duration" /> <ImageView android:id="@+id/imgvInPlaylist" @@ -105,8 +100,7 @@ android:layout_marginLeft="8dp" android:contentDescription="@string/in_queue_label" android:src="?attr/stat_playlist" - tools:src="@drawable/ic_list_grey600_24dp" - tools:background="@android:color/black" /> + tools:src="@sample/inplaylist" /> <TextView android:id="@+id/txtvPublished" @@ -116,8 +110,7 @@ android:layout_alignParentTop="true" android:layout_toLeftOf="@id/imgvInPlaylist" android:ellipsize="end" - tools:text="Jan 23" - tools:background="@android:color/holo_green_dark" /> + tools:text="@sample/episodes.json/data/published_at" /> <ProgressBar android:id="@+id/pbar_progress" diff --git a/app/src/main/res/layout/secondary_action.xml b/app/src/main/res/layout/secondary_action.xml index b2aea03f8..1f4d9e4e6 100644 --- a/app/src/main/res/layout/secondary_action.xml +++ b/app/src/main/res/layout/secondary_action.xml @@ -9,5 +9,4 @@ android:focusable="false" android:focusableInTouchMode="false" tools:ignore="ContentDescription" - tools:src="@drawable/ic_play_arrow_grey600_36dp" - tools:background="@android:color/holo_green_dark" /> + tools:src="@sample/secondaryaction" /> |