From 2fe3fd3baf8c7b780dfc97317ca5786fd3bc6e2b Mon Sep 17 00:00:00 2001 From: Daniel JB Clark Date: Sat, 11 Jul 2026 10:59:28 -0400 Subject: [PATCH 1/2] fix: reference existing console color resources in bottom_sheet_log --- app/src/main/res/layout/bottom_sheet_log.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/bottom_sheet_log.xml b/app/src/main/res/layout/bottom_sheet_log.xml index d5d377a9a..94d19883c 100644 --- a/app/src/main/res/layout/bottom_sheet_log.xml +++ b/app/src/main/res/layout/bottom_sheet_log.xml @@ -77,8 +77,8 @@ android:id="@+id/console" android:layout_width="match_parent" android:layout_height="match_parent" - app:color_debug="@color/console_debug" - app:color_verbose="@color/console_verbose"/> + app:color_debug="@color/console_view_debug" + app:color_verbose="@color/console_view_verbose"/> From 00573a0c06fa3ea33b9b1bc951ede83962751859 Mon Sep 17 00:00:00 2001 From: Daniel JB Clark Date: Tue, 14 Jul 2026 00:15:52 -0400 Subject: [PATCH 2/2] fix: correct LogBottomSheet AutoJs instance access Replace AutoJs.getInstance() (nullable, null-guarded) with AutoJs.instance (non-null) since the bottom sheet only opens after app initialization. --- .../autojs/autojs/ui/log/LogBottomSheet.kt | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/autojs/autojs/ui/log/LogBottomSheet.kt b/app/src/main/java/org/autojs/autojs/ui/log/LogBottomSheet.kt index 3b18d1fab..f5d195292 100644 --- a/app/src/main/java/org/autojs/autojs/ui/log/LogBottomSheet.kt +++ b/app/src/main/java/org/autojs/autojs/ui/log/LogBottomSheet.kt @@ -79,26 +79,24 @@ class LogBottomSheet : BottomSheetDialogFragment() { } // Setup ConsoleView with global console - val autoJs = AutoJs.getInstance() - if (autoJs != null) { - binding.console.setConsole(autoJs.globalConsole) - - // Hide input container (not needed in bottom sheet) - binding.console.findViewById(R.id.input_container)?.visibility = View.GONE - - // Enable clickable stack frame links (only in bottom sheet, not in LogActivity) - binding.console.setEnableStackFrameLinks(true) - - // Set up clickable stack frame listener - binding.console.setOnStackFrameClickListener { fileName, lineNumber, columnNumber -> - mStackFrameClickListener?.onStackFrameClick(fileName, lineNumber, columnNumber) - dismiss() - } + val autoJs = AutoJs.instance + binding.console.setConsole(autoJs.globalConsole) + + // Hide input container (not needed in bottom sheet) + binding.console.findViewById(R.id.input_container)?.visibility = View.GONE + + // Enable clickable stack frame links (only in bottom sheet, not in LogActivity) + binding.console.setEnableStackFrameLinks(true) + + // Set up clickable stack frame listener + binding.console.setOnStackFrameClickListener { fileName, lineNumber, columnNumber -> + mStackFrameClickListener?.onStackFrameClick(fileName, lineNumber, columnNumber) + dismiss() } // Clear button binding.btnClear.setOnClickListener { - AutoJs.getInstance()?.globalConsole?.clear() + AutoJs.instance.globalConsole.clear() } // Open full log activity button