From 066c5f6b66741e892154b52c557b5bd161a2185e Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 26 Sep 2024 16:21:42 +0530
Subject: [PATCH] Fix ui for tablets

---
 .../org/dmfs/tasks/EmptyTaskFragment.java     |   1 -
 .../main/res/layout/activity_task_twopane.xml |  65 +++++------
 .../layout/activity_task_twopane_small.xml    | 103 ++++++++++--------
 .../src/main/res/values-large-land/bools.xml  |   6 -
 .../src/main/res/values-large-land/dimens.xml |   6 -
 .../src/main/res/values-large-land/refs.xml   |  19 ----
 .../src/main/res/values-large-land/styles.xml |   9 --
 opentasks/src/main/res/values-large/bools.xml |   4 -
 .../src/main/res/values-large/dimens.xml      |   9 --
 .../src/main/res/values-large/styles.xml      |  28 -----
 .../main/res/values-sw600dp-land/bools.xml    |   6 -
 .../main/res/values-sw600dp-land/dimens.xml   |   5 -
 .../src/main/res/values-sw600dp-land/refs.xml |  18 ---
 .../main/res/values-sw600dp-land/styles.xml   |   9 --
 .../src/main/res/values-sw600dp/bools.xml     |   6 -
 .../src/main/res/values-sw600dp/dimens.xml    |  10 --
 .../src/main/res/values-sw600dp/styles.xml    |  29 -----
 .../main/res/values-sw720dp-land/dimens.xml   |   9 +-
 .../refs.xml                                  |   5 +-
 .../main/res/values-sw720dp-port/dimens.xml   |   2 -
 .../src/main/res/values-sw720dp-port/refs.xml |   3 -
 .../src/main/res/values-xlarge-port/bools.xml |   4 -
 22 files changed, 96 insertions(+), 260 deletions(-)
 delete mode 100644 opentasks/src/main/res/values-large-land/bools.xml
 delete mode 100644 opentasks/src/main/res/values-large-land/dimens.xml
 delete mode 100644 opentasks/src/main/res/values-large-land/refs.xml
 delete mode 100644 opentasks/src/main/res/values-large-land/styles.xml
 delete mode 100644 opentasks/src/main/res/values-large/bools.xml
 delete mode 100644 opentasks/src/main/res/values-large/dimens.xml
 delete mode 100644 opentasks/src/main/res/values-large/styles.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp-land/bools.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp-land/dimens.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp-land/refs.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp-land/styles.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp/bools.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp/dimens.xml
 delete mode 100644 opentasks/src/main/res/values-sw600dp/styles.xml
 rename opentasks/src/main/res/{values-xlarge-port => values-sw720dp-land}/refs.xml (77%)
 delete mode 100644 opentasks/src/main/res/values-xlarge-port/bools.xml

diff --git a/opentasks/src/main/java/org/dmfs/tasks/EmptyTaskFragment.java b/opentasks/src/main/java/org/dmfs/tasks/EmptyTaskFragment.java
index b9791348..4b93c061 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/EmptyTaskFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/EmptyTaskFragment.java
@@ -73,7 +73,6 @@ public class EmptyTaskFragment extends SupportFragment
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
         View view = inflater.inflate(R.layout.opentasks_fragment_empty_task, container, false);
-        view.findViewById(R.id.empty_task_fragment_appbar).setBackgroundColor(mColor.argb());
         return view;
     }
 }
diff --git a/opentasks/src/main/res/layout/activity_task_twopane.xml b/opentasks/src/main/res/layout/activity_task_twopane.xml
index e33c9eda..1a58bc8e 100644
--- a/opentasks/src/main/res/layout/activity_task_twopane.xml
+++ b/opentasks/src/main/res/layout/activity_task_twopane.xml
@@ -1,56 +1,47 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="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">
 
     <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/primary_dark"
-            >
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                android:layout_width="432dp"
-                android:layout_height="?attr/actionBarSize"
                 android:background="@color/primary_dark"
+                android:layout_width="@dimen/opentasks_two_pane_list_width"
+                android:layout_height="?attr/actionBarSize"
                 app:popupTheme="@style/actionBarPopUpTheme"/>
 
         <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
-                android:layout_width="432dp"
+                android:layout_width="@dimen/opentasks_two_pane_list_width"
                 android:layout_height="wrap_content"
-                android:background="?android:windowBackground"
                 app:tabGravity="fill"
                 app:tabIconTint="@color/accent"
                 app:tabIndicatorColor="@color/accent"
                 app:tabIndicatorHeight="8dp"
