Skip to content

bug/DTSERWFOUR-30-transactions-Screen-Minimize-header #212

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 4 commits into from
Nov 24, 2020
Merged

bug/DTSERWFOUR-30-transactions-Screen-Minimize-header #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e501b2
bug/DTSERWFOUR-30-transactions-Screen-Minimize-header
pdamodarannair Nov 23, 2020
837d085
Merge branch 'development' into bug/DTSERWFOUR-30-transactions-Screen…
malaw-hw Nov 24, 2020
6c8d2a1
Merge branch 'development' into bug/DTSERWFOUR-30-transactions-Screen…
malaw-hw Nov 24, 2020
ed003bf
Merge branch 'development' into bug/DTSERWFOUR-30-transactions-Screen…
malaw-hw Nov 24, 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
2 changes: 2 additions & 0 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 @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down
18 changes: 0 additions & 18 deletions receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,6 @@
android:layout_marginTop="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin">

<LinearLayout
android:id="@+id/transactions_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/default_margin"
android:paddingBottom="@dimen/item_horizontal_padding"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/transactions_header_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/transactions"
android:textAppearance="@style/TextAppearance.Hyperwallet.Headline5" />
</LinearLayout>

<androidx.viewpager.widget.ViewPager
android:id="@+id/receipts_pager"
android:layout_width="match_parent"
Expand Down