Skip to content

Android DetailedList: use theme text colors (replace R.color.black) #3751

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Android DetailedList: use theme text colors (replace R.color.black) #3751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
317937d
Android DetailedList: use theme text colors (replace Color.BLACK)
rasmusJenle Sep 5, 2025
fef6e37
Add towncrier change note for PR #3751
rasmusJenle Sep 6, 2025
aa06f39
Pre-commit: import ordering and line-wrap for ruff E402/E501
rasmusJenle Sep 6, 2025
5d66303
android: mark legacy/fallback resolver branches as no-cover (CI 100% …
rasmusJenle Sep 6, 2025
e3e4620
CI: re-run
rasmusJenle Sep 6, 2025
cf2dc87
android: mark inline-color and fallback branches as no-cover to satis…
rasmusJenle Sep 6, 2025
52989ae
android: minimize no-cover pragmas; narrow exceptions (JavaException,…
rasmusJenle Sep 7, 2025
79592a8
android: minimize no-cover pragmas; narrow exceptions (JavaException,…
rasmusJenle Sep 7, 2025
c7a03d6
android: exception-free theme color resolver via API level + ColorSta…
rasmusJenle Sep 7, 2025
65935bb
android: resolve text colors via obtainStyledAttributes; no rubicon, …
rasmusJenle Sep 8, 2025
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
31 changes: 22 additions & 9 deletions android/src/toga_android/widgets/detailedlist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
from android.widget import ImageView, LinearLayout, RelativeLayout, ScrollView, TextView
from java import dynamic_proxy

from .base import Widget


def _resolve_theme_color(view, attr_id):
ctx = view.getContext()
ta = ctx.getTheme().obtainStyledAttributes([attr_id])
try:
if not ta.hasValue(0):
# CI's emulator theme always defines textColorPrimary/Secondary,
# so this path can't be exercised there.
raise RuntimeError( # pragma: no cover
f"Required theme color attribute not found: {attr_id}"
)
return ta.getColor(0, 0)
finally:
ta.recycle()
Comment on lines +14 to +26
Copy link
Contributor

@johnzhou721 johnzhou721 Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... is there anywhere else where we might anticipate that this function gets used? If so maybe move it into libs folder? I'm not so sure though so don't do this yet.

Copy link
Member

@mhsmith mhsmith Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I suggest moving it to the base Widget class, and then it can also be used by the calls to getColor in DetailedList.create and Table.create. Note that self._native_activity is already a Context, so there's no need to require the existence of a View.



try:
from androidx.swiperefreshlayout.widget import SwipeRefreshLayout
except ImportError: # pragma: no cover
Expand All @@ -16,9 +34,6 @@
SwipeRefreshLayout = None


from .base import Widget


class DetailedListOnClickListener(dynamic_proxy(View.OnClickListener)):
def __init__(self, impl, row_number):
super().__init__()
Expand Down Expand Up @@ -180,15 +195,13 @@ def get_string(value):
top_text = TextView(self._native_activity)
top_text.setText(get_string(title))
top_text.setTextSize(20.0)
top_text.setTextColor(
self._native_activity.getResources().getColor(R.color.black)
)
top_text.setTextColor(_resolve_theme_color(top_text, R.attr.textColorPrimary))
bottom_text = TextView(self._native_activity)
bottom_text.setTextColor(
self._native_activity.getResources().getColor(R.color.black)
)
bottom_text.setText(get_string(subtitle))
bottom_text.setTextSize(16.0)
bottom_text.setTextColor(
_resolve_theme_color(bottom_text, R.attr.textColorSecondary)
)
top_text_params = LinearLayout.LayoutParams(
RelativeLayout.LayoutParams.WRAP_CONTENT,
RelativeLayout.LayoutParams.MATCH_PARENT,
Expand Down
1 change: 1 addition & 0 deletions changes/3751.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Android: DetailedList now uses theme-resolved text colors (Primary/Secondary) instead of hard-coded black, fixing unreadable text in dark mode.
Loading