diff options
author | ueen <ueli.sarnighausen@online.de> | 2021-05-14 21:06:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-14 21:06:04 +0200 |
commit | 292c9bf15136f76fea8928ed7abb2b55fb316678 (patch) | |
tree | 144f3969825b2b910e6bc0640325942bb8ed969e /app/src/main/res/layout | |
parent | fb6bd0cbaa909b6067fedef1e8a108130841f3fe (diff) | |
download | AntennaPod-292c9bf15136f76fea8928ed7abb2b55fb316678.zip |
New media player screen (#5075)
Co-authored-by: jonasburian <jonas.burian@protonmail.com>
Co-authored-by: ByteHamster <info@bytehamster.com>
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/audioplayer_fragment.xml | 15 | ||||
-rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 124 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditem_fragment.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/item_description_fragment.xml | 21 |
4 files changed, 131 insertions, 33 deletions
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index c173371d3..f801930f5 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -15,16 +15,6 @@ app:navigationIcon="?homeAsUpIndicator" android:id="@+id/toolbar"/> - <com.google.android.material.tabs.TabLayout - android:id="@+id/sliding_tabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - android:background="?android:attr/windowBackground" - app:tabBackground="?attr/selectableItemBackground" - app:tabMode="fixed" - app:tabGravity="fill"/> - <FrameLayout android:id="@+id/playerFragment" android:layout_width="match_parent" @@ -39,9 +29,10 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_above="@id/playtime_layout" - android:layout_below="@id/sliding_tabs" + android:layout_below="@id/toolbar" + android:layout_marginBottom="12dp" android:foreground="?android:windowContentOverlay" - android:layout_marginBottom="12dp"/> + android:orientation="vertical" /> <ImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 0ec46cbcd..2ac9992a3 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -10,14 +11,18 @@ android:padding="8dp" android:gravity="center"> + <Space + android:id="@+id/counterweight" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" /> + <de.danoeh.antennapod.ui.common.SquareImageView android:id="@+id/imgvCover" android:layout_width="0dp" android:layout_height="200dp" android:layout_gravity="center" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginTop="8dp" + android:layout_marginHorizontal="16dp" android:layout_weight="0" android:foreground="?attr/selectableItemBackgroundBorderless" android:importantForAccessibility="no" @@ -29,9 +34,9 @@ android:id="@+id/cover_fragment_text_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"> + android:layout_marginVertical="8dp" + android:gravity="center" + android:orientation="vertical"> <TextView android:id="@+id/txtvPodcastTitle" @@ -40,9 +45,9 @@ android:ellipsize="none" android:gravity="center_horizontal" android:maxLines="2" - android:textSize="@dimen/text_size_small" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="true" + android:textSize="@dimen/text_size_small" tools:text="Podcast" /> <TextView @@ -51,11 +56,114 @@ android:layout_height="wrap_content" android:ellipsize="none" android:gravity="center_horizontal" - android:textSize="@dimen/text_size_small" android:maxLines="2" android:textColor="?android:attr/textColorPrimary" android:textIsSelectable="true" + android:textSize="@dimen/text_size_small" tools:text="Episode" /> + + <Space + android:id="@+id/vertical_divider" + android:layout_width="match_parent" + android:layout_height="8dp" + android:visibility="gone" /> + + </LinearLayout> + + <Space + android:id="@+id/details_spacer" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" /> + + <LinearLayout + android:id="@+id/episode_details" + android:layout_width="wrap_content" + android:layout_height="36dp" + android:layout_weight="0" + android:baselineAligned="false" + android:orientation="horizontal" + android:paddingLeft="8dp" + android:paddingRight="8dp"> + + <LinearLayout + android:id="@+id/openDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" + android:background="@drawable/grey_border" + android:clickable="true" + android:focusable="true" + android:gravity="center" + android:minWidth="150dp" + android:layout_weight="1" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/description_icon" + android:layout_width="wrap_content" + android:layout_height="36dp" + android:contentDescription="@string/shownotes_contentdescription" + android:padding="2dp" + app:srcCompat="@drawable/ic_info" /> + + <TextView + android:id="@+id/shownotes_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="none" + android:layout_marginLeft="2dp" + android:layout_marginStart="2dp" + android:gravity="center_horizontal" + android:maxLines="2" + android:text="@string/shownotes_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="16sp" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/chapterButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="8dp" + android:layout_weight="1" + android:background="@drawable/grey_border" + android:clickable="true" + android:focusable="true" + android:gravity="center" + android:minWidth="150dp" + android:orientation="horizontal" + android:visibility="gone"> + + <ImageButton + android:id="@+id/butPrevChapter" + android:layout_width="36dp" + android:layout_height="36dp" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/prev_chapter" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_chapter_prev" /> + + <TextView + android:id="@+id/chapters_label" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="@string/chapters_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_navdrawer" /> + + <ImageButton + android:id="@+id/butNextChapter" + android:layout_width="36dp" + android:layout_height="36dp" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/next_chapter" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_chapter_next" /> + </LinearLayout> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index 256f45fe7..f070b4fd0 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/content_root" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -185,7 +186,8 @@ <de.danoeh.antennapod.view.NestedScrollableHost android:layout_below="@id/header" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + app:preferVertical="3"> <de.danoeh.antennapod.view.ShownotesWebView android:id="@+id/webvDescription" diff --git a/app/src/main/res/layout/item_description_fragment.xml b/app/src/main/res/layout/item_description_fragment.xml index 3766cf805..469cd4098 100644 --- a/app/src/main/res/layout/item_description_fragment.xml +++ b/app/src/main/res/layout/item_description_fragment.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<de.danoeh.antennapod.view.NestedScrollableHost xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:fillViewport="false"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:fillViewport="false" + app:preferVertical="10" + android:nestedScrollingEnabled="true"> - <de.danoeh.antennapod.view.NestedScrollableHost + <de.danoeh.antennapod.view.ShownotesWebView + android:id="@+id/webview" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent"/> - <de.danoeh.antennapod.view.ShownotesWebView - android:id="@+id/webview" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </de.danoeh.antennapod.view.NestedScrollableHost> - -</androidx.core.widget.NestedScrollView>
\ No newline at end of file +</de.danoeh.antennapod.view.NestedScrollableHost>
\ No newline at end of file |