diff options
Diffstat (limited to 'app/src/main/res/layout')
21 files changed, 457 insertions, 470 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 8e2fb99fa..0b6ede087 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -4,9 +4,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:orientation="vertical"> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -20,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - app:cardCornerRadius="4dp" + app:cardCornerRadius="8dp" app:cardElevation="4dp"> <LinearLayout diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index 2008a8f33..9b1650a76 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -1,276 +1,283 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:navigationContentDescription="@string/toolbar_back_button_content_description" - app:navigationIcon="@drawable/ic_arrow_down" /> - <androidx.fragment.app.FragmentContainerView android:id="@+id/playerFragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" + android:layout_gravity="top" android:background="?attr/background_elevated" android:elevation="8dp" tools:layout_height="@dimen/external_player_height" /> - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/pager" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_above="@id/playtime_layout" - android:layout_below="@id/toolbar" - android:layout_marginBottom="12dp" - android:foreground="?android:windowContentOverlay" - android:orientation="vertical" /> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - <ImageView - android:layout_width="match_parent" - android:layout_height="8dp" - android:layout_alignBottom="@id/pager" - android:importantForAccessibility="no" - app:srcCompat="@drawable/bg_gradient" - app:tint="?android:attr/windowBackground" /> - - <androidx.cardview.widget.CardView - android:id="@+id/cardViewSeek" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/pager" - android:layout_centerHorizontal="true" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginBottom="12dp" - android:alpha="0" - app:cardBackgroundColor="?attr/seek_background" - app:cardCornerRadius="8dp" - app:cardElevation="0dp" - tools:alpha="1"> - - <TextView - android:id="@+id/txtvSeek" - android:layout_width="wrap_content" + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" - android:paddingLeft="24dp" - android:paddingTop="4dp" - android:paddingRight="24dp" - android:paddingBottom="4dp" - android:textColor="@color/white" - android:textSize="16sp" - tools:text="1:06:29" /> + android:layout_alignParentTop="true" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:navigationContentDescription="@string/toolbar_back_button_content_description" + app:navigationIcon="@drawable/ic_arrow_down" /> - </androidx.cardview.widget.CardView> - - <LinearLayout - android:id="@+id/playtime_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layoutDirection="ltr" - android:orientation="vertical"> - - <de.danoeh.antennapod.view.ChapterSeekBar - android:id="@+id/sbPosition" + <androidx.viewpager2.widget.ViewPager2 + android:id="@+id/pager" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:clickable="true" - android:max="500" - tools:progress="100" /> + android:layout_height="0dp" + android:layout_above="@id/playtime_layout" + android:layout_below="@id/toolbar" + android:layout_marginBottom="12dp" + android:foreground="?android:windowContentOverlay" + android:orientation="vertical" /> - <RelativeLayout + <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:paddingLeft="8dp" - android:paddingRight="8dp"> + android:layout_height="8dp" + android:layout_alignBottom="@id/pager" + android:importantForAccessibility="no" + app:srcCompat="@drawable/bg_gradient" + app:tint="?android:attr/windowBackground" /> - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> + <androidx.cardview.widget.CardView + android:id="@+id/cardViewSeek" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/pager" + android:layout_centerHorizontal="true" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginBottom="12dp" + android:alpha="0" + app:cardBackgroundColor="?attr/seek_background" + app:cardCornerRadius="8dp" + app:cardElevation="0dp" + tools:alpha="1"> <TextView - android:id="@+id/txtvLength" + android:id="@+id/txtvSeek" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" - android:background="?android:attr/selectableItemBackground" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> + android:gravity="center" + android:paddingLeft="24dp" + android:paddingTop="4dp" + android:paddingRight="24dp" + android:paddingBottom="4dp" + android:textColor="@color/white" + android:textSize="16sp" + tools:text="1:06:29" /> - </RelativeLayout> + </androidx.cardview.widget.CardView> - <RelativeLayout - android:id="@+id/player_control" + <LinearLayout + android:id="@+id/playtime_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="24dp"> + android:layout_alignParentBottom="true" + android:layoutDirection="ltr" + android:orientation="vertical"> - <de.danoeh.antennapod.view.PlayButton - android:id="@+id/butPlay" - android:layout_width="@dimen/audioplayer_playercontrols_length_big" - android:layout_height="@dimen/audioplayer_playercontrols_length_big" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" - android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin" - android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" - android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/pause_label" - android:padding="8dp" - android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_play_48dp" - tools:srcCompat="@drawable/ic_play_48dp" /> + <de.danoeh.antennapod.view.ChapterSeekBar + android:id="@+id/sbPosition" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:clickable="true" + android:max="500" + tools:progress="100" /> - <de.danoeh.antennapod.ui.common.CircularProgressBar - android:layout_width="@dimen/audioplayer_playercontrols_length_big" - android:layout_height="@dimen/audioplayer_playercontrols_length_big" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" - android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" - app:foregroundColor="?attr/action_icon_color" /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:paddingLeft="8dp" + android:paddingRight="8dp"> - <ProgressBar - android:id="@+id/progLoading" - android:layout_width="@dimen/audioplayer_playercontrols_length_big" - android:layout_height="@dimen/audioplayer_playercontrols_length_big" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:visibility="gone" - style="?android:attr/progressBarStyle" /> + <TextView + android:id="@+id/txtvPosition" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_marginStart="16dp" + android:layout_marginLeft="16dp" + android:text="@string/position_default_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_micro" /> - <ImageButton - android:id="@+id/butRev" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_centerVertical="true" - android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" - android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin" - android:layout_toStartOf="@id/butPlay" - android:layout_toLeftOf="@id/butPlay" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/rewind_label" - android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_fast_rewind" - tools:srcCompat="@drawable/ic_fast_rewind" /> + <TextView + android:id="@+id/txtvLength" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_marginEnd="16dp" + android:layout_marginRight="16dp" + android:background="?android:attr/selectableItemBackground" + android:text="@string/position_default_label" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_micro" /> - <TextView - android:id="@+id/txtvRev" - android:layout_width="wrap_content" + </RelativeLayout> + + <RelativeLayout + android:id="@+id/player_control" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butRev" - android:layout_alignStart="@id/butRev" - android:layout_alignLeft="@id/butRev" - android:layout_alignEnd="@id/butRev" - android:layout_alignRight="@id/butRev" - android:clickable="false" - android:gravity="center" - android:text="30" - android:textColor="?android:attr/textColorSecondary" - android:textSize="12sp" /> + android:layout_marginBottom="24dp"> - <de.danoeh.antennapod.ui.common.PlaybackSpeedIndicatorView - android:id="@+id/butPlaybackSpeed" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_centerVertical="true" - android:layout_toStartOf="@id/butRev" - android:layout_toLeftOf="@id/butRev" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/playback_speed" - app:foregroundColor="?attr/action_icon_color" - tools:srcCompat="@drawable/ic_playback_speed" /> + <de.danoeh.antennapod.view.PlayButton + android:id="@+id/butPlay" + android:layout_width="@dimen/audioplayer_playercontrols_length_big" + android:layout_height="@dimen/audioplayer_playercontrols_length_big" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" + android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin" + android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" + android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/pause_label" + android:padding="8dp" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_play_48dp" + tools:srcCompat="@drawable/ic_play_48dp" /> - <TextView - android:id="@+id/txtvPlaybackSpeed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/butPlaybackSpeed" - android:layout_alignStart="@id/butPlaybackSpeed" - android:layout_alignLeft="@id/butPlaybackSpeed" - android:layout_alignEnd="@id/butPlaybackSpeed" - android:layout_alignRight="@id/butPlaybackSpeed" - android:clickable="false" - android:gravity="center" - android:text="1.00" - android:textColor="?android:attr/textColorSecondary" - android:textSize="12sp" /> + <de.danoeh.antennapod.ui.common.CircularProgressBar + android:layout_width="@dimen/audioplayer_playercontrols_length_big" + android:layout_height="@dimen/audioplayer_playercontrols_length_big" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginLeft="16dp" + android:layout_marginEnd="16dp" + android:layout_marginRight="16dp" + app:foregroundColor="?attr/action_icon_color" /> - <ImageButton - android:id="@+id/butFF" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_centerVertical="true" - android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" - android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" - android:layout_toEndOf="@id/butPlay" - android:layout_toRightOf="@id/butPlay" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/fast_forward_label" - android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_fast_forward" - tools:srcCompat="@drawable/ic_fast_forward" /> + <ProgressBar + android:id="@+id/progLoading" + android:layout_width="@dimen/audioplayer_playercontrols_length_big" + android:layout_height="@dimen/audioplayer_playercontrols_length_big" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:visibility="gone" + style="?android:attr/progressBarStyle" /> - <TextView - android:id="@+id/txtvFF" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/butFF" - android:layout_alignStart="@id/butFF" - android:layout_alignLeft="@id/butFF" - android:layout_alignEnd="@id/butFF" - android:layout_alignRight="@id/butFF" - android:clickable="false" - android:gravity="center" - android:text="30" - android:textColor="?android:attr/textColorSecondary" - android:textSize="12sp" /> + <ImageButton + android:id="@+id/butRev" + android:layout_width="@dimen/audioplayer_playercontrols_length" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" + android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin" + android:layout_toStartOf="@id/butPlay" + android:layout_toLeftOf="@id/butPlay" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/rewind_label" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_fast_rewind" + tools:srcCompat="@drawable/ic_fast_rewind" /> + + <TextView + android:id="@+id/txtvRev" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/butRev" + android:layout_alignStart="@id/butRev" + android:layout_alignLeft="@id/butRev" + android:layout_alignEnd="@id/butRev" + android:layout_alignRight="@id/butRev" + android:clickable="false" + android:gravity="center" + android:text="30" + android:textColor="?android:attr/textColorSecondary" + android:textSize="12sp" /> + + <de.danoeh.antennapod.ui.common.PlaybackSpeedIndicatorView + android:id="@+id/butPlaybackSpeed" + android:layout_width="@dimen/audioplayer_playercontrols_length" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_centerVertical="true" + android:layout_toStartOf="@id/butRev" + android:layout_toLeftOf="@id/butRev" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/playback_speed" + app:foregroundColor="?attr/action_icon_color" + tools:srcCompat="@drawable/ic_playback_speed" /> + + <TextView + android:id="@+id/txtvPlaybackSpeed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/butPlaybackSpeed" + android:layout_alignStart="@id/butPlaybackSpeed" + android:layout_alignLeft="@id/butPlaybackSpeed" + android:layout_alignEnd="@id/butPlaybackSpeed" + android:layout_alignRight="@id/butPlaybackSpeed" + android:clickable="false" + android:gravity="center" + android:text="1.00" + android:textColor="?android:attr/textColorSecondary" + android:textSize="12sp" /> + + <ImageButton + android:id="@+id/butFF" + android:layout_width="@dimen/audioplayer_playercontrols_length" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_centerVertical="true" + android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" + android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" + android:layout_toEndOf="@id/butPlay" + android:layout_toRightOf="@id/butPlay" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/fast_forward_label" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_fast_forward" + tools:srcCompat="@drawable/ic_fast_forward" /> + + <TextView + android:id="@+id/txtvFF" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/butFF" + android:layout_alignStart="@id/butFF" + android:layout_alignLeft="@id/butFF" + android:layout_alignEnd="@id/butFF" + android:layout_alignRight="@id/butFF" + android:clickable="false" + android:gravity="center" + android:text="30" + android:textColor="?android:attr/textColorSecondary" + android:textSize="12sp" /> + + <ImageButton + android:id="@+id/butSkip" + android:layout_width="@dimen/audioplayer_playercontrols_length" + android:layout_height="@dimen/audioplayer_playercontrols_length" + android:layout_centerVertical="true" + android:layout_toEndOf="@id/butFF" + android:layout_toRightOf="@id/butFF" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/skip_episode_label" + android:scaleType="fitCenter" + app:srcCompat="@drawable/ic_skip_48dp" + tools:srcCompat="@drawable/ic_skip_48dp" /> - <ImageButton - android:id="@+id/butSkip" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_centerVertical="true" - android:layout_toEndOf="@id/butFF" - android:layout_toRightOf="@id/butFF" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/skip_episode_label" - android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_skip_48dp" - tools:srcCompat="@drawable/ic_skip_48dp" /> + </RelativeLayout> - </RelativeLayout> + </LinearLayout> - </LinearLayout> + </RelativeLayout> -</RelativeLayout> +</FrameLayout> diff --git a/app/src/main/res/layout/download_log_fragment.xml b/app/src/main/res/layout/download_log_fragment.xml index eb80d3f5f..08473533b 100644 --- a/app/src/main/res/layout/download_log_fragment.xml +++ b/app/src/main/res/layout/download_log_fragment.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:minHeight="300dp"> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/episodes_list_fragment.xml b/app/src/main/res/layout/episodes_list_fragment.xml index 343d530fd..bfe7581fe 100644 --- a/app/src/main/res/layout/episodes_list_fragment.xml +++ b/app/src/main/res/layout/episodes_list_fragment.xml @@ -4,47 +4,46 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:navigationIcon="?homeAsUpIndicator" /> + android:fitsSystemWindows="true"> - <TextView - android:id="@+id/txtvInformation" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground" - android:gravity="center" - android:layout_below="@id/toolbar" - android:paddingTop="2dp" - android:paddingBottom="2dp" - android:visibility="gone" - tools:text="(i) Information" /> + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:navigationIcon="?homeAsUpIndicator" /> + + <TextView + android:id="@+id/txtvInformation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:paddingBottom="8dp" + android:text="@string/filtered_label" + android:layout_marginTop="-12dp" + android:layout_marginLeft="60dp" + android:layout_marginStart="60dp" + android:visibility="gone" + tools:visibility="visible" /> + + </com.google.android.material.appbar.AppBarLayout> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeRefresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@+id/txtvInformation"> + android:layout_below="@id/appbar"> <de.danoeh.antennapod.view.EpisodeItemListRecyclerView - android:id="@android:id/list" + android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="0dp" - android:layout_marginBottom="0dp" - android:paddingTop="@dimen/list_vertical_padding" - android:paddingBottom="@dimen/list_vertical_padding" - android:paddingHorizontal="@dimen/additional_horizontal_spacing" - tools:itemCount="13" - tools:listitem="@layout/feeditemlist_item" /> + android:paddingHorizontal="@dimen/additional_horizontal_spacing" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/app/src/main/res/layout/feed_item_list_fragment.xml b/app/src/main/res/layout/feed_item_list_fragment.xml index 2cc2b8214..043929e32 100644 --- a/app/src/main/res/layout/feed_item_list_fragment.xml +++ b/app/src/main/res/layout/feed_item_list_fragment.xml @@ -3,7 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appBar" @@ -14,8 +15,6 @@ android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/windowBackground" - app:contentScrim="?android:attr/windowBackground" app:scrimAnimationDuration="200" app:layout_scrollFlags="scroll|exitUntilCollapsed"> @@ -33,12 +32,11 @@ layout="@layout/feeditemlist_header" app:layout_collapseMode="parallax" /> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" android:layout_alignParentTop="true" app:navigationIcon="?homeAsUpIndicator" app:layout_collapseMode="pin" /> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index ac9db8fa2..af4aa2570 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -4,7 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appBar" @@ -34,7 +35,7 @@ layout="@layout/feeditemlist_header" app:layout_collapseMode="parallax" /> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/feeditem_pager_fragment.xml b/app/src/main/res/layout/feeditem_pager_fragment.xml index 690ac3bc1..604e7a703 100644 --- a/app/src/main/res/layout/feeditem_pager_fragment.xml +++ b/app/src/main/res/layout/feeditem_pager_fragment.xml @@ -1,23 +1,24 @@ <?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" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> - <androidx.appcompat.widget.Toolbar - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:navigationContentDescription="@string/toolbar_back_button_content_description" - app:navigationIcon="?homeAsUpIndicator" - android:id="@+id/toolbar"/> + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:navigationContentDescription="@string/toolbar_back_button_content_description" + app:navigationIcon="?homeAsUpIndicator" /> <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/feedsettings.xml b/app/src/main/res/layout/feedsettings.xml index df6e666eb..b9a220a02 100644 --- a/app/src/main/res/layout/feedsettings.xml +++ b/app/src/main/res/layout/feedsettings.xml @@ -1,25 +1,27 @@ <?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" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> - <androidx.appcompat.widget.Toolbar - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:title="@string/feed_settings_label" - app:navigationContentDescription="@string/toolbar_back_button_content_description" - app:navigationIcon="?homeAsUpIndicator" - android:elevation="4dp" - android:id="@+id/toolbar"/> + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + android:elevation="4dp" + app:title="@string/feed_settings_label" + app:navigationContentDescription="@string/toolbar_back_button_content_description" + app:navigationIcon="?homeAsUpIndicator" /> <androidx.fragment.app.FragmentContainerView - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:id="@+id/settings_fragment_container" /> + android:id="@+id/settings_fragment_container" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml index 7ecfc8223..a551b5db9 100644 --- a/app/src/main/res/layout/filter_dialog_row.xml +++ b/app/src/main/res/layout/filter_dialog_row.xml @@ -1,66 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<de.danoeh.antennapod.ui.common.RecursiveRadioGroup +<com.google.android.material.button.MaterialButtonToggleGroup xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="8dp" - android:orientation="horizontal"> + android:layout_height="wrap_content" + android:weightSum="2" + app:singleSelection="true"> - <androidx.cardview.widget.CardView + <Button + android:id="@+id/filterButton1" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:clipChildren="true" - android:layout_gravity="center_vertical" - app:cardCornerRadius="32dp" - app:cardElevation="0dp"> + style="?attr/materialButtonOutlinedStyle" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> - - <RadioButton - android:id="@+id/filter_dialog_radioButton1" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_marginEnd="2dp" - android:layout_marginRight="2dp" - android:layout_weight="1" - android:background="?attr/filter_dialog_button_background" - android:minHeight="40dp" - android:foreground="?android:attr/selectableItemBackground" - android:checked="false" - android:gravity="center" - android:textColor="@color/filter_dialog_button_text" - style="@style/NoButtonRadio" /> - - <RadioButton - android:id="@+id/filter_dialog_radioButton2" - android:layout_width="0dp" - android:layout_height="match_parent" - android:minHeight="40dp" - android:layout_weight="1" - android:background="?attr/filter_dialog_button_background" - android:foreground="?android:attr/selectableItemBackground" - android:checked="false" - android:gravity="center" - android:textColor="@color/filter_dialog_button_text" - style="@style/NoButtonRadio" /> - - </LinearLayout> - - </androidx.cardview.widget.CardView> - - <RadioButton - android:id="@+id/filter_dialog_clear" - android:layout_width="40dp" - android:layout_height="40dp" - android:background="@drawable/ic_filter_close" - android:foreground="?android:attr/selectableItemBackground" - android:layout_gravity="center_vertical" - android:checked="true" - style="@style/NoButtonRadio" /> + <Button + android:id="@+id/filterButton2" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + style="?attr/materialButtonOutlinedStyle" /> -</de.danoeh.antennapod.ui.common.RecursiveRadioGroup> +</com.google.android.material.button.MaterialButtonToggleGroup> diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index b20016f68..369928d1d 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <LinearLayout android:id="@+id/browsing" @@ -13,7 +14,7 @@ android:orientation="horizontal" android:layout_alignParentTop="true"> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 7bb652eb4..b19387cb0 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -4,38 +4,41 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" - app:title="@string/subscriptions_label" - app:navigationIcon="?homeAsUpIndicator" /> + android:fitsSystemWindows="true"> - <TextView - android:id="@+id/feeds_filtered_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - android:background="?android:attr/selectableItemBackground" - android:gravity="start" - android:paddingStart="8dp" - android:paddingTop="4dp" - android:paddingEnd="8dp" - android:paddingBottom="8dp" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small" /> + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:title="@string/subscriptions_label" + app:navigationIcon="?homeAsUpIndicator" /> + + <TextView + android:id="@+id/feeds_filtered_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:text="@string/filtered_label" + android:layout_marginTop="-12dp" + android:layout_marginLeft="60dp" + android:layout_marginStart="60dp" + android:background="?android:attr/selectableItemBackground" + android:visibility="gone" + tools:visibility="visible" /> + + </com.google.android.material.appbar.AppBarLayout> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeRefresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@id/feeds_filtered_message"> + android:layout_below="@id/appbar"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscriptions_grid" @@ -54,9 +57,9 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_margin="16dp" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" android:contentDescription="@string/add_feed_label" app:srcCompat="@drawable/ic_add" /> diff --git a/app/src/main/res/layout/home_fragment.xml b/app/src/main/res/layout/home_fragment.xml index 040e3df34..0c5d872b3 100644 --- a/app/src/main/res/layout/home_fragment.xml +++ b/app/src/main/res/layout/home_fragment.xml @@ -6,14 +6,20 @@ android:layout_height="match_parent" android:orientation="vertical"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:title="@string/home_label" - app:navigationIcon="?homeAsUpIndicator" /> + android:fitsSystemWindows="true" + android:elevation="0dp"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:title="@string/home_label" /> + + </com.google.android.material.appbar.AppBarLayout> <LinearLayout android:id="@+id/welcomeContainer" @@ -60,6 +66,7 @@ </LinearLayout> <androidx.core.widget.NestedScrollView + android:id="@+id/homeScrollView" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index a24ea3fba..52fde0a5f 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,16 +1,19 @@ -<?xml version='1.0' encoding='utf-8'?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<?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/nav_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:background="?android:attr/windowBackground"> <LinearLayout android:id="@+id/nav_settings" android:layout_width="match_parent" android:layout_height="@dimen/listitem_iconwithtext_height" + android:fitsSystemWindows="true" android:layout_alignParentBottom="true" android:background="?attr/selectableItemBackground" android:contentDescription="@string/settings_label" @@ -46,6 +49,7 @@ android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_navdrawer" tools:background="@android:color/holo_green_light" /> + </LinearLayout> <View @@ -73,9 +77,10 @@ tools:listitem="@layout/nav_listitem" /> <ProgressBar - style="?android:attr/progressBarStyle" + android:id="@+id/progressBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/progressBar" - android:layout_centerVertical="true"/> + android:layout_centerVertical="true" + style="?android:attr/progressBarStyle" /> + </RelativeLayout> diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml index 37b629abb..0aca5eb7d 100644 --- a/app/src/main/res/layout/nav_listitem.xml +++ b/app/src/main/res/layout/nav_listitem.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/listitem_iconwithtext_height" - android:foreground="?attr/selectableItemBackground" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginHorizontal="8dp" + android:background="@drawable/drawer_item_background"> <ImageView android:id="@+id/imgvCover" android:layout_width="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist" + android:importantForAccessibility="no" android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" @@ -21,7 +23,6 @@ android:layout_marginBottom="4dp" android:adjustViewBounds="true" android:cropToPadding="true" - android:importantForAccessibility="no" android:scaleType="centerInside" tools:src="@drawable/ic_download_black" /> diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index db7c55c85..0845044f0 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -6,40 +6,39 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" - app:title="@string/queue_label" - app:navigationIcon="?homeAsUpIndicator" /> - - <TextView - android:id="@+id/info_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - android:textSize="12sp" - android:layout_marginTop="-8dp" - android:layout_marginLeft="72dp" - android:layout_marginStart="72dp" - android:layout_marginBottom="4dp" - tools:text="12 Episodes - Time remaining: 12 hours" /> - - <View - android:id="@+id/divider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_below="@id/info_bar" - android:background="?android:attr/listDivider" /> + android:fitsSystemWindows="true" + android:elevation="0dp"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:navigationIcon="?homeAsUpIndicator" + app:title="@string/queue_label" /> + + <TextView + android:id="@+id/info_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/toolbar" + android:textSize="12sp" + android:layout_marginTop="-12dp" + android:layout_marginLeft="60dp" + android:layout_marginStart="60dp" + android:layout_marginBottom="8dp" + tools:text="12 Episodes - Time remaining: 12 hours" /> + + </com.google.android.material.appbar.AppBarLayout> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeRefresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_below="@id/divider"> + android:layout_below="@id/appbar"> <de.danoeh.antennapod.view.EpisodeItemListRecyclerView android:id="@+id/recyclerView" diff --git a/app/src/main/res/layout/quick_feed_discovery_item.xml b/app/src/main/res/layout/quick_feed_discovery_item.xml index c3a32f019..4407eb2f5 100644 --- a/app/src/main/res/layout/quick_feed_discovery_item.xml +++ b/app/src/main/res/layout/quick_feed_discovery_item.xml @@ -1,22 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="4dp" - android:clipToPadding="false"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="4dp" + android:clipToPadding="false"> <de.danoeh.antennapod.ui.common.SquareImageView - android:id="@+id/discovery_cover" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:elevation="4dp" - android:outlineProvider="bounds" - android:foreground="?android:attr/selectableItemBackground" - squareImageView:direction="width" - tools:src="@android:drawable/sym_def_app_icon"/> + android:id="@+id/discovery_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:elevation="4dp" + android:outlineProvider="background" + android:foreground="?android:attr/selectableItemBackground" + squareImageView:direction="width" + tools:src="@tools:sample/avatars" /> </LinearLayout> - diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml index 5745cf655..3fded8725 100644 --- a/app/src/main/res/layout/search_fragment.xml +++ b/app/src/main/res/layout/search_fragment.xml @@ -3,9 +3,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/share_episode_dialog.xml b/app/src/main/res/layout/share_episode_dialog.xml index 9d0a2f38d..7be941599 100644 --- a/app/src/main/res/layout/share_episode_dialog.xml +++ b/app/src/main/res/layout/share_episode_dialog.xml @@ -41,11 +41,10 @@ </RadioGroup> - <View + <com.google.android.material.divider.MaterialDivider android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_marginVertical="8dp" - android:background="?attr/background_elevated" /> + android:layout_height="wrap_content" + android:layout_marginVertical="8dp" /> <CheckBox android:id="@+id/share_position_checkbox" diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml index 5019edcfd..fc08dccf2 100644 --- a/app/src/main/res/layout/simple_list_fragment.xml +++ b/app/src/main/res/layout/simple_list_fragment.xml @@ -1,35 +1,41 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar" + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" - app:navigationIcon="?homeAsUpIndicator" /> + android:fitsSystemWindows="true"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:navigationIcon="?homeAsUpIndicator" /> + + </com.google.android.material.appbar.AppBarLayout> <de.danoeh.antennapod.view.EpisodeItemListRecyclerView android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="@dimen/additional_horizontal_spacing" - android:layout_below="@id/toolbar" /> + android:layout_below="@id/appbar" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <ProgressBar android:id="@+id/progLoading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerInParent="true" + android:layout_gravity="center" android:indeterminateOnly="true" android:visibility="gone" /> <include layout="@layout/multi_select_speed_dial" /> -</RelativeLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/subscription_selection_activity.xml b/app/src/main/res/layout/subscription_selection_activity.xml index b54e7e4a4..0331923e6 100644 --- a/app/src/main/res/layout/subscription_selection_activity.xml +++ b/app/src/main/res/layout/subscription_selection_activity.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <androidx.appcompat.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/swipeactions_row.xml b/app/src/main/res/layout/swipeactions_row.xml index df55d3f89..2e5323e1a 100644 --- a/app/src/main/res/layout/swipeactions_row.xml +++ b/app/src/main/res/layout/swipeactions_row.xml @@ -45,15 +45,15 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/background_elevated" /> + android:layout_height="wrap_content" /> <LinearLayout android:id="@+id/previewContainer" android:layout_width="match_parent" android:layout_height="76dp" + android:background="?attr/background_color" android:gravity="center" android:foreground="?attr/selectableItemBackground" android:orientation="horizontal"> @@ -76,9 +76,8 @@ </LinearLayout> - <View + <com.google.android.material.divider.MaterialDivider android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/background_elevated" /> + android:layout_height="wrap_content" /> </LinearLayout> |