From dababf75fd3e01b9f948948bb8b72d8d1a1c3139 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 20 Nov 2018 11:43:23 +0545 Subject: [PATCH] Withdraw money screen added --- .idea/caches/build_file_checksums.ser | Bin 0 -> 606 bytes .idea/misc.xml | 2 +- .idea/modules.xml | 2 + app/src/main/AndroidManifest.xml | 48 ++--- .../pennytest/PennyTestModalFragment.java | 5 - .../withdrawV2/gateway/WithdrawV2Gateway.java | 45 +++++ .../WithdrawV2InteractorInterface.java | 15 ++ .../presenter/WithdrawV2Presenter.java | 23 +++ .../WithdrawV2PresenterInterface.java | 17 ++ .../withdrawV2/view/WithdrawV2Activity.java | 16 ++ .../main/res/layout/activity_withdraw_v2.xml | 187 ++++++++++++++++++ 11 files changed, 332 insertions(+), 28 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/gateway/WithdrawV2Gateway.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2InteractorInterface.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2PresenterInterface.java create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java create mode 100644 app/src/main/res/layout/activity_withdraw_v2.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..b77d9f739f92d96edb75dc3bac48585da29ec0a4 GIT binary patch literal 606 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10Sz@dZX>sIc)x#G;Ln_HGoSuaz< zz>@^>FHBbMYwy&ceWF3} F6#$%?+1>yE literal 0 HcmV?d00001 diff --git a/.idea/misc.xml b/.idea/misc.xml index bb6e25a2..c0f68edd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index f8b351a9..b912bb7d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,8 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4f7a307..c5490364 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,10 +18,10 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:largeHeap="true" - tools:replace="android:allowBackup" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + tools:replace="android:allowBackup"> - - - + + + - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + android:windowSoftInputMode="stateAlwaysHidden" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestModalFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestModalFragment.java index 4d488b92..bff350cf 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestModalFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestModalFragment.java @@ -33,11 +33,6 @@ public class PennyTestModalFragment extends DialogFragment { } - @Override - public int getTheme() { - return R.style.DialogAnimation; - } - } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/gateway/WithdrawV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/gateway/WithdrawV2Gateway.java new file mode 100644 index 00000000..50df3fd8 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/gateway/WithdrawV2Gateway.java @@ -0,0 +1,45 @@ +package com.gmeremit.online.gmeremittance_native.withdrawV2.gateway; + +import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; +import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; +import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2APIResponse; +import com.gmeremit.online.gmeremittance_native.walletstatementV2.presenter.WalletStatementV2InteractorInterface; +import com.gmeremit.online.gmeremittance_native.withdrawV2.presenter.WithdrawV2InteractorInterface; +import com.google.gson.JsonObject; + +import io.reactivex.Observable; + +public class WithdrawV2Gateway extends PrivilegedGateway implements WithdrawV2InteractorInterface.WithdrawV2GatewayInterface { + + private final WithdrawV2InteractorInterface interactor; + + private String mockedString="{\n" + + " \"ErrorCode\": \"0\",\n" + + " \"Msg\": \"1 wallet txn\",\n" + + " \"Id\": null,\n" + + " \"Extra\": \"\",\n" + + " \"Extra2\": \"\",\n" + + " \"Data\": [\n" + + " {\n" + + " \"TransactionDate\": \"1900.01.01\",\n" + + " \"Particular\": \"Balance Brought Forward\",\n" + + " \"WalletIn\": \"₩0\",\n" + + " \"WalletOut\": \"₩100,000,000\",\n" + + " \"ClosingAmount\": \"-₩85,000\"\n" + + " },\n" + + " {\n" + + " \"TransactionDate\": \"1900.01.01\",\n" + + " \"Particular\": \"Balance Brought Backward\",\n" + + " \"WalletIn\": \"₩200,000,000\",\n" + + " \"WalletOut\": \"₩0\",\n" + + " \"ClosingAmount\": \"-₩100,000\"\n" + + " }\n" + + " ]\n" + + "}"; + + public WithdrawV2Gateway(WithdrawV2InteractorInterface interactor) { + this.interactor=interactor; + } + + +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2InteractorInterface.java new file mode 100644 index 00000000..3bc32150 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2InteractorInterface.java @@ -0,0 +1,15 @@ +package com.gmeremit.online.gmeremittance_native.withdrawV2.presenter; + +import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface; +import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; +import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2APIResponse; + +import io.reactivex.Observable; + +public interface WithdrawV2InteractorInterface extends BaseInteractorInterface { + + + interface WithdrawV2GatewayInterface extends PrivilegedGatewayInterface + { + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java new file mode 100644 index 00000000..da25c17c --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java @@ -0,0 +1,23 @@ +package com.gmeremit.online.gmeremittance_native.withdrawV2.presenter; + +import com.gmeremit.online.gmeremittance_native.base.BasePresenter; +import com.gmeremit.online.gmeremittance_native.withdrawV2.gateway.WithdrawV2Gateway; + +import io.reactivex.disposables.CompositeDisposable; + +public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2PresenterInterface,WithdrawV2InteractorInterface { + + private final WithdrawV2ContractInterface view; + private final WithdrawV2GatewayInterface gateway; + private final CompositeDisposable compositeDisposables; + + public WithdrawV2Presenter(WithdrawV2ContractInterface view) { + this.view=view; + this.gateway=new WithdrawV2Gateway(this); + compositeDisposables=new CompositeDisposable(); + } + + + + +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2PresenterInterface.java new file mode 100644 index 00000000..b2e53097 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2PresenterInterface.java @@ -0,0 +1,17 @@ +package com.gmeremit.online.gmeremittance_native.withdrawV2.presenter; + +import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface; +import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface; +import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2ItemModel; + +import java.util.List; + + +public interface WithdrawV2PresenterInterface extends BasePresenterInterface { + + + + + interface WithdrawV2ContractInterface extends BaseContractInterface { + } +} diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java new file mode 100644 index 00000000..05013da7 --- /dev/null +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java @@ -0,0 +1,16 @@ +package com.gmeremit.online.gmeremittance_native.withdrawV2.view; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import com.gmeremit.online.gmeremittance_native.R; +import com.gmeremit.online.gmeremittance_native.base.BaseActivity; + +public class WithdrawV2Activity extends BaseActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_withdraw_v2); + } +} diff --git a/app/src/main/res/layout/activity_withdraw_v2.xml b/app/src/main/res/layout/activity_withdraw_v2.xml new file mode 100644 index 00000000..6e13a4c2 --- /dev/null +++ b/app/src/main/res/layout/activity_withdraw_v2.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file