From 8b44284c7fae76e7e402387500acab7b64a7dad3 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 21 Aug 2018 22:39:07 +0200
Subject: Remove side gutters on large screens

---
 app/src/main/res/layout/base.xml          | 43 -------------------------------
 app/src/main/res/layout/base_activity.xml | 25 ++++++++++++++++++
 app/src/main/res/values-w960dp/dimens.xml | 23 -----------------
 app/src/main/res/values/dimens.xml        |  1 -
 4 files changed, 25 insertions(+), 67 deletions(-)
 delete mode 100644 app/src/main/res/layout/base.xml
 create mode 100644 app/src/main/res/layout/base_activity.xml
 delete mode 100644 app/src/main/res/values-w960dp/dimens.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
deleted file mode 100644
index 96dff5d..0000000
--- a/app/src/main/res/layout/base.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<android.support.design.widget.CoordinatorLayout 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/activity_base"
-																								 android:layout_width="match_parent"
-																								 android:layout_height="match_parent"
-																								 android:background="@color/backgroundSecondary"
-																								 android:clipToPadding="false"
-																								 android:fitsSystemWindows="true"
-																								 android:paddingLeft="@dimen/activity_horizontal_gutter"
-																								 android:paddingRight="@dimen/activity_horizontal_gutter"
-																								 app:layout_behavior="@string/appbar_scrolling_view_behavior"
-																								 tools:context=".activities.BaseActivity">
-
-	<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>
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/base_activity.xml b/app/src/main/res/layout/base_activity.xml
new file mode 100644
index 0000000..e61fea4
--- /dev/null
+++ b/app/src/main/res/layout/base_activity.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<android.support.design.widget.CoordinatorLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/base_activity_frame"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"/>
diff --git a/app/src/main/res/values-w960dp/dimens.xml b/app/src/main/res/values-w960dp/dimens.xml
deleted file mode 100644
index 959363b..0000000
--- a/app/src/main/res/values-w960dp/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<resources>
-	<dimen name="activity_horizontal_gutter">64dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5eb59e2..a514b9a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,7 +20,6 @@
 
 <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>
-- 
cgit v1.2.3