From 16e53a98d69d606c5b2d6426cd23788a2abfcfe6 Mon Sep 17 00:00:00 2001 From: Ampli-fier <22896574+Ampli-fier@users.noreply.github.com> Date: Sat, 27 Apr 2019 22:16:41 +0200 Subject: [PATCH] Enhance log with scroll and zoom possibility --- AndroidManifest.xml | 2 +- res/layout/log_view_activity.xml | 2 -- res/menu/view_log.xml | 11 +++++++++-- res/values/strings.xml | 4 ++++ .../thoughtcrime/securesms/LogViewActivity.java | 16 +++++++++++++++- .../thoughtcrime/securesms/LogViewFragment.java | 11 +++++++++++ 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 602e8828a..4217623c5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -199,7 +199,7 @@ diff --git a/res/layout/log_view_activity.xml b/res/layout/log_view_activity.xml index bea73d85d..d17fd7a87 100644 --- a/res/layout/log_view_activity.xml +++ b/res/layout/log_view_activity.xml @@ -6,6 +6,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - \ No newline at end of file diff --git a/res/menu/view_log.xml b/res/menu/view_log.xml index a9e69d77f..532ca866b 100644 --- a/res/menu/view_log.xml +++ b/res/menu/view_log.xml @@ -1,8 +1,15 @@ - + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index eff98c8d0..3dc25af60 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -136,6 +136,7 @@ Play Pause Scroll to the bottom + Scroll to the top Invite friends Help Select all @@ -146,6 +147,8 @@ Contact requests Press message to start chatting View profile + Zoom in + Zoom out Share location with all group members Mute for 1 hour @@ -380,6 +383,7 @@ In-chat sounds Message font size View log + Log Other Backup Backup chats to external storage diff --git a/src/org/thoughtcrime/securesms/LogViewActivity.java b/src/org/thoughtcrime/securesms/LogViewActivity.java index 20de00617..534f7a266 100644 --- a/src/org/thoughtcrime/securesms/LogViewActivity.java +++ b/src/org/thoughtcrime/securesms/LogViewActivity.java @@ -56,15 +56,29 @@ public class LogViewActivity extends BaseActionBarActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { super.onOptionsItemSelected(item); + Float newSize; switch (item.getItemId()) { case android.R.id.home: finish(); return true; - case R.id.copy_log_to_clipboard: Util.writeTextToClipboard(this, logViewFragment.getLogText()); Toast.makeText(getApplicationContext(), R.string.done, Toast.LENGTH_SHORT).show(); return true; + case R.id.log_zoom_in: + newSize = logViewFragment.getLogTextSize() + 2.0f; + logViewFragment.setLogTextSize(newSize); + return false; + case R.id.log_zoom_out: + newSize = logViewFragment.getLogTextSize() - 2.0f; + logViewFragment.setLogTextSize(newSize); + return false; + case R.id.log_scroll_down: + logViewFragment.scrollDownLog(); + return false; + case R.id.log_scroll_up: + logViewFragment.scrollUpLog(); + return false; } return false; diff --git a/src/org/thoughtcrime/securesms/LogViewFragment.java b/src/org/thoughtcrime/securesms/LogViewFragment.java index 3ee717139..4fdf9871a 100644 --- a/src/org/thoughtcrime/securesms/LogViewFragment.java +++ b/src/org/thoughtcrime/securesms/LogViewFragment.java @@ -30,6 +30,7 @@ import android.os.PowerManager; import android.support.v4.app.Fragment; import android.text.TextUtils; import android.util.Log; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -84,6 +85,16 @@ public class LogViewFragment extends Fragment { return logPreview==null? "null" : logPreview.getText().toString(); } + public Float getLogTextSize() { return logPreview.getTextSize(); } + + public void setLogTextSize(Float Textsize) { + logPreview.setTextSize(TypedValue.COMPLEX_UNIT_PX, Textsize); + } + + public void scrollDownLog() { logPreview.setSelection(logPreview.getText().length()); } + + public void scrollUpLog() { logPreview.setSelection(0); } + private static String grabLogcat() { try { final Process process = Runtime.getRuntime().exec("logcat -v threadtime -d");