fix(android): fragments in children of list view and tableview header…

…/footerview (#12524) specifically allow to add a MapView ("ti.map") inside headerView of Ti.UI.ListView Fixes TIMOB-28376
tidev · Mar 11, 2021 · ef5c95d · ef5c95d
1 parent 5a8acaa
commit ef5c95d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListItemProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListItemProxy.java
@@ -648,23 +648,6 @@ public void releaseViews()
 	{
 		this.holder = null;
 
-		final KrollDict properties = getProperties();
-
-		if (properties.containsKeyAndNotNull(TiC.PROPERTY_HEADER_VIEW)) {
-			final TiViewProxy header = (TiViewProxy) properties.get(TiC.PROPERTY_HEADER_VIEW);
-
-			if (header.getParent() == this) {
-				header.releaseViews();
-			}
-		}
-		if (properties.containsKeyAndNotNull(TiC.PROPERTY_FOOTER_VIEW)) {
-			final TiViewProxy footer = (TiViewProxy) properties.get(TiC.PROPERTY_FOOTER_VIEW);
-
-			if (footer.getParent() == this) {
-				footer.releaseViews();
-			}
-		}
-
 		super.releaseViews();
 	}
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java
@@ -357,11 +357,20 @@ public void release()
 	@Override
 	public void releaseViews()
 	{
+		// Release all section item views.
 		for (final ListItemProxy item : this.items) {
-
-			// Release all section item views.
 			item.releaseViews();
 		}
+
+		// Release header/footer views.
+		if (hasPropertyAndNotNull(TiC.PROPERTY_HEADER_VIEW)) {
+			final TiViewProxy headerProxy = (TiViewProxy) getProperty(TiC.PROPERTY_HEADER_VIEW);
+			headerProxy.releaseViews();
+		}
+		if (hasPropertyAndNotNull(TiC.PROPERTY_FOOTER_VIEW)) {
+			final TiViewProxy footerProxy = (TiViewProxy) getProperty(TiC.PROPERTY_FOOTER_VIEW);
+			footerProxy.releaseViews();
+		}
 	}
 
 	/**

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewHolder.java
@@ -313,6 +313,8 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 			return;
 		}
 
+		final Context context = this.itemView.getContext();
+
 		// Handle `header` and `footer`.
 		if (updateHeader) {
 			if (properties.containsKeyAndNotNull(TiC.PROPERTY_HEADER_TITLE)) {
@@ -325,6 +327,11 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 				// Handle header view.
 				final TiViewProxy headerProxy = (TiViewProxy) properties.get(TiC.PROPERTY_HEADER_VIEW);
+				if ((context instanceof Activity) && (headerProxy.getActivity() != context)) {
+					headerProxy.releaseViews();
+					headerProxy.setActivity((Activity) context);
+				}
+
 				final TiUIView view = headerProxy.getOrCreateView();
 				if (view != null) {
 					final View headerView = view.getOuterView();
@@ -354,6 +361,11 @@ private void setHeaderFooter(TiViewProxy listViewProxy,
 
 				// Handle footer view.
 				final TiViewProxy footerProxy = (TiViewProxy) properties.get(TiC.PROPERTY_FOOTER_VIEW);
+				if ((context instanceof Activity) && (footerProxy.getActivity() != context)) {
+					footerProxy.releaseViews();
+					footerProxy.setActivity((Activity) context);
+				}
+
 				final TiUIView view = footerProxy.getOrCreateView();
 				if (view != null) {
 					final View footerView = view.getOuterView();

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TableViewHolder.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TableViewHolder.java
@@ -520,6 +520,8 @@ private void setHeaderFooter(TiViewProxy tableViewProxy,
 			return;
 		}
 
+		final Context context = this.itemView.getContext();
+
 		// Handle `header` and `footer`.
 		if (updateHeader) {
 
@@ -536,8 +538,12 @@ private void setHeaderFooter(TiViewProxy tableViewProxy,
 
 				// Handle header view.
 				final TiViewProxy headerProxy = (TiViewProxy) properties.get(TiC.PROPERTY_HEADER_VIEW);
-				final TiUIView view = headerProxy.getOrCreateView();
+				if ((context instanceof Activity) && (headerProxy.getActivity() != context)) {
+					headerProxy.releaseViews();
+					headerProxy.setActivity((Activity) context);
+				}
 
+				final TiUIView view = headerProxy.getOrCreateView();
 				if (view != null) {
 					final View headerView = view.getOuterView();
 
@@ -574,8 +580,12 @@ private void setHeaderFooter(TiViewProxy tableViewProxy,
 
 				// Handle footer view.
 				final TiViewProxy footerProxy = (TiViewProxy) properties.get(TiC.PROPERTY_FOOTER_VIEW);
-				final TiUIView view = footerProxy.getOrCreateView();
+				if ((context instanceof Activity) && (footerProxy.getActivity() != context)) {
+					footerProxy.releaseViews();
+					footerProxy.setActivity((Activity) context);
+				}
 
+				final TiUIView view = footerProxy.getOrCreateView();
 				if (view != null) {
 					final View footerView = view.getOuterView();