From 483e6634e0621d2100ae11cbcd8cba6d21a76c4e Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 19 Aug 2018 18:04:58 +0200
Subject: Refactor log viewer activity

---
 app/src/main/res/layout/page_viewlog.xml      | 38 --------------------------
 app/src/main/res/layout/view_log_activity.xml | 39 +++++++++++++++++++++++++++
 app/src/main/res/menu/menu_viewlog.xml        |  8 +++---
 app/src/main/res/values/strings.xml           | 10 ++++---
 4 files changed, 49 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/main/res/layout/page_viewlog.xml
 create mode 100644 app/src/main/res/layout/view_log_activity.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/page_viewlog.xml b/app/src/main/res/layout/page_viewlog.xml
deleted file mode 100644
index 4eea176..0000000
--- a/app/src/main/res/layout/page_viewlog.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/logview_frame"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<TextView
-		android:id="@+id/logview_text"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:fontFamily="monospace"
-		android:paddingBottom="@dimen/activity_vertical_margin"
-		android:paddingLeft="@dimen/activity_horizontal_margin"
-		android:paddingRight="@dimen/activity_horizontal_margin"
-		android:paddingTop="@dimen/activity_vertical_margin"
-		android:textColor="@color/textSecondary"
-		android:textSize="12sp"/>
-</ScrollView>
diff --git a/app/src/main/res/layout/view_log_activity.xml b/app/src/main/res/layout/view_log_activity.xml
new file mode 100644
index 0000000..da663e4
--- /dev/null
+++ b/app/src/main/res/layout/view_log_activity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/log_view_frame"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fadeScrollbars="false">
+
+	<TextView
+		android:id="@+id/log_view_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fontFamily="monospace"
+		android:paddingBottom="@dimen/activity_vertical_margin"
+		android:paddingLeft="@dimen/activity_horizontal_margin"
+		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingTop="@dimen/activity_vertical_margin"
+		android:textColor="@color/textSecondary"
+		android:textSize="12sp"/>
+</ScrollView>
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>
-- 
cgit v1.2.3