diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/base.xml | 43 | ||||
| -rw-r--r-- | app/src/main/res/layout/base_activity.xml (renamed from app/src/main/res/values-w960dp/dimens.xml) | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 1 |
3 files changed, 5 insertions, 47 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 @@ | |||
| 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/values-w960dp/dimens.xml b/app/src/main/res/layout/base_activity.xml index 959363b..e61fea4 100644 --- a/app/src/main/res/values-w960dp/dimens.xml +++ b/app/src/main/res/layout/base_activity.xml | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 19 | --> | 19 | --> |
| 20 | 20 | ||
| 21 | <resources> | 21 | <android.support.design.widget.CoordinatorLayout |
| 22 | <dimen name="activity_horizontal_gutter">64dp</dimen> | 22 | xmlns:android="http://schemas.android.com/apk/res/android" |
| 23 | </resources> | 23 | android:id="@+id/base_activity_frame" |
| 24 | android:layout_width="match_parent" | ||
| 25 | android:layout_height="match_parent"/> | ||
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 @@ | |||
| 20 | 20 | ||
| 21 | <resources> | 21 | <resources> |
| 22 | <!-- Default screen margins, per the Android Design guidelines. --> | 22 | <!-- Default screen margins, per the Android Design guidelines. --> |
| 23 | <dimen name="activity_horizontal_gutter">0dp</dimen> | ||
| 24 | <dimen name="activity_horizontal_margin">16dp</dimen> | 23 | <dimen name="activity_horizontal_margin">16dp</dimen> |
| 25 | <dimen name="activity_vertical_margin">16dp</dimen> | 24 | <dimen name="activity_vertical_margin">16dp</dimen> |
| 26 | <dimen name="activity_page_elevation">2dp</dimen> | 25 | <dimen name="activity_page_elevation">2dp</dimen> |