|
@ -16,6 +16,7 @@ import android.widget.TextView; |
|
|
import com.gmeremit.online.gmeremittance_native.R; |
|
|
import com.gmeremit.online.gmeremittance_native.R; |
|
|
import com.gmeremit.online.gmeremittance_native.base.BaseActivity; |
|
|
import com.gmeremit.online.gmeremittance_native.base.BaseActivity; |
|
|
import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; |
|
|
import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.registerV2.view.RegisterV2Activity; |
|
|
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity; |
|
|
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity; |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener; |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener; |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter; |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter; |
|
@ -25,9 +26,15 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.T |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface; |
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface; |
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment; |
|
|
import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.DatePicker; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.DateRangePickerDialog; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder; |
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Calendar; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Locale; |
|
|
|
|
|
|
|
|
import butterknife.BindView; |
|
|
import butterknife.BindView; |
|
|
import butterknife.ButterKnife; |
|
|
import butterknife.ButterKnife; |
|
@ -143,7 +150,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa |
|
|
|
|
|
|
|
|
transactionViewPager.addOnPageChangeListener(this); |
|
|
transactionViewPager.addOnPageChangeListener(this); |
|
|
|
|
|
|
|
|
transactionViewPager.setOffscreenPageLimit(2); |
|
|
|
|
|
|
|
|
transactionViewPager.setOffscreenPageLimit(3); |
|
|
|
|
|
|
|
|
transactionViewPager.setAdapter(transactionHistoryViewPagerAdapter); |
|
|
transactionViewPager.setAdapter(transactionHistoryViewPagerAdapter); |
|
|
|
|
|
|
|
@ -191,36 +198,107 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// private void promptCalendarPicker() { |
|
|
|
|
|
// SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance( |
|
|
|
|
|
// new SmoothDateRangePickerFragment.OnDateRangeSetListener() { |
|
|
|
|
|
// @Override |
|
|
|
|
|
// public void onDateRangeSet(SmoothDateRangePickerFragment view, |
|
|
|
|
|
// int yearStart, int monthStart, |
|
|
|
|
|
// int dayStart, int yearEnd, |
|
|
|
|
|
// int monthEnd, int dayEnd) { |
|
|
|
|
|
// |
|
|
|
|
|
// String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart); |
|
|
|
|
|
// String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate)); |
|
|
|
|
|
// toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate)); |
|
|
|
|
|
// |
|
|
|
|
|
// presenter.getTransactionHistory(startDate,endDate); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// if(dateContainer.getVisibility()!=View.VISIBLE) |
|
|
|
|
|
// dateContainer.setVisibility(View.VISIBLE); |
|
|
|
|
|
// } |
|
|
|
|
|
// }); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// if(!smoothDateRangePickerFragment.isAdded()) |
|
|
|
|
|
// smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"); |
|
|
|
|
|
// } |
|
|
private void promptCalendarPicker() { |
|
|
private void promptCalendarPicker() { |
|
|
SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance( |
|
|
|
|
|
new SmoothDateRangePickerFragment.OnDateRangeSetListener() { |
|
|
|
|
|
|
|
|
new SpinnerDateRangePickerDialogBuilder() |
|
|
|
|
|
.context(TransactionHistoryActivityV2.this) |
|
|
|
|
|
.spinnerTheme(R.style.NumberPickerStyle) |
|
|
|
|
|
.showTitle(true) |
|
|
|
|
|
.showDaySpinner(true) |
|
|
|
|
|
.defaultDate(1990, 0, 1) |
|
|
|
|
|
.setCurrentDateAsMaxDate() |
|
|
|
|
|
.minDate(2017,9,10) |
|
|
|
|
|
.dialogTheme(R.style.DatePickerTheme) |
|
|
|
|
|
.showTitle(true) |
|
|
|
|
|
.setTitle("Filter by date") |
|
|
|
|
|
.callback(new DateRangePickerDialog.OnRangeDateSetListener() { |
|
|
|
|
|
private String startDate=""; |
|
|
|
|
|
private String endDate=""; |
|
|
@Override |
|
|
@Override |
|
|
public void onDateRangeSet(SmoothDateRangePickerFragment view, |
|
|
|
|
|
int yearStart, int monthStart, |
|
|
|
|
|
int dayStart, int yearEnd, |
|
|
|
|
|
int monthEnd, int dayEnd) { |
|
|
|
|
|
|
|
|
|
|
|
String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart); |
|
|
|
|
|
String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) { |
|
|
|
|
|
startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth); |
|
|
fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate)); |
|
|
fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate)); |
|
|
toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate)); |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
presenter.getTransactionHistory(startDate,endDate); |
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onToDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) { |
|
|
|
|
|
endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth); |
|
|
|
|
|
toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(dateContainer.getVisibility()!=View.VISIBLE) |
|
|
|
|
|
dateContainer.setVisibility(View.VISIBLE); |
|
|
|
|
|
} |
|
|
} |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onInvalidRangeSelected() { |
|
|
|
|
|
showToastMessage("Invalid date selected"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if(!smoothDateRangePickerFragment.isAdded()) |
|
|
|
|
|
smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"); |
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onDateRangeReceivedSucess() { |
|
|
|
|
|
presenter.getTransactionHistory(startDate,endDate); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
.build() |
|
|
|
|
|
.show(); |
|
|
|
|
|
// SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePickerFragment.newInstance( |
|
|
|
|
|
// new SmoothDateRangePickerFragment.OnDateRangeSetListener() { |
|
|
|
|
|
// @Override |
|
|
|
|
|
// public void onDateRangeSet(SmoothDateRangePickerFragment view, |
|
|
|
|
|
// int yearStart, int monthStart, |
|
|
|
|
|
// int dayStart, int yearEnd, |
|
|
|
|
|
// int monthEnd, int dayEnd) { |
|
|
|
|
|
// |
|
|
|
|
|
// String startDate = Integer.toString(yearStart) + "-" + Integer.toString(monthStart+1) + "-" + Integer.toString(dayStart); |
|
|
|
|
|
// String endDate = Integer.toString(yearEnd) + "-" + Integer.toString(monthEnd+1) + "-" + Integer.toString(dayEnd); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate)); |
|
|
|
|
|
// toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate)); |
|
|
|
|
|
// |
|
|
|
|
|
// presenter.getTransactionHistory(startDate,endDate); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// if(dateContainer.getVisibility()!=View.VISIBLE) |
|
|
|
|
|
// dateContainer.setVisibility(View.VISIBLE); |
|
|
|
|
|
// } |
|
|
|
|
|
// }); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// if(!smoothDateRangePickerFragment.isAdded()) |
|
|
|
|
|
// smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|