diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c4242328..725fd7e6 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8bdb0fba..6ca56506 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -319,7 +319,7 @@ android:theme="@style/AppTheme.NoActionBar" android:windowSoftInputMode="stateAlwaysHidden" /> diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index 1a1b32fb..fc04c456 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -45,7 +45,7 @@ import com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListing import com.gmeremit.online.gmeremittance_native.settings.view.FingerprintEnablePromptActivity; import com.gmeremit.online.gmeremittance_native.settings.view.SettingsView; import com.gmeremit.online.gmeremittance_native.static_pages.view.AboutGME; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.TransactionHistoryActivityV2; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryActivityV2; import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity; import com.gmeremit.online.gmeremittance_native.utils.ChatUtils; import com.gmeremit.online.gmeremittance_native.utils.Utils; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/transactionlisting/TransactionListingV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/transactionlisting/TransactionListingV2Gateway.java index b0c5922c..2159b26a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/transactionlisting/TransactionListingV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/gateway/transactionlisting/TransactionListingV2Gateway.java @@ -2,8 +2,6 @@ package com.gmeremit.online.gmeremittance_native.resendV2.gateway.transactionlis import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.resendV2.presenter.transactionlisting.TransactionListingV2InteractorInterface; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2InteractorInterface; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; import com.google.gson.JsonObject; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/transactionlisting/TransactionListingV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/transactionlisting/TransactionListingV2InteractorInterface.java index 0d125ce7..0ae85e2c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/transactionlisting/TransactionListingV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/transactionlisting/TransactionListingV2InteractorInterface.java @@ -2,8 +2,6 @@ package com.gmeremit.online.gmeremittance_native.resendV2.presenter.transactionl import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/model/SupportActivityV2APIResponse.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/model/SupportActivityV2APIResponse.java index 4734a32c..09d80a14 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/model/SupportActivityV2APIResponse.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/model/SupportActivityV2APIResponse.java @@ -1,11 +1,8 @@ package com.gmeremit.online.gmeremittance_native.supportV2.model; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import java.util.List; - public class SupportActivityV2APIResponse { @SerializedName("ErrorCode") diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2InteractorInterface.java index c6cca13b..bd67d790 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2InteractorInterface.java @@ -3,7 +3,6 @@ package com.gmeremit.online.gmeremittance_native.supportV2.presenter; import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; import com.gmeremit.online.gmeremittance_native.supportV2.model.SupportActivityV2APIResponse; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2PresenterInterface.java index 799fa254..34413272 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/presenter/SupportActivityV2PresenterInterface.java @@ -2,9 +2,6 @@ package com.gmeremit.online.gmeremittance_native.supportV2.presenter; import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2Presenter; - -import io.reactivex.Observable; public interface SupportActivityV2PresenterInterface extends BasePresenterInterface { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryActivityV2.java similarity index 92% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryActivityV2.java index 199eec11..9e41388e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryActivityV2.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2; import android.content.Intent; import android.os.Bundle; @@ -12,13 +12,14 @@ import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity; -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.TransactionHistoryViewPagerAdapter; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.gateway.TransactionHistoryV2Gateway; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2Presenter; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.domestic.view.DomesticTransactionHistoryTypeFragmentV2; +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.gateway.TransactionHistoryV2Gateway; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryItemModel; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter.TransactionHistoryV2Presenter; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter.TransactionHistoryV2PresenterInterface; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.view.InternationalTransactionHistoryContainerFragmentV2; import java.util.ArrayList; import java.util.List; @@ -106,7 +107,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa fragments.add(new DomesticTransactionHistoryTypeFragmentV2()); - fragments.add(new InternationalTransactionHistoryTypeFragmentV2()); + fragments.add(new InternationalTransactionHistoryContainerFragmentV2()); // fragments.add(deliveredTransactionFragment); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryV2ActionListener.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryV2ActionListener.java index f2a16209..c17e0ee5 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryV2ActionListener.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryV2ActionListener.java @@ -1,6 +1,6 @@ package com.gmeremit.online.gmeremittance_native.transactionhistoryV2; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter.TransactionHistoryV2PresenterInterface; /** * Created by Preyea diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/DomesticTransactionHistoryTypeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/domestic/view/DomesticTransactionHistoryTypeFragmentV2.java similarity index 98% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/DomesticTransactionHistoryTypeFragmentV2.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/domestic/view/DomesticTransactionHistoryTypeFragmentV2.java index 6b76fae8..34d58256 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/DomesticTransactionHistoryTypeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/domestic/view/DomesticTransactionHistoryTypeFragmentV2.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.domestic.view; import android.os.Bundle; import android.support.annotation.Nullable; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryRVAdapter.java similarity index 96% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryRVAdapter.java index 65372369..e19002d3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryRVAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryRVAdapter.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.adapter; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; @@ -6,8 +6,8 @@ import android.view.LayoutInflater; import android.view.ViewGroup; import com.gmeremit.online.gmeremittance_native.R; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.TransactionItemViewHolder; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryItemModel; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.view.TransactionItemViewHolder; import com.gmeremit.online.gmeremittance_native.utils.Utils; import java.util.ArrayList; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryViewPagerAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryViewPagerAdapter.java similarity index 96% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryViewPagerAdapter.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryViewPagerAdapter.java index 1b0fa29f..14875abc 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/adapter/TransactionHistoryViewPagerAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/adapter/TransactionHistoryViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.adapter; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/gateway/TransactionHistoryV2Gateway.java similarity index 95% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/gateway/TransactionHistoryV2Gateway.java index 233b1bb2..96395193 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/gateway/TransactionHistoryV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/gateway/TransactionHistoryV2Gateway.java @@ -1,11 +1,9 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.gateway; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.gateway; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2InteractorInterface; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryAPIResponse; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter.TransactionHistoryV2InteractorInterface; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import io.reactivex.Observable; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryAPIResponse.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryAPIResponse.java similarity index 91% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryAPIResponse.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryAPIResponse.java index 748c6de7..af0e9c57 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryAPIResponse.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryAPIResponse.java @@ -1,6 +1,5 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteModel; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryItemModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryItemModel.java similarity index 99% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryItemModel.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryItemModel.java index df73804d..93436d2a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/model/TransactionHistoryItemModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/model/TransactionHistoryItemModel.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2InteractorInterface.java similarity index 79% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2InteractorInterface.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2InteractorInterface.java index bd4be420..df1d866d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2InteractorInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2InteractorInterface.java @@ -1,9 +1,8 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter; import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteV2ResponseBody; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryAPIResponse; import io.reactivex.Observable; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2Presenter.java similarity index 97% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2Presenter.java index d4047f5f..ead9884c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2Presenter.java @@ -1,10 +1,9 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BasePresenter; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.gateway.TransactionHistoryV2Gateway; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryItemModel; import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2PresenterInterface.java new file mode 100644 index 00000000..2517dd71 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/presenter/TransactionHistoryV2PresenterInterface.java @@ -0,0 +1,22 @@ +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.presenter; + +import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; +import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; + +import io.reactivex.Observable; + + +public interface TransactionHistoryV2PresenterInterface extends BasePresenterInterface { + + + void getTransactionHistory(String startDate,String endDate); + + Observable subscribeToTransactionHistoryFetchinEvent(); + + + + interface TransactionHistoryV2ContractInterface extends BaseContractInterface + { + + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/InternationalTransactionHistoryTypeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryContainerFragmentV2.java similarity index 54% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/InternationalTransactionHistoryTypeFragmentV2.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryContainerFragmentV2.java index 8ec06c22..5cc4db28 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/InternationalTransactionHistoryTypeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryContainerFragmentV2.java @@ -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.os.Bundle; @@ -11,15 +11,20 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import android.widget.ImageView; import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseFragment; 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.List; @@ -27,7 +32,7 @@ import java.util.List; import butterknife.BindView; 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) ViewPager internationalTypeViewPager; @@ -55,13 +60,13 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment List 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; @@ -101,9 +106,9 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment fragments = new ArrayList<>(); 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); 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 public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) { Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class); @@ -160,7 +177,7 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment public void onPageSelected(int position) { try { searchEditText.setText(""); - currentFragment = (TransactionFragmentV2) fragments.get(position); + currentFragment = (InternationalTransactionHistoryTypeFragmentV2) fragments.get(position); } catch (NullPointerException | IndexOutOfBoundsException e) { Log.d("FManager", e.getMessage()); } @@ -169,5 +186,63 @@ public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment @Override 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; + } } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryTypeFragmentV2.java similarity index 95% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryTypeFragmentV2.java index 57f83602..94e979bc 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/InternationalTransactionHistoryTypeFragmentV2.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.view; import android.os.Bundle; import android.support.annotation.NonNull; @@ -14,9 +14,10 @@ import com.gmeremit.online.gmeremittance_native.GmeApplication; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryActivityV2; import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.adapter.TransactionHistoryRVAdapter; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryItemModel; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; import java.util.ArrayList; @@ -26,7 +27,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.Observable; -public class TransactionFragmentV2 extends BaseFragment implements View.OnClickListener, TransactionHistoryRVAdapter.TransactionItemClickListener { +public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment implements View.OnClickListener, TransactionHistoryRVAdapter.TransactionItemClickListener { @BindView(R.id.transactionHistoryRv) RecyclerView transactionRecyclerView; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionItemViewHolder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/TransactionItemViewHolder.java similarity index 98% rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionItemViewHolder.java rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/TransactionItemViewHolder.java index 615305a5..99353b90 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionItemViewHolder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/international/view/TransactionItemViewHolder.java @@ -1,4 +1,4 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view; +package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.view; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2PresenterInterface.java deleted file mode 100644 index 059aba13..00000000 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2PresenterInterface.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter; - -import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; -import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; -import com.gmeremit.online.gmeremittance_native.customwidgets.passwordpromptdialog.PasswordPromptDialog; -import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.ExchangeCalculationApiResponse; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.AmountDetailRelatedDataModel; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.BranchListApiResponse; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.AccountValidationApiResponse; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BankList; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BranchList; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.PayoutMode; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.PayoutModeApiResponse; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.verification.VerificationViewModel; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel; - -import java.util.List; - -import io.reactivex.Observable; - - -public interface TransactionHistoryV2PresenterInterface extends BasePresenterInterface { - - - void getTransactionHistory(String startDate,String endDate); - - Observable subscribeToTransactionHistoryFetchinEvent(); - - - - interface TransactionHistoryV2ContractInterface extends BaseContractInterface - { - - } -} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java index 167ac9dc..45af664d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java @@ -29,7 +29,7 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.Acc import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.PayoutModeApiResponse; import com.gmeremit.online.gmeremittance_native.supportV2.model.SupportActivityV2APIResponse; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryAPIResponse; +import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.international.model.TransactionHistoryAPIResponse; import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2APIResponse; import com.google.gson.JsonObject; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java index 7cb33288..59735164 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/walletstatementV2/view/WalletStatementV2Activity.java @@ -7,14 +7,12 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; -import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.TransactionHistoryActivityV2; import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.gmeremit.online.gmeremittance_native.walletstatementV2.adapter.WalletStatementRVAdapter; import com.gmeremit.online.gmeremittance_native.walletstatementV2.gateway.WalletStatmentV2Gateway; import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2ItemModel; import com.gmeremit.online.gmeremittance_native.walletstatementV2.presenter.WalletStatementV2Presenter; import com.gmeremit.online.gmeremittance_native.walletstatementV2.presenter.WalletStatementV2PresenterInterface; -import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment; import com.tsongkha.spinnerdatepicker.DatePicker; import com.tsongkha.spinnerdatepicker.DateRangePickerDialog; import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder; diff --git a/app/src/main/res/layout/fragment_domestic_transaction_history_type_v2.xml b/app/src/main/res/layout/fragment_domestic_transaction_history_type_v2.xml index 0878d6e9..8b188c7a 100644 --- a/app/src/main/res/layout/fragment_domestic_transaction_history_type_v2.xml +++ b/app/src/main/res/layout/fragment_domestic_transaction_history_type_v2.xml @@ -1,10 +1,13 @@ - + + + - + diff --git a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml index 90d9850d..408fbd26 100644 --- a/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml +++ b/app/src/main/res/layout/fragment_international_transaction_history_type_v2.xml @@ -1,10 +1,16 @@ - + + + - + - +