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)(8_1_X): ListView's SearchBar/SearchView wrongly overlaps rows as of 8.0.1 #11105

Merged
merged 2 commits into from
Aug 1, 2019
Merged

fix(android)(8_1_X): ListView's SearchBar/SearchView wrongly overlaps rows as of 8.0.1 #11105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f8f93
fix(android): ListView's SearchBar/SearchView wrongly overlaps rows a…
jquick-axway Aug 1, 2019
90bfafd
chore(android): update code format for [TIMOB-27094]
jquick-axway Aug 1, 2019
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
43 changes: 17 additions & 26 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import android.widget.AbsListView.OnScrollListener;
import android.widget.BaseAdapter;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.LinearLayout;
import android.widget.TextView;

public class TiListView extends TiUIView implements OnSearchChangeListener
Expand Down Expand Up @@ -83,7 +83,7 @@ public class TiListView extends TiUIView implements OnSearchChangeListener
private View footerView;
private String searchText;
private boolean caseInsensitive;
private RelativeLayout searchLayout;
private LinearLayout searchLayout;
private static final String TAG = "TiListView";

/* We cache properties that already applied to the recycled list item in ViewItem.java
Expand Down Expand Up @@ -663,57 +663,48 @@ public void processProperties(KrollDict d)
private void layoutSearchView(TiViewProxy searchView)
{
TiUIView search = searchView.getOrCreateView();
RelativeLayout layout = new RelativeLayout(proxy.getActivity());
layout.setGravity(Gravity.NO_GRAVITY);
LinearLayout layout = new LinearLayout(proxy.getActivity());
layout.setOrientation(LinearLayout.VERTICAL);
layout.setPadding(0, 0, 0, 0);
addSearchLayout(layout, searchView, search);
setNativeView(layout);
}

private void addSearchLayout(RelativeLayout layout, TiViewProxy searchView, TiUIView search)
private void addSearchLayout(LinearLayout layout, TiViewProxy searchView, TiUIView search)
{
RelativeLayout.LayoutParams p = createBasicSearchLayout();
p.addRule(RelativeLayout.ALIGN_PARENT_TOP);

// Fetch the height of the SearchBar/SearchView.
TiDimension rawHeight;
if (searchView.hasProperty(TiC.PROPERTY_HEIGHT)) {
rawHeight = TiConvert.toTiDimension(searchView.getProperty(TiC.PROPERTY_HEIGHT), 0);
} else {
rawHeight = TiConvert.toTiDimension(MIN_SEARCH_HEIGHT, 0);
}
p.height = rawHeight.getAsPixels(layout);

View nativeView = search.getNativeView();
layout.addView(nativeView, p);
// Add the search view to the top of the vertical layout.
LinearLayout.LayoutParams params =
new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, rawHeight.getAsPixels(layout));
layout.addView(search.getNativeView(), params);

p = createBasicSearchLayout();
p.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
p.addRule(RelativeLayout.BELOW, nativeView.getId());
// Add the ListView to the bottom of the vertical layout.
params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
ViewParent parentWrapper = wrapper.getParent();
if (parentWrapper != null && parentWrapper instanceof ViewGroup) {
// get the previous layout params so we can reset with new layout
ViewGroup.LayoutParams lp = wrapper.getLayoutParams();
ViewGroup.LayoutParams lastParams = wrapper.getLayoutParams();
ViewGroup parentView = (ViewGroup) parentWrapper;
// remove view from parent
parentView.removeView(wrapper);
// add new layout
layout.addView(wrapper, p);
parentView.addView(layout, lp);
layout.addView(wrapper, params);
parentView.addView(layout, lastParams);

} else {
layout.addView(wrapper, p);
layout.addView(wrapper, params);
}
this.searchLayout = layout;
}

private RelativeLayout.LayoutParams createBasicSearchLayout()
{
RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,
RelativeLayout.LayoutParams.MATCH_PARENT);
p.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
p.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
return p;
}
private void setHeaderOrFooterView(Object viewObj, boolean isHeader)
{
if (viewObj instanceof TiViewProxy) {
Expand Down