-                app:tabMode="fixed" />
+                app:tabBackground="@color/primary_dark"
+                app:tabMode="fixed"/>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-            android:id="@+id/task_detail_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:layout_marginStart="432dp"
-            android:backgroundTint="@color/color_default_background"
-            android:background="@drawable/opentasks_popup_background_mtrl_mult"
-            android:layout_marginLeft="432dp"
-            android:layout_marginTop="40dp"
-            android:layout_marginEnd="96dp"
-            android:layout_marginRight="96dp"
-            android:layout_marginBottom="-8dp"
-            android:elevation="8dp" />
-
-    <androidx.viewpager.widget.ViewPager xmlns:tools="http://schemas.android.com/tools"
+    <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
-            android:layout_width="432dp"
-            android:layout_height="match_parent"
+            android:layout_width="@dimen/opentasks_two_pane_list_width"
+            android:layout_height="0dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:context=".MainActivity" />
+            tools:context=".MainActivity"
+            app:layout_constraintTop_toBottomOf="@id/appbar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/floating_action_button"
@@ -59,9 +50,21 @@
             android:layout_gravity="center"
             android:layout_margin="16dp"
             android:src="@drawable/ic_action_add"
-            app:layout_anchor="@id/appbar"
             app:backgroundTint="@color/e_accent"
+            app:tint="@color/e_background"
             android:tint="@color/e_background"
-            app:layout_anchorGravity="bottom|right|end" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/pager"/>
+
+    <FrameLayout
+            android:id="@+id/task_detail_container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="@dimen/opentasks_two_pane_list_width"
+            android:layout_marginStart="@dimen/opentasks_two_pane_list_width"
+            android:backgroundTint="@color/color_default_background"
+            android:background="@drawable/opentasks_popup_background_mtrl_mult"
+            app:layout_constraintTop_toBottomOf="@id/appbar"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/layout/activity_task_twopane_small.xml b/opentasks/src/main/res/layout/activity_task_twopane_small.xml
index 33230a59..37ad2b84 100644
--- a/opentasks/src/main/res/layout/activity_task_twopane_small.xml
+++ b/opentasks/src/main/res/layout/activity_task_twopane_small.xml
@@ -1,53 +1,70 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primary_dark"
-            app:elevation="0dp">
+        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">
 
-        <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
+        <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/appbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:background="@color/primary_dark"
-                android:layout_width="@dimen/opentasks_two_pane_list_width"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/actionBarPopUpTheme"/>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabs"
-                android:layout_width="@dimen/opentasks_two_pane_list_width"
-                android:layout_height="wrap_content"
-                app:tabGravity="fill"
-                app:tabIconTint="@color/accent"
-                app:tabIndicatorColor="@color/accent"
-                app:tabIndicatorHeight="8dp"
-                app:tabMode="fixed"/>
-    </com.google.android.material.appbar.AppBarLayout>
+            <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:background="@color/primary_dark"
+                    android:layout_width="@dimen/opentasks_two_pane_list_width"
+                    android:layout_height="?attr/actionBarSize"
+                    app:popupTheme="@style/actionBarPopUpTheme"/>
 
+            <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tabs"
+                    android:layout_width="@dimen/opentasks_two_pane_list_width"
+                    android:layout_height="wrap_content"
+                    app:tabGravity="fill"
+                    app:tabIconTint="@color/accent"
+                    app:tabIndicatorColor="@color/accent"
+                    app:tabIndicatorHeight="8dp"
+                    app:tabBackground="@color/primary_dark"
+                    app:tabMode="fixed"/>
+        </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-            android:id="@+id/task_detail_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:layout_marginTop="40dp"
-            android:layout_marginLeft="@dimen/opentasks_two_pane_list_width"
-            android:layout_marginStart="@dimen/opentasks_two_pane_list_width"
-            android:layout_marginBottom="-8dp"
-            android:backgroundTint="@color/color_default_background"
-            android:background="@drawable/opentasks_popup_background_mtrl_mult"/>
+        <androidx.viewpager.widget.ViewPager
+                android:id="@+id/pager"
+                android:layout_width="@dimen/opentasks_two_pane_list_width"
+                android:layout_height="0dp"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                tools:context=".MainActivity"
+                app:layout_constraintTop_toBottomOf="@id/appbar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/floating_action_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="16dp"
+                android:src="@drawable/ic_action_add"
+                app:tint="@color/e_background"
+                app:backgroundTint="@color/e_accent"
+                android:tint="@color/e_background"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="@id/pager"/>
 
