From 7dfc7b2fb2fb1006bf210ea6396c6e898e74d40e Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 3 Jul 2017 22:33:51 +0200
Subject: List configured VPN on startup screen

---
 app/src/main/res/layout/base.xml                   |   4 +-
 app/src/main/res/layout/fragment_list_item.xml     |   9 ++
 .../fragment_network_list_empty_placeholder.xml    |   5 +
 .../res/layout/fragment_network_list_header.xml    |   4 +
 app/src/main/res/layout/page_configure.xml         | 113 +++++++++++----------
 app/src/main/res/layout/page_start.xml             |  40 +++-----
 app/src/main/res/values-ja/strings.xml             |   4 -
 app/src/main/res/values-nb-rNO/strings.xml         |   4 -
 app/src/main/res/values/strings.xml                |   4 +-
 app/src/main/res/values/styles.xml                 |   4 +
 10 files changed, 98 insertions(+), 93 deletions(-)
 create mode 100644 app/src/main/res/layout/fragment_list_item.xml
 create mode 100644 app/src/main/res/layout/fragment_network_list_empty_placeholder.xml
 create mode 100644 app/src/main/res/layout/fragment_network_list_header.xml

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

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 @@
 
 	</android.support.design.widget.AppBarLayout>
 
-	<ScrollView
+	<FrameLayout
 		android:id="@+id/main_content"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-	</ScrollView>
+	</FrameLayout>
 
 </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 @@
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.BlockTitle"
+	android:paddingBottom="@dimen/activity_vertical_margin"
+	android:paddingLeft="@dimen/activity_horizontal_margin"
+	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingTop="@dimen/activity_vertical_margin">
+
+</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 @@
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/network_list_empty"
+	style="@style/AppTheme.ListBlock.Placeholder"
+	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 @@
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.SectionTitle"
+	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 @@
-<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">
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-	<TextView
-		style="@style/AppTheme.SectionTitle"
-		android:text="@string/title_path_info"/>
+	<LinearLayout
+		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">
 
-	<LinearLayout style="@style/AppTheme.List">
+		<TextView
+			style="@style/AppTheme.SectionTitle"
+			android:text="@string/title_path_info"/>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+		<LinearLayout style="@style/AppTheme.List">
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_configuration_directory"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				android:id="@+id/text_configuration_directory"
-				style="@style/AppTheme.BlockContent"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/title_configuration_directory"/>
 
-		</LinearLayout>
+				<TextView
+					android:id="@+id/text_configuration_directory"
+					style="@style/AppTheme.BlockContent"/>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_log_directory"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				android:id="@+id/text_log_directory"
-				style="@style/AppTheme.BlockContent"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/title_log_directory"/>
 
-		</LinearLayout>
+				<TextView
+					android:id="@+id/text_log_directory"
+					style="@style/AppTheme.BlockContent"/>
+
+			</LinearLayout>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_tinc_binary"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/title_tinc_binary"/>
 
-			<TextView
-				android:id="@+id/text_tinc_binary"
-				style="@style/AppTheme.BlockContent"/>
+				<TextView
+					android:id="@+id/text_tinc_binary"
+					style="@style/AppTheme.BlockContent"/>
+
+			</LinearLayout>
 
 		</LinearLayout>
 
-	</LinearLayout>
+		<TextView
+			style="@style/AppTheme.SectionTitle"
+			android:text="@string/title_tools"/>
 
-	<TextView
-		style="@style/AppTheme.SectionTitle"
-		android:text="@string/title_tools"/>
+		<LinearLayout style="@style/AppTheme.List">
 
-	<LinearLayout style="@style/AppTheme.List">
+			<LinearLayout
+				style="@style/AppTheme.ListBlock.Clickable"
+				android:onClick="generateConf">
 
-		<LinearLayout
-			style="@style/AppTheme.ListBlock.Clickable"
-			android:onClick="generateConf">
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/action_generate_node_configuration_and_keys"/>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/action_generate_node_configuration_and_keys"/>
+			</LinearLayout>
 
-		</LinearLayout>
+			<LinearLayout
+				style="@style/AppTheme.ListBlock.Clickable"
+				android:onClick="joinNetwork">
 
-		<LinearLayout
-			style="@style/AppTheme.ListBlock.Clickable"
-			android:onClick="joinNetwork">
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/action_join_network_via_invitation_url"/>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/action_join_network_via_invitation_url"/>
+			</LinearLayout>
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-</LinearLayout>
+</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 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  xmlns:tools="http://schemas.android.com/tools"
-			  android:id="@+id/page_start"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content"
-			  android:orientation="vertical"
-			  tools:context="org.pacien.tincapp.activities.StartActivity">
-
-	<TextView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		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)."/>
-
-	<Button
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:onClick="requestVpnPermission"
-		android:text="@string/title_request_vpn_permissions"/>
-
-	<Button
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:onClick="startVpnDialog"
-		android:text="@string/title_connect_to_network"/>
-
-</LinearLayout>
+<ListView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/network_list"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:divider="@drawable/horizontal_line"
+	android:footerDividersEnabled="false"
+	android:headerDividersEnabled="false"
+	android:orientation="vertical"
+	tools:context="org.pacien.tincapp.activities.StartActivity">
+
+</ListView>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3f7c75a..38b7910 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,8 +19,4 @@
 
 	<string name="action_close">閉じる</string>
 	<string name="action_open_project_website">プロジェクト Web サイト</string>
-	<string name="action_connect">接続</string>
-
-	<string name="message_vpn_permissions_granted">VPN 権限を付与しました。</string>
-	<string name="message_vpn_permissions_denied">VPN 権限が拒否されました。</string>
 </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index be696ef..fe6671e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -19,8 +19,4 @@
 
 	<string name="action_close">Lukk</string>
 	<string name="action_open_project_website">Prosjektets nettside</string>
-	<string name="action_connect">Koble til</string>
-
-	<string name="message_vpn_permissions_granted">VPN-tilganger gitt.</string>
-	<string name="message_vpn_permissions_denied">VPN-tilganger nektet.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0870cb0..750edbb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,10 +25,8 @@
 
 	<string name="action_close">Close</string>
 	<string name="action_open_project_website">Project website</string>
-	<string name="action_connect">Connect</string>
 	<string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
 	<string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
 
-	<string name="message_vpn_permissions_granted">VPN permissions granted.</string>
-	<string name="message_vpn_permissions_denied">VPN permissions denied.</string>
+	<string name="message_no_network_configuration_found">No network configuration has been found.</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9f0eb8e..0b3ed77 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -47,6 +47,10 @@
 		<item name="android:clickable">true</item>
 	</style>
 
+	<style name="AppTheme.ListBlock.Placeholder">
+		<item name="android:textStyle">italic</item>
+	</style>
+
 	<style name="AppTheme.BlockTitle">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
-- 
cgit v1.2.3