Skip to content
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

Jump to bottom

chore(android): TableViewRow/ListItem added after theme switch should use current theme #12622

Merged
merged 4 commits into from
Mar 24, 2021
Merged

chore(android): TableViewRow/ListItem added after theme switch should use current theme #12622

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b61bd4
chore(android): row added after theme switch should use current theme
jquick-axway Mar 19, 2021
0d79b5b
Merge branch 'master' into TIMOB-28301-rev2
garymathews Mar 19, 2021
8091bbc
chore(android): make TableView/ListView holder context reference final
jquick-axway Mar 19, 2021
435bb5f
Merge branch 'master' into TIMOB-28301-rev2
lokeshchdhry Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,15 @@ public void bind(final ListItemProxy proxy, final boolean selected)
}

if (proxy != null) {
final TiUIView view = proxy.getOrCreateView();
// Update list item proxy's activity in case it has changed, such as after a dark/light theme change.
final Context context = this.itemView.getContext();
if ((context instanceof Activity) && (proxy.getActivity() != context)) {
proxy.releaseViews();
proxy.setActivity((Activity) context);
}

// Get or create the view. (Must be called after updating activity above.)
final TiUIView view = proxy.getOrCreateView();
if (view != null) {
final ViewGroup borderView = (ViewGroup) view.getOuterView();
final ViewGroup nativeView = (ViewGroup) view.getNativeView();
Expand Down
7 changes: 7 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TableViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ public void bind(final TableViewRowProxy proxy, final boolean selected)
// Obtain proxy properties.
final KrollDict properties = proxy.getProperties();

// Update row proxy's activity in case it has changed, such as after a dark/light theme change.
final Context context = this.itemView.getContext();
if ((context instanceof Activity) && (proxy.getActivity() != context)) {
proxy.releaseViews();
proxy.setActivity((Activity) context);
}

// Obtain row view.
final TableViewRowProxy.RowView rowView = (TableViewRowProxy.RowView) proxy.getOrCreateView();
if (rowView != null) {
Expand Down