Refactor log viewer activity

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 @@
 
 <ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/logview_frame"
+        android:id="@+id/log_view_frame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fadeScrollbars="false">
 
         <TextView
-                android:id="@+id/logview_text"
+                android:id="@+id/log_view_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 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 @@
 <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">
+                        tools:context="org.pacien.tincapp.activities.viewlog.ViewLogActivity">
 
         <item
                 android:id="@+id/log_viewer_action_toggle"
                 android:icon="@drawable/ic_pause_circle_outline_primary_24dp"
                 android:onClick="toggleLogging"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_toggle_logging"
+                android:title="@string/log_view_menu_toggle_logging"
                 app:showAsAction="ifRoom"/>
 
         <item
                 android:icon="@drawable/ic_share_primary_24dp"
-                android:onClick="share"
+                android:onClick="shareLog"
                 android:tint="@color/textAccent"
-                android:title="@string/menu_share_log"
+                android:title="@string/log_view_menu_share_log"
                 app:showAsAction="ifRoom"/>
 
 </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 @@
         <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="menu_share_log">Share log</string>
 
         <string name="field_passphrase">Passphrase</string>
 
@@ -74,8 +72,6 @@
         <string name="message_disconnecting_vpn">Disconnecting VPN…</string>
         <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\nCheck the logs for more details.</string>
-        <string name="message_log_level_set">Log level set to %1$d.</string>
-        <string name="message_log_paused">Logging paused.</string>
         <string name="message_could_not_configure_iface">Could not apply network interface configuration:\n%1$s</string>
         <string name="message_could_not_bind_iface">Could not bind network interface. Is another VPN running?</string>
         <string name="message_invalid_network_name">Invalid network name.</string>
@@ -136,4 +132,10 @@
         <string name="status_node_list_modal_placeholder_text">Loading…</string>
         <string name="status_node_info_dialog_title">Node info</string>
         <string name="status_node_info_dialog_close_action">Close</string>
+
+        <!-- Log viewer activity -->
+        <string name="log_view_state_level_format">Log level: %s</string>
+        <string name="log_view_state_paused">Logging paused</string>
+        <string name="log_view_menu_toggle_logging">Toggle logging</string>
+        <string name="log_view_menu_share_log">Share log</string>
 </resources>