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/AndroidManifest.xml                   |  6 ++
 .../org/pacien/tincapp/activities/BaseActivity.kt  | 19 +----
 .../pacien/tincapp/activities/ConfigureActivity.kt | 31 +++++++++
 .../org/pacien/tincapp/activities/StartActivity.kt | 18 ++---
 app/src/main/res/drawable/horizontal_line.xml      |  4 ++
 app/src/main/res/drawable/ic_build_black_24dp.xml  |  9 +++
 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 +----
 app/src/main/res/menu/menu_start.xml               | 14 ++++
 app/src/main/res/values-ja/strings.xml             |  4 --
 app/src/main/res/values-nb-rNO/strings.xml         |  4 --
 app/src/main/res/values/colors.xml                 |  4 +-
 app/src/main/res/values/strings.xml                | 12 ++--
 app/src/main/res/values/styles.xml                 | 45 ++++++++++++
 15 files changed, 215 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
 create mode 100644 app/src/main/res/drawable/horizontal_line.xml
 create mode 100644 app/src/main/res/drawable/ic_build_black_24dp.xml
 create mode 100644 app/src/main/res/layout/page_configure.xml
 create mode 100644 app/src/main/res/menu/menu_start.xml

(limited to 'app')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8321208..4866800 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,12 @@
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name=".activities.ConfigureActivity"
+			android:parentActivityName=".activities.StartActivity"
+			android:theme="@style/AppTheme.NoActionBar">
+		</activity>
+
 		<service
 			android:name="org.pacien.tincapp.service.TincVpnService"
 			android:permission="android.permission.BIND_VPN_SERVICE">
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index 2146cec..274e1ba 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -1,8 +1,5 @@
 package org.pacien.tincapp.activities
 
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -45,18 +42,8 @@ abstract class BaseActivity : AppCompatActivity() {
                 .show()
     }
 
-    protected fun openWebsite(@StringRes url: Int) {
-        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(resources.getString(url))))
-    }
-
-    protected fun notify(@StringRes msg: Int) {
-        Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
-    }
-
-    protected fun copyIntoClipboard(label: String, str: String) {
-        val c = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        c.primaryClip = ClipData.newPlainText(label, str)
-        notify(R.string.message_text_copied)
-    }
+    protected fun openWebsite(@StringRes url: Int) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(resources.getString(url))))
+    protected fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
+    protected fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show()
 
 }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
new file mode 100644
index 0000000..69408d8
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -0,0 +1,31 @@
+package org.pacien.tincapp.activities
+
+import android.os.Bundle
+import android.view.View
+import kotlinx.android.synthetic.main.base.*
+import kotlinx.android.synthetic.main.page_configure.*
+import org.pacien.tincapp.R
+import org.pacien.tincapp.context.AppPaths
+
+/**
+ * @author pacien
+ */
+class ConfigureActivity : BaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        layoutInflater.inflate(R.layout.page_configure, main_content)
+        writeContent()
+    }
+
+    private fun writeContent() {
+        text_configuration_directories.text = AppPaths.Storage.values().map { AppPaths.confDir(it) }.joinToString("\n")
+        text_log_directories.text = AppPaths.Storage.values().map { AppPaths.cacheDir(it) }.joinToString("\n")
+        text_tinc_binaries.text = listOf(AppPaths.tinc(), AppPaths.tincd()).joinToString("\n")
+    }
+
+    fun generateConf(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet")
+    fun joinNetwork(@Suppress("UNUSED_PARAMETER") v: View) = notify("Not implemented yet")
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index 910b36f..709989b 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -6,6 +6,8 @@ import android.content.Intent
 import android.net.VpnService
 import android.os.Bundle
 import android.support.v7.app.AlertDialog
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
@@ -26,6 +28,11 @@ class StartActivity : BaseActivity() {
         layoutInflater.inflate(R.layout.page_start, main_content)
     }
 
+    override fun onCreateOptionsMenu(m: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_start, m)
+        return super.onCreateOptionsMenu(m)
+    }
+
     override fun onActivityResult(request: Int, result: Int, data: Intent?) {
         notify(if (result == Activity.RESULT_OK) R.string.message_vpn_permissions_granted else R.string.message_vpn_permissions_denied)
     }
