Browse Source

Transaction history fixes

master
preyearegmi 6 years ago
parent
commit
554ae7f5e8
  1. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
  2. 31
      app/src/main/res/layout/activity_transaction_history_v2.xml

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java

@ -72,7 +72,6 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
@BindView(R.id.tv_from_date)
TextView fromDateTv;
private TransactionHistoryViewPagerAdapter transactionHistoryViewPagerAdapter;
private TransactionFragmentV2 allTransactionFragment;
private TransactionFragmentV2 deliveredTransactionFragment;
@ -234,8 +233,9 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
@Override
public void onDateRangeReceivedSucess() {
if(dateContainer.getVisibility()!=View.VISIBLE)
if(dateContainer.getVisibility()!= View.VISIBLE) {
dateContainer.setVisibility(View.VISIBLE);
}
presenter.getTransactionHistory(startDate,endDate);
}
})

31
app/src/main/res/layout/activity_transaction_history_v2.xml

@ -78,7 +78,7 @@
<android.support.v7.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
android:contentInsetEnd="0dp"
android:contentInsetLeft="0dp"
android:contentInsetRight="0dp"
@ -89,11 +89,15 @@
app:contentInsetStart="0dp"
app:layout_collapseMode="pin">
<LinearLayout
android:background="@color/send_money_bg_grey"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.design.widget.TabLayout
android:id="@+id/transactionTabLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="@color/white"
app:tabIndicatorColor="@color/colorAccent"
@ -104,16 +108,6 @@
app:tabPaddingEnd="0dp"
app:tabPaddingStart="0dp"
app:tabSelectedTextColor="@color/colorAccent" />
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:id="@+id/dateContainer"
@ -167,6 +161,17 @@
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.view.ViewPager
android:id="@+id/transactionHistoryViewPager"

Loading…
Cancel
Save