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 b9add009..87b3b789 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 @@ -45,13 +45,6 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen private final CompositeDisposable compositeDisposables; private final String sendCountryDefault = "118"; - - - - - /** - * Exrate Related Data - */ private List countryRelatedCurrencyList; private CountryPaymentService selectedCountryPaymentService; private PaymentMode selectedPaymentMode; @@ -139,7 +132,7 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen public void getExrateRelatedData() { compositeDisposables.add( Observable.zip(getPaymentServiceInfo(), getDefaultValue(this.gateway.getPreferredCountryCode()), PaymentServiceData::new) - .delay(300, TimeUnit.MILLISECONDS) + .delaySubscription(3000, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new PaymentServiceDataObserver()) ); 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 1b439a30..a054b88f 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,6 +16,7 @@ import android.support.transition.Transition; import android.support.transition.TransitionListenerAdapter; import android.support.transition.TransitionManager; import android.support.v4.app.FragmentManager; +import android.support.v4.content.ContextCompat; import android.support.v4.view.GestureDetectorCompat; import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPropertyAnimatorListenerAdapter; @@ -33,6 +34,7 @@ import android.view.animation.OvershootInterpolator; import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; +import android.widget.ProgressBar; import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; @@ -131,6 +133,9 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, @BindView(R.id.sendMoneyViewContainer) View sendMoneyViewContainer; + @BindView(R.id.progressBar) + ProgressBar progressBar; + LanguageViewTransitionManager languageViewTransitionManager; @@ -175,6 +180,8 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, } private void init() { + progressBar.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this, android.R.color.white), android.graphics.PorterDuff.Mode.MULTIPLY); + presenter = new SplashScreenPresenter(this); initAntiDebugger(); languageViewTransitionManager = new LanguageViewTransitionManager(this); diff --git a/app/src/main/res/layout/activity_splash_screen_key_0.xml b/app/src/main/res/layout/activity_splash_screen_key_0.xml index 298413af..e4f27cb4 100644 --- a/app/src/main/res/layout/activity_splash_screen_key_0.xml +++ b/app/src/main/res/layout/activity_splash_screen_key_0.xml @@ -457,6 +457,20 @@ app:layout_constraintVertical_bias="0.52" tools:text="2" /> + + diff --git a/app/src/main/res/layout/activity_splash_screen_key_1.xml b/app/src/main/res/layout/activity_splash_screen_key_1.xml index b62b0f6b..78a42323 100644 --- a/app/src/main/res/layout/activity_splash_screen_key_1.xml +++ b/app/src/main/res/layout/activity_splash_screen_key_1.xml @@ -460,6 +460,20 @@ app:layout_constraintVertical_bias="0.52" tools:text="2" /> + + diff --git a/app/src/main/res/layout/activity_splash_screen_key_2.xml b/app/src/main/res/layout/activity_splash_screen_key_2.xml index 83e72e48..1a3d0390 100644 --- a/app/src/main/res/layout/activity_splash_screen_key_2.xml +++ b/app/src/main/res/layout/activity_splash_screen_key_2.xml @@ -143,6 +143,20 @@ app:layout_constraintTop_toBottomOf="@+id/btn_new_user" tools:text=" 2.2.3 " /> + +