From 5b3cadb7a8072bdf5ea054eb93c26ef9451f78ff Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 19 Nov 2021 14:06:43 -0500
Subject: [PATCH] Clean up some tablet dimension values

---
 app/src/main/res/layout-sw720dp/manga_controller.xml          | 2 +-
 app/src/main/res/values-sw600dp/dimens.xml                    | 4 ----
 app/src/main/res/{values-w820dp => values-sw720dp}/dimens.xml | 2 ++
 app/src/main/res/values/dimens.xml                            | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 app/src/main/res/values-sw600dp/dimens.xml
 rename app/src/main/res/{values-w820dp => values-sw720dp}/dimens.xml (88%)

diff --git a/app/src/main/res/layout-sw720dp/manga_controller.xml b/app/src/main/res/layout-sw720dp/manga_controller.xml
index e4fa42b147..d90991b0a4 100644
--- a/app/src/main/res/layout-sw720dp/manga_controller.xml
+++ b/app/src/main/res/layout-sw720dp/manga_controller.xml
@@ -26,7 +26,7 @@
                 app:layout_constraintEnd_toStartOf="@id/chapters_recycler"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_max="450dp"
+                app:layout_constraintWidth_max="@dimen/tablet_sidebar_max_width"
                 app:layout_constraintWidth_percent="0.5"
                 tools:itemCount="1"
                 tools:listitem="@layout/manga_info_header" />
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index fc0bcc36e2..0000000000
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="screen_edge_margin">24dp</dimen>
-</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
similarity index 88%
rename from app/src/main/res/values-w820dp/dimens.xml
rename to app/src/main/res/values-sw720dp/dimens.xml
index 0b0e8dced3..1d4db08e74 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -5,4 +5,6 @@
     <dimen name="activity_horizontal_margin">64dp</dimen>
 
     <dimen name="bottom_sheet_width">480dp</dimen>
+
+    <dimen name="screen_edge_margin">24dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 20ebb38557..4e4c2b238c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <resources>
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 
     <dimen name="bottom_sheet_width">0dp</dimen>
 
@@ -15,4 +14,5 @@
     <dimen name="screen_edge_margin">16dp</dimen>
 
     <dimen name="tablet_horizontal_cover_margin">128dp</dimen>
+    <dimen name="tablet_sidebar_max_width">450dp</dimen>
 </resources>