Skip to content

Fix console color resource references and AutoJs singleton in LogBottomSheet #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
djbclark wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix console color resource references and AutoJs singleton in LogBottomSheet #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fe3fd3
fix: reference existing console color resources in bottom_sheet_log
djbclark Jul 11, 2026
00573a0
fix: correct LogBottomSheet AutoJs instance access
djbclark Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions app/src/main/java/org/autojs/autojs/ui/log/LogBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<View>(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<View>(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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/bottom_sheet_log.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

</FrameLayout>

Expand Down