-    <androidx.viewpager.widget.ViewPager xmlns:tools="http://schemas.android.com/tools"
-            android:id="@+id/pager"
-            android:layout_width="@dimen/opentasks_two_pane_list_width"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:context=".MainActivity"/>
+        <FrameLayout
+                android:id="@+id/task_detail_container"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginLeft="@dimen/opentasks_two_pane_list_width"
+                android:layout_marginStart="@dimen/opentasks_two_pane_list_width"
+                android:backgroundTint="@color/color_default_background"
+                android:background="@drawable/opentasks_popup_background_mtrl_mult"
+                app:layout_constraintTop_toBottomOf="@id/appbar"
+                app:layout_constraintBottom_toBottomOf="parent"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large-land/bools.xml b/opentasks/src/main/res/values-large-land/bools.xml
deleted file mode 100644
index e5436733..00000000
--- a/opentasks/src/main/res/values-large-land/bools.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <bool name="has_two_panes">true</bool>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large-land/dimens.xml b/opentasks/src/main/res/values-large-land/dimens.xml
deleted file mode 100644
index e034564d..00000000
--- a/opentasks/src/main/res/values-large-land/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-    <dimen name="task_list_right_margin">10dp</dimen>
-    <dimen name="opentasks_two_pane_list_width">360dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large-land/refs.xml b/opentasks/src/main/res/values-large-land/refs.xml
deleted file mode 100644
index aacdabbc..00000000
--- a/opentasks/src/main/res/values-large-land/refs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-    Layout alias to replace the single-pane version of the layout with a
-    two-pane version on Large screens.
-
-    For more on layout aliases, see:
-    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-    -->
-    <item name="activity_task_list"
-            type="layout">@layout/activity_task_twopane_small
-    </item>
-    <item name="fragment_task_edit_detail"
-            type="layout">@layout/fragment_task_edit_detail_twopane
-    </item>
-    <!--     <item name="fragment_task_view_detail" type="layout">@layout/fragment_task_view_detail</item> -->
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large-land/styles.xml b/opentasks/src/main/res/values-large-land/styles.xml
deleted file mode 100644
index afd3c4d0..00000000
--- a/opentasks/src/main/res/values-large-land/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="edit_detail_ll">
-        <item name="android:background">@color/color_default_primary_text</item>
-        <item name="android:layout_width">600dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large/bools.xml b/opentasks/src/main/res/values-large/bools.xml
deleted file mode 100644
index 0f2ac08b..00000000
--- a/opentasks/src/main/res/values-large/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="has_two_panes">false</bool>
-</resources>
diff --git a/opentasks/src/main/res/values-large/dimens.xml b/opentasks/src/main/res/values-large/dimens.xml
deleted file mode 100644
index 2162c2d0..00000000
--- a/opentasks/src/main/res/values-large/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <dimen name="task_list_right_margin">10dp</dimen>
-    <dimen name="task_list_left_margin">10dp</dimen>
-    <dimen name="opentasks_details_pane_overlay_top">104dp</dimen>
-    <dimen name="opentasks_details_pane_margin_bottom">-66dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-large/styles.xml b/opentasks/src/main/res/values-large/styles.xml
deleted file mode 100644
index 07e59fcd..00000000
--- a/opentasks/src/main/res/values-large/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="edit_detail_pane">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:background">@color/light_gray</item>
-    </style>
-
-    <style name="edit_detail_ll">
-        <item name="android:background">@color/color_default_primary_text</item>
-        <item name="android:layout_width">fill_parent</item>
-    </style>
-
-    <style name="task_list_container">
-        <item name="android:background">@color/color_default_background</item>
-    </style>
-
-    <style name="task_list_item_date">
-        <item name="android:layout_marginRight">25dp</item>
-    </style>
-
-    <style name="task_list_group_count"
-            parent="editor_label_text">
-        <item name="android:layout_marginRight">25dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp-land/bools.xml b/opentasks/src/main/res/values-sw600dp-land/bools.xml
deleted file mode 100644
index e5436733..00000000
--- a/opentasks/src/main/res/values-sw600dp-land/bools.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <bool name="has_two_panes">true</bool>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp-land/dimens.xml b/opentasks/src/main/res/values-sw600dp-land/dimens.xml
deleted file mode 100644
index 94f5b2da..00000000
--- a/opentasks/src/main/res/values-sw600dp-land/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <dimen name="task_list_right_margin">10dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp-land/refs.xml b/opentasks/src/main/res/values-sw600dp-land/refs.xml
deleted file mode 100644
index 3aa3fd4a..00000000
--- a/opentasks/src/main/res/values-sw600dp-land/refs.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-    Layout alias to replace the single-pane version of the layout with a
-    two-pane version on Large screens.
-
-    For more on layout aliases, see:
-    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
-    -->
-    <item name="activity_task_list"
-            type="layout">@layout/activity_task_twopane
-    </item>
-    <item name="fragment_task_edit_detail"
-            type="layout">@layout/fragment_task_edit_detail_twopane
-    </item>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp-land/styles.xml b/opentasks/src/main/res/values-sw600dp-land/styles.xml
deleted file mode 100644
index afd3c4d0..00000000
--- a/opentasks/src/main/res/values-sw600dp-land/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="edit_detail_ll">
-        <item name="android:background">@color/color_default_primary_text</item>
-        <item name="android:layout_width">600dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp/bools.xml b/opentasks/src/main/res/values-sw600dp/bools.xml
deleted file mode 100644
index 691b11d4..00000000
--- a/opentasks/src/main/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <bool name="has_two_panes">false</bool>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp/dimens.xml b/opentasks/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 32e94693..00000000
--- a/opentasks/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <dimen name="task_list_right_margin">10dp</dimen>
-    <dimen name="task_list_left_margin">10dp</dimen>
-    <dimen name="opentasks_details_pane_overlay_top">128dp</dimen>
-    <dimen name="opentasks_details_pane_margin_bottom">-80dp</dimen>
-    <dimen name="opentasks_two_pane_list_width">360dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw600dp/styles.xml b/opentasks/src/main/res/values-sw600dp/styles.xml
deleted file mode 100644
index e8321d57..00000000
--- a/opentasks/src/main/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="edit_detail_pane">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:background">@color/light_gray</item>
-    </style>
-
-    <style name="edit_detail_ll">
-        <item name="android:background">@color/color_default_primary_text</item>
-        <item name="android:layout_width">fill_parent</item>
-    </style>
-
-    <style name="task_list_container">
-        <item name="android:background">@color/color_default_background</item>
-    </style>
-
-    <style name="task_list_item_date"
-            parent="dark_text">
-        <item name="android:layout_marginRight">25dp</item>
-    </style>
-
-    <style name="task_list_group_count"
-            parent="editor_label_text">
-        <item name="android:layout_marginRight">25dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw720dp-land/dimens.xml b/opentasks/src/main/res/values-sw720dp-land/dimens.xml
index dfef51ea..cd5ddc80 100644
--- a/opentasks/src/main/res/values-sw720dp-land/dimens.xml
+++ b/opentasks/src/main/res/values-sw720dp-land/dimens.xml
@@ -1,10 +1,3 @@
 <resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-    <dimen name="task_list_right_margin">10dp</dimen>
