Skip to content

Commit

Permalink
NTV-637: Messages screen unable to load more messages (#1716)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arkariang
Arkariang committed Dec 8, 2022
1 parent f14116a commit a45dc1f
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 78 deletions.
2 changes: 0 additions & 2 deletions app/src/main/java/com/kickstarter/libs/RecyclerViewPaginator.java
View file
Expand Up @@ -22,7 +22,6 @@ public final class RecyclerViewPaginator {
private final @NonNull Action0 nextPage;
private final Observable<Boolean> isLoading;
private Subscription subscription;
private static final int DIRECTION_DOWN = 1;
private Subscription retrySubscription;
private final PublishSubject<Void> retryLoadingNextPageSubject = PublishSubject.create();

Expand Down Expand Up @@ -51,7 +50,6 @@ public void start() {

final Observable<Pair<Integer, Integer>> lastVisibleAndCount = RxRecyclerView.scrollEvents(this.recyclerView)
.filter(__ -> BoolenExtKt.isFalse(Secrets.IS_OSS))
.filter(__ -> this.recyclerView.canScrollVertically(DIRECTION_DOWN))
.map(__ -> this.recyclerView.getLayoutManager())
.ofType(LinearLayoutManager.class)
.map(this::displayedItemFromLinearLayout)
Expand Down
148 changes: 72 additions & 76 deletions app/src/main/res/layout/message_thread_view.xml
View file
@@ -1,94 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/message_thread_container"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:foreground="@drawable/click_indicator_light"
android:orientation="vertical">

<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/message_thread_container"
android:paddingTop="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="wrap_content">

<ImageView
android:id="@+id/participant_avatar_image_view"
android:layout_width="@dimen/grid_5"
android:layout_height="@dimen/grid_5"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
tools:background="@color/accent"
tools:ignore="ContentDescription" />
android:id="@+id/participant_avatar_image_view"
android:layout_width="@dimen/grid_7"
android:layout_height="@dimen/grid_7"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/grid_3"
android:layout_marginRight="@dimen/grid_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/accent"
tools:ignore="ContentDescription" />

<TextView
android:id="@+id/message_thread_date_text_view"
style="@style/Caption2Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
tools:text="Yesterday" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/grid_2"
android:layout_marginStart="@dimen/grid_2"
android:layout_toEndOf="@+id/participant_avatar_image_view"
android:layout_toStartOf="@+id/message_thread_date_text_view"
android:orientation="vertical">

<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/participant_name_text_view"
style="@style/BodyPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/grid_1_half"
android:orientation="horizontal">

<TextView
android:id="@+id/participant_name_text_view"
style="@style/BodyPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/grid_1_half"
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
tools:text="Somebody once told me that" />

<TextView
android:id="@+id/message_thread_unread_count_text_view"
style="@style/Caption1Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/grid_1"
android:layout_weight="0"
android:textColor="@color/accent"
android:textStyle="bold"
tools:text="(2)" />
android:layout_marginEnd="@dimen/grid_1_half"
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
tools:text="Somebody once told me that"
app:layout_constraintStart_toStartOf="@+id/guideline1"
app:layout_constraintEnd_toStartOf="@+id/message_thread_unread_count_text_view"
app:layout_constraintTop_toTopOf="parent"/>

</LinearLayout>
<TextView
android:id="@+id/message_thread_unread_count_text_view"
style="@style/Caption1Primary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/grid_1"
android:layout_weight="0"
android:textColor="@color/accent"
android:textStyle="bold"
tools:text="(2)"
app:layout_constraintStart_toEndOf="@+id/participant_name_text_view"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="parent"/>

<TextView
<TextView
android:id="@+id/message_thread_body_text_view"
style="@style/FootnoteSecondary"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:importantForAccessibility="no"
android:lines="1"
tools:text="Thanks for backing our project!" />
android:layout_marginTop="@dimen/grid_1"
tools:text="Thanks for backing our project!"
app:layout_constraintTop_toBottomOf="@+id/participant_name_text_view"
app:layout_constraintStart_toStartOf="@+id/guideline1"
app:layout_constraintEnd_toEndOf="@+id/guideline2" />

<TextView
android:id="@+id/message_thread_date_text_view"
style="@style/Caption2Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Yesterday"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

</LinearLayout>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.18" />

</RelativeLayout>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.82" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit a45dc1f

Please sign in to comment.