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

fix(android): amend TableViewRow reuse #12620

Merged
merged 4 commits into from
Mar 23, 2021
Merged

fix(android): amend TableViewRow reuse #12620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a82b7e
fix(android): amend TableViewRow.clone()
garymathews Mar 18, 2021
a2408da
fix(android): validate activity for ripple effect
garymathews Mar 19, 2021
942c873
Merge branch 'master' into TIMOB-28399
lokeshchdhry Mar 19, 2021
898001c
Merge branch 'master' into TIMOB-28399
lokeshchdhry Mar 22, 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
13 changes: 11 additions & 2 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,14 @@ public void deleteRow(Object rowObj, @Kroll.argument(optional = true) KrollDict
@Kroll.method
public void deleteSection(int index, @Kroll.argument(optional = true) KrollDict animation)
{
this.sections.remove(getSectionByIndex(index));
final TableViewSectionProxy section = getSectionByIndex(index);

update();
if (section != null) {
this.sections.remove(section);
section.setParent(null);

update();
}
}

@Override
Expand Down Expand Up @@ -351,6 +356,10 @@ public Object[] getData()
public void setData(Object[] data)
// clang-format on
{
for (final TableViewSectionProxy section : this.sections) {
section.releaseViews();
section.setParent(null);
}
this.sections.clear();

for (Object d : data) {
Expand Down
9 changes: 2 additions & 7 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TableViewRowProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.List;

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.TiC;
Expand Down Expand Up @@ -81,14 +80,10 @@ public TableViewRowProxy(boolean placeholder)
*
* @return TableViewRowProxy
*/
@Override
public TableViewRowProxy clone()
{
final TableViewRowProxy proxy = (TableViewRowProxy) KrollProxy.createProxy(
this.getClass(),
getKrollObject(),
new Object[] { properties },
this.creationUrl.url
);
final TableViewRowProxy proxy = (TableViewRowProxy) super.clone();

// Reference clone, to update properties.
clones.add(new WeakReference<>(proxy));
Expand Down
6 changes: 4 additions & 2 deletions android/modules/ui/src/java/ti/modules/titanium/ui/TableViewSectionProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public void add(int index, Object rowObj)

if (row != null) {

if (row.getParent() != null) {
final TiViewProxy parent = row.getParent();
if (parent != null && parent.getParent() != null) {

// Row already exists, clone.
row = row.clone();
Expand Down Expand Up @@ -79,7 +80,8 @@ public void add(Object rowObj)

if (row != null) {

if (row.getParent() != null) {
final TiViewProxy parent = row.getParent();
if (parent != null && parent.getParent() != null) {

// Row already exists, clone.
row = row.clone();
Expand Down
22 changes: 22 additions & 0 deletions android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,28 @@ public void release()
*/
public abstract TiUIView createView(Activity activity);

/**
* Create clone of existing proxy, including children.
*
* @return TiViewProxy
*/
public TiViewProxy clone()
{
final TiViewProxy proxy = (TiViewProxy) KrollProxy.createProxy(
this.getClass(),
getKrollObject(),
new Object[] { properties },
this.creationUrl.url
);

// Include children.
for (final TiViewProxy child : this.children) {
proxy.add(child.clone());
}

return proxy;
}

/**
* Adds a child to this view proxy.
* @param args The child view proxy/proxies to add.
Expand Down