feat: Add "Clear All Logs" & "Jump To Bottom" button

Add "Clear All Logs" to clear all logs in logcat. Add "Jump to Bottom" in `LogActivity` to jump to the last position in the log view. Refs #646
osfans · Dec 11, 2023 · 5e1b5a8 · 5e1b5a8
1 parent 0b07cf1
commit 5e1b5a8
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 3 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ui/components/log/LogView.kt b/app/src/main/java/com/osfans/trime/ui/components/log/LogView.kt
@@ -105,4 +105,8 @@ class LogView
         fun clear() {
             logAdapter.clear()
         }
+
+        fun scrollToBottom() {
+            recyclerView.scrollToPosition(logAdapter.itemCount - 1)
+        }
     }
diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/ToolkitFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/ToolkitFragment.kt
@@ -1,11 +1,13 @@
 package com.osfans.trime.ui.fragments
 
+import android.app.AlertDialog
 import android.os.Bundle
 import androidx.fragment.app.activityViewModels
 import androidx.preference.Preference
 import com.osfans.trime.R
 import com.osfans.trime.ui.components.PaddingPreferenceFragment
 import com.osfans.trime.ui.main.MainViewModel
+import com.osfans.trime.util.Logcat
 import com.osfans.trime.util.ShortcutUtils
 
 class ToolkitFragment : PaddingPreferenceFragment() {
@@ -27,6 +29,21 @@ class ToolkitFragment : PaddingPreferenceFragment() {
                 }
             },
         )
+        screen.addPreference(
+            Preference(context).apply {
+                setTitle(R.string.real_time_logs_clear)
+                isIconSpaceReserved = false
+                setOnPreferenceClickListener {
+                    AlertDialog.Builder(context)
+                        .setMessage(R.string.real_time_logs_confirm)
+                        .setPositiveButton(R.string.ok) { _, _ ->
+                            Logcat.default.clearLog()
+                        }.setNegativeButton(R.string.cancel, null)
+                        .show()
+                    true
+                }
+            },
+        )
         preferenceScreen = screen
     }
 

diff --git a/app/src/main/java/com/osfans/trime/ui/main/LogActivity.kt b/app/src/main/java/com/osfans/trime/ui/main/LogActivity.kt
@@ -101,6 +101,9 @@ class LogActivity : AppCompatActivity() {
             exportButton.setOnClickListener {
                 launcher.launch("$packageName-${iso8601UTCDateTime()}.txt")
             }
+            jumpToBottomButton.setOnClickListener {
+                logView.scrollToBottom()
+            }
         }
         registerLauncher()
     }

diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
@@ -46,6 +46,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/export" />
+
+        <Button
+            android:id="@+id/jumpToBottomButton"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/scroll_to_bottom" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -216,9 +216,12 @@
     <string name="pref_toolkit">工具箱</string>
     <string name="system">系统</string>
     <string name="export">导出</string>
-    <string name="clear">清除</string>
+    <string name="scroll_to_bottom">跳到最後</string>
+    <string name="clear">清除画面</string>
     <string name="crash_logs">崩溃日志</string>
     <string name="real_time_logs">实时日志</string>
+    <string name="real_time_logs_clear">清除所有日志</string>
+    <string name="real_time_logs_confirm">要清除有日志吗？(此动作不能复原)</string>
     <string name="app_crash">应用程序崩溃了</string>
     <string name="exception_logcat_created">Logcat 进程已创建</string>
     <string name="app_crash_message">抱歉，但我们提供了日志以供调查。</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -218,11 +218,14 @@
         <item name="100">100</item>
     </string-array>
     <string name="export">匯出</string>
+    <string name="scroll_to_bottom">跳到最後</string>
     <string name="app_crash_message">抱歉，但我們為您帶來了一些紀錄檔以供調查。</string>
     <string name="app_crash">應用程式當機</string>
     <string name="crash_logs">當機紀錄檔</string>
     <string name="real_time_logs">即時紀錄檔</string>
-    <string name="clear">清除</string>
+    <string name="real_time_logs_clear">清除所有紀錄檔</string>
+    <string name="real_time_logs_confirm">要清除有紀錄檔嗎？(此動作不能復原)</string>
+    <string name="clear">清除畫面</string>
     <string name="system">系統</string>
     <string name="pref_toolkit">工具箱</string>
     <string name="exception_logcat_created">Logcat 行程已建立</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -227,9 +227,12 @@
     <string name="app_crash">Application crashed</string>
     <string name="app_crash_message">Sorry, but we bring you some logs to investigate.</string>
     <string name="real_time_logs">Real-time logs</string>
+    <string name="real_time_logs_clear">Clear All Logs</string>
+    <string name="real_time_logs_confirm">Do you want to clear all Logs? (This action cannot be undo)</string>
     <string name="crash_logs">Crash logs</string>
-    <string name="clear">Clear</string>
+    <string name="clear">Clear Screen</string>
     <string name="export">Export</string>
+    <string name="scroll_to_bottom">Jump to Bottom</string>
     <string name="system">System</string>
     <string name="pref_toolkit">Toolkit</string>
     <string name="reset__asset_is_null_or_empty">This path points to a empty directory or null pointer.</string>