IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Transaction history fixes

master
preyearegmi 6 years ago
parent
4cc43335fe
commit
554ae7f5e8
2 changed files with 63 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java
  2. 117
      app/src/main/res/layout/activity_transaction_history_v2.xml

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

@ -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);
}
})

117
app/src/main/res/layout/activity_transaction_history_v2.xml
View File

@ -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,6 +108,60 @@
app:tabPaddingEnd="0dp"
app:tabPaddingStart="0dp"
app:tabSelectedTextColor="@color/colorAccent" />
<LinearLayout
android:id="@+id/dateContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:textColor="@color/darkgray"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:text="-"
android:textColor="@color/darkgray"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:textColor="@color/darkgray"
android:textSize="11sp" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
@ -115,59 +173,6 @@
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:id="@+id/dateContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:textColor="@color/darkgray"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:text="-"
android:textColor="@color/darkgray"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:padding="3dp"
android:textColor="@color/darkgray"
android:textSize="11sp" />
</LinearLayout>
<android.support.v4.view.ViewPager
android:id="@+id/transactionHistoryViewPager"
android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save