From 32a68afadec59da045118c6707cf4caec145502b Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 29 Mar 2018 19:08:24 +0200
Subject: Better support for large screens

---
 app/src/main/res/layout/base.xml          | 13 ++++++++++++-
 app/src/main/res/menu/menu_conf.xml       | 14 ++++++++++++++
 app/src/main/res/values-w600dp/dimens.xml |  3 +++
 app/src/main/res/values-w820dp/dimens.xml |  3 ---
 app/src/main/res/values-w960dp/dimens.xml |  3 +++
 app/src/main/res/values/colors.xml        |  3 +++
 app/src/main/res/values/dimens.xml        |  4 ++++
 7 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/menu/menu_conf.xml
 create mode 100644 app/src/main/res/values-w600dp/dimens.xml
 delete mode 100644 app/src/main/res/values-w820dp/dimens.xml
 create mode 100644 app/src/main/res/values-w960dp/dimens.xml

(limited to 'app/src')

diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
index 3ffcff8..bdd1ee4 100644
--- a/app/src/main/res/layout/base.xml
+++ b/app/src/main/res/layout/base.xml
@@ -27,11 +27,22 @@
 	</android.support.design.widget.AppBarLayout>
 
 	<FrameLayout
-		android:id="@+id/main_content"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:background="@color/backgroundSecondary"
+		android:clipToPadding="false"
+		android:paddingLeft="@dimen/activity_horizontal_gutter"
+		android:paddingRight="@dimen/activity_horizontal_gutter"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
+		<FrameLayout
+			android:id="@+id/main_content"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="@color/backgroundPrimary"
+			android:elevation="@dimen/activity_page_elevation">
+		</FrameLayout>
+
 	</FrameLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/menu/menu_conf.xml b/app/src/main/res/menu/menu_conf.xml
new file mode 100644
index 0000000..df81b00
--- /dev/null
+++ b/app/src/main/res/menu/menu_conf.xml
@@ -0,0 +1,14 @@
+<menu 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"
+			tools:context="org.pacien.tincapp.activities.ConfigureActivity">
+
+	<item
+		android:id="@+id/menu_open_config_dir"
+		android:icon="@drawable/ic_folder_primary_24dp"
+		android:onClick="openConfigDir"
+		android:tint="@color/colorAccent"
+		android:title="@string/menu_open_config_dir"
+		app:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..517bc44
--- /dev/null
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="activity_horizontal_margin">24dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 42a1541..0000000
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-	<dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/app/src/main/res/values-w960dp/dimens.xml b/app/src/main/res/values-w960dp/dimens.xml
new file mode 100644
index 0000000..0c2cc5c
--- /dev/null
+++ b/app/src/main/res/values-w960dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="activity_horizontal_gutter">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cc0489b..970f582 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,4 +6,7 @@
 	<color name="colorPrimaryLight">#757575</color>
 	<color name="colorPrimaryLighter">#d9d9d9</color>
 	<color name="colorAccent">#f9a825</color>
+
+	<color name="backgroundPrimary">#FFFFFF</color>
+	<color name="backgroundSecondary">#d9d9d9</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9d64c93..890275c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,9 +1,13 @@
 <resources>
 	<!-- Default screen margins, per the Android Design guidelines. -->
+	<dimen name="activity_horizontal_gutter">0dp</dimen>
 	<dimen name="activity_horizontal_margin">16dp</dimen>
 	<dimen name="activity_vertical_margin">16dp</dimen>
+	<dimen name="activity_page_elevation">2dp</dimen>
+
 	<dimen name="dialog_horizontal_margin">20dp</dimen>
 	<dimen name="dialog_vertical_margin">20dp</dimen>
+
 	<dimen name="appbar_padding_top">0dp</dimen>
 	<dimen name="text_margin">16dp</dimen>
 </resources>
-- 
cgit v1.2.3