11 files changed, 166 insertions, 41 deletions

diff --git a/app/src/main/res/drawable/horizontal_line.xml b/app/src/main/res/drawable/horizontal_line.xml
new file mode 100644
index 0000000..76386bb
--- /dev/null
+++ b/app/src/main/res/drawable/horizontal_line.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+        <size android:height="1dp"/>
+        <solid android:color="@color/colorPrimaryLighter"/>
+</shape>
diff --git a/app/src/main/res/drawable/ic_build_black_24dp.xml b/app/src/main/res/drawable/ic_build_black_24dp.xml
new file mode 100644
index 0000000..b099a5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_build_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/textPrimary"
+        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>
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 @@
         </android.support.design.widget.AppBarLayout>
 
         <ScrollView
+                android:id="@+id/main_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <FrameLayout
-                        android:id="@+id/main_content"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="@dimen/activity_vertical_margin"
-                        android:paddingLeft="@dimen/activity_horizontal_margin"
-                        android:paddingRight="@dimen/activity_horizontal_margin"
-                        android:paddingTop="@dimen/activity_vertical_margin">
-
-                </FrameLayout>
-
         </ScrollView>
 
 </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 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          xmlns:tools="http://schemas.android.com/tools"
+                          android:id="@+id/page_configure"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="vertical"
+                          tools:context="org.pacien.tincapp.activities.ConfigureActivity">
+
+        <TextView
+                style="@style/AppTheme.SectionTitle"
+                android:text="@string/title_path_info"/>
+
+        <LinearLayout style="@style/AppTheme.List">
+
+                <LinearLayout style="@style/AppTheme.ListBlock">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@string/title_configuration_directories"/>
+
+                        <TextView
+                                android:id="@+id/text_configuration_directories"
+                                style="@style/AppTheme.BlockContent"/>
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/AppTheme.ListBlock">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@string/title_log_directories"/>
+
+                        <TextView
+                                android:id="@+id/text_log_directories"
+                                style="@style/AppTheme.BlockContent"/>
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/AppTheme.ListBlock">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@string/title_tinc_binaries"/>
+
+                        <TextView
+                                android:id="@+id/text_tinc_binaries"
+                                style="@style/AppTheme.BlockContent"/>
+
+                </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+                style="@style/AppTheme.SectionTitle"
+                android:text="@string/title_tools"/>
+
+        <LinearLayout style="@style/AppTheme.List">
+
+                <LinearLayout
+                        style="@style/AppTheme.ListBlock.Clickable"
+                        android:onClick="generateConf">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@string/action_generate_node_configuration_and_keys"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/AppTheme.ListBlock.Clickable"
+                        android:onClick="joinNetwork">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@string/action_join_network_via_invitation_url"/>
+
+                </LinearLayout>
+
+        </LinearLayout>
+
+</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 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                           xmlns:tools="http://schemas.android.com/tools"
-                          android:id="@+id/fragment_start"
+                          android:id="@+id/page_start"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
                           android:orientation="vertical"
@@ -12,11 +12,6 @@
                 android:text="\nThis is a technical preview of the application, with a minimal user interface that should be sufficient for testing.
                 \nNo check is performed on user input, and the application will simply crash at the first encountered error (refer to ADB logs)."/>
 
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="\nActions"/>
-
         <Button
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -29,15 +24,4 @@
                 android:onClick="startVpnDialog"
                 android:text="@string/title_connect_to_network"/>
 
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="\nInfo"/>
-
-        <Button
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:onClick="confDirDialog"
-                android:text="@string/menu_display_conf_dir"/>
-
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml
new file mode 100644
index 0000000..4f455d1
--- /dev/null
+++ b/app/src/main/res/menu/menu_start.xml
@@ -0,0 +1,14 @@
+<menu 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"
+          tools:context="org.pacien.tincapp.activities.StartActivity">
+
+        <item
+                android:id="@+id/menu_about"
+                android:icon="@drawable/ic_build_black_24dp"
+                android:onClick="openConfigureActivity"
+                android:tint="@color/colorAccent"
+                android:title="@string/menu_configure"
+                app:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c27f2d1..3f7c75a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -11,20 +11,16 @@
         <string name="info_supported_abis_format">デバイス ABI: %1$s</string>
 
         <string name="menu_about">このアプリについて</string>
-        <string name="menu_display_conf_dir">設定ディレクトリを表示</string>
 
         <string name="field_net_name">Tinc ネットワーク名</string>