diff options
| -rw-r--r-- | app/src/main/res/layout-sw720dp/main.xml | 40 | ||||
| -rw-r--r-- | app/src/main/res/layout/main.xml | 38 |
2 files changed, 39 insertions, 39 deletions
diff --git a/app/src/main/res/layout-sw720dp/main.xml b/app/src/main/res/layout-sw720dp/main.xml index 1ce9b973f..fe5a86d24 100644 --- a/app/src/main/res/layout-sw720dp/main.xml +++ b/app/src/main/res/layout-sw720dp/main.xml @@ -1,29 +1,29 @@ <?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" - tools:viewBindingIgnore="true"> + 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" + android:orientation="horizontal" + tools:viewBindingIgnore="true"> <FrameLayout - android:id="@+id/navDrawerFragment" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:orientation="vertical" /> + 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" /> + 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"> + android:id="@+id/overview_coordinator_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/main_view" @@ -34,14 +34,14 @@ 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:elevation="8dp" android:visibility="gone" app:layout_behavior="de.danoeh.antennapod.view.LockableBottomSheetBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 4be48a271..10b560faf 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.drawerlayout.widget.DrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:ignore="InconsistentLayout" - tools:viewBindingIgnore="true"> + 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:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:ignore="InconsistentLayout" + tools:viewBindingIgnore="true"> + <!-- InconsistentLayout: Tablet layout does not have a drawer --> <!-- viewBindingIgnore: Configurations for main.xml must agree on the root element's ID --> - <androidx.coordinatorlayout.widget.CoordinatorLayout - android:id="@+id/overview_coordinator_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:id="@+id/overview_coordinator_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> <FrameLayout android:id="@+id/main_view" @@ -26,21 +26,21 @@ 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:elevation="8dp" android:visibility="gone" app:layout_behavior="de.danoeh.antennapod.view.LockableBottomSheetBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> <FrameLayout - android:id="@+id/navDrawerFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="start" - android:orientation="vertical" /> + android:id="@+id/navDrawerFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="start" + android:orientation="vertical" /> -</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file +</androidx.drawerlayout.widget.DrawerLayout> |