2 files changed, 25 insertions, 43 deletions
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/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 @@
1	<?xml version="1.0" encoding="utf-8"?>
2
3	<!--
4	* Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5	* Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6	*
7	* This program is free software: you can redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation, either version 3 of the License, or
10	* (at your option) any later version.
11	*
12	* This program is distributed in the hope that it will be useful,
13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	* GNU General Public License for more details.
16	*
17	* You should have received a copy of the GNU General Public License
18	* along with this program. If not, see <https://www.gnu.org/licenses/>.
19	-->
20
21	<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
22	xmlns:app="http://schemas.android.com/apk/res-auto"
23	xmlns:tools="http://schemas.android.com/tools"
24	android:id="@+id/activity_base"
25	android:layout_width="match_parent"
26	android:layout_height="match_parent"
27	android:background="@color/backgroundSecondary"
28	android:clipToPadding="false"
29	android:fitsSystemWindows="true"
30	android:paddingLeft="@dimen/activity_horizontal_gutter"
31	android:paddingRight="@dimen/activity_horizontal_gutter"
32	app:layout_behavior="@string/appbar_scrolling_view_behavior"
33	tools:context=".activities.BaseActivity">
34
35	<FrameLayout
36	android:id="@+id/main_content"
37	android:layout_width="match_parent"
38	android:layout_height="match_parent"
39	android:background="@color/backgroundPrimary"
40	android:elevation="@dimen/activity_page_elevation">
41	</FrameLayout>
42
43	</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 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2
		3	<!--
		4	* Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
		5	* Copyright (C) 2017-2018 Pacien TRAN-GIRARD
		6	*
		7	* This program is free software: you can redistribute it and/or modify
		8	* it under the terms of the GNU General Public License as published by
		9	* the Free Software Foundation, either version 3 of the License, or
		10	* (at your option) any later version.
		11	*
		12	* This program is distributed in the hope that it will be useful,
		13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	* GNU General Public License for more details.
		16	*
		17	* You should have received a copy of the GNU General Public License
		18	* along with this program. If not, see <https://www.gnu.org/licenses/>.
		19	-->
		20
		21	<android.support.design.widget.CoordinatorLayout
		22	xmlns:android="http://schemas.android.com/apk/res/android"
		23	android:id="@+id/base_activity_frame"
		24	android:layout_width="match_parent"
		25	android:layout_height="match_parent"/>