From 328ad552b0b508e08072ebcd9409f6214c748a0d Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 3 Jul 2017 15:45:50 +0200
Subject: Add configure activity, displaying various paths

---
 app/src/main/res/layout/base.xml           | 12 +----
 app/src/main/res/layout/page_configure.xml | 81 ++++++++++++++++++++++++++++++
 app/src/main/res/layout/page_start.xml     | 18 +------
 3 files changed, 83 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/layout/page_configure.xml

(limited to 'app/src/main/res/layout')

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>
-- 
cgit v1.2.3