diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 85 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_feedlistitem.xml | 9 |
2 files changed, 33 insertions, 61 deletions
diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index b1e93a195..fec7be26c 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -1,70 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> - -<android.support.percent.PercentRelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="8dp"> + + <TextView + android:id="@+id/txtvPodcastTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:ellipsize="end" + android:gravity="center" + android:maxLines="2" + android:textColor="?android:attr/textColorSecondary" + android:textIsSelectable="true" + tools:text="Podcast" /> <ImageView android:id="@+id/imgvCover" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_centerInParent="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0.5" android:contentDescription="@string/cover_label" android:scaleType="fitCenter" - app:layout_aspectRatio="100%" - app:layout_widthPercent="82%" android:transitionName="coverTransition" tools:src="@android:drawable/sym_def_app_icon" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:orientation="vertical" - android:layout_above="@id/imgvCover"> - - <TextView - android:id="@+id/txtvPodcastTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" - android:gravity="center" - android:maxLines="2" - android:ellipsize="end" - android:text="Podcast" - android:textIsSelectable="true" - android:textColor="?android:attr/textColorSecondary" /> - - </LinearLayout> - - <LinearLayout + <TextView + android:id="@+id/txtvEpisodeTitle" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:ellipsize="end" android:gravity="center" - android:orientation="vertical" - android:layout_below="@id/imgvCover"> - - <TextView - android:id="@+id/txtvEpisodeTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" - android:gravity="center" - android:maxLines="2" - android:ellipsize="end" - android:text="Episode" - android:textIsSelectable="true" - android:textColor="?android:attr/textColorPrimary" /> - - </LinearLayout> + android:maxLines="2" + android:textColor="?android:attr/textColorPrimary" + android:textIsSelectable="true" + tools:text="Episode" /> -</android.support.percent.PercentRelativeLayout> +</LinearLayout> diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index 73d07bc57..816870d1c 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -5,6 +5,10 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="@dimen/listitem_iconwithtext_height" + android:paddingLeft="@dimen/listitem_icon_leftpadding" + android:paddingStart="@dimen/listitem_icon_leftpadding" + android:paddingRight="@dimen/listitem_icon_rightpadding" + android:paddingEnd="@dimen/listitem_icon_rightpadding" tools:background="@android:color/darker_gray" android:foreground="?attr/selectableItemBackground"> @@ -21,8 +25,6 @@ android:scaleType="centerCrop" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - android:layout_marginLeft="@dimen/listitem_icon_leftpadding" - android:layout_marginStart="@dimen/listitem_icon_leftpadding" tools:src="@drawable/ic_stat_antenna_default" tools:background="@android:color/holo_green_dark"/> @@ -32,8 +34,6 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/list_vertical_padding" android:layout_marginStart="@dimen/list_vertical_padding" - android:layout_marginRight="@dimen/listitem_icon_rightpadding" - android:layout_marginEnd="@dimen/listitem_icon_rightpadding" android:lines="1" android:textColor="?android:attr/textColorTertiary" android:textSize="@dimen/text_size_navdrawer" @@ -80,5 +80,4 @@ tools:text="Navigation feed item title" tools:background="@android:color/holo_green_dark"/> - </RelativeLayout> |