aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/view_log_activity.xml (renamed from app/src/main/res/layout/page_viewlog.xml)7
-rw-r--r--app/src/main/res/menu/menu_viewlog.xml8
-rw-r--r--app/src/main/res/values/strings.xml10
3 files changed, 14 insertions, 11 deletions
diff --git a/app/src/main/res/layout/page_viewlog.xml b/app/src/main/res/layout/view_log_activity.xml
index 4eea176..da663e4 100644
--- a/app/src/main/res/layout/page_viewlog.xml
+++ b/app/src/main/res/layout/view_log_activity.xml
@@ -20,12 +20,13 @@
20 20
21<ScrollView 21<ScrollView
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/logview_frame" 23 android:id="@+id/log_view_frame"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="match_parent"> 25 android:layout_height="match_parent"
26 android:fadeScrollbars="false">
26 27
27 <TextView 28 <TextView
28 android:id="@+id/logview_text" 29 android:id="@+id/log_view_text"
29 android:layout_width="match_parent" 30 android:layout_width="match_parent"
30 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
31 android:fontFamily="monospace" 32 android:fontFamily="monospace"
diff --git a/app/src/main/res/menu/menu_viewlog.xml b/app/src/main/res/menu/menu_viewlog.xml
index 7b1ce6d..bdcdb99 100644
--- a/app/src/main/res/menu/menu_viewlog.xml
+++ b/app/src/main/res/menu/menu_viewlog.xml
@@ -21,21 +21,21 @@
21<menu xmlns:android="http://schemas.android.com/apk/res/android" 21<menu xmlns:android="http://schemas.android.com/apk/res/android"
22 xmlns:app="http://schemas.android.com/apk/res-auto" 22 xmlns:app="http://schemas.android.com/apk/res-auto"
23 xmlns:tools="http://schemas.android.com/tools" 23 xmlns:tools="http://schemas.android.com/tools"
24 tools:context="org.pacien.tincapp.activities.ViewLogActivity"> 24 tools:context="org.pacien.tincapp.activities.viewlog.ViewLogActivity">
25 25
26 <item 26 <item
27 android:id="@+id/log_viewer_action_toggle" 27 android:id="@+id/log_viewer_action_toggle"
28 android:icon="@drawable/ic_pause_circle_outline_primary_24dp" 28 android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
29 android:onClick="toggleLogging" 29 android:onClick="toggleLogging"
30 android:tint="@color/textAccent" 30 android:tint="@color/textAccent"
31 android:title="@string/menu_toggle_logging" 31 android:title="@string/log_view_menu_toggle_logging"
32 app:showAsAction="ifRoom"/> 32 app:showAsAction="ifRoom"/>
33 33
34 <item 34 <item
35 android:icon="@drawable/ic_share_primary_24dp" 35 android:icon="@drawable/ic_share_primary_24dp"
36 android:onClick="share" 36 android:onClick="shareLog"
37 android:tint="@color/textAccent" 37 android:tint="@color/textAccent"
38 android:title="@string/menu_share_log" 38 android:title="@string/log_view_menu_share_log"
39 app:showAsAction="ifRoom"/> 39 app:showAsAction="ifRoom"/>
40 40
41</menu> 41</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a27fab7..a9bf3ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,8 +38,6 @@
38 <string name="menu_configure">Configure</string> 38 <string name="menu_configure">Configure</string>
39 <string name="menu_disconnect">Disconnect</string> 39 <string name="menu_disconnect">Disconnect</string>
40 <string name="menu_show_log">Show log</string> 40 <string name="menu_show_log">Show log</string>
41 <string name="menu_toggle_logging">Toggle logging</string>
42 <string name="menu_share_log">Share log</string>
43 41
44 <string name="field_passphrase">Passphrase</string> 42 <string name="field_passphrase">Passphrase</string>
45 43
@@ -74,8 +72,6 @@
74 <string name="message_disconnecting_vpn">Disconnecting VPN…</string> 72 <string name="message_disconnecting_vpn">Disconnecting VPN…</string>
75 <string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string> 73 <string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string>
76 <string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\nCheck the logs for more details.</string> 74 <string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\nCheck the logs for more details.</string>
77 <string name="message_log_level_set">Log level set to %1$d.</string>
78 <string name="message_log_paused">Logging paused.</string>
79 <string name="message_could_not_configure_iface">Could not apply network interface configuration:\n%1$s</string> 75 <string name="message_could_not_configure_iface">Could not apply network interface configuration:\n%1$s</string>
80 <string name="message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string> 76 <string name="message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string>
81 <string name="message_invalid_network_name">Invalid network name.</string> 77 <string name="message_invalid_network_name">Invalid network name.</string>
@@ -136,4 +132,10 @@
136 <string name="status_node_list_modal_placeholder_text">Loading…</string> 132 <string name="status_node_list_modal_placeholder_text">Loading…</string>
137 <string name="status_node_info_dialog_title">Node info</string> 133 <string name="status_node_info_dialog_title">Node info</string>
138 <string name="status_node_info_dialog_close_action">Close</string> 134 <string name="status_node_info_dialog_close_action">Close</string>
135
136 <!-- Log viewer activity -->
137 <string name="log_view_state_level_format">Log level: %s</string>
138 <string name="log_view_state_paused">Logging paused</string>
139 <string name="log_view_menu_toggle_logging">Toggle logging</string>
140 <string name="log_view_menu_share_log">Share log</string>
139</resources> 141</resources>