7 files changed, 64 insertions, 0 deletions

diff --git a/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml b/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml
new file mode 100644
index 0000000..84ac134
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_circle_filled_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+                                android:width="24dp"
+                                android:height="24dp"
+                                android:viewportHeight="24.0"
+                                android:viewportWidth="24.0">
+        <path
+                android:fillColor="@color/textPrimary"
+                android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,16L9,16L9,8h2v8zM15,16h-2L13,8h2v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml b/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml
new file mode 100644
index 0000000..9374a21
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_circle_outline_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+                                android:width="24dp"
+                                android:height="24dp"
+                                android:viewportHeight="24.0"
+                                android:viewportWidth="24.0">
+        <path
+                android:fillColor="@color/textPrimary"
+                android:pathData="M9,16h2L11,8L9,8v8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM13,16h2L15,8h-2v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_receipt_primary_24dp.xml b/app/src/main/res/drawable/ic_receipt_primary_24dp.xml
new file mode 100644
index 0000000..4ce8a76
--- /dev/null
+++ b/app/src/main/res/drawable/ic_receipt_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+                                android:width="24dp"
+                                android:height="24dp"
+                                android:viewportHeight="24.0"
+                                android:viewportWidth="24.0">
+        <path
+                android:fillColor="@color/textPrimary"
+                android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
+</vector>
diff --git a/app/src/main/res/layout/page_viewlog.xml b/app/src/main/res/layout/page_viewlog.xml
new file mode 100644
index 0000000..a7afed8
--- /dev/null
+++ b/app/src/main/res/layout/page_viewlog.xml
@@ -0,0 +1,13 @@
+<TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/text_log"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="monospace"
+        android:gravity="bottom"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:scrollbarStyle="outsideOverlay"
+        android:scrollbars="vertical"
+        android:textColor="@color/colorPrimary"
+        android:textSize="12sp"/>
diff --git a/app/src/main/res/menu/menu_status.xml b/app/src/main/res/menu/menu_status.xml
index 4b7c7dc..7415aeb 100644
--- a/app/src/main/res/menu/menu_status.xml
+++ b/app/src/main/res/menu/menu_status.xml
@@ -11,4 +11,12 @@
                 android:title="@string/menu_disconnect"
                 app:showAsAction="ifRoom"/>
 
+        <item
+                android:id="@+id/menu_show_log"
+                android:icon="@drawable/ic_receipt_primary_24dp"
+                android:onClick="openLogViewer"
+                android:tint="@color/colorAccent"
+                android:title="@string/menu_show_log"
+                app:showAsAction="ifRoom"/>
+
 </menu>
diff --git a/app/src/main/res/menu/menu_viewlog.xml b/app/src/main/res/menu/menu_viewlog.xml
new file mode 100644
index 0000000..ee3c60f
--- /dev/null
+++ b/app/src/main/res/menu/menu_viewlog.xml
@@ -0,0 +1,13 @@
+<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.ViewLogActivity">
+
+        <item
+                android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
+                android:onClick="toggleLogging"
+                android:tint="@color/colorAccent"
+                android:title="@string/menu_toggle_logging"
+                app:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14d1180..4a412ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,8 @@
         <string name="menu_about">About this app</string>
         <string name="menu_configure">Configure</string>
         <string name="menu_disconnect">Disconnect</string>
+        <string name="menu_show_log">Show log</string>
+        <string name="menu_toggle_logging">Toggle logging</string>
 
         <string name="field_net_name">Tinc network name</string>
         <string name="field_node_name">Name of this node</string>
@@ -80,6 +82,7 @@
         <string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string>
         <string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\n\nCheck the logs for more details.</string>
         <string name="message_loading">Loading…</string>
+        <string name="message_log_level_set">Log level set to %1$d.</string>
 
         <string name="value_none">none</string>
         <string name="value_yes">yes</string>