aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorpacien2018-03-29 19:08:24 +0200
committerpacien2018-03-29 19:08:49 +0200
commit32a68afadec59da045118c6707cf4caec145502b (patch)
tree5b8d98a7e583e374a72fa0c4e9c7db953977916f /app/src/main/res
parent3bf3446658dfaac14f93b6550ede90ba0e3da4a2 (diff)
downloadtincapp-32a68afadec59da045118c6707cf4caec145502b.tar.gz
Better support for large screens
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/base.xml13
-rw-r--r--app/src/main/res/menu/menu_conf.xml14
-rw-r--r--app/src/main/res/values-w600dp/dimens.xml3
-rw-r--r--app/src/main/res/values-w820dp/dimens.xml3
-rw-r--r--app/src/main/res/values-w960dp/dimens.xml3
-rw-r--r--app/src/main/res/values/colors.xml3
-rw-r--r--app/src/main/res/values/dimens.xml4
7 files changed, 39 insertions, 4 deletions
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 @@
27 </android.support.design.widget.AppBarLayout> 27 </android.support.design.widget.AppBarLayout>
28 28
29 <FrameLayout 29 <FrameLayout
30 android:id="@+id/main_content"
31 android:layout_width="match_parent" 30 android:layout_width="match_parent"
32 android:layout_height="match_parent" 31 android:layout_height="match_parent"
32 android:background="@color/backgroundSecondary"
33 android:clipToPadding="false"
34 android:paddingLeft="@dimen/activity_horizontal_gutter"
35 android:paddingRight="@dimen/activity_horizontal_gutter"
33 app:layout_behavior="@string/appbar_scrolling_view_behavior"> 36 app:layout_behavior="@string/appbar_scrolling_view_behavior">
34 37
38 <FrameLayout
39 android:id="@+id/main_content"
40 android:layout_width="match_parent"
41 android:layout_height="match_parent"
42 android:background="@color/backgroundPrimary"
43 android:elevation="@dimen/activity_page_elevation">
44 </FrameLayout>
45
35 </FrameLayout> 46 </FrameLayout>
36 47
37</android.support.design.widget.CoordinatorLayout> 48</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 @@
1<menu xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:app="http://schemas.android.com/apk/res-auto"
3 xmlns:tools="http://schemas.android.com/tools"
4 tools:context="org.pacien.tincapp.activities.ConfigureActivity">
5
6 <item
7 android:id="@+id/menu_open_config_dir"
8 android:icon="@drawable/ic_folder_primary_24dp"
9 android:onClick="openConfigDir"
10 android:tint="@color/colorAccent"
11 android:title="@string/menu_open_config_dir"
12 app:showAsAction="ifRoom"/>
13
14</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 @@
1<resources>
2 <dimen name="activity_horizontal_margin">24dp</dimen>
3</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 @@
1<resources>
2 <dimen name="activity_horizontal_margin">64dp</dimen>
3</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 @@
1<resources>
2 <dimen name="activity_horizontal_gutter">64dp</dimen>
3</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 @@
6 <color name="colorPrimaryLight">#757575</color> 6 <color name="colorPrimaryLight">#757575</color>
7 <color name="colorPrimaryLighter">#d9d9d9</color> 7 <color name="colorPrimaryLighter">#d9d9d9</color>
8 <color name="colorAccent">#f9a825</color> 8 <color name="colorAccent">#f9a825</color>
9
10 <color name="backgroundPrimary">#FFFFFF</color>
11 <color name="backgroundSecondary">#d9d9d9</color>
9</resources> 12</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 @@
1<resources> 1<resources>
2 <!-- Default screen margins, per the Android Design guidelines. --> 2 <!-- Default screen margins, per the Android Design guidelines. -->
3 <dimen name="activity_horizontal_gutter">0dp</dimen>
3 <dimen name="activity_horizontal_margin">16dp</dimen> 4 <dimen name="activity_horizontal_margin">16dp</dimen>
4 <dimen name="activity_vertical_margin">16dp</dimen> 5 <dimen name="activity_vertical_margin">16dp</dimen>
6 <dimen name="activity_page_elevation">2dp</dimen>
7
5 <dimen name="dialog_horizontal_margin">20dp</dimen> 8 <dimen name="dialog_horizontal_margin">20dp</dimen>
6 <dimen name="dialog_vertical_margin">20dp</dimen> 9 <dimen name="dialog_vertical_margin">20dp</dimen>
10
7 <dimen name="appbar_padding_top">0dp</dimen> 11 <dimen name="appbar_padding_top">0dp</dimen>
8 <dimen name="text_margin">16dp</dimen> 12 <dimen name="text_margin">16dp</dimen>
9</resources> 13</resources>