diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index aa4a0a0f..a793d6f1 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 75afa8aa..cb09e3ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -348,10 +348,13 @@
android:name=".transactionpasspromt.view.TransactionPasswordPromptActivity"
android:theme="@style/ActivityDialog"
android:windowSoftInputMode="stateAlwaysHidden" />
-
+ android:windowSoftInputMode="stateAlwaysHidden" />
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java
index 142e4852..85fdbeb7 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java
@@ -151,7 +151,6 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI
@Override
public void loginUser(String userId, String userPwd) {
String auth = "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + GmeApplication.getAppRelatedMetaData().getDeviceId());
-
this.gateway.loginUser(auth, userId, encUserPassword)
.subscribeOn(Schedulers.io())
.flatMap(loginResponse -> {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardlisting/RewardListingV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardlisting/RewardListingV2Gateway.java
new file mode 100644
index 00000000..52088e0b
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardlisting/RewardListingV2Gateway.java
@@ -0,0 +1,14 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardlisting;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting.RewardListingV2InteractorInterface;
+
+public class RewardListingV2Gateway extends PrivilegedGateway implements RewardListingV2InteractorInterface.RewardListingV2GatewayInterface {
+
+
+ private final RewardListingV2InteractorInterface interactor;
+
+ public RewardListingV2Gateway(RewardListingV2InteractorInterface interactor) {
+ this.interactor=interactor;
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardredeem/RewardRedeemV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardredeem/RewardRedeemV2Gateway.java
new file mode 100644
index 00000000..df9e790f
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/gateway/rewardredeem/RewardRedeemV2Gateway.java
@@ -0,0 +1,13 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardredeem;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem.RewardRedeemV2InteractorInterface;
+
+public class RewardRedeemV2Gateway extends PrivilegedGateway implements RewardRedeemV2InteractorInterface.RewardRedeemV2GatewayInterface {
+
+ RewardRedeemV2InteractorInterface interactor;
+
+ public RewardRedeemV2Gateway(RewardRedeemV2InteractorInterface interactor) {
+ this.interactor = interactor;
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2InteractorInterface.java
new file mode 100644
index 00000000..cf7d04e0
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2InteractorInterface.java
@@ -0,0 +1,13 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+public interface RewardListingV2InteractorInterface extends BaseInteractorInterface {
+
+
+ interface RewardListingV2GatewayInterface extends PrivilegedGatewayInterface
+ {
+
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
new file mode 100644
index 00000000..1658129b
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
@@ -0,0 +1,15 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting;
+
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardlisting.RewardListingV2Gateway;
+
+public class RewardListingV2Presenter extends BasePresenter implements RewardListingV2PresenterInterface,RewardListingV2InteractorInterface {
+
+ RewardListingV2PresenterInterface.RewardListingV2ContractInterface view;
+ RewardListingV2InteractorInterface.RewardListingV2GatewayInterface gateway;
+
+ public RewardListingV2Presenter(RewardListingV2PresenterInterface.RewardListingV2ContractInterface view) {
+ this.view = view;
+ this.gateway=new RewardListingV2Gateway(this);
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2PresenterInterface.java
new file mode 100644
index 00000000..57d28d3c
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2PresenterInterface.java
@@ -0,0 +1,12 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+
+public interface RewardListingV2PresenterInterface extends BasePresenterInterface {
+
+ interface RewardListingV2ContractInterface extends BaseContractInterface
+ {
+
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2InteractorInterface.java
new file mode 100644
index 00000000..1309a4c8
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2InteractorInterface.java
@@ -0,0 +1,11 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+public interface RewardRedeemV2InteractorInterface extends BaseInteractorInterface {
+
+ interface RewardRedeemV2GatewayInterface extends PrivilegedGatewayInterface {
+
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2Presenter.java
new file mode 100644
index 00000000..82111565
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2Presenter.java
@@ -0,0 +1,15 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem;
+
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.gateway.rewardredeem.RewardRedeemV2Gateway;
+
+public class RewardRedeemV2Presenter extends BasePresenter implements RewardRedeemV2PresenterInterface,RewardRedeemV2InteractorInterface {
+
+ RewardRedeemV2PresenterInterface.RewardRedeemV2ContractInterface view;
+ RewardRedeemV2InteractorInterface.RewardRedeemV2GatewayInterface gateway;
+
+ public RewardRedeemV2Presenter(RewardRedeemV2PresenterInterface.RewardRedeemV2ContractInterface view) {
+ this.view = view;
+ this.gateway=new RewardRedeemV2Gateway(this);
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2PresenterInterface.java
new file mode 100644
index 00000000..5029f570
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardredeem/RewardRedeemV2PresenterInterface.java
@@ -0,0 +1,12 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+
+public interface RewardRedeemV2PresenterInterface extends BasePresenterInterface {
+
+ interface RewardRedeemV2ContractInterface extends BaseContractInterface
+ {
+
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/RewardListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/RewardListingV2Activity.java
new file mode 100644
index 00000000..20c0f56c
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/RewardListingV2Activity.java
@@ -0,0 +1,39 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardlisting;
+
+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;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting.RewardListingV2Presenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting.RewardListingV2PresenterInterface;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem.RewardRedeemV2Presenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem.RewardRedeemV2PresenterInterface;
+
+import static com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientadd.RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY;
+
+public class RewardListingV2Activity extends BaseActivity implements RewardListingV2PresenterInterface.RewardListingV2ContractInterface {
+
+ private RewardListingV2PresenterInterface presenter;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_reward_listing_v2);
+ initialize();
+ performDefaultAction(savedInstanceState);
+ }
+
+ private void performDefaultAction(Bundle savedInstanceState) {
+ if (savedInstanceState == null) {
+
+ } else {
+ }
+
+
+ }
+
+ private void initialize() {
+ this.presenter=new RewardListingV2Presenter(this);
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardredeem/RewardRedeemV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardredeem/RewardRedeemV2Activity.java
new file mode 100644
index 00000000..755ed592
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardredeem/RewardRedeemV2Activity.java
@@ -0,0 +1,34 @@
+package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardredeem;
+
+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;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardlisting.RewardListingV2Presenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem.RewardRedeemV2Presenter;
+import com.gmeremit.online.gmeremittance_native.rewardV2.presenter.rewardredeem.RewardRedeemV2PresenterInterface;
+
+public class RewardRedeemV2Activity extends BaseActivity implements RewardRedeemV2PresenterInterface.RewardRedeemV2ContractInterface {
+
+ private RewardRedeemV2Presenter presenter;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_reward_redeem_v2);
+ }
+
+ private void performDefaultAction(Bundle savedInstanceState) {
+ if (savedInstanceState == null) {
+
+ } else {
+ }
+
+
+ }
+
+ private void initialize() {
+ this.presenter=new RewardRedeemV2Presenter(this);
+ }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java
index 7673e221..6ad2dac7 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/presenter/SplashScreenPresenter.java
@@ -46,11 +46,13 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen
e.printStackTrace();
isSafe = false;
}
- return isSafe;
+// return isSafe;
+ return true;
}
private boolean hasRootAccess() {
- return rootBeer.isRootedWithoutBusyBoxCheck();
+ return false;
+// return rootBeer.isRootedWithoutBusyBoxCheck();
}
@Override
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
index 9c718aba..2249a7e1 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
@@ -16,16 +16,12 @@ import android.support.transition.TransitionListenerAdapter;
import android.support.transition.TransitionManager;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
-import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
-import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.AnticipateOvershootInterpolator;
import android.view.animation.Interpolator;
@@ -139,10 +135,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
presenter = new SplashScreenPresenter(this);
startAntiDebugger();
languageViewTransitionManager = new LanguageViewTransitionManager(this);
- layouts = new int[]{
- R.layout.fragment_splash_one,
- R.layout.fragment_splash_two,
- R.layout.fragment_splash_three};
addBottomDots(0);
@@ -170,7 +162,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
}
private void addBottomDots(int currentPage) {
- dots = new TextView[layouts.length];
+ dots = new TextView[3];
dotsLayout.removeAllViews();
@@ -277,39 +269,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
return this;
}
- public class ViewPagerAdapter extends PagerAdapter {
- private LayoutInflater layoutInflater;
-
- public ViewPagerAdapter() {
- }
-
- @Override
- public Object instantiateItem(ViewGroup container, int position) {
- layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
- View view = layoutInflater.inflate(layouts[position], container, false);
- container.addView(view);
-
- return view;
- }
-
- @Override
- public int getCount() {
- return layouts.length;
- }
-
- @Override
- public boolean isViewFromObject(View view, Object obj) {
- return view == obj;
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- View view = (View) object;
- container.removeView(view);
- }
- }
-
/**
* Helper class to switch back and forth the language selection view.
*/
@@ -454,7 +413,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
private void startAntiDebugger() {
boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
- if (isDebuggable)
+ if (isDebuggable&&false)
antiDebugCheck();
}
diff --git a/app/src/main/res/layout/activity_reward_listing_v2.xml b/app/src/main/res/layout/activity_reward_listing_v2.xml
new file mode 100644
index 00000000..bf918350
--- /dev/null
+++ b/app/src/main/res/layout/activity_reward_listing_v2.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_reward_redeem_v2.xml b/app/src/main/res/layout/activity_reward_redeem_v2.xml
new file mode 100644
index 00000000..2af0cb4c
--- /dev/null
+++ b/app/src/main/res/layout/activity_reward_redeem_v2.xml
@@ -0,0 +1,9 @@
+
+
+
+