diff options
Diffstat (limited to 'app/src/main/res/layout')
17 files changed, 496 insertions, 767 deletions
diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml index 8c540fcc6..325b5cec5 100644 --- a/app/src/main/res/layout/activity_widget_config.xml +++ b/app/src/main/res/layout/activity_widget_config.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + 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:layout_width="match_parent" @@ -16,91 +17,108 @@ android:id="@+id/widget_config_background" android:layout_width="match_parent" android:layout_height="match_parent" - app:srcCompat="@drawable/teaser" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + app:srcCompat="@drawable/teaser" /> <include android:id="@+id/widget_config_preview" - layout="@layout/player_widget" android:layout_width="match_parent" android:layout_height="96dp" android:layout_gravity="center" - android:layout_margin="16dp" /> + android:layout_margin="16dp" + layout="@layout/player_widget" /> + </FrameLayout> - <LinearLayout + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> + android:layout_height="wrap_content"> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:orientation="horizontal"> + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> - <TextView - android:id="@+id/textView" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/widget_opacity" - android:textSize="16sp" - android:textColor="?android:attr/textColorPrimary" /> + android:gravity="center_vertical" + android:orientation="horizontal"> - <TextView - android:id="@+id/widget_opacity_textView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="end" - android:text="100%" - android:textSize="16sp" - android:textColor="?android:attr/textColorSecondary" /> + <TextView + android:id="@+id/textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/widget_opacity" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary" /> - </LinearLayout> + <TextView + android:id="@+id/widget_opacity_textView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="end" + android:text="100%" + android:textSize="16sp" + android:textColor="?android:attr/textColorSecondary" /> - <SeekBar - android:id="@+id/widget_opacity_seekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:max="100" - android:progress="100" /> + </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/ckRewind" - android:layout_width="wrap_content" + <SeekBar + android:id="@+id/widget_opacity_seekBar" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Rewind" /> + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:max="100" + android:progress="100" /> - <CheckBox - android:id="@+id/ckFastForward" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Forward" /> + android:orientation="vertical"> + + <CheckBox + android:id="@+id/ckPlaybackSpeed" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/playback_speed" /> - <CheckBox - android:id="@+id/ckSkip" - android:layout_width="wrap_content" + <CheckBox + android:id="@+id/ckRewind" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/rewind_label" /> + + <CheckBox + android:id="@+id/ckFastForward" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/fast_forward_label" /> + + <CheckBox + android:id="@+id/ckSkip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/skip_episode_label" /> + + </LinearLayout> + + <Button + android:id="@+id/butConfirm" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="Skip" /> + android:layout_gravity="center" + android:text="@string/widget_create_button" /> + </LinearLayout> - <Button - android:id="@+id/butConfirm" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/widget_create_button" /> - </LinearLayout> + + </androidx.core.widget.NestedScrollView> </LinearLayout> diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml index 0bfa4f521..dc48006bb 100644 --- a/app/src/main/res/layout/audio_controls.xml +++ b/app/src/main/res/layout/audio_controls.xml @@ -19,31 +19,6 @@ android:visibility="gone" android:layout_marginBottom="8dp" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/playback_speed" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" /> - - <TextView - android:id="@+id/txtvPlaybackSpeed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="1.00x" /> - - </LinearLayout> - - <de.danoeh.antennapod.view.PlaybackSpeedSeekBar - android:id="@+id/speed_seek_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index 7efbd23c8..4e4ab389c 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -1,273 +1,274 @@ <?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:layout_width="match_parent" - android:layout_height="match_parent"> + 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:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - android:layout_alignParentTop="true" - app:navigationContentDescription="@string/toolbar_back_button_content_description" - app:navigationIcon="?homeAsUpIndicator" - android:id="@+id/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="?homeAsUpIndicator" /> - <FrameLayout - android:id="@+id/playerFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:background="?attr/background_elevated" - tools:layout_height="@dimen/external_player_height" - android:elevation="8dp"/> + <androidx.fragment.app.FragmentContainerView + android:id="@+id/playerFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:background="?attr/background_elevated" + android:elevation="8dp" + tools:layout_height="@dimen/external_player_height" /> <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/pager" - 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:id="@+id/pager" + 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" /> <ImageView - android:layout_width="match_parent" - android:layout_height="8dp" - android:layout_alignBottom="@id/pager" - app:srcCompat="@drawable/bg_gradient" - app:tint="?android:attr/windowBackground" - android:importantForAccessibility="no"/> + 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:alpha="0" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_alignBottom="@+id/pager" - android:layout_centerHorizontal="true" - android:layout_marginBottom="12dp" - app:cardCornerRadius="8dp" - app:cardBackgroundColor="?attr/seek_background" - app:cardElevation="0dp" - tools:alpha="1"> + 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:gravity="center" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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:id="@+id/txtvSeek" + android:layout_width="wrap_content" + 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" /> </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"> + 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" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:max="500" - tools:progress="100" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:clickable="true"/> + 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" /> <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:paddingLeft="8dp" + android:paddingRight="8dp"> <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginLeft="16dp" - android:layout_marginStart="16dp" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro"/> + 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" /> <TextView - android:id="@+id/txtvLength" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dp" - android:text="@string/position_default_label" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" - android:background="?android:attr/selectableItemBackground"/> + 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" /> </RelativeLayout> <RelativeLayout - android:id="@+id/player_control" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="24dp"> + android:id="@+id/player_control" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="24dp"> <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_marginLeft="@dimen/audioplayer_playercontrols_margin" - android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" - android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" - android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" - android:padding="8dp" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/pause_label" - app:srcCompat="@drawable/ic_play_48dp" - android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_play_48dp"/> + 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.ui.common.CircularProgressBar - android:layout_width="@dimen/audioplayer_playercontrols_length_big" - android:layout_height="@dimen/audioplayer_playercontrols_length_big" - android:layout_marginLeft="16dp" - android:layout_marginStart="16dp" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dp" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - app:foregroundColor="?attr/action_icon_color"/> + 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" /> <ProgressBar - style="?android:attr/progressBarStyle" - 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:id="@+id/progLoading" - android:visibility="gone"/> + 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" /> <ImageButton - android:id="@+id/butRev" - android:layout_width="@dimen/audioplayer_playercontrols_length" - android:layout_height="@dimen/audioplayer_playercontrols_length" - android:layout_toLeftOf="@id/butPlay" - android:layout_toStartOf="@id/butPlay" - android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin" - android:layout_marginStart="@dimen/audioplayer_playercontrols_margin" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/rewind_label" - app:srcCompat="@drawable/ic_fast_rewind" - android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_fast_rewind"/> + 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_alignLeft="@id/butRev" - android:layout_alignStart="@id/butRev" - android:layout_alignRight="@id/butRev" - android:layout_alignEnd="@id/butRev" - android:gravity="center" - android:text="30" - android:textSize="12sp" - android:textColor="?android:attr/textColorSecondary" - android:clickable="false"/> + 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_toLeftOf="@id/butRev" - android:layout_toStartOf="@id/butRev" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/playback_speed" - tools:srcCompat="@drawable/ic_playback_speed" - app:foregroundColor="?attr/action_icon_color"/> + 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_alignLeft="@id/butPlaybackSpeed" - android:layout_alignStart="@id/butPlaybackSpeed" - android:layout_alignRight="@id/butPlaybackSpeed" - android:layout_alignEnd="@id/butPlaybackSpeed" - android:gravity="center" - android:text="1.00" - android:textSize="12sp" - android:textColor="?android:attr/textColorSecondary" - android:clickable="false"/> + 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_toRightOf="@id/butPlay" - android:layout_toEndOf="@id/butPlay" - android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" - android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/fast_forward_label" - app:srcCompat="@drawable/ic_fast_forward" - android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_fast_forward"/> + 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_alignLeft="@id/butFF" - android:layout_alignStart="@id/butFF" - android:layout_alignRight="@id/butFF" - android:layout_alignEnd="@id/butFF" - android:gravity="center" - android:text="30" - android:textSize="12sp" - android:textColor="?android:attr/textColorSecondary" - android:clickable="false"/> + 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_toRightOf="@id/butFF" - android:layout_toEndOf="@id/butFF" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_skip_48dp" - android:contentDescription="@string/skip_episode_label" - tools:srcCompat="@drawable/ic_skip_48dp"/> + 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> </LinearLayout> 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 734ce64dd..2f175770f 100644 --- a/app/src/main/res/layout/feed_item_list_fragment.xml +++ b/app/src/main/res/layout/feed_item_list_fragment.xml @@ -22,19 +22,16 @@ <ImageView android:id="@+id/imgvBackground" android:layout_width="match_parent" - android:layout_height="232dp" + android:layout_height="match_parent" android:background="@color/image_readability_tint" style="@style/BigBlurryBackground" app:layout_collapseMode="parallax" app:layout_collapseParallaxMultiplier="0.6" /> <include - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:id="@+id/header" layout="@layout/feeditemlist_header" - app:layout_collapseMode="parallax" - app:layout_collapseParallaxMultiplier="0.6" /> + app:layout_collapseMode="parallax" /> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" @@ -73,6 +70,7 @@ android:visibility="gone" /> <include + android:id="@+id/more_content" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" diff --git a/app/src/main/res/layout/feed_refresh_dialog.xml b/app/src/main/res/layout/feed_refresh_dialog.xml index 02b49a6c6..5a6770a80 100644 --- a/app/src/main/res/layout/feed_refresh_dialog.xml +++ b/app/src/main/res/layout/feed_refresh_dialog.xml @@ -10,7 +10,7 @@ android:id="@+id/intervalRadioButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/feed_refresh_interval"/> + android:text="@string/feed_refresh_interval" /> <Spinner android:id="@+id/spinner" @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:text="@string/feed_refresh_time" /> - <TimePicker + <de.danoeh.antennapod.view.TimePicker android:id="@+id/timePicker" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -36,4 +36,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/feed_refresh_never" /> + </RadioGroup> diff --git a/app/src/main/res/layout/feed_statistics.xml b/app/src/main/res/layout/feed_statistics.xml deleted file mode 100644 index f8f5ac555..000000000 --- a/app/src/main/res/layout/feed_statistics.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<TableLayout - 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"> - - <TableRow - android:tag="detailed"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_episodes_started_total" /> - - <TextView - android:id="@+id/startedTotalLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0 / 0" /> - - </TableRow> - - <TableRow> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_time_played" /> - - <TextView - android:id="@+id/timePlayedLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0 min" /> - - </TableRow> - - <TableRow - android:tag="detailed"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_duration_played_episodes" /> - - <TextView - android:id="@+id/durationPlayedLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0 min" /> - - </TableRow> - - <TableRow - android:tag="detailed"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_total_duration" /> - - <TextView - android:id="@+id/totalDurationLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0 min" /> - - </TableRow> - - <TableRow> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_episodes_on_device" /> - - <TextView - android:id="@+id/onDeviceLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0" /> - - </TableRow> - - <TableRow> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_space_used" /> - - <TextView - android:id="@+id/spaceUsedLabel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - tools:text="0 MB" /> - - </TableRow> - -</TableLayout> diff --git a/app/src/main/res/layout/feed_statistics_dialog.xml b/app/src/main/res/layout/feed_statistics_dialog.xml deleted file mode 100644 index fcd36fe7a..000000000 --- a/app/src/main/res/layout/feed_statistics_dialog.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.fragment.app.FragmentContainerView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/statisticsContainer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" /> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index b0a73cb97..ac9db8fa2 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -23,19 +23,16 @@ <ImageView android:id="@+id/imgvBackground" android:layout_width="match_parent" - android:layout_height="232dp" + android:layout_height="match_parent" android:background="@color/image_readability_tint" style="@style/BigBlurryBackground" app:layout_collapseMode="parallax" app:layout_collapseParallaxMultiplier="0.6" /> <include - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:id="@+id/header" layout="@layout/feeditemlist_header" - app:layout_collapseMode="parallax" - app:layout_collapseParallaxMultiplier="0.6" /> + app:layout_collapseMode="parallax" /> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 9e83051d6..6d96141a2 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -1,134 +1,181 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout - xmlns:tools="http://schemas.android.com/tools" - 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:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/headerContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" + android:layout_marginTop="?attr/actionBarSize" + android:orientation="vertical"> + + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/headerContainer" - android:paddingHorizontal="@dimen/additional_horizontal_spacing" - android:orientation="vertical"> + android:layout_height="156dp" + android:orientation="horizontal" + android:gravity="bottom"> - <LinearLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="8dp" + android:background="@color/image_readability_tint" android:orientation="horizontal" - android:padding="16dp" - android:layout_marginBottom="16dp" - android:gravity="center_vertical"> + android:layout_alignParentBottom="true"> + + <View + android:layout_width="148dp" + android:layout_height="match_parent" /> + + <ImageButton + android:id="@+id/butShowInfo" + android:layout_width="40dp" + android:layout_height="40dp" + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/show_info_label" + android:layout_marginLeft="-8dp" + android:layout_marginStart="-8dp" + android:scaleType="fitXY" + android:padding="8dp" + app:srcCompat="@drawable/ic_info_white" + tools:visibility="visible" /> + + <ImageButton + android:id="@+id/butFilter" + android:layout_width="40dp" + android:layout_height="40dp" + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/filter" + android:scaleType="fitXY" + android:padding="8dp" + app:srcCompat="@drawable/ic_filter_white" + tools:visibility="visible" /> + + <ImageButton + android:id="@+id/butShowSettings" + android:layout_width="40dp" + android:layout_height="40dp" + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/show_feed_settings_label" + android:scaleType="fitXY" + android:padding="8dp" + app:srcCompat="@drawable/ic_settings_white" + tools:visibility="visible" /> + + </LinearLayout> <ImageView + android:layout_width="12dp" + android:layout_height="12dp" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:scaleType="fitXY" + android:src="@drawable/ic_rounded_corner_left" /> + + <ImageView + android:layout_width="12dp" + android:layout_height="12dp" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:scaleType="fitXY" + android:src="@drawable/ic_rounded_corner_right" /> + + <androidx.cardview.widget.CardView + android:id="@+id/coverHolder" + android:layout_width="124dp" + android:layout_height="124dp" + android:layout_marginBottom="24dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_alignParentBottom="true" + app:cardBackgroundColor="@color/non_square_icon_background" + app:cardCornerRadius="8dp" + app:cardPreventCornerOverlap="false" + app:cardElevation="0dp"> + + <ImageView android:id="@+id/imgvCover" - android:layout_width="100dp" - android:layout_height="100dp" - android:layout_marginRight="16dp" - android:layout_marginEnd="16dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerVertical="true" android:importantForAccessibility="no" - tools:src="@tools:sample/avatars" - tools:background="@android:color/holo_green_dark"/> + tools:src="@tools:sample/avatars" /> + + </androidx.cardview.widget.CardView> <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toEndOf="@id/coverHolder" + android:layout_alignTop="@id/coverHolder" + android:layout_marginEnd="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - android:id="@+id/txtvTitle" - style="@style/AntennaPod.TextView.Heading" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="2" - android:shadowColor="@color/black" - android:shadowRadius="2" - android:textColor="@color/white" - tools:text="Podcast title" - tools:background="@android:color/holo_green_dark"/> + android:ellipsize="end" + android:maxLines="2" + android:shadowColor="@color/black" + android:shadowRadius="2" + android:textColor="@color/white" + style="@style/AntennaPod.TextView.Heading" + tools:text="Podcast title" /> <TextView - android:id="@+id/txtvAuthor" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="2" - android:shadowColor="@color/black" - android:shadowRadius="2" - android:textColor="@color/white" - android:textSize="@dimen/text_size_small" - tools:text="Podcast author" - tools:background="@android:color/holo_green_dark"/> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <ImageButton - android:id="@+id/butShowInfo" - android:layout_width="40dp" - android:layout_height="40dp" - android:background="?attr/selectableItemBackground" - android:contentDescription="@string/show_info_label" - app:srcCompat="@drawable/ic_info_white" - tools:background="@android:color/holo_green_dark" - android:layout_marginLeft="-8dp" - android:layout_marginStart="-8dp" - android:scaleType="fitXY" - android:visibility="invisible" - tools:visibility="visible" - android:padding="8dp"/> - - <ImageButton - android:id="@+id/butShowSettings" - android:layout_width="40dp" - android:layout_height="40dp" - android:background="?attr/selectableItemBackground" - android:contentDescription="@string/show_feed_settings_label" - app:srcCompat="@drawable/ic_settings_white" - tools:background="@android:color/holo_green_dark" - android:scaleType="fitXY" - android:visibility="invisible" - tools:visibility="visible" - android:padding="8dp"/> - </LinearLayout> + android:id="@+id/txtvAuthor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="2" + android:shadowColor="@color/black" + android:shadowRadius="2" + android:textColor="@color/white" + android:textSize="@dimen/text_size_small" + tools:text="Podcast author" /> </LinearLayout> - </LinearLayout> + </RelativeLayout> <com.joanzapata.iconify.widget.IconTextView - android:id="@+id/txtvFailure" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="2dp" - android:background="@color/download_failed_red" - android:gravity="center" - android:textColor="@color/white" - android:visibility="gone" - android:text="@string/refresh_failed_msg" - tools:visibility="visible" - tools:text="(!) Last refresh failed"/> + android:id="@+id/txtvFailure" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="2dp" + android:background="@color/download_failed_red" + android:gravity="center" + android:textColor="@color/white" + android:visibility="gone" + android:text="@string/refresh_failed_msg" + tools:visibility="visible" + tools:text="(!) Last refresh failed" /> <TextView - android:id="@+id/txtvInformation" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="2dp" - android:background="?android:attr/windowBackground" - android:foreground="?android:attr/selectableItemBackground" - android:visibility="gone" - android:gravity="center" - android:textColor="?attr/colorAccent" - tools:visibility="visible" - tools:text="(i) Information"/> + android:id="@+id/txtvInformation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="2dp" + android:background="?android:attr/windowBackground" + android:foreground="?android:attr/selectableItemBackground" + android:visibility="gone" + android:gravity="center" + android:textColor="?attr/colorAccent" + tools:visibility="visible" + tools:text="(i) Information" /> <TextView - android:id="@+id/txtvUpdatesDisabled" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="2dp" - android:background="?android:attr/windowBackground" - android:visibility="gone" - android:gravity="center" - android:textColor="?attr/colorAccent" - tools:visibility="visible" - tools:text="Updates disabled"/> + android:id="@+id/txtvUpdatesDisabled" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="2dp" + android:background="?android:attr/windowBackground" + android:visibility="gone" + android:gravity="center" + android:textColor="?attr/colorAccent" + tools:visibility="visible" + tools:text="Updates disabled" /> + </LinearLayout> diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml index 914525387..7ecfc8223 100644 --- a/app/src/main/res/layout/filter_dialog_row.xml +++ b/app/src/main/res/layout/filter_dialog_row.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:clipChildren="true" + android:layout_gravity="center_vertical" app:cardCornerRadius="32dp" app:cardElevation="0dp"> @@ -28,34 +29,38 @@ android:layout_marginRight="2dp" android:layout_weight="1" android:background="?attr/filter_dialog_button_background" - style="@style/NoButtonRadio" + android:minHeight="40dp" android:foreground="?android:attr/selectableItemBackground" android:checked="false" android:gravity="center" - android:textColor="@color/filter_dialog_button_text" /> + 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" - style="@style/NoButtonRadio" android:foreground="?android:attr/selectableItemBackground" android:checked="false" android:gravity="center" - android:textColor="@color/filter_dialog_button_text" /> + 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="48dp" - android:layout_height="48dp" + android:layout_width="40dp" + android:layout_height="40dp" android:background="@drawable/ic_filter_close" - style="@style/NoButtonRadio" android:foreground="?android:attr/selectableItemBackground" android:layout_gravity="center_vertical" - android:checked="true" /> + android:checked="true" + style="@style/NoButtonRadio" /> </de.danoeh.antennapod.ui.common.RecursiveRadioGroup> diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 10b560faf..c5cfb494e 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <FrameLayout + <androidx.fragment.app.FragmentContainerView android:id="@+id/main_view" android:layout_width="match_parent" android:layout_height="match_parent" @@ -25,7 +25,7 @@ android:foreground="?android:windowContentOverlay" tools:background="@android:color/holo_red_dark" /> - <FrameLayout + <androidx.fragment.app.FragmentContainerView android:id="@+id/audioplayerFragment" android:layout_width="match_parent" android:layout_height="match_parent" @@ -36,7 +36,7 @@ </androidx.coordinatorlayout.widget.CoordinatorLayout> - <FrameLayout + <androidx.fragment.app.FragmentContainerView android:id="@+id/navDrawerFragment" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml deleted file mode 100644 index ea007892a..000000000 --- a/app/src/main/res/layout/pager_fragment.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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"> - - <androidx.appcompat.widget.Toolbar - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - 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:background="?android:attr/windowBackground" - app:tabBackground="?attr/selectableItemBackground" - app:tabMode="fixed" - app:tabGravity="fill"/> - - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/viewpager" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - -</LinearLayout> diff --git a/app/src/main/res/layout/share_episode_dialog.xml b/app/src/main/res/layout/share_episode_dialog.xml index d79854972..f03899671 100644 --- a/app/src/main/res/layout/share_episode_dialog.xml +++ b/app/src/main/res/layout/share_episode_dialog.xml @@ -11,17 +11,22 @@ android:id="@+id/share_dialog_radio_group" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" android:orientation="vertical"> <RadioButton - android:id="@+id/share_link_to_episode_radio" + android:id="@+id/share_social_radio" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/share_dialog_link_to_episode" + android:text="@string/share_dialog_for_social" android:checked="true" /> <RadioButton + android:id="@+id/share_media_receiver_radio" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/share_dialog_media_address" /> + + <RadioButton android:id="@+id/share_media_file_radio" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -29,13 +34,14 @@ </RadioGroup> - <TextView + <View android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/share_dialog_include_label" /> + android:layout_height="1dp" + android:layout_marginVertical="8dp" + android:background="?android:attr/listDivider" /> <CheckBox - android:id="@+id/share_start_at_timer_dialog" + android:id="@+id/share_position_checkbox" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/share_playback_position_dialog_label" /> diff --git a/app/src/main/res/layout/statistics_activity.xml b/app/src/main/res/layout/statistics_activity.xml deleted file mode 100644 index 9d9cad438..000000000 --- a/app/src/main/res/layout/statistics_activity.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout 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:orientation="vertical"> - - <ProgressBar - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/progressBar" - android:layout_gravity="center"/> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/statistics_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:paddingBottom="@dimen/list_vertical_padding" - android:paddingTop="@dimen/list_vertical_padding" - android:scrollbarStyle="outsideOverlay" - tools:listitem="@layout/statistics_listitem"/> - -</FrameLayout> diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml deleted file mode 100644 index 5989595e1..000000000 --- a/app/src/main/res/layout/statistics_listitem.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="?android:attr/selectableItemBackground"> - - <ImageView - android:id="@+id/imgvCover" - android:importantForAccessibility="no" - android:layout_width="40dp" - android:layout_height="40dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:adjustViewBounds="true" - android:cropToPadding="true" - android:scaleType="fitCenter" - tools:src="@tools:sample/avatars" - tools:background="@android:color/holo_green_dark"/> - - <TextView - android:id="@+id/txtvTitle" - android:lines="1" - android:ellipsize="end" - android:singleLine="true" - android:textColor="?android:attr/textColorPrimary" - android:textSize="16sp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginStart="16dp" - android:layout_toRightOf="@id/imgvCover" - android:layout_toEndOf="@id/imgvCover" - android:layout_alignTop="@id/imgvCover" - android:layout_alignWithParentIfMissing="true" - tools:text="Feed title"/> - - <TextView - android:id="@+id/chip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="13sp" - android:layout_toEndOf="@+id/imgvCover" - android:layout_toRightOf="@+id/imgvCover" - android:layout_marginLeft="16dp" - android:layout_marginStart="16dp" - android:layout_below="@+id/txtvTitle" - android:layout_marginEnd="4dp" - android:layout_marginRight="4dp" - android:text="⬤" - tools:ignore="HardcodedText"/> - - <TextView - android:id="@+id/txtvValue" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:lines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="14sp" - android:layout_toEndOf="@+id/chip" - android:layout_toRightOf="@+id/chip" - android:layout_below="@+id/txtvTitle" - tools:text="23 hours"/> - -</RelativeLayout> diff --git a/app/src/main/res/layout/statistics_listitem_total.xml b/app/src/main/res/layout/statistics_listitem_total.xml deleted file mode 100644 index 628e26c1f..000000000 --- a/app/src/main/res/layout/statistics_listitem_total.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout 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:padding="16dp"> - - <de.danoeh.antennapod.view.PieChartView - android:id="@+id/pie_chart" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:layout_marginRight="8dp" - android:maxWidth="800dp" - android:minWidth="460dp" - android:layout_marginLeft="8dp" /> - - <TextView - android:id="@+id/total_description" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerHorizontal="true" - android:textAlignment="center" - android:layout_marginLeft="56dp" - android:layout_marginRight="56dp" - android:maxLines="3" - android:layout_above="@id/total_time" - android:textSize="14sp" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/total_time" - android:textColor="?android:attr/textColorPrimary" - android:gravity="center_horizontal" - android:textSize="28sp" - android:layout_marginBottom="16dp" - android:layout_alignBottom="@id/pie_chart" - tools:text="10.0 hours"/> - - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_marginTop="16dp" - android:background="?android:attr/dividerVertical" - android:layout_below="@+id/pie_chart"/> - -</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/statistics_mode_select_dialog.xml b/app/src/main/res/layout/statistics_mode_select_dialog.xml deleted file mode 100644 index 8f8e1e657..000000000 --- a/app/src/main/res/layout/statistics_mode_select_dialog.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="16dp"> - - <TextView - android:text="@string/statistics_speed_not_counted" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp"/> - - <RadioButton - android:id="@+id/statistics_mode_normal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_mode_normal"/> - - <RadioButton - android:id="@+id/statistics_mode_count_all" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/statistics_mode_count_all"/> -</RadioGroup> |