|
|
@ -1,4 +1,4 @@ |
|
|
package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view; |
|
|
|
|
|
|
|
|
package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.view; |
|
|
|
|
|
|
|
|
import android.content.Intent; |
|
|
import android.content.Intent; |
|
|
import android.os.Bundle; |
|
|
import android.os.Bundle; |
|
|
@ -11,15 +11,20 @@ import android.view.LayoutInflater; |
|
|
import android.view.View; |
|
|
import android.view.View; |
|
|
import android.view.ViewGroup; |
|
|
import android.view.ViewGroup; |
|
|
import android.widget.EditText; |
|
|
import android.widget.EditText; |
|
|
import android.widget.ImageView; |
|
|
|
|
|
import android.widget.TextView; |
|
|
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.BaseFragment; |
|
|
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; |
|
|
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.adapter.TransactionHistoryRVAdapter; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryViewPagerAdapter; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; |
|
|
|
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryActivityV2; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.adapter.TransactionHistoryRVAdapter; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.adapter.TransactionHistoryViewPagerAdapter; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryItemModel; |
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.DatePicker; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.DateRangePickerDialog; |
|
|
|
|
|
import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
@ -27,7 +32,7 @@ import java.util.List; |
|
|
import butterknife.BindView; |
|
|
import butterknife.BindView; |
|
|
import butterknife.ButterKnife; |
|
|
import butterknife.ButterKnife; |
|
|
|
|
|
|
|
|
public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment implements TransactionHistoryRVAdapter.TransactionItemClickListener, ViewPager.OnPageChangeListener { |
|
|
|
|
|
|
|
|
public class InternationalTransactionHistoryContainerFragmentV2 extends BaseFragment implements TransactionHistoryRVAdapter.TransactionItemClickListener, ViewPager.OnPageChangeListener, View.OnClickListener { |
|
|
|
|
|
|
|
|
@BindView(R.id.internationaltxnTypeViewPager) |
|
|
@BindView(R.id.internationaltxnTypeViewPager) |
|
|
ViewPager internationalTypeViewPager; |
|
|
ViewPager internationalTypeViewPager; |
|
|
@ -55,13 +60,13 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment |
|
|
|
|
|
|
|
|
List<Fragment> fragments; |
|
|
List<Fragment> fragments; |
|
|
|
|
|
|
|
|
private TransactionFragmentV2 currentFragment; |
|
|
|
|
|
|
|
|
private InternationalTransactionHistoryTypeFragmentV2 currentFragment; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private TransactionFragmentV2 allTransactionFragment; |
|
|
|
|
|
private TransactionFragmentV2 deliveredTransactionFragment; |
|
|
|
|
|
private TransactionFragmentV2 sentTransactionFragment; |
|
|
|
|
|
|
|
|
private InternationalTransactionHistoryTypeFragmentV2 allTransactionFragment; |
|
|
|
|
|
private InternationalTransactionHistoryTypeFragmentV2 deliveredTransactionFragment; |
|
|
|
|
|
private InternationalTransactionHistoryTypeFragmentV2 sentTransactionFragment; |
|
|
private TransactionHistoryViewPagerAdapter transactionHistoryViewPagerAdapter; |
|
|
private TransactionHistoryViewPagerAdapter transactionHistoryViewPagerAdapter; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -101,9 +106,9 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment |
|
|
fragments = new ArrayList<>(); |
|
|
fragments = new ArrayList<>(); |
|
|
transactionHistoryViewPagerAdapter = new TransactionHistoryViewPagerAdapter(getChildFragmentManager()); |
|
|
transactionHistoryViewPagerAdapter = new TransactionHistoryViewPagerAdapter(getChildFragmentManager()); |
|
|
|
|
|
|
|
|
allTransactionFragment = new TransactionFragmentV2(); |
|
|
|
|
|
deliveredTransactionFragment = new TransactionFragmentV2(); |
|
|
|
|
|
sentTransactionFragment = new TransactionFragmentV2(); |
|
|
|
|
|
|
|
|
allTransactionFragment = new InternationalTransactionHistoryTypeFragmentV2(); |
|
|
|
|
|
deliveredTransactionFragment = new InternationalTransactionHistoryTypeFragmentV2(); |
|
|
|
|
|
sentTransactionFragment = new InternationalTransactionHistoryTypeFragmentV2(); |
|
|
|
|
|
|
|
|
allTransactionFragment.setTransactionListener(this); |
|
|
allTransactionFragment.setTransactionListener(this); |
|
|
deliveredTransactionFragment.setTransactionListener(this); |
|
|
deliveredTransactionFragment.setTransactionListener(this); |
|
|
@ -134,6 +139,18 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onStart() { |
|
|
|
|
|
super.onStart(); |
|
|
|
|
|
ivCalendar.setOnClickListener(this); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onStop() { |
|
|
|
|
|
super.onStop(); |
|
|
|
|
|
ivCalendar.setOnClickListener(null); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) { |
|
|
public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) { |
|
|
Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class); |
|
|
Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class); |
|
|
@ -160,7 +177,7 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment |
|
|
public void onPageSelected(int position) { |
|
|
public void onPageSelected(int position) { |
|
|
try { |
|
|
try { |
|
|
searchEditText.setText(""); |
|
|
searchEditText.setText(""); |
|
|
currentFragment = (TransactionFragmentV2) fragments.get(position); |
|
|
|
|
|
|
|
|
currentFragment = (InternationalTransactionHistoryTypeFragmentV2) fragments.get(position); |
|
|
} catch (NullPointerException | IndexOutOfBoundsException e) { |
|
|
} catch (NullPointerException | IndexOutOfBoundsException e) { |
|
|
Log.d("FManager", e.getMessage()); |
|
|
Log.d("FManager", e.getMessage()); |
|
|
} |
|
|
} |
|
|
@ -169,5 +186,63 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment |
|
|
@Override |
|
|
@Override |
|
|
public void onPageScrollStateChanged(int i) { |
|
|
public void onPageScrollStateChanged(int i) { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void promptCalendarPicker() { |
|
|
|
|
|
new SpinnerDateRangePickerDialogBuilder() |
|
|
|
|
|
.context(getActivity()) |
|
|
|
|
|
.spinnerTheme(R.style.NumberPickerStyle) |
|
|
|
|
|
.showTitle(true) |
|
|
|
|
|
.showDaySpinner(true) |
|
|
|
|
|
.defaultDate(1990, 0, 1) |
|
|
|
|
|
.setCurrentDateAsMaxDate() |
|
|
|
|
|
.minDate(2017,9,10) |
|
|
|
|
|
.dialogTheme(R.style.DatePickerTheme) |
|
|
|
|
|
.setTitle(getString(R.string.filter_by_date_text)) |
|
|
|
|
|
.setFromTitle(getString(R.string.from_text)+" :") |
|
|
|
|
|
.setToTitle(getString(R.string.to_text)+" :") |
|
|
|
|
|
.setPositiveButtonText(getString(R.string.ok_text)) |
|
|
|
|
|
.setNegativeButtonText(getString(R.string.cancel_text)) |
|
|
|
|
|
.callback(new DateRangePickerDialog.OnRangeDateSetListener() { |
|
|
|
|
|
private String startDate=""; |
|
|
|
|
|
private String endDate=""; |
|
|
|
|
|
@Override |
|
|
|
|
|
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)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@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)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onInvalidRangeSelected() { |
|
|
|
|
|
showToastMessage(getString(R.string.invalid_date_range_selected)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onDateRangeReceivedSucess() { |
|
|
|
|
|
if(dateContainer.getVisibility()!= View.VISIBLE) { |
|
|
|
|
|
dateContainer.setVisibility(View.VISIBLE); |
|
|
|
|
|
} |
|
|
|
|
|
((TransactionHistoryV2ActionListener) getActivity()).getPresenter().getTransactionHistory(startDate,endDate); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
.build() |
|
|
|
|
|
.show(); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public void onClick(View view) { |
|
|
|
|
|
switch(view.getId()) |
|
|
|
|
|
{ |
|
|
|
|
|
case R.id.iv_calendar: |
|
|
|
|
|
promptCalendarPicker(); |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
Preyea Regmi
5 years ago