-
+    <dimen name="opentasks_two_pane_list_width">432dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-xlarge-port/refs.xml b/opentasks/src/main/res/values-sw720dp-land/refs.xml
similarity index 77%
rename from opentasks/src/main/res/values-xlarge-port/refs.xml
rename to opentasks/src/main/res/values-sw720dp-land/refs.xml
index 3aa3fd4a..f0a09bfb 100644
--- a/opentasks/src/main/res/values-xlarge-port/refs.xml
+++ b/opentasks/src/main/res/values-sw720dp-land/refs.xml
@@ -11,8 +11,5 @@
     <item name="activity_task_list"
             type="layout">@layout/activity_task_twopane
     </item>
-    <item name="fragment_task_edit_detail"
-            type="layout">@layout/fragment_task_edit_detail_twopane
-    </item>
-
+    
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw720dp-port/dimens.xml b/opentasks/src/main/res/values-sw720dp-port/dimens.xml
index d4f39d6f..50db893e 100644
--- a/opentasks/src/main/res/values-sw720dp-port/dimens.xml
+++ b/opentasks/src/main/res/values-sw720dp-port/dimens.xml
@@ -1,5 +1,3 @@
 <resources>
-
     <dimen name="opentasks_two_pane_list_width">360dp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-sw720dp-port/refs.xml b/opentasks/src/main/res/values-sw720dp-port/refs.xml
index ca3c9025..cc615a49 100644
--- a/opentasks/src/main/res/values-sw720dp-port/refs.xml
+++ b/opentasks/src/main/res/values-sw720dp-port/refs.xml
@@ -11,8 +11,5 @@
     <item name="activity_task_list"
             type="layout">@layout/activity_task_twopane_small
     </item>
-    <item name="fragment_task_edit_detail"
-            type="layout">@layout/fragment_task_edit_detail_twopane
-    </item>
 
 </resources>
\ No newline at end of file
diff --git a/opentasks/src/main/res/values-xlarge-port/bools.xml b/opentasks/src/main/res/values-xlarge-port/bools.xml
deleted file mode 100644
index 9b999fec..00000000
--- a/opentasks/src/main/res/values-xlarge-port/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="has_two_panes">true</bool>
-</resources>
-- 
GitLab