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/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 +++++++++++++
11 files changed, 166 insertions(+), 41 deletions(-)
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/src/main/res')
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 @@
+
+
+
+
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 @@
+
+
+
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 @@
-
-
-
-
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
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 @@
+
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 @@
デバイス ABI: %1$s
このアプリについて
- 設定ディレクトリを表示
Tinc ネットワーク名
- Tinc 設定ディレクトリ
ネットワークに接続
VPN 権限のリクエスト
閉じる
- コピー
プロジェクト Web サイト
接続
- テキストをクリップボードにコピーしました。
VPN 権限を付与しました。
VPN 権限が拒否されました。
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 @@
Enhets-binærkompabilitet: %1$s
Om
- Vis oppsettsmappe
Tinc-nettverksnavn
- Oppsettsmappe for Tinc
Koble til nettverk
Forespør VPN-tilganger
Lukk
- Kopier
Prosjektets nettside
Koble til
- Tekst kopiert til utklippstavle.
VPN-tilganger gitt.
VPN-tilganger nektet.
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 @@
#FFFFFFFF
#424242
#212121
- #FBC02D
+ #757575
+ #d9d9d9
+ #f9a825
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 @@
Device ABIs: %1$s
About this app
- Show configuration directory
+ Configure
Tinc network name
- Tinc config directory
Connect to network
Request VPN permissions
+ Path info
+ Tools
+ Configuration directories
+ Log directories
+ Tinc binaries
Close
- Copy
Project website
Connect
+ Generate node configuration and keys
+ Join network via invitation URL
- Text copied to clipboard.
VPN permissions granted.
VPN permissions denied.
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 @@
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.2.3