summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/itemdescription_listitem.xml48
-rw-r--r--app/src/main/res/layout/itunes_podcast_listitem.xml8
-rw-r--r--app/src/main/res/layout/onlinefeedview_activity.xml53
-rw-r--r--app/src/main/res/layout/onlinefeedview_header.xml55
4 files changed, 77 insertions, 87 deletions
diff --git a/app/src/main/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml
index 6ed856796..c3f8c24b8 100644
--- a/app/src/main/res/layout/itemdescription_listitem.xml
+++ b/app/src/main/res/layout/itemdescription_listitem.xml
@@ -1,46 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
+<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="wrap_content"
- android:paddingTop="8dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingBottom="8dp"
- tools:background="@android:color/holo_orange_light">
+ android:orientation="vertical"
+ android:paddingHorizontal="20dp"
+ android:paddingVertical="16dp">
<TextView
android:id="@+id/txtvPubDate"
- style="@android:style/TextAppearance.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="8dp"
- android:layout_marginStart="8dp"
- android:textSize="14sp"
- android:textColor="?android:textColorSecondary"
android:ellipsize="end"
android:lines="1"
+ style="@android:style/TextAppearance.Small"
tools:text="22 Jan 2016"
tools:background="@android:color/holo_green_dark" />
<TextView
android:id="@+id/txtvTitle"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:layout_toLeftOf="@id/txtvPubDate"
- android:layout_toStartOf="@id/txtvPubDate"
- android:textSize="16sp"
- android:textColor="?android:attr/textColorPrimary"
+ android:layout_marginVertical="12dp"
android:ellipsize="end"
android:maxLines="2"
+ style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
tools:text="Feed item title"
tools:background="@android:color/holo_green_dark" />
@@ -48,22 +33,19 @@
android:id="@+id/txtvDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvTitle"
- android:textSize="14sp"
- android:textColor="?android:attr/textColorSecondary"
android:ellipsize="end"
- android:maxLines="3"
+ android:maxLines="2"
+ style="@style/AntennaPod.TextView.ListItemBody"
tools:text="Feed item description"
tools:background="@android:color/holo_green_dark" />
<Button
android:id="@+id/butPreview"
- android:layout_below="@id/txtvDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:text="@string/preview_episode"/>
+ android:layout_marginTop="8dp"
+ android:text="@string/preview_episode"
+ android:layout_gravity="end|right"
+ style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index fe53e1944..da2de457b 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
@@ -37,24 +36,23 @@
<TextView
android:id="@+id/txtvTitle"
- style="@style/AntennaPod.TextView.ListItemPrimaryTitle2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:maxLines="2"
+ style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
tools:background="@android:color/holo_green_dark"
tools:text="Podcast title" />
<TextView
android:id="@+id/txtvAuthor"
- style="android:style/TextAppearance.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="?android:attr/textColorSecondary"
android:ellipsize="middle"
android:maxLines="2"
+ style="android:style/TextAppearance.Small"
tools:text="author"
- tools:background="@android:color/holo_green_dark"/>
+ tools:background="@android:color/holo_green_dark" />
</LinearLayout>
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml
index c9ee91ead..88b87da1a 100644
--- a/app/src/main/res/layout/onlinefeedview_activity.xml
+++ b/app/src/main/res/layout/onlinefeedview_activity.xml
@@ -11,7 +11,7 @@
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="32dp"
+ android:layout_margin="24dp"
android:elevation="16dp"
app:cardCornerRadius="8dp">
@@ -35,13 +35,14 @@
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/feeditemlist_header_height"
+ android:layout_marginBottom="12dp"
android:background="@color/feed_image_bg">
<ImageView
android:id="@+id/backgroundImage"
android:layout_width="match_parent"
- android:layout_height="@dimen/feeditemlist_header_height"
+ android:layout_height="match_parent"
android:scaleType="centerCrop" />
<ImageView
@@ -52,10 +53,12 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_centerVertical="true"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="12dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/bg_rounded_corners"
+ android:clipToOutline="true"
android:importantForAccessibility="no"
tools:src="@tools:sample/avatars" />
@@ -64,12 +67,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_marginTop="16dp"
- android:layout_marginRight="16dp"
- android:layout_marginEnd="16dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginRight="24dp"
+ android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/coverImage"
@@ -79,7 +82,8 @@
android:shadowColor="@color/black"
android:shadowRadius="3"
android:textColor="@color/white"
- style="@style/AntennaPod.TextView.Heading"
+ android:textSize="20sp"
+ android:textFontWeight="800"
tools:text="Podcast title" />
<TextView
@@ -104,21 +108,28 @@
android:textSize="@dimen/text_size_small"
tools:text="Podcast author" />
+ <ImageButton
+ android:id="@+id/closeButton"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:layout_alignParentRight="true"
+ android:layout_marginTop="12dp"
+ android:layout_marginRight="12dp"
+ android:background="@android:color/transparent"
+ android:src="@drawable/ic_close_white" />
+
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginBottom="16dp"
+ android:paddingHorizontal="16dp"
android:orientation="vertical">
<Spinner
android:id="@+id/alternate_urls_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
android:dropDownWidth="match_parent"
android:padding="8dp"
android:textColor="?android:attr/textColorPrimary"
@@ -128,10 +139,7 @@
android:id="@+id/subscribeButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginTop="16dp"
- android:layout_marginEnd="8dp"
- android:focusable="false"
+ android:layout_marginTop="4dp"
android:text="@string/subscribe_label" />
<CheckBox
@@ -139,8 +147,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
- android:focusable="false"
android:checked="true"
+ android:layout_marginTop="8dp"
android:text="@string/auto_download_label"
android:visibility="gone"
tools:visibility="visible" />
@@ -149,8 +157,7 @@
android:id="@+id/stopPreviewButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:focusable="false"
+ android:layout_marginTop="4dp"
android:text="@string/stop_preview"
android:visibility="gone"
tools:visibility="visible" />
@@ -160,7 +167,9 @@
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:paddingTop="16dp"
+ android:clipToPadding="false" />
</LinearLayout>
diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml
index aa690e142..6d740c772 100644
--- a/app/src/main/res/layout/onlinefeedview_header.xml
+++ b/app/src/main/res/layout/onlinefeedview_header.xml
@@ -1,35 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:layout_marginBottom="8dp">
+
+ <TextView
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
+ android:layout_marginBottom="8dp"
+ android:text="@string/description_label"
+ style="@style/TextAppearance.Material3.TitleMedium" />
<TextView
- android:id="@+id/txtvDescription"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginRight="16dp"
- android:layout_marginEnd="16dp"
- android:ellipsize="end"
- android:textColor="?android:attr/textColorSecondary"
- android:textSize="@dimen/text_size_small"
- tools:text="@string/design_time_lorem_ipsum"
- tools:background="@android:color/holo_green_dark"/>
+ android:id="@+id/txtvDescription"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:ellipsize="end"
+ android:lineHeight="20dp"
+ style="@style/AntennaPod.TextView.ListItemBody"
+ tools:text="@string/design_time_lorem_ipsum" />
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp"
- android:layout_marginRight="16dp"
- android:layout_marginEnd="16dp"
- android:textSize="@dimen/text_size_medium"
- android:text="@string/episodes_label"/>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:text="@string/episodes_label"
+ style="@style/TextAppearance.Material3.TitleMedium" />
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 22:09:14 +0000