diff --git a/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java index 302f1b9a7..821ce0a7d 100644 --- a/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java +++ b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java @@ -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; @@ -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( @@ -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"))); @@ -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))); diff --git a/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java index 905220a6b..ac990fc48 100644 --- a/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java +++ b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java @@ -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"))); @@ -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))); diff --git a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java index 73e190abd..71c4753a8 100644 --- a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java +++ b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java @@ -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; @@ -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(); diff --git a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/TabbedListReceiptsFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/TabbedListReceiptsFragment.java index be268b1df..ed0805574 100644 --- a/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/TabbedListReceiptsFragment.java +++ b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/TabbedListReceiptsFragment.java @@ -51,7 +51,6 @@ public class TabbedListReceiptsFragment extends Fragment { private ListReceiptsViewPagerAdapter mListReceiptsViewPagerAdapter; private ViewPager mViewPager; private TabLayout mTabLayout; - private LinearLayout mHeader; private TabbedListReceiptsViewModel mTabbedListReceiptsViewModel; @@ -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() { @@ -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(), diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml index 538fa614b..53689e370 100644 --- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml +++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml @@ -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">