From 799a10893e495f01bebd3f0cf5ae7bcbc123f7e3 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Mon, 30 Nov 2020 13:35:57 +0530 Subject: [PATCH 1/3] bug/DTSERWFOUR-30-transactions-Screen-Minimize-header-Transfer-Screen-fix - Issue fixes --- .../view/TabbedListReceiptsFragment.java | 2 ++ .../layout/fragment_tabbed_list_receipt.xml | 21 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-) 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..19e135031 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 @@ -28,6 +28,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; @@ -81,6 +82,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat mViewPager = view.findViewById(R.id.receipts_pager); mTabLayout = view.findViewById(R.id.tab_layout); mHeader = view.findViewById(R.id.transactions_header); + ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(R.string.transactions); } void retry() { diff --git a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml index 342a5e04c..50edd156c 100644 --- a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml +++ b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml @@ -7,31 +7,12 @@ android:layout_marginTop="@dimen/default_margin" android:layout_marginEnd="@dimen/default_margin"> - - - - - + app:layout_constraintBottom_toBottomOf="parent"> Date: Tue, 1 Dec 2020 01:20:35 +0530 Subject: [PATCH 2/3] bug/DTSERWFOUR-30-transactions-Screen-Minimize-header-Transfer-Screen-fix Issue fixed --- receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml | 2 -- receiptui/src/main/res/values/dimens.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml index 50edd156c..81c468f23 100644 --- a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml +++ b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml @@ -4,14 +4,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="@dimen/default_margin" - android:layout_marginTop="@dimen/default_margin" android:layout_marginEnd="@dimen/default_margin"> 10dp 8dp 80dp - 48dp From 6a3e696279b7c2d1f309d7569becf991fdd7b3d1 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Tue, 1 Dec 2020 20:24:05 +0530 Subject: [PATCH 3/3] bug/DTSERWFOUR-30-transactions-Screen-Minimize-header-Transfer-Screen-fix - Code review comments --- .../android/ui/receipt/view/TabbedListReceiptsFragment.java | 2 -- 1 file changed, 2 deletions(-) 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 19e135031..be268b1df 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 @@ -28,7 +28,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; @@ -82,7 +81,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat mViewPager = view.findViewById(R.id.receipts_pager); mTabLayout = view.findViewById(R.id.tab_layout); mHeader = view.findViewById(R.id.transactions_header); - ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(R.string.transactions); } void retry() {