Skip to content

Task/dtserwfour 175 transaction section label is not displayed in some devices #224

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

Merged
malaw-hw merged 5 commits into from
Dec 17, 2020
Merged

Task/dtserwfour 175 transaction section label is not displayed in some devices #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0927d14
DTSERWFOUR-175-TRANSACTION-section-label-is-not-displayed-in-some-dev…
shanavas123 Dec 12, 2020
f97bc8f
DTSERWFOUR-175-TRANSACTION-section-label-is-not-displayed-in-some-dev…
shanavas123 Dec 12, 2020
6afa184
DTSERWFOUR-175-TRANSACTION-section-label-is-not-displayed-in-some-dev…
shanavas123 Dec 12, 2020
e05a191
fixed testListPrepaidCardReceipt_checkDateTextOnLocaleChange
malaw-hw Dec 15, 2020
650a360
Since static header got refactored to minimize based on scrolling. No…
ShravanKumarSidigum Dec 15, 2020
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
10 changes: 6 additions & 4 deletions .../src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import static androidx.test.espresso.matcher.ViewMatchers.withText;

import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;

import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
Expand Down Expand Up @@ -309,13 +310,14 @@ public void testListPrepaidCardReceipt_checkDateTextOnLocaleChange() {
mActivityTestRule.launchActivity(null);
// assert
onView(withId(R.id.list_receipts))
.check(matches(atPosition(0, hasDescendant(withText("Juni 2019")))));
.check(matches(atPosition(0, hasDescendant(withText(containsString("Juni 2019"))))));
onView(withId(R.id.list_receipts)).check(matches(atPosition(0,
hasDescendant(withText(com.hyperwallet.android.ui.receipt.R.string.debit)))));
onView(withId(R.id.list_receipts)).check(
matches(atPosition(0, hasDescendant(withText(R.string.adjustment)))));

onView(withId(R.id.list_receipts)).check(
matches(atPosition(0, hasDescendant(withText(debitSymbol + usdCurrencySymbol + "8.90")))));
matches(atPosition(0, hasDescendant(withText(containsString(debitSymbol + "8,90"))))));
onView(withId(R.id.list_receipts)).check(
matches(atPosition(0, hasDescendant(withText("1. Juni 2019")))));
onView(withId(R.id.list_receipts)).check(
Expand Down Expand Up @@ -394,7 +396,7 @@ public void testListPrepaidCardReceipt_clickTransactionDisplaysDetails() {
onView(withId(R.id.receipt_id_label)).check(matches(withText(R.string.mobileJournalNumberLabel)));
onView(withId(R.id.receipt_id_value)).check(matches(withText("FISVL_5240220")));
onView(withId(R.id.date_label)).check(matches(withText(R.string.date)));
onView(withId(R.id.date_value)).check(matches(withText("Thu, June 6, 2019, 3:48 PM PDT")));
onView(withId(R.id.date_value)).check(matches(withText("Jun 6, 2019, 3:48 PM PDT")));

onView(withId(R.id.client_id_label)).check(matches(withText(R.string.mobileMerchantTxnLabel)));
onView(withId(R.id.client_id_value)).check(matches(withText("AOxXefx9")));
Expand Down Expand Up @@ -448,7 +450,7 @@ public void testListPrepaidCardReceipt_clickTransactionDisplaysDetailsWithoutFee
onView(withId(R.id.receipt_id_label)).check(matches(withText(R.string.mobileJournalNumberLabel)));
onView(withId(R.id.receipt_id_value)).check(matches(withText("FISVL_5240221")));
onView(withId(R.id.date_label)).check(matches(withText(R.string.date)));
onView(withId(R.id.date_value)).check(matches(withText("Thu, June 6, 2019, 3:48 PM PDT")));
onView(withId(R.id.date_value)).check(matches(withText("Jun 6, 2019, 3:48 PM PDT")));

onView(withId(R.id.client_id_label)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
onView(withId(R.id.client_id_value)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
Expand Down
4 changes: 2 additions & 2 deletions receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public void testListReceipt_clickTransactionDisplaysDetails() {
onView(withId(R.id.receipt_id_label)).check(matches(withText(R.string.mobileJournalNumberLabel)));
onView(withId(R.id.receipt_id_value)).check(matches(withText("3051579")));
onView(withId(R.id.date_label)).check(matches(withText(R.string.date)));
onView(withId(R.id.date_value)).check(matches(withText("Fri, June 7, 2019, 10:08 AM PDT")));
onView(withId(R.id.date_value)).check(matches(withText("Jun 7, 2019, 10:08 AM PDT")));

onView(withId(R.id.client_id_label)).check(matches(withText(R.string.mobileMerchantTxnLabel)));
onView(withId(R.id.client_id_value)).check(matches(withText("8OxXefx5")));
Expand Down Expand Up @@ -498,7 +498,7 @@ public void testListReceipt_clickTransactionDisplaysDetailsWithoutFees() {
onView(withId(R.id.receipt_id_label)).check(matches(withText(R.string.mobileJournalNumberLabel)));
onView(withId(R.id.receipt_id_value)).check(matches(withText("3051590")));
onView(withId(R.id.date_label)).check(matches(withText(R.string.date)));
onView(withId(R.id.date_value)).check(matches(withText("Sat, December 1, 2018, 9:12 AM PST")));
onView(withId(R.id.date_value)).check(matches(withText("Dec 1, 2018, 9:12 AM PST")));

onView(withId(R.id.client_id_label)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
onView(withId(R.id.client_id_value)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
Expand Down
3 changes: 2 additions & 1 deletion receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.hyperwallet.android.ui.receipt.view;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
import static android.text.format.DateUtils.FORMAT_ABBREV_WEEKDAY;
import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
import static android.text.format.DateUtils.FORMAT_SHOW_TIME;
Expand Down Expand Up @@ -187,7 +188,7 @@ private void setDetailsView(@NonNull final Receipt receipt, @NonNull final View
dateView.setText(view.getContext().getString(R.string.concat_date_string_view_format,
formatDateTime(view.getContext(), date.getTime(),
FORMAT_SHOW_DATE | FORMAT_SHOW_TIME | FORMAT_SHOW_YEAR
| FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_WEEKDAY), timezone));
| FORMAT_ABBREV_MONTH), timezone));

if (receipt.getDetails() != null) {
ReceiptDetails receiptDetails = receipt.getDetails();
Expand Down
5 changes: 0 additions & 5 deletions ...tui/src/main/java/com/hyperwallet/android/ui/receipt/view/TabbedListReceiptsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class TabbedListReceiptsFragment extends Fragment {
private ListReceiptsViewPagerAdapter mListReceiptsViewPagerAdapter;
private ViewPager mViewPager;
private TabLayout mTabLayout;
private LinearLayout mHeader;

private TabbedListReceiptsViewModel mTabbedListReceiptsViewModel;

Expand Down Expand Up @@ -80,7 +79,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
super.onViewCreated(view, savedInstanceState);
mViewPager = view.findViewById(R.id.receipts_pager);
mTabLayout = view.findViewById(R.id.tab_layout);
mHeader = view.findViewById(R.id.transactions_header);
}

void retry() {
Expand All @@ -90,9 +88,6 @@ void retry() {
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (getActivity() instanceof TabbedListReceiptsActivity) {
mHeader.setVisibility(View.GONE);
}
mTabbedListReceiptsViewModel = ViewModelProviders.of(requireActivity()).get(TabbedListReceiptsViewModel.class);
mListReceiptsViewPagerAdapter = new ListReceiptsViewPagerAdapter(getFragmentManager(),
FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT, new ArrayList<Parcelable>(),
Expand Down
1 change: 1 addition & 0 deletions receiptui/src/main/res/layout/fragment_receipt_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
style="@style/HeaderTitleAppearance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="@dimen/grid_padding_top">

<TextView
Expand Down