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

CCCT-580 || Payment card tap issue in delivery progress screen #2922

Open
wants to merge 1 commit into
base: connect_qa
Choose a base branch
from
+15 −7
Open

CCCT-580 || Payment card tap issue in delivery progress screen #2922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions app/res/layout/connect_delivery_progress_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="15dp"
android:layout_margin="10dp"
android:id="@+id/rootView"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:shadowColor="@color/connect_light_grey_transparent"
android:shadowDx="30"
android:shadowDy="30"
android:shadowRadius="50"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="15dp"
app:cardElevation="10dp">

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -66,19 +74,19 @@
android:textSize="11sp" />

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
android:id="@+id/tvApproved"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvApproved"
android:layout_marginTop="3dp"
android:text="10"
android:textColor="@color/connect_green"
android:textSize="12sp" />

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
android:id="@+id/tvDeliveryTotalAmount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:id="@+id/tvDeliveryTotalAmount"
android:text="10,000 MWK"
android:textColor="@color/connect_green"
android:textSize="12sp" />
Expand Down Expand Up @@ -119,8 +127,8 @@
android:textSize="11sp" />

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
android:layout_width="wrap_content"
android:id="@+id/tvRemaining"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginTop="3dp"
Expand All @@ -142,8 +150,8 @@
app:layout_constraintTop_toBottomOf="@+id/linearLayout5" />

<ImageView
android:layout_width="15dp"
android:id="@+id/imgArrowForward"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="10dp"
android:contentDescription="@null"
Expand Down
2 changes: 1 addition & 1 deletion app/src/org/commcare/adapters/ConnectDeliveryProgressReportAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void onBindViewHolder(@NonNull ProgressBarViewHolder holder, int position
String remaining = context.getString(R.string.connect_results_summary_remaining_days,
connectDeliveryDetails.getPendingCount(), connectDeliveryDetails.getRemainingDays());
holder.binding.tvRemaining.setText(remaining);
holder.binding.imgArrowForward.setOnClickListener(view -> {
holder.binding.rootView.setOnClickListener(view -> {
deliveryItemOnClickListener.onClick(connectDeliveryDetails.getDeliveryName());
});
}
Expand Down