@@ -45,7 +52,7 @@ class StartActivity : BaseActivity() {
         i.setHint(R.string.field_net_name)
 
         @SuppressLint("InflateParams")
-        val vg = layoutInflater.inflate(R.layout.dialog_frame, null) as ViewGroup
+        val vg = layoutInflater.inflate(R.layout.dialog_frame, main_content, false) as ViewGroup
         vg.addView(i)
 
         AlertDialog.Builder(this)
@@ -56,14 +63,7 @@ class StartActivity : BaseActivity() {
                 .show()
     }
 
-    fun confDirDialog(@Suppress("UNUSED_PARAMETER") v: View) {
-        AlertDialog.Builder(this)
-                .setTitle(R.string.title_tinc_config_dir)
-                .setMessage("Internal: " + AppPaths.confDir(AppPaths.Storage.INTERNAL) + "\n\n" +
-                        "External: " + AppPaths.confDir(AppPaths.Storage.EXTERNAL))
-                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
-                .show()
-    }
+    fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) = startActivity(Intent(this, ConfigureActivity::class.java))
 
     private fun startVpn(netName: String) {
         startService(Intent(this, TincVpnService::class.java).putExtra(TincVpnService.INTENT_EXTRA_NET_CONF,
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>
 
-	<string name="title_tinc_config_dir">Tinc 設定ディレクトリ</string>
 	<string name="title_connect_to_network">ネットワークに接続</string>
 	<string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
 
 	<string name="action_close">閉じる</string>
-	<string name="action_copy">コピー</string>
 	<string name="action_open_project_website">プロジェクト Web サイト</string>
 	<string name="action_connect">接続</string>
 
-	<string name="message_text_copied">テキストをクリップボードにコピーしました。</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 95f1267..be696ef 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -11,20 +11,16 @@
 	<string name="info_supported_abis_format">Enhets-binærkompabilitet: %1$s</string>
 
 	<string name="menu_about">Om</string>
-	<string name="menu_display_conf_dir">Vis oppsettsmappe</string>
 
 	<string name="field_net_name">Tinc-nettverksnavn</string>
 
-	<string name="title_tinc_config_dir">Oppsettsmappe for Tinc</string>
 	<string name="title_connect_to_network">Koble til nettverk</string>
 	<string name="title_request_vpn_permissions">Forespør VPN-tilganger</string>
 
 	<string name="action_close">Lukk</string>
-	<string name="action_copy">Kopier</string>
 	<string name="action_open_project_website">Prosjektets nettside</string>
 	<string name="action_connect">Koble til</string>
 
-	<string name="message_text_copied">Tekst kopiert til utklippstavle.</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/colors.xml b/app/src/main/res/values/colors.xml
index 5e30dc2..cc0489b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,5 +3,7 @@
 	<color name="textPrimary">#FFFFFFFF</color>
 	<color name="colorPrimary">#424242</color>
 	<color name="colorPrimaryDark">#212121</color>
-	<color name="colorAccent">#FBC02D</color>
+	<color name="colorPrimaryLight">#757575</color>
+	<color name="colorPrimaryLighter">#d9d9d9</color>
+	<color name="colorAccent">#f9a825</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e5faea..3bcf701 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,20 +11,24 @@
 	<string name="info_supported_abis_format">Device ABIs: %1$s</string>
 
 	<string name="menu_about">About this app</string>
-	<string name="menu_display_conf_dir">Show configuration directory</string>
+	<string name="menu_configure">Configure</string>
 
 	<string name="field_net_name">Tinc network name</string>
 
-	<string name="title_tinc_config_dir">Tinc config directory</string>
 	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
+	<string name="title_path_info">Path info</string>
+	<string name="title_tools">Tools</string>
+	<string name="title_configuration_directories">Configuration directories</string>
+	<string name="title_log_directories">Log directories</string>
+	<string name="title_tinc_binaries">Tinc binaries</string>
 
 	<string name="action_close">Close</string>
-	<string name="action_copy">Copy</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_text_copied">Text copied to clipboard.</string>
 	<string name="message_vpn_permissions_granted">VPN permissions granted.</string>
 	<string name="message_vpn_permissions_denied">VPN permissions denied.</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b849c8..9f0eb8e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,5 @@
 <resources>
+
 	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
 		<item name="colorPrimary">@color/colorPrimary</item>
 		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -13,4 +14,48 @@
 	<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
 	<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+	<style name="AppTheme.SectionTitle">
+		<item name="android:textColor">@color/colorAccent</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+		<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+		<item name="android:paddingTop">@dimen/activity_vertical_margin</item>
+	</style>
+
+	<style name="AppTheme.List">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:divider">@drawable/horizontal_line</item>
+		<item name="android:orientation">vertical</item>
+		<item name="android:showDividers">middle</item>
+	</style>
+
+	<style name="AppTheme.ListBlock">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
+		<item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+		<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+		<item name="android:paddingTop">@dimen/activity_vertical_margin</item>
+		<item name="android:orientation">vertical</item>
+	</style>
+
+	<style name="AppTheme.ListBlock.Clickable">
+		<item name="android:background">?attr/selectableItemBackground</item>
+		<item name="android:clickable">true</item>
+	</style>
+
+	<style name="AppTheme.BlockTitle">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textAppearance">@style/TextAppearance.AppCompat.Light.SearchResult.Subtitle</item>
+	</style>
+
+	<style name="AppTheme.BlockContent">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textColor">@color/colorPrimaryLight</item>
+	</style>
 </resources>
-- 
cgit v1.2.3