aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/base.xml12
-rw-r--r--app/src/main/res/layout/page_configure.xml81
-rw-r--r--app/src/main/res/layout/page_start.xml18
3 files changed, 83 insertions, 28 deletions
diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
index 11df049..f2a8f49 100644
--- a/app/src/main/res/layout/base.xml
+++ b/app/src/main/res/layout/base.xml
@@ -27,21 +27,11 @@
27 </android.support.design.widget.AppBarLayout> 27 </android.support.design.widget.AppBarLayout>
28 28
29 <ScrollView 29 <ScrollView
30 android:id="@+id/main_content"
30 android:layout_width="match_parent" 31 android:layout_width="match_parent"
31 android:layout_height="match_parent" 32 android:layout_height="match_parent"
32 app:layout_behavior="@string/appbar_scrolling_view_behavior"> 33 app:layout_behavior="@string/appbar_scrolling_view_behavior">
33 34
34 <FrameLayout
35 android:id="@+id/main_content"
36 android:layout_width="match_parent"
37 android:layout_height="wrap_content"
38 android:paddingBottom="@dimen/activity_vertical_margin"
39 android:paddingLeft="@dimen/activity_horizontal_margin"
40 android:paddingRight="@dimen/activity_horizontal_margin"
41 android:paddingTop="@dimen/activity_vertical_margin">
42
43 </FrameLayout>
44
45 </ScrollView> 35 </ScrollView>
46 36
47</android.support.design.widget.CoordinatorLayout> 37</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
new file mode 100644
index 0000000..3ecdaa6
--- /dev/null
+++ b/app/src/main/res/layout/page_configure.xml
@@ -0,0 +1,81 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:tools="http://schemas.android.com/tools"
3 android:id="@+id/page_configure"
4 android:layout_width="match_parent"
5 android:layout_height="wrap_content"
6 android:orientation="vertical"
7 tools:context="org.pacien.tincapp.activities.ConfigureActivity">
8
9 <TextView
10 style="@style/AppTheme.SectionTitle"
11 android:text="@string/title_path_info"/>
12
13 <LinearLayout style="@style/AppTheme.List">
14
15 <LinearLayout style="@style/AppTheme.ListBlock">
16
17 <TextView
18 style="@style/AppTheme.BlockTitle"
19 android:text="@string/title_configuration_directories"/>
20
21 <TextView
22 android:id="@+id/text_configuration_directories"
23 style="@style/AppTheme.BlockContent"/>
24
25 </LinearLayout>
26
27 <LinearLayout style="@style/AppTheme.ListBlock">
28
29 <TextView
30 style="@style/AppTheme.BlockTitle"
31 android:text="@string/title_log_directories"/>
32
33 <TextView
34 android:id="@+id/text_log_directories"
35 style="@style/AppTheme.BlockContent"/>
36
37 </LinearLayout>
38
39 <LinearLayout style="@style/AppTheme.ListBlock">
40
41 <TextView
42 style="@style/AppTheme.BlockTitle"
43 android:text="@string/title_tinc_binaries"/>
44
45 <TextView
46 android:id="@+id/text_tinc_binaries"
47 style="@style/AppTheme.BlockContent"/>
48
49 </LinearLayout>
50
51 </LinearLayout>
52
53 <TextView
54 style="@style/AppTheme.SectionTitle"
55 android:text="@string/title_tools"/>
56
57 <LinearLayout style="@style/AppTheme.List">
58
59 <LinearLayout
60 style="@style/AppTheme.ListBlock.Clickable"
61 android:onClick="generateConf">
62
63 <TextView
64 style="@style/AppTheme.BlockTitle"
65 android:text="@string/action_generate_node_configuration_and_keys"/>
66
67 </LinearLayout>
68
69 <LinearLayout
70 style="@style/AppTheme.ListBlock.Clickable"
71 android:onClick="joinNetwork">
72
73 <TextView
74 style="@style/AppTheme.BlockTitle"
75 android:text="@string/action_join_network_via_invitation_url"/>
76
77 </LinearLayout>
78
79 </LinearLayout>
80
81</LinearLayout>
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
index 8ead05b..d470dc0 100644
--- a/app/src/main/res/layout/page_start.xml
+++ b/app/src/main/res/layout/page_start.xml
@@ -1,6 +1,6 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:tools="http://schemas.android.com/tools"
3 android:id="@+id/fragment_start" 3 android:id="@+id/page_start"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="wrap_content" 5 android:layout_height="wrap_content"
6 android:orientation="vertical" 6 android:orientation="vertical"
@@ -12,11 +12,6 @@
12 android:text="\nThis is a technical preview of the application, with a minimal user interface that should be sufficient for testing. 12 android:text="\nThis is a technical preview of the application, with a minimal user interface that should be sufficient for testing.
13 \nNo check is performed on user input, and the application will simply crash at the first encountered error (refer to ADB logs)."/> 13 \nNo check is performed on user input, and the application will simply crash at the first encountered error (refer to ADB logs)."/>
14 14
15 <TextView
16 android:layout_width="match_parent"
17 android:layout_height="wrap_content"
18 android:text="\nActions"/>
19
20 <Button 15 <Button
21 android:layout_width="match_parent" 16 android:layout_width="match_parent"
22 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
@@ -29,15 +24,4 @@
29 android:onClick="startVpnDialog" 24 android:onClick="startVpnDialog"
30 android:text="@string/title_connect_to_network"/> 25 android:text="@string/title_connect_to_network"/>
31 26
32 <TextView
33 android:layout_width="match_parent"
34 android:layout_height="wrap_content"
35 android:text="\nInfo"/>
36
37 <Button
38 android:layout_width="match_parent"
39 android:layout_height="wrap_content"
40 android:onClick="confDirDialog"
41 android:text="@string/menu_display_conf_dir"/>
42
43</LinearLayout> 27</LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:40:10 +0000