aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/base.xml4
-rw-r--r--app/src/main/res/layout/fragment_list_item.xml9
-rw-r--r--app/src/main/res/layout/fragment_network_list_empty_placeholder.xml5
-rw-r--r--app/src/main/res/layout/fragment_network_list_header.xml4
-rw-r--r--app/src/main/res/layout/page_configure.xml113
-rw-r--r--app/src/main/res/layout/page_start.xml40
-rw-r--r--app/src/main/res/values-ja/strings.xml4
-rw-r--r--app/src/main/res/values-nb-rNO/strings.xml4
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml4
10 files changed, 98 insertions, 93 deletions
diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
index f2a8f49..997dd01 100644
--- a/app/src/main/res/layout/base.xml
+++ b/app/src/main/res/layout/base.xml
@@ -26,12 +26,12 @@
26 26
27 </android.support.design.widget.AppBarLayout> 27 </android.support.design.widget.AppBarLayout>
28 28
29 <ScrollView 29 <FrameLayout
30 android:id="@+id/main_content" 30 android:id="@+id/main_content"
31 android:layout_width="match_parent" 31 android:layout_width="match_parent"
32 android:layout_height="match_parent" 32 android:layout_height="match_parent"
33 app:layout_behavior="@string/appbar_scrolling_view_behavior"> 33 app:layout_behavior="@string/appbar_scrolling_view_behavior">
34 34
35 </ScrollView> 35 </FrameLayout>
36 36
37</android.support.design.widget.CoordinatorLayout> 37</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_list_item.xml b/app/src/main/res/layout/fragment_list_item.xml
new file mode 100644
index 0000000..c6049f5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_list_item.xml
@@ -0,0 +1,9 @@
1<TextView
2 xmlns:android="http://schemas.android.com/apk/res/android"
3 style="@style/AppTheme.BlockTitle"
4 android:paddingBottom="@dimen/activity_vertical_margin"
5 android:paddingLeft="@dimen/activity_horizontal_margin"
6 android:paddingRight="@dimen/activity_horizontal_margin"
7 android:paddingTop="@dimen/activity_vertical_margin">
8
9</TextView>
diff --git a/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml b/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml
new file mode 100644
index 0000000..169942f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml
@@ -0,0 +1,5 @@
1<TextView
2 xmlns:android="http://schemas.android.com/apk/res/android"
3 android:id="@+id/network_list_empty"
4 style="@style/AppTheme.ListBlock.Placeholder"
5 android:text="@string/message_no_network_configuration_found"/>
diff --git a/app/src/main/res/layout/fragment_network_list_header.xml b/app/src/main/res/layout/fragment_network_list_header.xml
new file mode 100644
index 0000000..3531e3e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_network_list_header.xml
@@ -0,0 +1,4 @@
1<TextView
2 xmlns:android="http://schemas.android.com/apk/res/android"
3 style="@style/AppTheme.SectionTitle"
4 android:text="@string/title_connect_to_network"/>
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
index bc8832e..35a7416 100644
--- a/app/src/main/res/layout/page_configure.xml
+++ b/app/src/main/res/layout/page_configure.xml
@@ -1,81 +1,88 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 1<ScrollView
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:android="http://schemas.android.com/apk/res/android"
3 android:id="@+id/page_configure" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="wrap_content" 5 android:layout_height="match_parent">
6 android:orientation="vertical"
7 tools:context="org.pacien.tincapp.activities.ConfigureActivity">
8 6
9 <TextView 7 <LinearLayout
10 style="@style/AppTheme.SectionTitle" 8 android:id="@+id/page_configure"
11 android:text="@string/title_path_info"/> 9 android:layout_width="match_parent"
10 android:layout_height="wrap_content"
11 android:orientation="vertical"
12 tools:context="org.pacien.tincapp.activities.ConfigureActivity">
12 13
13 <LinearLayout style="@style/AppTheme.List"> 14 <TextView
15 style="@style/AppTheme.SectionTitle"
16 android:text="@string/title_path_info"/>
14 17
15 <LinearLayout style="@style/AppTheme.ListBlock"> 18 <LinearLayout style="@style/AppTheme.List">
16 19
17 <TextView 20 <LinearLayout style="@style/AppTheme.ListBlock">
18 style="@style/AppTheme.BlockTitle"
19 android:text="@string/title_configuration_directory"/>
20 21
21 <TextView 22 <TextView
22 android:id="@+id/text_configuration_directory" 23 style="@style/AppTheme.BlockTitle"
23 style="@style/AppTheme.BlockContent"/> 24 android:text="@string/title_configuration_directory"/>
24 25
25 </LinearLayout> 26 <TextView
27 android:id="@+id/text_configuration_directory"
28 style="@style/AppTheme.BlockContent"/>
26 29
27 <LinearLayout style="@style/AppTheme.ListBlock"> 30 </LinearLayout>
28 31
29 <TextView 32 <LinearLayout style="@style/AppTheme.ListBlock">
30 style="@style/AppTheme.BlockTitle"
31 android:text="@string/title_log_directory"/>
32 33
33 <TextView 34 <TextView
34 android:id="@+id/text_log_directory" 35 style="@style/AppTheme.BlockTitle"
35 style="@style/AppTheme.BlockContent"/> 36 android:text="@string/title_log_directory"/>
36 37
37 </LinearLayout> 38 <TextView
39 android:id="@+id/text_log_directory"
40 style="@style/AppTheme.BlockContent"/>
41
42 </LinearLayout>
38 43
39 <LinearLayout style="@style/AppTheme.ListBlock"> 44 <LinearLayout style="@style/AppTheme.ListBlock">
40 45
41 <TextView 46 <TextView
42 style="@style/AppTheme.BlockTitle" 47 style="@style/AppTheme.BlockTitle"
43 android:text="@string/title_tinc_binary"/> 48 android:text="@string/title_tinc_binary"/>
44 49
45 <TextView 50 <TextView
46 android:id="@+id/text_tinc_binary" 51 android:id="@+id/text_tinc_binary"
47 style="@style/AppTheme.BlockContent"/> 52 style="@style/AppTheme.BlockContent"/>
53
54 </LinearLayout>
48 55
49 </LinearLayout> 56 </LinearLayout>
50 57
51 </LinearLayout> 58 <TextView
59 style="@style/AppTheme.SectionTitle"
60 android:text="@string/title_tools"/>
52 61
53 <TextView 62 <LinearLayout style="@style/AppTheme.List">
54 style="@style/AppTheme.SectionTitle"
55 android:text="@string/title_tools"/>
56 63
57 <LinearLayout style="@style/AppTheme.List"> 64 <LinearLayout
65 style="@style/AppTheme.ListBlock.Clickable"
66 android:onClick="generateConf">
58 67
59 <LinearLayout 68 <TextView
60 style="@style/AppTheme.ListBlock.Clickable" 69 style="@style/AppTheme.BlockTitle"
61 android:onClick="generateConf"> 70 android:text="@string/action_generate_node_configuration_and_keys"/>
62 71
63 <TextView 72 </LinearLayout>
64 style="@style/AppTheme.BlockTitle"
65 android:text="@string/action_generate_node_configuration_and_keys"/>
66 73
67 </LinearLayout> 74 <LinearLayout
75 style="@style/AppTheme.ListBlock.Clickable"
76 android:onClick="joinNetwork">
68 77
69 <LinearLayout 78 <TextView
70 style="@style/AppTheme.ListBlock.Clickable" 79 style="@style/AppTheme.BlockTitle"
71 android:onClick="joinNetwork"> 80 android:text="@string/action_join_network_via_invitation_url"/>
72 81
73 <TextView 82 </LinearLayout>
74 style="@style/AppTheme.BlockTitle"
75 android:text="@string/action_join_network_via_invitation_url"/>
76 83
77 </LinearLayout> 84 </LinearLayout>
78 85
79 </LinearLayout> 86 </LinearLayout>
80 87
81</LinearLayout> 88</ScrollView>
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
index d470dc0..fec55de 100644
--- a/app/src/main/res/layout/page_start.xml
+++ b/app/src/main/res/layout/page_start.xml
@@ -1,27 +1,13 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 1<ListView
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:android="http://schemas.android.com/apk/res/android"
3 android:id="@+id/page_start" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="m