diff options
| author | ByteHamster <info@bytehamster.com> | 2023-02-20 23:19:34 +0100 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2023-02-20 23:19:34 +0100 |
| commit | 2b22d4b6977f9a22abfd4bc2d269c79834551ee2 (patch) | |
| tree | 58582dd73eafe2c536aa2c842b5609ded3735040 /app/src/main/res | |
| parent | e58e2d063948fe52e5fed1536548b6c4220be8fb (diff) | |
| parent | 2833812238c19d16d464c337adeecc575ff484ba (diff) | |
| download | AntennaPod-2b22d4b6977f9a22abfd4bc2d269c79834551ee2.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/audioplayer_fragment.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/scrollable_dialog.xml | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index a9964089c..496875a5f 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:elevation="8dp" + android:outlineProvider="none" tools:layout_height="@dimen/external_player_height" /> <RelativeLayout diff --git a/app/src/main/res/layout/scrollable_dialog.xml b/app/src/main/res/layout/scrollable_dialog.xml new file mode 100644 index 000000000..29b84ee4b --- /dev/null +++ b/app/src/main/res/layout/scrollable_dialog.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="end" + android:orientation="horizontal" + android:paddingHorizontal="32dp" + android:paddingVertical="16dp" + style="?android:attr/buttonBarStyle"> + + <Button + android:id="@+id/negativeButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/buttonBarButtonStyle" /> + + <Button + android:id="@+id/positiveButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/buttonBarButtonStyle" /> + + </LinearLayout> + +</LinearLayout> |