Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand app below system windows

Browse Source
This commit is contained in:
ByteHamster 2022-08-07 11:25:51 +02:00
parent e5d2d1b6ef
commit a524b81060
19 changed files with 342 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -19,6 +19,9 @@ import android.widget.EditText;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.appbar.MaterialToolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
@ -104,6 +107,7 @@ public class MainActivity extends CastEnabledActivity {
if (savedInstanceState != null) { if (savedInstanceState != null) {
ensureGeneratedViewIdGreaterThan(savedInstanceState.getInt(KEY_GENERATED_VIEW_ID, 0)); ensureGeneratedViewIdGreaterThan(savedInstanceState.getInt(KEY_GENERATED_VIEW_ID, 0));
} }
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.main); setContentView(R.layout.main);
recycledViewPool.setMaxRecycledViews(R.id.view_type_episode_item, 25); recycledViewPool.setMaxRecycledViews(R.id.view_type_episode_item, 25);
@ -144,11 +148,17 @@ public class MainActivity extends CastEnabledActivity {
PreferenceUpgrader.checkUpgrades(this); PreferenceUpgrader.checkUpgrades(this);
View bottomSheet = findViewById(R.id.audioplayerFragment); View bottomSheet = findViewById(R.id.audioplayerFragment);
sheetBehavior = (LockableBottomSheetBehavior) BottomSheetBehavior.from(bottomSheet); sheetBehavior = (LockableBottomSheetBehavior) BottomSheetBehavior.from(bottomSheet);
sheetBehavior.setPeekHeight((int) getResources().getDimension(R.dimen.external_player_height));
sheetBehavior.setHideable(false); sheetBehavior.setHideable(false);
sheetBehavior.setBottomSheetCallback(bottomSheetCallback); sheetBehavior.setBottomSheetCallback(bottomSheetCallback);
} }
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
int playerHeight = (int) getResources().getDimension(R.dimen.external_player_height);
sheetBehavior.setPeekHeight(playerHeight + getBottomInset());
}
/** /**
* View.generateViewId stores the current ID in a static variable. * View.generateViewId stores the current ID in a static variable.
* When the process is killed, the variable gets reset. * When the process is killed, the variable gets reset.
@ -238,6 +248,11 @@ public class MainActivity extends CastEnabledActivity {
return sheetBehavior; return sheetBehavior;
} }
private int getBottomInset() {
WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(getWindow().getDecorView());
return insets == null ? 0 : insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
}
public void setPlayerVisible(boolean visible) { public void setPlayerVisible(boolean visible) {
getBottomSheet().setLocked(!visible); getBottomSheet().setLocked(!visible);
if (visible) { if (visible) {
@ -247,7 +262,8 @@ public class MainActivity extends CastEnabledActivity {
} }
FragmentContainerView mainView = findViewById(R.id.main_view); FragmentContainerView mainView = findViewById(R.id.main_view);
ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mainView.getLayoutParams(); ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mainView.getLayoutParams();
params.setMargins(0, 0, 0, visible ? (int) getResources().getDimension(R.dimen.external_player_height) : 0); int externalPlayerHeight = (int) getResources().getDimension(R.dimen.external_player_height);
params.setMargins(0, 0, 0, getBottomInset() + (visible ? externalPlayerHeight : 0));
mainView.setLayoutParams(params); mainView.setLayoutParams(params);
findViewById(R.id.audioplayerFragment).setVisibility(visible ? View.VISIBLE : View.GONE); findViewById(R.id.audioplayerFragment).setVisibility(visible ? View.VISIBLE : View.GONE);
} }

1
app/src/main/res/layout/addfeed.xml
View File

@ -4,6 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar

473
app/src/main/res/layout/audioplayer_fragment.xml
View File

@ -1,276 +1,283 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.MaterialToolbar
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 <androidx.fragment.app.FragmentContainerView
android:id="@+id/playerFragment" android:id="@+id/playerFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_gravity="top"
android:background="?attr/background_elevated" android:background="?attr/background_elevated"
android:elevation="8dp" android:elevation="8dp"
tools:layout_height="@dimen/external_player_height" /> tools:layout_height="@dimen/external_player_height" />
<androidx.viewpager2.widget.ViewPager2 <RelativeLayout
android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_above="@id/playtime_layout" android:fitsSystemWindows="true">
android:layout_below="@id/toolbar"
android:layout_marginBottom="12dp"
android:foreground="?android:windowContentOverlay"
android:orientation="vertical" />
<ImageView <com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent" android:id="@+id/toolbar"
android:layout_height="8dp" android:layout_width="match_parent"
android:layout_alignBottom="@id/pager" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:layout_alignParentTop="true"
app:srcCompat="@drawable/bg_gradient" android:minHeight="?attr/actionBarSize"
app:tint="?android:attr/windowBackground" /> android:theme="?attr/actionBarTheme"
app:navigationContentDescription="@string/toolbar_back_button_content_description"
app:navigationIcon="@drawable/ic_arrow_down" />
<androidx.cardview.widget.CardView <androidx.viewpager2.widget.ViewPager2
android:id="@+id/cardViewSeek" android:id="@+id/pager"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_alignBottom="@+id/pager" android:layout_above="@id/playtime_layout"
android:layout_centerHorizontal="true" android:layout_below="@id/toolbar"
android:layout_marginLeft="16dp" android:layout_marginBottom="12dp"
android:layout_marginRight="16dp" android:foreground="?android:windowContentOverlay"
android:layout_marginBottom="12dp" android:orientation="vertical" />
android:alpha="0"
app:cardBackgroundColor="?attr/seek_background"
app:cardCornerRadius="8dp"
app:cardElevation="0dp"
tools:alpha="1">
<TextView <ImageView
android:id="@+id/txtvSeek" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_alignBottom="@+id/pager"
android:paddingLeft="24dp" android:layout_centerHorizontal="true"
android:paddingTop="4dp" android:layout_marginLeft="16dp"
android:paddingRight="24dp" android:layout_marginRight="16dp"
android:paddingBottom="4dp" android:layout_marginBottom="12dp"
android:textColor="@color/white" android:alpha="0"
android:textSize="16sp" app:cardBackgroundColor="?attr/seek_background"
tools:text="1:06:29" /> app:cardCornerRadius="8dp"
app:cardElevation="0dp"
tools:alpha="1">
</androidx.cardview.widget.CardView> <TextView
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" />
<LinearLayout </androidx.cardview.widget.CardView>
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 <LinearLayout
android:id="@+id/sbPosition" android:id="@+id/playtime_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_alignParentBottom="true"
android:layout_marginRight="8dp" android:layoutDirection="ltr"
android:clickable="true" android:orientation="vertical">
android:max="500"
tools:progress="100" />
<RelativeLayout <de.danoeh.antennapod.view.ChapterSeekBar
android:layout_width="match_parent" android:id="@+id/sbPosition"
android:layout_height="wrap_content" android:layout_width="match_parent"
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_height="wrap_content"
android:layout_alignParentStart="true" android:layout_marginLeft="8dp"
android:layout_alignParentLeft="true" android:layout_marginRight="8dp"
android:layout_marginStart="16dp" android:clickable="true"
android:layout_marginLeft="16dp" android:max="500"
android:text="@string/position_default_label" tools:progress="100" />
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_micro" />
<TextView <RelativeLayout
android:id="@+id/txtvLength" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_marginTop="4dp"
android:layout_alignParentRight="true" android:layout_marginBottom="4dp"
android:layout_marginEnd="16dp" android:paddingLeft="8dp"
android:layout_marginRight="16dp" android:paddingRight="8dp">
android:background="?android:attr/selectableItemBackground"
android:text="@string/position_default_label"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_micro" />
</RelativeLayout> <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" />
<RelativeLayout <TextView
android:id="@+id/player_control" android:id="@+id/txtvLength"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dp"> 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" />
<de.danoeh.antennapod.view.PlayButton </RelativeLayout>
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 <RelativeLayout
android:layout_width="@dimen/audioplayer_playercontrols_length_big" android:id="@+id/player_control"
android:layout_height="@dimen/audioplayer_playercontrols_length_big" android:layout_width="match_parent"
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
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_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_height="wrap_content"
android:layout_below="@id/butRev" android:layout_marginBottom="24dp">
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 <de.danoeh.antennapod.view.PlayButton
android:id="@+id/butPlaybackSpeed" android:id="@+id/butPlay"
android:layout_width="@dimen/audioplayer_playercontrols_length" android:layout_width="@dimen/audioplayer_playercontrols_length_big"
android:layout_height="@dimen/audioplayer_playercontrols_length" android:layout_height="@dimen/audioplayer_playercontrols_length_big"
android:layout_centerVertical="true" android:layout_centerHorizontal="true"
android:layout_toStartOf="@id/butRev" android:layout_centerVertical="true"
android:layout_toLeftOf="@id/butRev" android:layout_marginStart="@dimen/audioplayer_playercontrols_margin"
android:background="?attr/selectableItemBackgroundBorderless" android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin"
android:contentDescription="@string/playback_speed" android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin"
app:foregroundColor="?attr/action_icon_color" android:layout_marginRight="@dimen/audioplayer_playercontrols_margin"
tools:srcCompat="@drawable/ic_playback_speed" /> 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 <de.danoeh.antennapod.ui.common.CircularProgressBar
android:id="@+id/txtvPlaybackSpeed" android:layout_width="@dimen/audioplayer_playercontrols_length_big"
android:layout_width="wrap_content" android:layout_height="@dimen/audioplayer_playercontrols_length_big"
android:layout_height="wrap_content" android:layout_centerHorizontal="true"
android:layout_below="@id/butPlaybackSpeed" android:layout_centerVertical="true"
android:layout_alignStart="@id/butPlaybackSpeed" android:layout_marginStart="16dp"
android:layout_alignLeft="@id/butPlaybackSpeed" android:layout_marginLeft="16dp"
android:layout_alignEnd="@id/butPlaybackSpeed" android:layout_marginEnd="16dp"
android:layout_alignRight="@id/butPlaybackSpeed" android:layout_marginRight="16dp"
android:clickable="false" app:foregroundColor="?attr/action_icon_color" />
android:gravity="center"
android:text="1.00"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp" />
<ImageButton <ProgressBar
android:id="@+id/butFF" android:id="@+id/progLoading"
android:layout_width="@dimen/audioplayer_playercontrols_length" android:layout_width="@dimen/audioplayer_playercontrols_length_big"
android:layout_height="@dimen/audioplayer_playercontrols_length" android:layout_height="@dimen/audioplayer_playercontrols_length_big"
android:layout_centerVertical="true" android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/audioplayer_playercontrols_margin" android:layout_centerVertical="true"
android:layout_marginRight="@dimen/audioplayer_playercontrols_margin" android:visibility="gone"
android:layout_toEndOf="@id/butPlay" style="?android:attr/progressBarStyle" />
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 <ImageButton
android:id="@+id/txtvFF" android:id="@+id/butRev"
android:layout_width="wrap_content" android:layout_width="@dimen/audioplayer_playercontrols_length"
android:layout_height="wrap_content" android:layout_height="@dimen/audioplayer_playercontrols_length"
android:layout_below="@id/butFF" android:layout_centerVertical="true"
android:layout_alignStart="@id/butFF" android:layout_marginStart="@dimen/audioplayer_playercontrols_margin"
android:layout_alignLeft="@id/butFF" android:layout_marginLeft="@dimen/audioplayer_playercontrols_margin"
android:layout_alignEnd="@id/butFF" android:layout_toStartOf="@id/butPlay"
android:layout_alignRight="@id/butFF" android:layout_toLeftOf="@id/butPlay"
android:clickable="false" android:background="?attr/selectableItemBackgroundBorderless"
android:gravity="center" android:contentDescription="@string/rewind_label"
android:text="30" android:scaleType="fitCenter"
android:textColor="?android:attr/textColorSecondary" app:srcCompat="@drawable/ic_fast_rewind"
android:textSize="12sp" /> tools:srcCompat="@drawable/ic_fast_rewind" />
<ImageButton <TextView
android:id="@+id/butSkip" android:id="@+id/txtvRev"
android:layout_width="@dimen/audioplayer_playercontrols_length" android:layout_width="wrap_content"
android:layout_height="@dimen/audioplayer_playercontrols_length" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_below="@id/butRev"
android:layout_toEndOf="@id/butFF" android:layout_alignStart="@id/butRev"
android:layout_toRightOf="@id/butFF" android:layout_alignLeft="@id/butRev"
android:background="?attr/selectableItemBackgroundBorderless" android:layout_alignEnd="@id/butRev"
android:contentDescription="@string/skip_episode_label" android:layout_alignRight="@id/butRev"
android:scaleType="fitCenter" android:clickable="false"
app:srcCompat="@drawable/ic_skip_48dp" android:gravity="center"
tools:srcCompat="@drawable/ic_skip_48dp" /> android:text="30"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp" />
</RelativeLayout> <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" />
</LinearLayout> <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" />
</RelativeLayout> <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" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</FrameLayout>

3
app/src/main/res/layout/episodes_list_fragment.xml
View File

@ -9,7 +9,8 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

3
app/src/main/res/layout/feed_item_list_fragment.xml
View File

@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar" android:id="@+id/appBar"

3
app/src/main/res/layout/feedinfo.xml
View File

@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar" android:id="@+id/appBar"

33
app/src/main/res/layout/feeditem_pager_fragment.xml
View File

@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent" android:id="@+id/toolbar"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize" android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme" android:minHeight="?attr/actionBarSize"
app:navigationContentDescription="@string/toolbar_back_button_content_description" android:theme="?attr/actionBarTheme"
app:navigationIcon="?homeAsUpIndicator" app:navigationContentDescription="@string/toolbar_back_button_content_description"
android:id="@+id/toolbar"/> app:navigationIcon="?homeAsUpIndicator" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>

40
app/src/main/res/layout/feedsettings.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent" android:id="@+id/toolbar"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize" android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme" android:minHeight="?attr/actionBarSize"
app:title="@string/feed_settings_label" android:theme="?attr/actionBarTheme"
app:navigationContentDescription="@string/toolbar_back_button_content_description" android:elevation="4dp"
app:navigationIcon="?homeAsUpIndicator" app:title="@string/feed_settings_label"
android:elevation="4dp" app:navigationContentDescription="@string/toolbar_back_button_content_description"
android:id="@+id/toolbar"/> app:navigationIcon="?homeAsUpIndicator" />
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:layout_width="match_parent" android:id="@+id/settings_fragment_container"
android:layout_height="0dp" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="0dp"
android:id="@+id/settings_fragment_container" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

3
app/src/main/res/layout/fragment_itunes_search.xml
View File

@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fitsSystemWindows="true">
<LinearLayout <LinearLayout
android:id="@+id/browsing" android:id="@+id/browsing"

3
app/src/main/res/layout/fragment_subscriptions.xml
View File

@ -9,7 +9,8 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

15
app/src/main/res/layout/nav_list.xml
View File

@ -1,16 +1,19 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/nav_layout" android:id="@+id/nav_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="?android:attr/windowBackground"> android:background="?android:attr/windowBackground">
<LinearLayout <LinearLayout
android:id="@+id/nav_settings" android:id="@+id/nav_settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/listitem_iconwithtext_height" android:layout_height="@dimen/listitem_iconwithtext_height"
android:fitsSystemWindows="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:contentDescription="@string/settings_label" android:contentDescription="@string/settings_label"
@ -46,6 +49,7 @@
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_navdrawer" android:textSize="@dimen/text_size_navdrawer"
tools:background="@android:color/holo_green_light" /> tools:background="@android:color/holo_green_light" />
</LinearLayout> </LinearLayout>
<View <View
@ -73,9 +77,10 @@
tools:listitem="@layout/nav_listitem" /> tools:listitem="@layout/nav_listitem" />
<ProgressBar <ProgressBar
style="?android:attr/progressBarStyle" android:id="@+id/progressBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/progressBar" android:layout_centerVertical="true"
android:layout_centerVertical="true"/> style="?android:attr/progressBarStyle" />
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/queue_fragment.xml
View File

@ -10,6 +10,7 @@
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:elevation="0dp"> android:elevation="0dp">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar

3
app/src/main/res/layout/search_fragment.xml
View File

@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"

7
app/src/main/res/layout/share_episode_dialog.xml
View File

@ -41,11 +41,10 @@
</RadioGroup> </RadioGroup>
<View <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginVertical="8dp" android:layout_marginVertical="8dp" />
android:background="?attr/background_elevated" />
<CheckBox <CheckBox
android:id="@+id/share_position_checkbox" android:id="@+id/share_position_checkbox"

10
app/src/main/res/layout/swipeactions_row.xml
View File

@ -45,10 +45,9 @@
</RelativeLayout> </RelativeLayout>
<View <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content" />
android:background="?attr/background_elevated" />
<LinearLayout <LinearLayout
android:id="@+id/previewContainer" android:id="@+id/previewContainer"
@ -77,9 +76,8 @@
</LinearLayout> </LinearLayout>
<View <com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content" />
android:background="?attr/background_elevated" />
</LinearLayout> </LinearLayout>

20
core/src/main/res/values-v21/styles.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
<item name="android:windowContentTransitions">true</item>
<!-- To make icons visible -->
<item name="android:statusBarColor">@color/grey600</item>
<item name="android:navigationBarColor">@color/grey600</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_darktheme</item>
<item name="android:navigationBarColor">@color/background_darktheme</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
<item name="android:statusBarColor">@color/black</item>
<item name="android:navigationBarColor">@color/black</item>
</style>
</resources>

21
core/src/main/res/values-v23/styles.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_light</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@color/grey600</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_darktheme</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">@color/background_darktheme</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
<item name="android:statusBarColor">@color/black</item>
<item name="android:navigationBarColor">@color/black</item>
</style>
</resources>

11
core/src/main/res/values-v27/styles.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_light</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@color/background_light</item>
<item name="android:navigationBarDividerColor">@color/navigation_bar_divider_light</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
</resources>

15
core/src/main/res/values/styles.xml
View File

@ -15,6 +15,7 @@
<item name="colorPrimaryContainer">@color/accent_light</item> <item name="colorPrimaryContainer">@color/accent_light</item>
<item name="colorOnPrimaryContainer">@color/white</item> <item name="colorOnPrimaryContainer">@color/white</item>
<item name="android:windowBackground">@color/background_light</item> <item name="android:windowBackground">@color/background_light</item>
<item name="colorSurface">@color/background_light</item>
<item name="background_color">@color/background_light</item> <item name="background_color">@color/background_light</item>
<item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Light</item> <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Light</item>
<item name="background_elevated">@color/background_elevated_light</item> <item name="background_elevated">@color/background_elevated_light</item>
@ -36,6 +37,12 @@
<item name="icon_purple">#5F1984</item> <item name="icon_purple">#5F1984</item>
<item name="icon_gray">#25365A</item> <item name="icon_gray">#25365A</item>
<item name="android:splitMotionEvents">false</item> <item name="android:splitMotionEvents">false</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
</style> </style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@ -51,6 +58,7 @@
<item name="colorPrimaryContainer">@color/accent_dark</item> <item name="colorPrimaryContainer">@color/accent_dark</item>
<item name="colorOnPrimaryContainer">@color/black</item> <item name="colorOnPrimaryContainer">@color/black</item>
<item name="android:windowBackground">@color/background_darktheme</item> <item name="android:windowBackground">@color/background_darktheme</item>
<item name="colorSurface">@color/background_darktheme</item>
<item name="background_color">@color/background_darktheme</item> <item name="background_color">@color/background_darktheme</item>
<item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Dark</item> <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar.Dark</item>
<item name="background_elevated">@color/background_elevated_darktheme</item> <item name="background_elevated">@color/background_elevated_darktheme</item>
@ -74,6 +82,12 @@
<item name="icon_purple">#AA55D8</item> <item name="icon_purple">#AA55D8</item>
<item name="icon_gray">#CDD9E4</item> <item name="icon_gray">#CDD9E4</item>
<item name="android:splitMotionEvents">false</item> <item name="android:splitMotionEvents">false</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
</style> </style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@ -89,6 +103,7 @@
<item name="android:color">@color/white</item> <item name="android:color">@color/white</item>
<item name="android:colorBackground">@color/black</item> <item name="android:colorBackground">@color/black</item>
<item name="android:windowBackground">@color/black</item> <item name="android:windowBackground">@color/black</item>
<item name="colorSurface">@color/black</item>
<item name="background_color">@color/black</item> <item name="background_color">@color/black</item>
<item name="android:actionBarStyle">@color/black</item> <item name="android:actionBarStyle">@color/black</item>
<item name="background_elevated">@color/black</item> <item name="background_elevated">@color/black</item>