diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout-sw720dp/main.xml | 46 | ||||
-rw-r--r-- | app/src/main/res/layout/all_episodes_fragment.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/feed_item_list_fragment.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/feedinfo.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditemlist_header.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/main.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/queue_fragment.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/search_fragment.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/simple_list_fragment.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-sw600dp/integers.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-w1000dp/dimens.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-w300dp/dimens-fabspeeddial.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/values-w300dp/dimens.xml | 11 | ||||
-rw-r--r-- | app/src/main/res/values/dimens.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values/integers.xml | 4 |
15 files changed, 86 insertions, 13 deletions
diff --git a/app/src/main/res/layout-sw720dp/main.xml b/app/src/main/res/layout-sw720dp/main.xml new file mode 100644 index 000000000..79b7213e0 --- /dev/null +++ b/app/src/main/res/layout-sw720dp/main.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<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:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/navDrawerFragment" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:orientation="vertical" /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="?android:attr/listDivider" /> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + android:id="@+id/overview_coordinator_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/main_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentTop="true" + android:foreground="?android:windowContentOverlay" + tools:background="@android:color/holo_red_dark" /> + + <FrameLayout + android:elevation="8dp" + android:id="@+id/audioplayerFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/windowBackground" + android:visibility="gone" + app:layout_behavior="de.danoeh.antennapod.view.LockableBottomSheetBehavior" /> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index b67e7e277..353e4f1d0 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -23,9 +23,9 @@ android:layout_below="@+id/txtvInformation" android:layout_marginTop="0dp" android:layout_marginBottom="0dp" - android:clipToPadding="false" android:paddingTop="@dimen/list_vertical_padding" android:paddingBottom="@dimen/list_vertical_padding" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:layout_above="@id/loadingMore" tools:itemCount="13" tools:listitem="@layout/feeditemlist_item" /> 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 d6c7409a8..b995ff28f 100644 --- a/app/src/main/res/layout/feed_item_list_fragment.xml +++ b/app/src/main/res/layout/feed_item_list_fragment.xml @@ -52,6 +52,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <ProgressBar diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index fa6aac251..dd349c15c 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -62,6 +62,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/infoContainer" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:orientation="vertical"> <TextView diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index e74aeac0a..a8845ec27 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -5,6 +5,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/headerContainer" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:orientation="vertical"> <LinearLayout diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 6da514b4a..effa87684 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -5,7 +5,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:ignore="InconsistentLayout"> + <!-- InconsistentLayout: Tablet layout does not have a drawer --> <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/overview_coordinator_layout" diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 94f929d30..6a1851648 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -36,6 +36,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:layout_below="@id/divider" /> <ProgressBar diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml index 19cd87409..0bc663db1 100644 --- a/app/src/main/res/layout/search_fragment.xml +++ b/app/src/main/res/layout/search_fragment.xml @@ -36,7 +36,7 @@ android:layout_below="@id/recyclerViewFeeds" android:layout_marginTop="-4dp" android:paddingTop="12dp" - android:clipToPadding="false" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:layout_width="match_parent" android:layout_height="match_parent"/> </RelativeLayout> diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml index 368029932..989566499 100644 --- a/app/src/main/res/layout/simple_list_fragment.xml +++ b/app/src/main/res/layout/simple_list_fragment.xml @@ -14,9 +14,9 @@ <de.danoeh.antennapod.view.EpisodeItemListRecyclerView android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" android:layout_below="@id/toolbar" - android:id="@+id/recyclerView" - android:clipToPadding="false"/> + android:id="@+id/recyclerView"/> <ProgressBar android:id="@+id/progLoading" diff --git a/app/src/main/res/values-sw600dp/integers.xml b/app/src/main/res/values-sw600dp/integers.xml new file mode 100644 index 000000000..fb43e5de6 --- /dev/null +++ b/app/src/main/res/values-sw600dp/integers.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <integer name="subscriptions_default_num_of_columns">5</integer> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values-w1000dp/dimens.xml b/app/src/main/res/values-w1000dp/dimens.xml new file mode 100644 index 000000000..59ddcb5c0 --- /dev/null +++ b/app/src/main/res/values-w1000dp/dimens.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="additional_horizontal_spacing">56dp</dimen> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml b/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml deleted file mode 100644 index 882f8b4be..000000000 --- a/app/src/main/res/values-w300dp/dimens-fabspeeddial.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources xmlns:tools="http://schemas.android.com/tools"> - <!-- increase FAB speed dial label's max width if the screen is wide enough - (300dp ~ 1.875 inch, devices with 3.5-inch screens have a width of ~ 1.9in - so the setup is applicable for most phones) - --> - <dimen name="sd_label_max_width" tools:ignore="MissingDefaultResource, UnusedResources">240dp</dimen> -</resources> diff --git a/app/src/main/res/values-w300dp/dimens.xml b/app/src/main/res/values-w300dp/dimens.xml new file mode 100644 index 000000000..8adaf4c2d --- /dev/null +++ b/app/src/main/res/values-w300dp/dimens.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:tools="http://schemas.android.com/tools"> + <dimen name="additional_horizontal_spacing">0dp</dimen> + <!-- + Overwrites FAB library. + Increase FAB speed dial label's max width if the screen is wide enough + (300dp ~ 1.875 inch, devices with 3.5-inch screens have a width of ~ 1.9in + so the setup is applicable for most phones) + --> + <dimen name="sd_label_max_width" tools:ignore="MissingDefaultResource, UnusedResources">240dp</dimen> +</resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 000000000..f5f6aa0a8 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="additional_horizontal_spacing">0dp</dimen> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml new file mode 100644 index 000000000..5b45a8b1e --- /dev/null +++ b/app/src/main/res/values/integers.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <integer name="subscriptions_default_num_of_columns">3</integer> +</resources>
\ No newline at end of file |