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

ListView has empty cells while scrolling up/down #14119

Merged
merged 2 commits into from
Sep 22, 2024
Merged

ListView has empty cells while scrolling up/down #14119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd6f381
fix(android): use Barrier to set constraints
prashantsaini1 Sep 18, 2024
7875e19
fix(android): list-item shifts to left on having accessoryType field
prashantsaini1 Sep 18, 2024
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
23 changes: 14 additions & 9 deletions android/modules/ui/res/layout/titanium_ui_listview_holder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
app:layout_constraintBottom_toTopOf="@+id/titanium_ui_listview_holder_footer_title"
app:layout_constraintStart_toEndOf="@id/titanium_ui_listview_holder_left_image"
app:layout_constraintTop_toBottomOf="@+id/titanium_ui_listview_holder_header_title" />
app:layout_constraintTop_toBottomOf="@+id/barrierHeader" />

<ImageView
android:id="@+id/titanium_ui_listview_holder_left_image"
Expand All @@ -24,9 +23,9 @@
android:focusableInTouchMode="false"
android:paddingStart="6dp"
android:paddingEnd="0dp"
app:layout_constraintBottom_toTopOf="@id/titanium_ui_listview_holder_footer_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_header_title" />
app:layout_constraintTop_toTopOf="@id/titanium_ui_listview_holder_content"
app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_content" />

<ImageView
android:id="@+id/titanium_ui_listview_holder_right_image"
Expand All @@ -35,9 +34,9 @@
android:layout_marginEnd="6dp"
android:focusable="false"
android:focusableInTouchMode="false"
app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_footer_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_header_title" />
app:layout_constraintTop_toTopOf="@id/titanium_ui_listview_holder_content"
app:layout_constraintBottom_toBottomOf="@id/titanium_ui_listview_holder_content" />

<TextView
android:id="@+id/titanium_ui_listview_holder_header_title"
Expand All @@ -63,10 +62,16 @@
android:minHeight="18dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_content" />

<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrierHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="titanium_ui_listview_holder_header,titanium_ui_listview_holder_header_title" />

<org.appcelerator.titanium.view.TiCompositeLayout
android:id="@+id/titanium_ui_listview_holder_header"
Expand All @@ -84,7 +89,7 @@
android:layout_height="wrap_content"
android:focusable="false"
android:focusableInTouchMode="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/titanium_ui_listview_holder_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

Expand Down
28 changes: 0 additions & 28 deletions 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 @@ -34,8 +34,6 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.recyclerview.widget.RecyclerView;

import java.lang.ref.WeakReference;
Expand Down Expand Up @@ -365,16 +363,6 @@ private void setHeaderFooter(TiViewProxy listViewProxy,

this.header.addView(headerView, view.getLayoutParams());
this.header.setVisibility(View.VISIBLE);

ConstraintSet constraintSet = new ConstraintSet();
constraintSet.clone((ConstraintLayout) this.container);
constraintSet.connect(R.id.titanium_ui_listview_holder_content, ConstraintSet.TOP,
R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.TOP,
R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.TOP,
R.id.titanium_ui_listview_holder_header, ConstraintSet.BOTTOM, 0);
constraintSet.applyTo((ConstraintLayout) this.container);
}
}
}
Expand Down Expand Up @@ -409,22 +397,6 @@ private void setHeaderFooter(TiViewProxy listViewProxy,

this.footer.addView(footerView, view.getLayoutParams());
this.footer.setVisibility(View.VISIBLE);

ConstraintSet constraintSet = new ConstraintSet();
constraintSet.clone((ConstraintLayout) this.container);

int constraintStartId = R.id.titanium_ui_listview_holder_header;
if (this.content.getChildCount() > 0) {
constraintStartId = R.id.titanium_ui_listview_holder_content;
}

constraintSet.connect(constraintStartId, ConstraintSet.BOTTOM,
R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
constraintSet.connect(R.id.titanium_ui_listview_holder_left_image, ConstraintSet.BOTTOM,
R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
constraintSet.connect(R.id.titanium_ui_listview_holder_right_image, ConstraintSet.BOTTOM,
R.id.titanium_ui_listview_holder_footer, ConstraintSet.TOP, 0);
constraintSet.applyTo((ConstraintLayout) this.container);
}
}
}
Expand Down
Loading